">>>>>>>>>> 355
if (fp)
{
llinfos << "Looking in " << fname
<< " for VRAM info..." << llendl;
rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
if (0 == rtn)
{
rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
if (0 == rtn)
{
rtn = x11_detect_VRAM_kb_fp(fp, ": Video RAM: ");
}
}
fclose(fp);
}
>>>>>>>>>>> 370
Spacings gonna be quite messed up here,
I work from svn trunk and created this patch with 'svn diff >> window.patch'
from that directory. Thats how i normally do it, for a single file i mite have
also done "svn diff indra/llwindow/llwindowsdl.cpp >> window.patch"
for patching 'patch -p0 < window.patch' if it ever doesnt work i just do a
find and replace to fix all the locations of the source files. 'patch -Rp0 <
window.patch to unpatch it, and 'svn revert indra/llwindow/llwindow.cpp. if I
ever end up distroying it and want to revert to the latest version.
Khyota :)
Index: indra/llwindow/llwindowsdl.cpp
===================================================================
--- indra/llwindow/llwindowsdl.cpp (revision 1583)
+++ indra/llwindow/llwindowsdl.cpp (working copy)
@@ -355,18 +355,17 @@
if (fp)
{
llinfos << "Looking in " << fname
- << " for VRAM info..." << llendl;
- rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
- fclose(fp);
+ << " for VRAM info..." << llendl;
+ rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
+ if (0 == rtn)
+ {
+ rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
if (0 == rtn)
{
- fp = fopen(fname.c_str(), "r");
- if (fp)
- {
- rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
- fclose(fp);
- }
+ rtn = x11_detect_VRAM_kb_fp(fp, ": Video RAM: ");
+ }
}
+ fclose(fp);
}
else
{
_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/SLDev
Please read the policies before posting to keep unmoderated posting privileges
