From 3f27ba891ac4d032753b219b4b96d1ffbc9fb488 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:16 -0500
Subject: Second Life viewer sources 1.18.5.0-RC

---
 linden/indra/newview/lloverlaybar.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/lloverlaybar.cpp')

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 @@
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaengine.h"
+#include "llmediaremotectrl.h"
 #include "llpanelaudiovolume.h"
 #include "llparcel.h"
 #include "lltextbox.h"
@@ -124,7 +125,7 @@ LLOverlayBar::LLOverlayBar(const std::string& name, const LLRect& rect)
 	setMouseOpaque(FALSE);
 	setIsChrome(TRUE);
 
-	isBuilt = FALSE;
+	mBuilt = false;
 
 	LLCallbackMap::map_t factory_map;
 	factory_map["master_volume"] = LLCallbackMap(LLOverlayBar::createMasterRemote, this);
@@ -141,7 +142,7 @@ LLOverlayBar::LLOverlayBar(const std::string& name, const LLRect& rect)
 	childSetAction("Stand Up",onClickStandUp,this);
 
 	mIsFocusRoot = TRUE;
-	isBuilt = true;
+	mBuilt = true;
 
 	// make overlay bar conform to window size
 	setRect(rect);
@@ -168,7 +169,7 @@ void LLOverlayBar::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	LLView::reshape(width, height, called_from_parent);
 
-	if (isBuilt) 
+	if (mBuilt) 
 	{
 		layoutButtons();
 	}
-- 
cgit v1.1