diff options
| author | Jacek Antonelli | 2010-01-26 15:20:01 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2010-01-26 15:20:01 -0600 |
| commit | 97cd5a30b9b98c8b620d96763577ec509cc2c16a (patch) | |
| tree | 47da3e6065589b56148a7f7e70e4093808d511e5 /linden/indra/newview/llfirstuse.h | |
| parent | Improved how opacity is displayed in color swatches. (diff) | |
| parent | Fixed crash due to missing FloaterHtmlRect setting (diff) | |
| download | meta-impy-97cd5a30b9b98c8b620d96763577ec509cc2c16a.zip meta-impy-97cd5a30b9b98c8b620d96763577ec509cc2c16a.tar.gz meta-impy-97cd5a30b9b98c8b620d96763577ec509cc2c16a.tar.bz2 meta-impy-97cd5a30b9b98c8b620d96763577ec509cc2c16a.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/llfirstuse.h')
| -rw-r--r-- | linden/indra/newview/llfirstuse.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h index 3305ffe..e327984 100644 --- a/linden/indra/newview/llfirstuse.h +++ b/linden/indra/newview/llfirstuse.h | |||
| @@ -111,6 +111,8 @@ public: | |||
| 111 | static void useDebugMenus(); | 111 | static void useDebugMenus(); |
| 112 | static void useSculptedPrim(); | 112 | static void useSculptedPrim(); |
| 113 | static void useMedia(); | 113 | static void useMedia(); |
| 114 | static void callbackClientTags(const LLSD& notification, const LLSD& response); | ||
| 115 | static void ClientTags(); | ||
| 114 | 116 | ||
| 115 | protected: | 117 | protected: |
| 116 | static std::set<std::string> sConfigVariables; | 118 | static std::set<std::string> sConfigVariables; |