Second Life viewer sources 1.19.0.0

1 files changed, 7 insertions, 18 deletions

diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 9475bbb..46dbfef 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -54,15 +54,15 @@ class LLOverlayBar
 :       public LLPanel
 {
 public:
-        LLOverlayBar(const std::string& name, const LLRect& rect );
+        LLOverlayBar();
         ~LLOverlayBar();
 
         virtual EWidgetType getWidgetType() const;
         virtual LLString getWidgetTag() const;
 
         /*virtual*/ void refresh();
-        /*virtual*/ void draw();
         /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+        /*virtual*/ BOOL postBuild();
 
         void layoutButtons();
 
@@ -79,27 +79,16 @@ public:
 
         //static media helper functions
         static void mediaPlay(void*);
-        static void mediaPause(void*);
-        static void mediaStop(void*);
-        
         static void musicPlay(void*);
-        static void musicPause(void*);
-        static void musicStop(void*);
 
-        static void toggleAudioVolumeFloater(void*);
-        
-        static void enableMediaButtons(LLPanel* panel);
-        static void enableMusicButtons(LLPanel* panel);
-        
 protected:      
-        static void* createMasterRemote(void* userdata);
-        static void* createMusicRemote(void* userdata);
         static void* createMediaRemote(void* userdata);
         static void* createVoiceRemote(void* userdata);
+        static void* createChatBar(void* userdata);
+
+        void enableMediaButtons();
 
 protected:
-        LLMediaRemoteCtrl*      mMasterRemote;
-        LLMediaRemoteCtrl*      mMusicRemote;
         LLMediaRemoteCtrl*      mMediaRemote;
         LLVoiceRemoteCtrl*      mVoiceRemote;
         bool mBuilt;    // dialog constructed yet?