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();