From b7edc965bc77ab21e9a1e3f6b424299a50053529 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 19 Nov 2013 16:32:41 -0500
Subject: STORM-68 Place initial call to send cap in new, better location. Make
 processing of debug setting names a little more elegant.

---
 indra/newview/llfloaterperms.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloaterperms.h')

diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index a31d034ec8..b4b5d58aa5 100644
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -1,7 +1,7 @@
 /** 
  * @file llfloaterperms.h
  * @brief Asset creation permission preferences.
- * @author Coco 
+ * @author Jonathan Yap
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -62,6 +62,7 @@ public:
 	static void updateCap(bool alwaysUpdate);
 	static void setCapSent(bool cap_sent);
 
+// Update instantiation of sCategoryNames in the .cpp file to match if you change this!
 enum Categories
 {
 	CAT_OBJECTS,
@@ -77,7 +78,7 @@ private:
 	LLFloaterPermsDefault(const LLSD& seed);
 	void refresh();
 
-	std::string category_names[CAT_LAST];
+	static const std::string sCategoryNames[CAT_LAST]; 
 
 	// cached values only for implementing cancel.
 	bool mShareWithGroup[CAT_LAST];
-- 
cgit v1.2.3