summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-25 13:50:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-25 13:50:39 -0400
commitc3488d1fc64fb3f2bc5ad3a5a0fd5722eb574a4c (patch)
treecbb01e0c6df666a14c7a312c12884e03710b3b28 /indra/newview
parentcf60f6a1910e8fa82011d6f13aa1bd9c6767fffb (diff)
SH-3172 WIP - useServerTextureBaking() func
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llappearancemgr.cpp9
-rwxr-xr-x[-rw-r--r--]indra/newview/llappearancemgr.h2
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index faadfb4b87..5d2ff1b40f 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2581,8 +2581,13 @@ void LLAppearanceMgr::updateClothingOrderingInfo(LLUUID cat_id, bool update_base
if (inventory_changed) gInventory.notifyObservers();
}
-
-
+// Should be true iff both the appropriate debug setting is enabled
+// and the corresponding cap has been found.
+bool useServerTextureBaking()
+{
+ // TODO: add cap check.
+ return gSavedSettings.getBOOL("UseServerTextureBaking");
+}
class LLShowCreatedOutfit: public LLInventoryCallback
{
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index c1d561781d..4423486b95 100644..100755
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -182,6 +182,8 @@ public:
bool isInUpdateAppearanceFromCOF() { return mIsInUpdateAppearanceFromCOF; }
+ bool useServerTextureBaking();
+
protected:
LLAppearanceMgr();
~LLAppearanceMgr();