diff options
author | Armin Weatherwax | 2011-04-09 16:34:41 +0200 |
---|---|---|
committer | McCabe Maxsted | 2011-04-19 17:50:31 -0700 |
commit | 435b1ab185f88ec9716e8abfca61e80b2b44fabd (patch) | |
tree | e70d0533a8efeb73fd71b02c2da648b6cedd5b38 /linden/indra/newview/llprefsadvanced.h | |
parent | Added missing NULL check for gAudiostream in chatbar_as_cmdline (diff) | |
download | meta-impy-435b1ab185f88ec9716e8abfca61e80b2b44fabd.zip meta-impy-435b1ab185f88ec9716e8abfca61e80b2b44fabd.tar.gz meta-impy-435b1ab185f88ec9716e8abfca61e80b2b44fabd.tar.bz2 meta-impy-435b1ab185f88ec9716e8abfca61e80b2b44fabd.tar.xz |
add some basic cloud preferences in prefs > advanced >eye candy - please review perms
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsadvanced.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h index 22236ce..87ddc59 100644 --- a/linden/indra/newview/llprefsadvanced.h +++ b/linden/indra/newview/llprefsadvanced.h | |||
@@ -33,6 +33,7 @@ | |||
33 | 33 | ||
34 | #include "llpanel.h" | 34 | #include "llpanel.h" |
35 | #include "llviewerinventory.h" | 35 | #include "llviewerinventory.h" |
36 | class LLColor4; | ||
36 | 37 | ||
37 | class LLPrefsAdvanced : public LLPanel | 38 | class LLPrefsAdvanced : public LLPanel |
38 | { | 39 | { |
@@ -45,7 +46,7 @@ public: | |||
45 | void apply(); | 46 | void apply(); |
46 | void cancel(); | 47 | void cancel(); |
47 | void refresh(); | 48 | void refresh(); |
48 | 49 | void draw(); | |
49 | private: | 50 | private: |
50 | static LLPrefsAdvanced* sInstance; | 51 | static LLPrefsAdvanced* sInstance; |
51 | 52 | ||
@@ -58,12 +59,21 @@ private: | |||
58 | static void onSpellEditCustom(void* data); | 59 | static void onSpellEditCustom(void* data); |
59 | static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata); | 60 | static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata); |
60 | static void onAutoCorrectButton(void * data); | 61 | static void onAutoCorrectButton(void * data); |
62 | static void onSaveThisCloudButton(void * data); | ||
63 | static void onSaveAnyoneCloudButton(void * data); | ||
61 | 64 | ||
62 | LLColor4 mClientTagColor; | 65 | LLColor4 mClientTagColor; |
63 | 66 | ||
64 | protected: | 67 | protected: |
68 | void setParticleControls(bool is_logged_in); | ||
65 | void initHelpBtn(const std::string& name, const std::string& xml_alert); | 69 | void initHelpBtn(const std::string& name, const std::string& xml_alert); |
66 | static void onClickHelp(void* data); | 70 | static void onClickHelp(void* data); |
71 | |||
72 | private: | ||
73 | bool mWasLoggedIn; | ||
74 | LLColor4 mCloudStartColor; | ||
75 | LLColor4 mCloudEndColor; | ||
76 | LLUUID mCloudTextureID; | ||
67 | }; | 77 | }; |
68 | 78 | ||
69 | #endif // LLPREFSADVANCED_H | 79 | #endif // LLPREFSADVANCED_H |