From c3488d1fc64fb3f2bc5ad3a5a0fd5722eb574a4c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 25 Jun 2012 13:50:39 -0400
Subject: SH-3172 WIP - useServerTextureBaking() func

---
 indra/newview/llappearancemgr.cpp | 9 +++++++--
 indra/newview/llappearancemgr.h   | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 indra/newview/llappearancemgr.h

(limited to 'indra')

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
old mode 100644
new mode 100755
index c1d561781d..4423486b95
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -182,6 +182,8 @@ public:
 
 	bool isInUpdateAppearanceFromCOF() { return mIsInUpdateAppearanceFromCOF; }
 
+	bool useServerTextureBaking();
+
 protected:
 	LLAppearanceMgr();
 	~LLAppearanceMgr();
-- 
cgit v1.2.3