summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-26 16:05:03 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-26 16:05:03 -0400
commit99c1c64aa494c0b9085f0766b951fedfb60ce412 (patch)
tree12bae21b70126f6df2d1bbafc80d5e76c2a8ec16 /indra
parentc3488d1fc64fb3f2bc5ad3a5a0fd5722eb574a4c (diff)
SH-3172 WIP - fix
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llappearancemgr.cpp2
-rwxr-xr-x[-rw-r--r--]indra/newview/lldynamictexture.cpp0
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 5d2ff1b40f..02a90c60ec 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2583,7 +2583,7 @@ void LLAppearanceMgr::updateClothingOrderingInfo(LLUUID cat_id, bool update_base
// Should be true iff both the appropriate debug setting is enabled
// and the corresponding cap has been found.
-bool useServerTextureBaking()
+bool LLAppearanceMgr::useServerTextureBaking()
{
// TODO: add cap check.
return gSavedSettings.getBOOL("UseServerTextureBaking");
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index a93b2b71de..a93b2b71de 100644..100755
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp