aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lloverlaybar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lloverlaybar.cpp')
-rw-r--r--linden/indra/newview/lloverlaybar.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index d8131c2..bcdb6c6 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -42,6 +42,7 @@
42#include "llfocusmgr.h" 42#include "llfocusmgr.h"
43#include "llimview.h" 43#include "llimview.h"
44#include "llmediaengine.h" 44#include "llmediaengine.h"
45#include "llmediaremotectrl.h"
45#include "llpanelaudiovolume.h" 46#include "llpanelaudiovolume.h"
46#include "llparcel.h" 47#include "llparcel.h"
47#include "lltextbox.h" 48#include "lltextbox.h"
@@ -124,7 +125,7 @@ LLOverlayBar::LLOverlayBar(const std::string& name, const LLRect& rect)
124 setMouseOpaque(FALSE); 125 setMouseOpaque(FALSE);
125 setIsChrome(TRUE); 126 setIsChrome(TRUE);
126 127
127 isBuilt = FALSE; 128 mBuilt = false;
128 129
129 LLCallbackMap::map_t factory_map; 130 LLCallbackMap::map_t factory_map;
130 factory_map["master_volume"] = LLCallbackMap(LLOverlayBar::createMasterRemote, this); 131 factory_map["master_volume"] = LLCallbackMap(LLOverlayBar::createMasterRemote, this);
@@ -141,7 +142,7 @@ LLOverlayBar::LLOverlayBar(const std::string& name, const LLRect& rect)
141 childSetAction("Stand Up",onClickStandUp,this); 142 childSetAction("Stand Up",onClickStandUp,this);
142 143
143 mIsFocusRoot = TRUE; 144 mIsFocusRoot = TRUE;
144 isBuilt = true; 145 mBuilt = true;
145 146
146 // make overlay bar conform to window size 147 // make overlay bar conform to window size
147 setRect(rect); 148 setRect(rect);
@@ -168,7 +169,7 @@ void LLOverlayBar::reshape(S32 width, S32 height, BOOL called_from_parent)
168{ 169{
169 LLView::reshape(width, height, called_from_parent); 170 LLView::reshape(width, height, called_from_parent);
170 171
171 if (isBuilt) 172 if (mBuilt)
172 { 173 {
173 layoutButtons(); 174 layoutButtons();
174 } 175 }