summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-09-10 11:09:05 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-09-10 11:09:05 -0700
commitef39011f433d93ea72cf636d4c415b468f776a01 (patch)
tree48bd9f1ccfca180d19fd9f5fb6efa804e3d904cb /indra/newview/llconversationview.h
parent8366efc339e7eca3918d7246b3bb7a9ba61ce765 (diff)
CHUI-283: Now displaying the speaker icon instead of the profile icon
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-xindra/newview/llconversationview.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index 0a008475a3..98eb32d44e 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -36,6 +36,7 @@
#include "llcallbackmap.h"
#include "lltextbox.h"
#include "llbutton.h"
+#include "lloutputmonitorctrl.h"
class LLIMFloaterContainer;
@@ -75,9 +76,9 @@ public:
struct Params : public LLInitParam::Block<Params, LLFolderViewItem::Params>
{
Optional<LLIMFloaterContainer*> container;
- Optional<LLButton::Params> view_profile_button,
- info_button;
-
+ Optional<LLButton::Params> info_button;
+ Optional<LLOutputMonitorCtrl::Params> output_monitor;
+
Params();
};
@@ -91,12 +92,10 @@ protected:
BOOL postBuild();
void onInfoBtnClick();
- void onProfileBtnClick();
private:
LLButton* createProfileButton();
LLButton * mInfoBtn;
- LLButton * mProfileBtn;
};