diff options
| author | Jonathan Yap <none@none> | 2013-11-19 16:32:41 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-19 16:32:41 -0500 |
| commit | b7edc965bc77ab21e9a1e3f6b424299a50053529 (patch) | |
| tree | da4ffe124f994e5c96a03e88bc0a6083b9430e07 /indra/newview/llfloaterperms.h | |
| parent | 56b1b35a18c21f6dad4147df35ba4594f31b67e3 (diff) | |
STORM-68 Place initial call to send cap in new, better location.
Make processing of debug setting names a little more elegant.
Diffstat (limited to 'indra/newview/llfloaterperms.h')
| -rw-r--r-- | indra/newview/llfloaterperms.h | 5 |
1 files changed, 3 insertions, 2 deletions
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]; |