merge

--HG--
branch : product-engine

5 files changed, 46 insertions, 80 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 69336243da..53ac1dc0b9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3664,17 +3664,6 @@
       <key>Value</key>
       <string />
     </map>
-    <key>IMInChat</key>
-    <map>
-      <key>Comment</key>
-      <string>Copy IM into chat console</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>IMShowTimestamps</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index c24c224133..cdb9b8edb8 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -311,7 +311,7 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data)
 }
 
 // Put a line of chat in all the right places
-void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL local_agent)
+void LLFloaterChat::addChat(const LLChat& chat, BOOL local_agent)
 {
 	triggerAlerts(chat.mText);
 
@@ -321,19 +321,7 @@ void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL
 	//if(chat.mSourceType == CHAT_SOURCE_AGENT && chat.mFromID.notNull())
 	//	LLRecentPeople::instance().add(chat.mFromID);
 	
-	bool add_chat = true;
-	bool log_chat = true;
-	if(from_instant_message)
-	{
-		if (!gSavedSettings.getBOOL("IMInChat"))
-			add_chat = false;
-		//log_chat = false;
-}
-	
-	if (add_chat)
-	{
-		addChatHistory(chat, log_chat);
-	}
+	addChatHistory(chat, true);
 }
 
 // Moved from lltextparser.cpp to break llui/llaudio library dependency.
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index 84fc199bfa..4437a0a5c2 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -61,7 +61,7 @@ public:
 	//  *TODO:Skinning - move these to LLChat (or LLViewerChat?)
 	// Add chat to console and history list.
 	// Color based on source, type, distance.
-	static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE);
+	static void addChat(const LLChat& chat, BOOL local_agent = FALSE);
 	// Add chat to history alone.
 	static void addChatHistory(const LLChat& chat, bool log_to_file = true);
 	
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index f1d550f625..3f556e5608 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6373,57 +6373,57 @@ class LLToolsSelectedScriptAction : public view_listener_t
 
 void handle_selected_texture_info(void*)
 {
-	for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();

-   		iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)

-	{

-		LLSelectNode* node = *iter;

-	   	

-   		std::string msg;

-   		msg.assign("Texture info for: ");

-   		msg.append(node->mName);

-

+	for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
+   		iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
+	{
+		LLSelectNode* node = *iter;
+	   	
+   		std::string msg;
+   		msg.assign("Texture info for: ");
+   		msg.append(node->mName);
+
 		//TODO* CHAT: how to show this?
 		//LLSD args;
 		//args["MESSAGE"] = msg;
 		//LLNotificationsUtil::add("SystemMessage", args);
-	   

-   		U8 te_count = node->getObject()->getNumTEs();

-   		// map from texture ID to list of faces using it

-   		typedef std::map< LLUUID, std::vector<U8> > map_t;

-   		map_t faces_per_texture;

-   		for (U8 i = 0; i < te_count; i++)

-   		{

-   			if (!node->isTESelected(i)) continue;

-	   

-   			LLViewerTexture* img = node->getObject()->getTEImage(i);

-   			LLUUID image_id = img->getID();

-   			faces_per_texture[image_id].push_back(i);

-   		}

-   		// Per-texture, dump which faces are using it.

-   		map_t::iterator it;

-   		for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)

-   		{

-   			LLUUID image_id = it->first;

-   			U8 te = it->second[0];

-   			LLViewerTexture* img = node->getObject()->getTEImage(te);

-   			S32 height = img->getHeight();

-   			S32 width = img->getWidth();

-   			S32 components = img->getComponents();

-   			msg = llformat("%dx%d %s on face ",

-   								width,

-   								height,

-   								(components == 4 ? "alpha" : "opaque"));

-   			for (U8 i = 0; i < it->second.size(); ++i)

-   			{

-   				msg.append( llformat("%d ", (S32)(it->second[i])));

-   			}

-

+	   
+   		U8 te_count = node->getObject()->getNumTEs();
+   		// map from texture ID to list of faces using it
+   		typedef std::map< LLUUID, std::vector<U8> > map_t;
+   		map_t faces_per_texture;
+   		for (U8 i = 0; i < te_count; i++)
+   		{
+   			if (!node->isTESelected(i)) continue;
+	   
+   			LLViewerTexture* img = node->getObject()->getTEImage(i);
+   			LLUUID image_id = img->getID();
+   			faces_per_texture[image_id].push_back(i);
+   		}
+   		// Per-texture, dump which faces are using it.
+   		map_t::iterator it;
+   		for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
+   		{
+   			LLUUID image_id = it->first;
+   			U8 te = it->second[0];
+   			LLViewerTexture* img = node->getObject()->getTEImage(te);
+   			S32 height = img->getHeight();
+   			S32 width = img->getWidth();
+   			S32 components = img->getComponents();
+   			msg = llformat("%dx%d %s on face ",
+   								width,
+   								height,
+   								(components == 4 ? "alpha" : "opaque"));
+   			for (U8 i = 0; i < it->second.size(); ++i)
+   			{
+   				msg.append( llformat("%d ", (S32)(it->second[i])));
+   			}
+
 			//TODO* CHAT: how to show this?
 			//LLSD args;
 			//args["MESSAGE"] = msg;
 			//LLNotificationsUtil::add("SystemMessage", args);
-   		}

-	}

+   		}
+	}
 }
 
 void handle_test_male(void*)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 21fe2bb242..a98a049c17 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1603,17 +1603,6 @@
              function="ToggleControl"
              parameter="MouseSmooth" />
         </menu_item_check>
-        <menu_item_check
-         label="Show IMs in Nearby Chat"
-         layout="topleft"
-         name="IMInChat">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="IMInChat" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="IMInChat" />
-        </menu_item_check>
         <menu_item_separator
          layout="topleft" />
         <menu