diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-10-28 20:16:13 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-10-28 20:16:13 +0200 |
| commit | e9c83f234306e070aa1f31eff68719589265f916 (patch) | |
| tree | 06ae45597b71fa10e061e51423c8f9f486b86dc8 /indra/newview/llimview.h | |
| parent | e8e5dfeb369d13509bd7631230373dda0c3c7b6a (diff) | |
| parent | d01f7a7422d3db38b2cd6370a03cfd10bb0d53e0 (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 80b54d7ef0..ae8fd355ea 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -34,7 +34,7 @@ #define LL_LLIMVIEW_H #include "lldarray.h" -#include "llfloateractivespeakers.h" //for LLIMSpeakerMgr +#include "llspeakers.h" //for LLIMSpeakerMgr #include "llimpanel.h" //for voice channels #include "llmodaldialog.h" #include "llinstantmessage.h" @@ -76,7 +76,7 @@ public: bool mCallBackEnabled; bool mTextIMPossible; - bool mProfileButtonEnabled; + bool mOtherParticipantIsAvatar; }; |