aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lloverlaybar.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-08 23:23:07 -0700
committerMcCabe Maxsted2009-06-08 23:23:07 -0700
commitc4f22cd6a6f96546a39702097accc8557130d34a (patch)
tree8827b07170fea501cdfbfd7696461298dfb587dc /linden/indra/newview/lloverlaybar.h
parentMerged in 1.2.0-communicatetitle (diff)
downloadmeta-impy-c4f22cd6a6f96546a39702097accc8557130d34a.zip
meta-impy-c4f22cd6a6f96546a39702097accc8557130d34a.tar.gz
meta-impy-c4f22cd6a6f96546a39702097accc8557130d34a.tar.bz2
meta-impy-c4f22cd6a6f96546a39702097accc8557130d34a.tar.xz
'IM Received' button to '__ New IMs'
Diffstat (limited to 'linden/indra/newview/lloverlaybar.h')
-rw-r--r--linden/indra/newview/lloverlaybar.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 8b9b6bc..52a469a 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -95,9 +95,11 @@ protected:
95protected: 95protected:
96 LLMediaRemoteCtrl* mMediaRemote; 96 LLMediaRemoteCtrl* mMediaRemote;
97 LLVoiceRemoteCtrl* mVoiceRemote; 97 LLVoiceRemoteCtrl* mVoiceRemote;
98 bool mBuilt; // dialog constructed yet? 98 bool mBuilt; // dialog constructed yet?
99 S32 mMusicState;
100 std::string mOriginalIMLabel;
101
99 enum { STOPPED=0, PLAYING=1, PAUSED=2 }; 102 enum { STOPPED=0, PLAYING=1, PAUSED=2 };
100 S32 mMusicState;
101}; 103};
102 104
103extern LLOverlayBar* gOverlayBar; 105extern LLOverlayBar* gOverlayBar;