merge with latest

4 files changed, 76 insertions, 38 deletions

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 7a60903950..55c63edd74 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -400,7 +400,7 @@ void LLBottomTray::onMouselookModeOut()
 {
 	mIsInLiteMode = false;
 	mBottomTrayLite->setVisible(FALSE);
-	mNearbyChatBar->getChatBox()->setText(mBottomTrayLite->mNearbyChatBar->getChatBox()->getText());
+	//mNearbyChatBar->getChatBox()->setText(mBottomTrayLite->mNearbyChatBar->getChatBox()->getText());
 	setVisible(TRUE);
 }
 
@@ -413,8 +413,8 @@ void LLBottomTray::onMouselookModeIn()
 		getParent()->addChild(mBottomTrayLite);
 
 	mBottomTrayLite->setShape(getLocalRect());
-	mBottomTrayLite->mNearbyChatBar->getChatBox()->setText(mNearbyChatBar->getChatBox()->getText());
-	mBottomTrayLite->mGesturePanel->setVisible(gSavedSettings.getBOOL("ShowGestureButton"));
+	//mBottomTrayLite->mNearbyChatBar->getChatBox()->setText(mNearbyChatBar->getChatBox()->getText());
+	//mBottomTrayLite->mGesturePanel->setVisible(gSavedSettings.getBOOL("ShowGestureButton"));
 
 	mIsInLiteMode = true;
 }
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 361912a5cb..8d57ae3a32 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -58,7 +58,7 @@
 static const S32 RESIZE_BAR_THICKNESS = 3;
 
 LLNearbyChat::LLNearbyChat(const LLSD& key) 
-	: LLDockableFloater(NULL, false, false, key)
+	: LLFloater(key)
 	,mChatHistory(NULL)
 {
 	
@@ -86,20 +86,9 @@ BOOL LLNearbyChat::postBuild()
 
 	mChatHistory = getChild<LLChatHistory>("chat_history");
 
-	if(!LLDockableFloater::postBuild())
+	if(!LLFloater::postBuild())
 		return false;
 
-	if (getDockControl() == NULL)
-	{
-		setDockControl(new LLDockControl(
-			LLFloaterReg::getInstance("chat_bar"), this,
-			getDockTongue(), LLDockControl::TOP, boost::bind(&LLNearbyChat::getAllowedRect, this, _1)));
-	}
-
-        //fix for EXT-4621 
-        //chrome="true" prevents floater from stilling capture
-        setIsChrome(true);
-	//chrome="true" hides floater caption 
 	if (mDragHandle)
 		mDragHandle->setTitleVisible(TRUE);
 
@@ -118,20 +107,6 @@ void    LLNearbyChat::applySavedVariables()
 			setRect(rect);
 		}
 	}
-
-
-	if(!LLFloater::getControlGroup()->controlExists(mDocStateControl))
-	{
-		setDocked(true);
-	}
-	else
-	{
-		if (mDocStateControl.size() > 1)
-		{
-			bool dockState = LLFloater::getControlGroup()->getBOOL(mDocStateControl);
-			setDocked(dockState);
-		}
-	}
 }
 
 std::string appendTime()
@@ -229,17 +204,17 @@ void	LLNearbyChat::setVisible(BOOL visible)
 		}
 	}
 
-	LLDockableFloater::setVisible(visible);
+	LLFloater::setVisible(visible);
 }
 
 void	LLNearbyChat::onOpen(const LLSD& key )
 {
-	LLDockableFloater::onOpen(key);
+	LLFloater::onOpen(key);
 }
 
 void LLNearbyChat::setRect	(const LLRect &rect)
 {
-	LLDockableFloater::setRect(rect);
+	LLFloater::setRect(rect);
 }
 
 void LLNearbyChat::getAllowedRect(LLRect& rect)
@@ -367,7 +342,7 @@ BOOL	LLNearbyChat::handleMouseDown(S32 x, S32 y, MASK mask)
 	
 	if(mChatHistory)
 		mChatHistory->setFocus(TRUE);
-	return LLDockableFloater::handleMouseDown(x, y, mask);
+	return LLFloater::handleMouseDown(x, y, mask);
 }
 
 void LLNearbyChat::draw()
@@ -380,5 +355,5 @@ void LLNearbyChat::draw()
 		setTransparencyType(hasFocus() ? TT_ACTIVE : TT_INACTIVE);
 	}
 
-	LLDockableFloater::draw();
+	LLFloater::draw();
 }
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 2ea79797f8..834a31bbf0 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -1,4 +1,4 @@
-/** 
+ /** 
  * @file llnearbychat.h
  * @brief nearby chat history scrolling panel implementation
  *
@@ -27,14 +27,14 @@
 #ifndef LL_LLNEARBYCHAT_H_
 #define LL_LLNEARBYCHAT_H_
 
-#include "lldockablefloater.h"
 #include "llscrollbar.h"
 #include "llviewerchat.h"
+#include "llfloater.h"
 
 class LLResizeBar;
 class LLChatHistory;
 
-class LLNearbyChat: public LLDockableFloater
+class LLNearbyChat: public LLFloater
 {
 public:
 	LLNearbyChat(const LLSD& key);
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
new file mode 100644
index 0000000000..d0059b281e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="60"
+ layout="topleft"
+ legacy_header_height="20"
+ title="Nearby chat"
+ can_close="true"
+ can_minimize="true"
+ help_topic="chat_bar"
+ save_rect="true"
+ min_height="60"
+ min_width="150"
+ can_resize="true"
+ name="chat_bar"
+ width="380">
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="23"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="7"
+     left="0"
+     max_length_bytes="1023"
+     name="chat_box"
+     text_pad_left="5"
+     text_pad_right="25"
+     tool_tip="Press Enter to say, Ctrl+Enter to shout"
+     top="27"
+     width="335" />
+    <output_monitor
+     auto_update="true"
+     follows="right"
+     draw_border="false"
+     height="16"
+     layout="topleft"
+     left_pad="-24"
+     mouse_opaque="true"
+     name="chat_zone_indicator"
+     top="31"
+     visible="true"
+     width="20" />
+    <button
+     follows="right"
+     is_toggle="true"
+     width="20"
+     top="27"
+     layout="topleft"
+     left_pad="12"
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_On"
+     image_pressed="ComboButton_UpSelected"
+     image_pressed_selected="ComboButton_Selected"
+     height="23"
+     name="show_nearby_chat"
+     tool_tip="Shows/hides nearby chat log">
+        <button.init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="nearby_chat" />
+    </button>
+</floater>