aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsim.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-06 22:27:24 -0700
committerMcCabe Maxsted2010-04-06 22:27:24 -0700
commitc6fbf529fce49017cbb7f3cbbfd3a11d611aa137 (patch)
tree23b0f3cf4f21a42a5da77a6e05a207f04792ae28 /linden/indra/newview/llprefsim.cpp
parentCreated new Advanced preferences panel, ready for filling (diff)
downloadmeta-impy-c6fbf529fce49017cbb7f3cbbfd3a11d611aa137.zip
meta-impy-c6fbf529fce49017cbb7f3cbbfd3a11d611aa137.tar.gz
meta-impy-c6fbf529fce49017cbb7f3cbbfd3a11d611aa137.tar.bz2
meta-impy-c6fbf529fce49017cbb7f3cbbfd3a11d611aa137.tar.xz
Ported IM autoresponse options from Emerald, added them to a new window in Preferences > IM
Diffstat (limited to 'linden/indra/newview/llprefsim.cpp')
-rw-r--r--linden/indra/newview/llprefsim.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 0c06122..045139c 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -35,6 +35,7 @@
35 35
36#include "llprefsim.h" 36#include "llprefsim.h"
37 37
38#include "floaterbusy.h"
38#include "llpanel.h" 39#include "llpanel.h"
39#include "llcheckboxctrl.h" 40#include "llcheckboxctrl.h"
40#include "llstring.h" 41#include "llstring.h"
@@ -65,6 +66,8 @@ public:
65 static void onClickLogPath(void* user_data); 66 static void onClickLogPath(void* user_data);
66 static void onCommitLogging(LLUICtrl* ctrl, void* user_data); 67 static void onCommitLogging(LLUICtrl* ctrl, void* user_data);
67 68
69 static void onClickBusyAdvanced(void* user_data);
70
68protected: 71protected:
69 72
70 bool mGotPersonalInfo; 73 bool mGotPersonalInfo;
@@ -136,6 +139,8 @@ BOOL LLPrefsIMImpl::postBuild()
136 childSetAction("log_path_button", onClickLogPath, this); 139 childSetAction("log_path_button", onClickLogPath, this);
137 childSetCommitCallback("log_chat",onCommitLogging,this); 140 childSetCommitCallback("log_chat",onCommitLogging,this);
138 childSetCommitCallback("log_instant_messages",onCommitLogging,this); 141 childSetCommitCallback("log_instant_messages",onCommitLogging,this);
142
143 childSetAction("busy_adv_btn", onClickBusyAdvanced, this);
139 144
140 return TRUE; 145 return TRUE;
141} 146}
@@ -287,6 +292,13 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
287 292
288 293
289// static 294// static
295void LLPrefsIMImpl::onClickBusyAdvanced(void* user_data)
296{
297 FloaterBusy::getInstance()->open();
298 FloaterBusy::getInstance()->center();
299}
300
301// static
290void LLPrefsIMImpl::onClickLogPath(void* user_data) 302void LLPrefsIMImpl::onClickLogPath(void* user_data)
291{ 303{
292 LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data; 304 LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data;