From 4b9c365b442acfd662086a8ce23209f8f7a7afc2 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 18 Dec 2009 14:00:00 +0200
Subject: Renamed method to reflect what it does

--HG--
branch : product-engine
---
 indra/newview/llcallfloater.cpp | 5 +++--
 indra/newview/llcallfloater.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 7ca49928da..1acdb96da6 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -162,6 +162,7 @@ void LLCallFloater::onChange()
 	if (NULL == mPaticipants) return;
 
 	mPaticipants->refreshVoiceState();
+
 }
 
 
@@ -243,7 +244,7 @@ void LLCallFloater::updateSession()
 	childSetVisible("leave_call_btn", !is_local_chat);
 	
 	refreshPartisipantList();
-	updateModeratorState();
+	updateAgentModeratorState();
 
 	//show floater for voice calls
 	if (!is_local_chat)
@@ -366,7 +367,7 @@ void LLCallFloater::setModeratorMutedVoice(bool moderator_muted)
 	mSpeakingIndicator->setIsMuted(moderator_muted);
 }
 
-void LLCallFloater::updateModeratorState()
+void LLCallFloater::updateAgentModeratorState()
 {
 	std::string name;
 	gCacheName->getFullName(gAgentID, name);
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index f9c9149085..ac45e283eb 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -101,7 +101,7 @@ private:
 	void updateTitle();
 	void initAgentData();
 	void setModeratorMutedVoice(bool moderator_muted);
-	void updateModeratorState();
+	void updateAgentModeratorState();
 
 private:
 	LLSpeakerMgr* mSpeakerManager;
-- 
cgit v1.2.3


From fb862f18159d320572008b6a8da81ffd2f109e37 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Fri, 18 Dec 2009 11:05:44 -0800
Subject: Slight hack: if pixel area is 1024, force recalculation of it This is
 because I've observed that in heavy regions, media was not getting loaded
 because the queue items were stuck with the head item at interest = 1024. 
 This is the "default" value, which means it probably wasn't calculated yet. 
 This forces the calculation.

Also cleaned up some logging in mediadataclient
---
 indra/newview/llmediadataclient.cpp | 16 ++++++++--------
 indra/newview/llvovolume.cpp        | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
index 2bb2a3da6f..b8da368bd7 100755
--- a/indra/newview/llmediadataclient.cpp
+++ b/indra/newview/llmediadataclient.cpp
@@ -164,7 +164,7 @@ void LLMediaDataClient::enqueue(const Request *request)
 		// Sadly, we have to const-cast because items put into the queue are not const
 		mSortedQueue.push_back(const_cast<LLMediaDataClient::Request*>(request));
 		
-		LL_DEBUGS("LLMediaDataClient") << "SORTED queue:" << mSortedQueue << LL_ENDL;
+		LL_DEBUGS("LLMediaDataClientQueue") << "SORTED queue:" << mSortedQueue << LL_ENDL;
 	}
 	else {
 		if (mRoundRobinQueue.size() > mMaxRoundRobinQueueSize) 
@@ -187,7 +187,7 @@ void LLMediaDataClient::enqueue(const Request *request)
 			// Sadly, we have to const-cast because items put into the queue are not const
 			mRoundRobinQueue.push_front(const_cast<LLMediaDataClient::Request*>(request));
 			
-			LL_DEBUGS("LLMediaDataClient") << "RR queue:" << mRoundRobinQueue << LL_ENDL;			
+			LL_DEBUGS("LLMediaDataClientQueue") << "RR queue:" << mRoundRobinQueue << LL_ENDL;			
 		}
 		else
 		{
@@ -226,16 +226,16 @@ bool LLMediaDataClient::processQueueTimer()
 	{
 		LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() started, SORTED queue size is:	  " << mSortedQueue.size() 
 			<< ", RR queue size is:	  " << mRoundRobinQueue.size() << LL_ENDL;
-		LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() started, SORTED queue is:	  " << mSortedQueue << LL_ENDL;
-		LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() started, RR queue is:	  " << mRoundRobinQueue << LL_ENDL;
+		LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() started, SORTED queue is:	  " << mSortedQueue << LL_ENDL;
+		LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() started, RR queue is:	  " << mRoundRobinQueue << LL_ENDL;
 	}
 	
 	serviceQueue();
 	
 	LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() finished, SORTED queue size is:	  " << mSortedQueue.size() 
 		<< ", RR queue size is:	  " << mRoundRobinQueue.size() << LL_ENDL;
-	LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() finished, SORTED queue is:	  " << mSortedQueue << LL_ENDL;
-	LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() finished, RR queue is:	  " << mRoundRobinQueue << LL_ENDL;
+	LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() finished, SORTED queue is:	  " << mSortedQueue << LL_ENDL;
+	LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() finished, RR queue is:	  " << mRoundRobinQueue << LL_ENDL;
 	
 	return isEmpty();
 }
@@ -649,7 +649,7 @@ void LLMediaDataClient::Responder::error(U32 status, const std::string& reason)
 /*virtual*/
 void LLMediaDataClient::Responder::result(const LLSD& content)
 {
-	LL_DEBUGS("LLMediaDataClient") << *mRequest << " result : " << ll_print_sd(content) << LL_ENDL;
+	LL_DEBUGS("LLMediaDataClientResponse") << *mRequest << " result : " << ll_print_sd(content) << LL_ENDL;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
@@ -703,7 +703,7 @@ void LLObjectMediaDataClient::Responder::result(const LLSD& content)
 	llassert(type == LLMediaDataClient::Request::GET || type == LLMediaDataClient::Request::UPDATE)
 	if (type == LLMediaDataClient::Request::GET)
 	{
-		LL_DEBUGS("LLMediaDataClient") << *(getRequest()) << " GET returned: " << ll_print_sd(content) << LL_ENDL;
+		LL_DEBUGS("LLMediaDataClientResponse") << *(getRequest()) << " GET returned: " << ll_print_sd(content) << LL_ENDL;
 		
 		// Look for an error
 		if (content.has("error"))
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index f98aa361e0..70bfc67523 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -134,9 +134,21 @@ public:
 	
 	virtual F64 getMediaInterest() const 
 		{ 
-			F64 tmp = mObject->getTotalMediaInterest();  
-			return (tmp < 0.0) ? mObject->getPixelArea() : tmp; 
+			F64 interest = mObject->getTotalMediaInterest();
+			if (interest < (F64)0.0)
+			{
+				// media interest not valid yet, try pixel area
+				interest = mObject->getPixelArea();
+				// HACK: force recalculation of pixel area if interest is the "magic default" of 1024.
+				if (interest == 1024.f)
+				{
+					const_cast<LLVOVolume*>(static_cast<LLVOVolume*>(mObject))->setPixelAreaAndAngle(gAgent);
+					interest = mObject->getPixelArea();
+				}
+			}
+			return interest; 
 		}
+	
 	virtual bool isInterestingEnough() const
 		{
 			return LLViewerMedia::isInterestingEnough(mObject, getMediaInterest());
-- 
cgit v1.2.3


From b910de4ad7f91bb2022bfb8304c3dea32c0a4857 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 18 Dec 2009 18:44:43 -0800
Subject: Client changes to pick up new version of Qt 4.6 with codecs for
 default text encoding.

---
 indra/newview/CMakeLists.txt     |  8 ++++++++
 indra/newview/viewer_manifest.py | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 8953682fae..fa3d0d1db9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1444,6 +1444,10 @@ if (WINDOWS)
       ${ARCH_PREBUILT_DIRS_RELEASE}/imageformats/qmng4.dll
       ${ARCH_PREBUILT_DIRS_RELEASE}/imageformats/qsvg4.dll
       ${ARCH_PREBUILT_DIRS_RELEASE}/imageformats/qtiff4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qcncodecs4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qjpcodecs4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qkrcodecs4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecs4.dll
       ${ARCH_PREBUILT_DIRS_DEBUG}/libeay32.dll
       ${ARCH_PREBUILT_DIRS_DEBUG}/qtcored4.dll
       ${ARCH_PREBUILT_DIRS_DEBUG}/qtguid4.dll
@@ -1458,6 +1462,10 @@ if (WINDOWS)
       ${ARCH_PREBUILT_DIRS_DEBUG}/imageformats/qmngd4.dll
       ${ARCH_PREBUILT_DIRS_DEBUG}/imageformats/qsvgd4.dll
       ${ARCH_PREBUILT_DIRS_DEBUG}/imageformats/qtiffd4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qcncodecsd4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qjpcodecsd4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qkrcodecsd4.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecsd4.dll
       SLPlugin
       media_plugin_quicktime
       media_plugin_webkit
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d2859db296..0db18525d7 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -354,6 +354,14 @@ class WindowsManifest(ViewerManifest):
                     self.path("qtiffd4.dll")
                     self.end_prefix()
 
+                # For WebKit/Qt plugin runtimes (codec/character encoding plugins)
+                if self.prefix(src="codecs", dst="codecs"):
+                    self.path("qcncodecsd4.dll")
+                    self.path("qjpcodecsd4.dll")
+                    self.path("qkrcodecsd4.dll")
+                    self.path("qtwcodecsd4.dll")
+                    self.end_prefix()
+
                 self.end_prefix()
         else:
             if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'release'),
@@ -377,6 +385,14 @@ class WindowsManifest(ViewerManifest):
                     self.path("qtiff4.dll")
                     self.end_prefix()
 
+                # For WebKit/Qt plugin runtimes (codec/character encoding plugins)
+                if self.prefix(src="codecs", dst="codecs"):
+                    self.path("qcncodecs4.dll")
+                    self.path("qjpcodecs4.dll")
+                    self.path("qkrcodecs4.dll")
+                    self.path("qtwcodecs4.dll")
+                    self.end_prefix()
+
                 self.end_prefix()
 
         self.disable_manifest_check()
-- 
cgit v1.2.3


From dc8cd05082e4d82a578d4a20278725cdf5e0450f Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Sat, 19 Dec 2009 18:35:38 +0200
Subject: implemented minor task EXT-3455 Code Improvements: Improve
 LLAvatarListItem not to calculate constant values in each constructing

--HG--
branch : product-engine
---
 indra/newview/llavatarlistitem.cpp | 19 +++++++++++++++----
 indra/newview/llavatarlistitem.h   | 10 ++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 072eebdf2d..08b359d26e 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -43,6 +43,12 @@
 #include "lltextutil.h"
 #include "llbutton.h"
 
+bool LLAvatarListItem::mStaticInitialized = false;
+S32 LLAvatarListItem::mIconWidth = 0;
+S32 LLAvatarListItem::mInfoBtnWidth = 0;
+S32 LLAvatarListItem::mProfileBtnWidth = 0;
+S32 LLAvatarListItem::mSpeakingIndicatorWidth = 0;
+
 LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/)
 :	LLPanel(),
 	mAvatarIcon(NULL),
@@ -88,10 +94,15 @@ BOOL  LLAvatarListItem::postBuild()
 
 	// Remember avatar icon width including its padding from the name text box,
 	// so that we can hide and show the icon again later.
-	mIconWidth = mAvatarName->getRect().mLeft - mAvatarIcon->getRect().mLeft;
-	mInfoBtnWidth = mInfoBtn->getRect().mRight - mSpeakingIndicator->getRect().mRight;
-	mProfileBtnWidth = mProfileBtn->getRect().mRight - mInfoBtn->getRect().mRight;
-	mSpeakingIndicatorWidth = mSpeakingIndicator->getRect().mRight - mAvatarName->getRect().mRight; 
+	if (!mStaticInitialized)
+	{
+		mIconWidth = mAvatarName->getRect().mLeft - mAvatarIcon->getRect().mLeft;
+		mInfoBtnWidth = mInfoBtn->getRect().mRight - mSpeakingIndicator->getRect().mRight;
+		mProfileBtnWidth = mProfileBtn->getRect().mRight - mInfoBtn->getRect().mRight;
+		mSpeakingIndicatorWidth = mSpeakingIndicator->getRect().mRight - mAvatarName->getRect().mRight;
+
+		mStaticInitialized = true;
+	}
 
 /*
 	if(!p.buttons.profile)
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index aa1b7593f5..1272bdf7a9 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -135,10 +135,12 @@ private:
 	//Speaker indicator and avatar name coords are translated accordingly
 	bool mShowInfoBtn;
 	bool mShowProfileBtn;
-	S32	 mIconWidth; // icon width + padding
-	S32  mInfoBtnWidth; //info btn width + padding
-	S32  mProfileBtnWidth; //profile btn width + padding
-	S32  mSpeakingIndicatorWidth; //speaking indicator width + padding
+
+	static bool	mStaticInitialized; // this variable is introduced to improve code readability
+	static S32	mIconWidth; // icon width + padding
+	static S32  mInfoBtnWidth; //info btn width + padding
+	static S32  mProfileBtnWidth; //profile btn width + padding
+	static S32  mSpeakingIndicatorWidth; //speaking indicator width + padding
 };
 
 #endif //LL_LLAVATARLISTITEM_H
-- 
cgit v1.2.3


From 368c75ccd367320c650dbfdb62fdb3334e888f8a Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Sat, 19 Dec 2009 18:52:14 +0200
Subject: no ticket. static variables renamed according to convention.

--HG--
branch : product-engine
---
 indra/newview/llavatarlistitem.cpp | 38 +++++++++++++++++++-------------------
 indra/newview/llavatarlistitem.h   | 10 +++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 08b359d26e..bbe5cdcc4a 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -43,11 +43,11 @@
 #include "lltextutil.h"
 #include "llbutton.h"
 
-bool LLAvatarListItem::mStaticInitialized = false;
-S32 LLAvatarListItem::mIconWidth = 0;
-S32 LLAvatarListItem::mInfoBtnWidth = 0;
-S32 LLAvatarListItem::mProfileBtnWidth = 0;
-S32 LLAvatarListItem::mSpeakingIndicatorWidth = 0;
+bool LLAvatarListItem::sStaticInitialized = false;
+S32 LLAvatarListItem::sIconWidth = 0;
+S32 LLAvatarListItem::sInfoBtnWidth = 0;
+S32 LLAvatarListItem::sProfileBtnWidth = 0;
+S32 LLAvatarListItem::sSpeakingIndicatorWidth = 0;
 
 LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/)
 :	LLPanel(),
@@ -94,14 +94,14 @@ BOOL  LLAvatarListItem::postBuild()
 
 	// Remember avatar icon width including its padding from the name text box,
 	// so that we can hide and show the icon again later.
-	if (!mStaticInitialized)
+	if (!sStaticInitialized)
 	{
-		mIconWidth = mAvatarName->getRect().mLeft - mAvatarIcon->getRect().mLeft;
-		mInfoBtnWidth = mInfoBtn->getRect().mRight - mSpeakingIndicator->getRect().mRight;
-		mProfileBtnWidth = mProfileBtn->getRect().mRight - mInfoBtn->getRect().mRight;
-		mSpeakingIndicatorWidth = mSpeakingIndicator->getRect().mRight - mAvatarName->getRect().mRight;
+		sIconWidth = mAvatarName->getRect().mLeft - mAvatarIcon->getRect().mLeft;
+		sInfoBtnWidth = mInfoBtn->getRect().mRight - mSpeakingIndicator->getRect().mRight;
+		sProfileBtnWidth = mProfileBtn->getRect().mRight - mInfoBtn->getRect().mRight;
+		sSpeakingIndicatorWidth = mSpeakingIndicator->getRect().mRight - mAvatarName->getRect().mRight;
 
-		mStaticInitialized = true;
+		sStaticInitialized = true;
 	}
 
 /*
@@ -225,7 +225,7 @@ void LLAvatarListItem::setShowInfoBtn(bool show)
 	if(mShowInfoBtn == show)
 		return;
 	mShowInfoBtn = show;
-	S32 width_delta = show ? - mInfoBtnWidth : mInfoBtnWidth;
+	S32 width_delta = show ? - sInfoBtnWidth : sInfoBtnWidth;
 
 	//Translating speaking indicator
 	mSpeakingIndicator->translate(width_delta, 0);
@@ -239,7 +239,7 @@ void LLAvatarListItem::setShowProfileBtn(bool show)
 	if(mShowProfileBtn == show)
 			return;
 	mShowProfileBtn = show;
-	S32 width_delta = show ? - mProfileBtnWidth : mProfileBtnWidth;
+	S32 width_delta = show ? - sProfileBtnWidth : sProfileBtnWidth;
 
 	//Translating speaking indicator
 	mSpeakingIndicator->translate(width_delta, 0);
@@ -253,7 +253,7 @@ void LLAvatarListItem::setSpeakingIndicatorVisible(bool visible)
 	if (mSpeakingIndicator->getVisible() == (BOOL)visible)
 		return;
 	mSpeakingIndicator->setVisible(visible);
-	S32 width_delta = visible ? - mSpeakingIndicatorWidth : mSpeakingIndicatorWidth;
+	S32 width_delta = visible ? - sSpeakingIndicatorWidth : sSpeakingIndicatorWidth;
 
 	//Reshaping avatar name
 	mAvatarName->reshape(mAvatarName->getRect().getWidth() + width_delta, mAvatarName->getRect().getHeight());
@@ -270,7 +270,7 @@ void LLAvatarListItem::setAvatarIconVisible(bool visible)
 
 	// Move the avatar name horizontally by icon size + its distance from the avatar name.
 	LLRect name_rect = mAvatarName->getRect();
-	name_rect.mLeft += visible ? mIconWidth : -mIconWidth;
+	name_rect.mLeft += visible ? sIconWidth : -sIconWidth;
 	mAvatarName->setRect(name_rect);
 }
 
@@ -338,10 +338,10 @@ void LLAvatarListItem::onNameCache(const std::string& first_name, const std::str
 void LLAvatarListItem::reshapeAvatarName()
 {
 	S32 width_delta = 0;
-	width_delta += mShowProfileBtn ? mProfileBtnWidth : 0;
-	width_delta += mSpeakingIndicator->getVisible() ? mSpeakingIndicatorWidth : 0;
-	width_delta += mAvatarIcon->getVisible() ? mIconWidth : 0;
-	width_delta += mShowInfoBtn ? mInfoBtnWidth : 0;
+	width_delta += mShowProfileBtn ? sProfileBtnWidth : 0;
+	width_delta += mSpeakingIndicator->getVisible() ? sSpeakingIndicatorWidth : 0;
+	width_delta += mAvatarIcon->getVisible() ? sIconWidth : 0;
+	width_delta += mShowInfoBtn ? sInfoBtnWidth : 0;
 	width_delta += mLastInteractionTime->getVisible() ? mLastInteractionTime->getRect().getWidth() : 0;
 
 	S32 height = mAvatarName->getRect().getHeight();
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index 1272bdf7a9..df8b04126e 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -136,11 +136,11 @@ private:
 	bool mShowInfoBtn;
 	bool mShowProfileBtn;
 
-	static bool	mStaticInitialized; // this variable is introduced to improve code readability
-	static S32	mIconWidth; // icon width + padding
-	static S32  mInfoBtnWidth; //info btn width + padding
-	static S32  mProfileBtnWidth; //profile btn width + padding
-	static S32  mSpeakingIndicatorWidth; //speaking indicator width + padding
+	static bool	sStaticInitialized; // this variable is introduced to improve code readability
+	static S32	sIconWidth; // icon width + padding
+	static S32  sInfoBtnWidth; //info btn width + padding
+	static S32  sProfileBtnWidth; //profile btn width + padding
+	static S32  sSpeakingIndicatorWidth; //speaking indicator width + padding
 };
 
 #endif //LL_LLAVATARLISTITEM_H
-- 
cgit v1.2.3


From 24b1f278247315efcc317394c200651ea7ab11d2 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Sat, 19 Dec 2009 19:55:04 +0200
Subject: Added "Group Call" verb button to the group list so that you can
 start a call without opening group chat first (EXT-3596).

--HG--
branch : product-engine
---
 indra/newview/llgroupactions.cpp                   | 30 ++++++++++++++++++++++
 indra/newview/llgroupactions.h                     |  5 ++++
 indra/newview/llpanelpeople.cpp                    |  8 ++++++
 indra/newview/llpanelpeople.h                      |  1 +
 .../newview/skins/default/xui/en/panel_people.xml  | 10 ++++++++
 5 files changed, 54 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index ff75d461df..22658b4d65 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -118,6 +118,36 @@ void LLGroupActions::search()
 	LLFloaterReg::showInstance("search", LLSD().with("category", "groups"));
 }
 
+// static
+void LLGroupActions::startCall(const LLUUID& group_id)
+{
+	// create a new group voice session
+	LLGroupData gdata;
+
+	if (!gAgent.getGroupData(group_id, gdata))
+	{
+		llwarns << "Error getting group data" << llendl;
+		return;
+	}
+
+	LLUUID session_id = gIMMgr->addSession(gdata.mName, IM_SESSION_GROUP_START, group_id, true);
+	if (session_id == LLUUID::null)
+	{
+		llwarns << "Error adding session" << llendl;
+		return;
+	}
+
+	// start the call
+	// *TODO: move this to LLIMMgr?
+	LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id);
+	if (session && session->mSessionInitialized)
+		gIMMgr->startCall(session_id);
+	else
+		gIMMgr->autoStartCallOnStartup(session_id);
+
+	make_ui_sound("UISndStartIM");
+}
+
 // static
 void LLGroupActions::join(const LLUUID& group_id)
 {
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
index 9750b3e3cb..e99df86cd9 100644
--- a/indra/newview/llgroupactions.h
+++ b/indra/newview/llgroupactions.h
@@ -98,6 +98,11 @@ public:
 	/// Returns if the current user is a member of the group
 	static bool isInGroup(const LLUUID& group_id);
 
+	/**
+	 * Start a group voice call.
+	 */
+	static void startCall(const LLUUID& group_id);
+
 	/**
 	 * Returns true if avatar is in group.
 	 *
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index e134840153..e5846c7318 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -564,6 +564,7 @@ BOOL LLPanelPeople::postBuild()
 	buttonSetAction("chat_btn",			boost::bind(&LLPanelPeople::onChatButtonClicked,		this));
 	buttonSetAction("im_btn",			boost::bind(&LLPanelPeople::onImButtonClicked,			this));
 	buttonSetAction("call_btn",			boost::bind(&LLPanelPeople::onCallButtonClicked,		this));
+	buttonSetAction("group_call_btn",	boost::bind(&LLPanelPeople::onGroupCallButtonClicked,	this));
 	buttonSetAction("teleport_btn",		boost::bind(&LLPanelPeople::onTeleportButtonClicked,	this));
 	buttonSetAction("share_btn",		boost::bind(&LLPanelPeople::onShareButtonClicked,		this));
 
@@ -733,6 +734,7 @@ void LLPanelPeople::updateButtons()
 	buttonSetVisible("view_profile_btn",	!group_tab_active);
 	buttonSetVisible("im_btn",				!group_tab_active);
 	buttonSetVisible("call_btn",			!group_tab_active);
+	buttonSetVisible("group_call_btn",		group_tab_active);
 	buttonSetVisible("teleport_btn",		friends_tab_active);
 	buttonSetVisible("share_btn",			nearby_tab_active || friends_tab_active);
 
@@ -781,6 +783,7 @@ void LLPanelPeople::updateButtons()
 
 	bool none_group_selected = item_selected && selected_id.isNull();
 	buttonSetEnabled("group_info_btn", !none_group_selected);
+	buttonSetEnabled("group_call_btn", !none_group_selected);
 	buttonSetEnabled("chat_btn", !none_group_selected);
 }
 
@@ -1272,6 +1275,11 @@ void LLPanelPeople::onCallButtonClicked()
 	}
 }
 
+void LLPanelPeople::onGroupCallButtonClicked()
+{
+	LLGroupActions::startCall(getCurrentItemID());
+}
+
 void LLPanelPeople::onTeleportButtonClicked()
 {
 	LLAvatarActions::offerTeleport(getCurrentItemID());
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index f5cdc0935c..0d2bae1baf 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -100,6 +100,7 @@ private:
 	void					onChatButtonClicked();
 	void					onImButtonClicked();
 	void					onCallButtonClicked();
+	void					onGroupCallButtonClicked();
 	void					onTeleportButtonClicked();
 	void					onShareButtonClicked();
 	void					onMoreButtonClicked();
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8883c27c47..08a10553a8 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -411,5 +411,15 @@ background_visible="true"
          name="chat_btn"
          tool_tip="Open chat session"
          width="110" />
+        <button
+         follows="bottom|left"
+         top="4"
+         left_pad="2"
+         height="23"
+         label="Group Call"
+         layout="topleft"
+         name="group_call_btn"
+         tool_tip="Call this group"
+         width="110" />
     </panel>
 </panel>
-- 
cgit v1.2.3


From 05898105c88a2fa175bdc3d353461a6f61ad0616 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Sat, 19 Dec 2009 20:00:46 +0200
Subject: fixed major bug EXT-3586 IM well button shows \"9+\" if number of
 unread IMs is more than 9

--HG--
branch : product-engine
---
 indra/newview/llchiclet.cpp                             | 2 +-
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 21a0381495..bb09f34362 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -140,7 +140,7 @@ private:
 LLSysWellChiclet::Params::Params()
 : button("button")
 , unread_notifications("unread_notifications")
-, max_displayed_count("max_displayed_count", 9)
+, max_displayed_count("max_displayed_count", 99)
 , flash_to_lit_count("flash_to_lit_count", 3)
 , flash_period("flash_period", 0.5F)
 {
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 3e2910458f..5ae808581d 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -327,6 +327,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_width="35"
          user_resize="false">
             <chiclet_im_well
+             max_displayed_count="99"
              flash_period="0.3"
              follows="right"
              height="23"
@@ -356,7 +357,6 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  image_selected="PushButton_Selected_Press"
                  label_color="Black"
                  left="0"
-                 max_displayed_count="99"
                  name="Unread IM messages"
                  pad_left="0"
                  pad_right="0"
-- 
cgit v1.2.3


From 2fd6bb4b59ac5f016de91f2dfddcebd71883f0d0 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Mon, 21 Dec 2009 12:11:26 +0200
Subject: fix for low  Task EXT-2881 Enough space to place 5 chiclets without
 arrows in bottom bar when voice indicator isn't shown change whole chicklet
 arranging.

--HG--
branch : product-engine
---
 indra/newview/llchiclet.cpp | 57 ++++++++++++++++++++++++++++++++++++---------
 indra/newview/llchiclet.h   |  5 ++++
 2 files changed, 51 insertions(+), 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 5695f7cac1..b77c9b3348 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -67,7 +67,8 @@ static LLDefaultChildRegistry::Register<LLInvOfferChiclet> t7("chiclet_offer");
 static const LLRect CHICLET_RECT(0, 25, 25, 0);
 static const LLRect CHICLET_ICON_RECT(0, 22, 22, 0);
 static const LLRect VOICE_INDICATOR_RECT(25, 25, 45, 0);
-static const S32	OVERLAY_ICON_SHIFT = 2;	// used for shifting of an overlay icon for new massages in a chiclet
+static const S32 OVERLAY_ICON_SHIFT = 2;	// used for shifting of an overlay icon for new massages in a chiclet
+static const S32 SCROLL_BUTTON_PAD = 5;
 
 // static
 const S32 LLChicletPanel::s_scroll_ratio = 10;
@@ -1230,7 +1231,6 @@ bool LLChicletPanel::addChiclet(LLChiclet* chiclet, S32 index)
 		chiclet->setChicletSizeChangedCallback(boost::bind(&LLChicletPanel::onChicletSizeChanged, this, _1, index));
 
 		arrange();
-		showScrollButtonsIfNeeded();
 
 		return true;
 	}
@@ -1241,8 +1241,6 @@ bool LLChicletPanel::addChiclet(LLChiclet* chiclet, S32 index)
 void LLChicletPanel::onChicletSizeChanged(LLChiclet* ctrl, const LLSD& param)
 {
 	arrange();
-	trimChiclets();
-	showScrollButtonsIfNeeded();
 }
 
 void LLChicletPanel::onChicletClick(LLUICtrl*ctrl,const LLSD&param)
@@ -1259,8 +1257,6 @@ void LLChicletPanel::removeChiclet(chiclet_list_t::iterator it)
 	mChicletList.erase(it);
 	
 	arrange();
-	trimChiclets();
-	showScrollButtonsIfNeeded();
 }
 
 void LLChicletPanel::removeChiclet(S32 index)
@@ -1353,8 +1349,6 @@ void LLChicletPanel::reshape(S32 width, S32 height, BOOL called_from_parent )
 {
 	LLPanel::reshape(width,height,called_from_parent);
 
-	static const S32 SCROLL_BUTTON_PAD = 5;
-
 	//Needed once- to avoid error at first call of reshape() before postBuild()
 	if(!mLeftScrollButton||!mRightScrollButton)
 		return;
@@ -1365,9 +1359,21 @@ void LLChicletPanel::reshape(S32 width, S32 height, BOOL called_from_parent )
 	scroll_button_rect = mRightScrollButton->getRect();
 	mRightScrollButton->setRect(LLRect(width - scroll_button_rect.getWidth(),scroll_button_rect.mTop,
 		width, scroll_button_rect.mBottom));
-	mScrollArea->setRect(LLRect(scroll_button_rect.getWidth() + SCROLL_BUTTON_PAD,
-		height, width - scroll_button_rect.getWidth() - SCROLL_BUTTON_PAD, 0));
+	
+
+	bool need_show_scroll = needShowScroll();
+	if(need_show_scroll)
+	{
+		mScrollArea->setRect(LLRect(scroll_button_rect.getWidth() + SCROLL_BUTTON_PAD,
+			height, width - scroll_button_rect.getWidth() - SCROLL_BUTTON_PAD, 0));
+	}
+	else
+	{
+		mScrollArea->setRect(LLRect(0,height, width, 0));
+	}
+	
 	mShowControls = width >= mMinWidth;
+	
 	mScrollArea->setVisible(mShowControls);
 
 	trimChiclets();
@@ -1380,8 +1386,8 @@ void LLChicletPanel::arrange()
 	if(mChicletList.empty())
 		return;
 
+	//initial arrange of chicklets positions
 	S32 chiclet_left = getChiclet(0)->getRect().mLeft;
-
 	S32 size = getChicletCount();
 	for( int n = 0; n < size; ++n)
 	{
@@ -1395,6 +1401,24 @@ void LLChicletPanel::arrange()
 
 		chiclet_left += chiclet_width + getChicletPadding();
 	}
+
+	//reset size and pos on mScrollArea
+	LLRect rect = getRect();
+	LLRect scroll_button_rect = mLeftScrollButton->getRect();
+	
+	bool need_show_scroll = needShowScroll();
+	if(need_show_scroll)
+	{
+		mScrollArea->setRect(LLRect(scroll_button_rect.getWidth() + SCROLL_BUTTON_PAD,
+			rect.getHeight(), rect.getWidth() - scroll_button_rect.getWidth() - SCROLL_BUTTON_PAD, 0));
+	}
+	else
+	{
+		mScrollArea->setRect(LLRect(0,rect.getHeight(), rect.getWidth(), 0));
+	}
+	
+	trimChiclets();
+	showScrollButtonsIfNeeded();
 }
 
 void LLChicletPanel::trimChiclets()
@@ -1412,6 +1436,17 @@ void LLChicletPanel::trimChiclets()
 	}
 }
 
+bool LLChicletPanel::needShowScroll()
+{
+	if(mChicletList.empty())
+		return false;
+	
+	S32 chicklet_width  = (*mChicletList.rbegin())->getRect().mRight - (*mChicletList.begin())->getRect().mLeft;
+
+	return chicklet_width>getRect().getWidth();
+}
+
+
 void LLChicletPanel::showScrollButtonsIfNeeded()
 {
 	bool can_scroll_left = canScrollLeft();
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index d8f641d0f9..122e8bd8b4 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -1020,6 +1020,11 @@ protected:
 	 */
 	bool canScrollRight();
 
+	/**
+	 * Returns true if we need to show scroll buttons
+	 */
+	bool needShowScroll();
+
 	/**
 	 * Returns true if chiclets can be scrolled left.
 	 */
-- 
cgit v1.2.3


From 45b859b50b18d214559ee2da0376496da9222fdf Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Mon, 21 Dec 2009 12:13:29 +0200
Subject: working on EXT-2781 this is extra and useless callback since
 setFlyingMode will be called from OnStopFlyingButtonClick.

--HG--
branch : product-engine
---
 indra/newview/llmoveview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 22201aecb2..818e7e0db1 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -571,7 +571,7 @@ BOOL LLPanelStandStopFlying::postBuild()
 	mStandButton->setVisible(FALSE);
 	
 	mStopFlyingButton = getChild<LLButton>("stop_fly_btn");
-	mStopFlyingButton->setCommitCallback(boost::bind(&LLFloaterMove::setFlyingMode, FALSE));
+	//mStopFlyingButton->setCommitCallback(boost::bind(&LLFloaterMove::setFlyingMode, FALSE));
 	mStopFlyingButton->setCommitCallback(boost::bind(&LLPanelStandStopFlying::onStopFlyingButtonClick, this));
 	mStopFlyingButton->setVisible(FALSE);
 	
-- 
cgit v1.2.3


From 2b873b073c146d820d51b8f59db9ef1ff41b2648 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 21 Dec 2009 12:46:11 +0200
Subject: =?UTF-8?q?fixed=20EXT-3395=20=E2=80=9CDocked=20IM/Chat=20windows?=
 =?UTF-8?q?=20shouldn't=20hide=20when=20voice=20control=20panel=20is=20ope?=
 =?UTF-8?q?ned=E2=80=9D,=20made=20transient=20floaters=20visible=20if=20cl?=
 =?UTF-8?q?icked=20any=20context=20menu;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/lltransientfloatermgr.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp
index 7befb87248..347399f239 100644
--- a/indra/newview/lltransientfloatermgr.cpp
+++ b/indra/newview/lltransientfloatermgr.cpp
@@ -37,6 +37,7 @@
 #include "llrootview.h"
 #include "llviewerwindow.h"
 #include "lldockablefloater.h"
+#include "llmenugl.h"
 
 
 LLTransientFloaterMgr::LLTransientFloaterMgr()
@@ -87,6 +88,13 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y,
 	for (controls_set_t::iterator it = mControlsSet.begin(); it
 			!= mControlsSet.end(); it++)
 	{
+		// don't hide transient floater if any context menu opened
+		if (LLMenuGL::sMenuContainer->getVisibleMenu() != NULL)
+		{
+			hide = false;
+			break;
+		}
+
 		LLView* control_view = *it;
 		if (!control_view->getVisible())
 		{
-- 
cgit v1.2.3


From 40e9c253fc6888e3e1b150dc265d79652e9ec26c Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Mon, 21 Dec 2009 14:43:09 +0200
Subject: additional commit to major task EXT-3509   	 User's own name
 should appear in the Group chat participant list 1. agent will be appear in
 ad-hoc conference too. 2. Disabling block/unblock yourself.

--HG--
branch : product-engine
---
 indra/newview/llavatarlist.cpp          | 6 +++---
 indra/newview/llcallfloater.cpp         | 2 +-
 indra/newview/llpanelimcontrolpanel.cpp | 3 ++-
 indra/newview/llparticipantlist.cpp     | 8 ++++----
 indra/newview/llparticipantlist.h       | 2 +-
 indra/newview/llspeakers.cpp            | 2 --
 6 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 71b23e1383..5865df3e26 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -33,7 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llavatarlist.h"
-#include "llagent.h" // for comparator
+#include "llagentdata.h" // for comparator
 
 // newview
 #include "llcallingcard.h" // for LLAvatarTracker
@@ -425,11 +425,11 @@ bool LLAvatarItemAgentOnTopComparator::doCompare(const LLAvatarListItem* avatar_
 {
 	//keep agent on top, if first is agent, 
 	//then we need to return true to elevate this id, otherwise false.
-	if(avatar_item1->getAvatarId() == gAgent.getID())
+	if(avatar_item1->getAvatarId() == gAgentID)
 	{
 		return true;
 	}
-	else if (avatar_item2->getAvatarId() == gAgent.getID())
+	else if (avatar_item2->getAvatarId() == gAgentID)
 	{
 		return false;
 	}
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 20739d2401..7ca49928da 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -280,7 +280,7 @@ void LLCallFloater::refreshPartisipantList()
 
 	if (!non_avatar_caller)
 	{
-		mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList);
+		mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT);
 
 		if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager)
 		{
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index 70e4798079..ae1c28c7ab 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -282,8 +282,9 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id)
 
 	mGroupID = LLIMModel::getInstance()->getOtherParticipantID(session_id);
 
+	// for group and Ad-hoc chat we need to include agent into list 
 	if(!mParticipantList)
-		mParticipantList = new LLParticipantList(mSpeakerManager, getChild<LLAvatarList>("speakers_list"));
+		mParticipantList = new LLParticipantList(mSpeakerManager, getChild<LLAvatarList>("speakers_list"), true,false);
 }
 
 
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index afb9892d12..e8aa1e9831 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -51,12 +51,13 @@
 
 static const LLAvatarItemAgentOnTopComparator AGENT_ON_TOP_NAME_COMPARATOR;
 
-LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list,  bool use_context_menu/* = true*/):
+LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list,  bool use_context_menu/* = true*/,
+		bool exclude_agent /*= true*/):
 	mSpeakerMgr(data_source),
 	mAvatarList(avatar_list),
 	mSortOrder(E_SORT_BY_NAME)
 ,	mParticipantListMenu(NULL)
-,	mExcludeAgent(true)
+,	mExcludeAgent(exclude_agent)
 {
 	mSpeakerAddListener = new SpeakerAddListener(*this);
 	mSpeakerRemoveListener = new SpeakerRemoveListener(*this);
@@ -101,7 +102,6 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av
 		}
 	}
 	// we need to exclude agent id for non group chat
-	mExcludeAgent = !gAgent.isInGroup(mSpeakerMgr->getSessionID());
 	mAvatarList->setDirty(true);
 	sort();
 }
@@ -555,7 +555,7 @@ void LLParticipantList::LLParticipantListMenu::moderateVoiceOtherParticipants(co
 bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& userdata)
 {
 	std::string item = userdata.asString();
-	if (item == "can_mute_text")
+	if (item == "can_mute_text" || "can_block" == item)
 	{
 		return mUUIDs.front() != gAgentID;
 	}
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index 72c413d188..b85d4c9bc4 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -43,7 +43,7 @@ class LLParticipantList
 {
 	LOG_CLASS(LLParticipantList);
 	public:
-		LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list, bool use_context_menu = true);
+		LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list, bool use_context_menu = true, bool exclude_agent = true);
 		~LLParticipantList();
 		void setSpeakingIndicatorsVisible(BOOL visible);
 
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 3861a96355..91b417c61f 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -630,8 +630,6 @@ void LLIMSpeakerMgr::toggleAllowTextChat(const LLUUID& speaker_id)
 
 void LLIMSpeakerMgr::moderateVoiceParticipant(const LLUUID& avatar_id, bool unmute)
 {
-	if (gAgentID == avatar_id) return; // do not process myself
-
 	LLPointer<LLSpeaker> speakerp = findSpeaker(avatar_id);
 	if (!speakerp) return;
 
-- 
cgit v1.2.3


From c4d684d462fe555345a1c311a1e904f7baee56c6 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 21 Dec 2009 15:14:56 +0200
Subject: Fixed major bug EXT-3572 (Notification Well button becomes "lit"
 after resolving any notification)  -- set "new messages" state only if count
 of unread messages is increased.

--HG--
branch : product-engine
---
 indra/newview/llchiclet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 957d272f40..17ef1f41a4 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -187,9 +187,9 @@ void LLSysWellChiclet::setCounter(S32 counter)
 
 	mButton->setLabel(s_count);
 
-	setNewMessagesState(counter > 0);
+	setNewMessagesState(counter > mCounter);
 
-	// we have to flash to 'Lit' state each time new unread message is comming.
+	// we have to flash to 'Lit' state each time new unread message is coming.
 	if (counter > mCounter)
 	{
 		mFlashToLitTimer->flash();
-- 
cgit v1.2.3


From eb4f026181c83dfd2106cce3ab1fde6a3fe60ec3 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 21 Dec 2009 15:18:48 +0200
Subject: implemented EXT-3594 IM Chiclet should be created for voice calls
 also

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp    | 27 ---------------------------
 indra/newview/llbottomtray.h      |  2 --
 indra/newview/llsyswellwindow.cpp | 20 --------------------
 indra/newview/llsyswellwindow.h   |  2 --
 4 files changed, 51 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index ab657e0e99..4d5d416907 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -81,9 +81,6 @@ LLBottomTray::LLBottomTray(const LLSD&)
 
 	LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraPresets, _2));
 
-	//managing chiclets for voice calls
-	LLIMModel::getInstance()->addNewMsgCallback(boost::bind(&LLBottomTray::onNewIM, this, _1));
-
 	//this is to fix a crash that occurs because LLBottomTray is a singleton
 	//and thus is deleted at the end of the viewers lifetime, but to be cleanly
 	//destroyed LLBottomTray requires some subsystems that are long gone
@@ -153,9 +150,6 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
 
 	if (getChicletPanel()->findChiclet<LLChiclet>(session_id)) return;
 
-	// For im sessions started as voice call chiclet gets created on the first incoming message
-	if (gIMMgr->isVoiceCall(session_id)) return;
-
 	LLIMChiclet* chiclet = createIMChiclet(session_id);
 	if(chiclet)
 	{
@@ -197,27 +191,6 @@ void LLBottomTray::sessionIDUpdated(const LLUUID& old_session_id, const LLUUID&
 	}
 }
 
-void LLBottomTray::onNewIM(const LLSD& data)
-{
-	LLUUID from_id = data["from_id"];
-	if (from_id.isNull() || gAgentID == from_id) return;
-
-	LLUUID session_id = data["session_id"];
-	if (session_id.isNull()) return;
-
-	if (!gIMMgr->isVoiceCall(session_id)) return;
-
-	if (getChicletPanel()->findChiclet<LLChiclet>(session_id)) return;
-
-	//first real message, time to create chiclet
-	LLIMChiclet* chiclet = createIMChiclet(session_id);
-	if(chiclet)
-	{
-		chiclet->setIMSessionName(LLIMModel::getInstance()->getName(session_id));
-		chiclet->setOtherParticipantId(LLIMModel::getInstance()->getOtherParticipantID(session_id));
-	}
-}
-
 S32 LLBottomTray::getTotalUnreadIMCount()
 {
 	return getChicletPanel()->getTotalUnreadIMCount();
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 5cd3f15746..9be0e5810f 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -75,8 +75,6 @@ public:
 	virtual void sessionRemoved(const LLUUID& session_id);
 	void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
 
-	void onNewIM(const LLSD& data);
-
 	S32 getTotalUnreadIMCount();
 
 	virtual void reshape(S32 width, S32 height, BOOL called_from_parent);
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 26f9824f9c..9b60f58be1 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -744,9 +744,6 @@ void LLIMWellWindow::sessionAdded(const LLUUID& session_id,
 {
 	if (mMessageList->getItemByValue(session_id)) return;
 
-	// For im sessions started as voice call chiclet gets created on the first incoming message
-	if (gIMMgr->isVoiceCall(session_id)) return;
-
 	if (!gIMMgr->hasSession(session_id)) return;
 
 	addIMRow(session_id, 0, name, other_participant_id);	
@@ -905,23 +902,6 @@ bool LLIMWellWindow::hasIMRow(const LLUUID& session_id)
 	return mMessageList->getItemByValue(session_id);
 }
 
-void LLIMWellWindow::onNewIM(const LLSD& data)
-{
-	LLUUID from_id = data["from_id"];
-	if (from_id.isNull() || gAgentID == from_id) return;
-
-	LLUUID session_id = data["session_id"];
-	if (session_id.isNull()) return;
-
-	if (!gIMMgr->isVoiceCall(session_id)) return;
-
-	if (hasIMRow(session_id)) return;
-
-	//first real message, time to create chiclet
-	addIMRow(session_id);
-}
-
-
 void LLIMWellWindow::closeAll()
 {
 	// Generate an ignorable alert dialog if there is an active voice IM sesion
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index 6cfa25b84d..7030f4b427 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -191,8 +191,6 @@ public:
 	/*virtual*/ void sessionRemoved(const LLUUID& session_id);
 	/*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id);
 
-	void onNewIM(const LLSD& data);
-
 	void addObjectRow(const LLUUID& object_id, bool new_message = false);
 	void removeObjectRow(const LLUUID& object_id);
 
-- 
cgit v1.2.3


From c353e640fa80a335be741dd0edfdc9952ea3cdea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=B4=D0=BC=D0=B8=D0=BD=D0=B8=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80?= <>
Date: Mon, 21 Dec 2009 16:13:09 +0200
Subject: Fixed low bug EXT-3353 - There's an ability to create classified w/o
 title and description.

--HG--
branch : product-engine
---
 indra/newview/llpanelclassified.cpp | 39 +++++++++++++++++++++++++++++++++++++
 indra/newview/llpanelclassified.h   |  6 ++++++
 indra/newview/llpanelpicks.cpp      |  5 +++++
 3 files changed, 50 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 0dae667e7f..e29320ffc2 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -1557,6 +1557,11 @@ void LLPanelClassifiedEdit::resetControls()
 	childSetValue("price_for_listing", MINIMUM_PRICE_FOR_LISTING);
 }
 
+bool LLPanelClassifiedEdit::canClose()
+{
+	return isValidName();
+}
+
 void LLPanelClassifiedEdit::sendUpdate()
 {
 	LLAvatarClassifiedInfo c_data;
@@ -1671,6 +1676,12 @@ void LLPanelClassifiedEdit::onChange()
 
 void LLPanelClassifiedEdit::onSaveClick()
 {
+	if(!isValidName())
+	{
+		notifyInvalidName();
+		return;
+	}
+
 	sendUpdate();
 	resetDirty();
 }
@@ -1681,6 +1692,34 @@ std::string LLPanelClassifiedEdit::getLocationNotice()
 	return location_notice;
 }
 
+bool LLPanelClassifiedEdit::isValidName()
+{
+	std::string name = getClassifiedName();
+	if (name.empty())
+	{
+		return false;
+	}
+	if (!isalnum(name[0]))
+	{
+		return false;
+	}
+
+	return true;
+}
+
+void LLPanelClassifiedEdit::notifyInvalidName()
+{
+	std::string name = getClassifiedName();
+	if (name.empty())
+	{
+		LLNotificationsUtil::add("BlankClassifiedName");
+	}
+	else if (!isalnum(name[0]))
+	{
+		LLNotificationsUtil::add("ClassifiedMustBeAlphanumeric");
+	}
+}
+
 void LLPanelClassifiedEdit::onTexturePickerMouseEnter(LLUICtrl* ctrl)
 {
 	ctrl->setVisible(TRUE);
diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
index 8b32495854..10fdf60bbe 100644
--- a/indra/newview/llpanelclassified.h
+++ b/indra/newview/llpanelclassified.h
@@ -305,6 +305,8 @@ public:
 
 	bool isNew() { return mIsNew; }
 
+	bool canClose();
+
 protected:
 
 	LLPanelClassifiedEdit();
@@ -325,6 +327,10 @@ protected:
 
 	std::string getLocationNotice();
 
+	bool isValidName();
+
+	void notifyInvalidName();
+
 	void onSetLocationClick();
 	void onChange();
 	void onSaveClick();
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 4d22d96072..a52aa6d30f 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -769,6 +769,11 @@ void LLPanelPicks::onPanelPickSave(LLPanel* panel)
 
 void LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit* panel)
 {
+	if(!panel->canClose())
+	{
+		return;
+	}
+
 	if(panel->isNew())
 	{
 		LLClassifiedItem* c_item = new LLClassifiedItem(getAvatarId(), panel->getClassifiedId());
-- 
cgit v1.2.3


From bf7494017f5d90624243e5069dea9342c6b1869c Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Mon, 21 Dec 2009 15:49:52 +0000
Subject: EXT-3486: Support SLapps and URLs in the nav bar.

If the user enters a string into the navigation bar that is not
recognized as an SL location, the behavior is now:

- handle any secondlife:// SLapps, or
- open any http: or https: URLs in the media browser, or
- otherwise, send the text to the search floater
---
 indra/newview/llnavigationbar.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 6210151d1b..71dc0f9011 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -51,6 +51,8 @@
 #include "llsidetray.h"
 #include "llslurl.h"
 #include "llurlsimstring.h"
+#include "llurlregistry.h"
+#include "llurldispatcher.h"
 #include "llviewerinventory.h"
 #include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
@@ -58,6 +60,7 @@
 #include "llappviewer.h"
 #include "llviewercontrol.h"
 #include "llfloatermediabrowser.h"
+#include "llweb.h"
 
 #include "llinventorymodel.h"
 #include "lllandmarkactions.h"
@@ -543,7 +546,20 @@ void LLNavigationBar::onRegionNameResponse(
 	// Invalid location?
 	if (!region_handle)
 	{
-		invokeSearch(typed_location);
+		// handle any secondlife:// SLapps, or
+		// display http:// URLs in the media browser, or
+		// anything else is sent to the search floater
+		if (LLUrlRegistry::instance().isUrl(typed_location))
+		{
+			if (! LLURLDispatcher::dispatchFromTextEditor(typed_location))
+			{
+				LLWeb::loadURL(typed_location);
+			}
+		}
+		else
+		{
+			invokeSearch(typed_location);
+		}
 		return;
 	}
 
-- 
cgit v1.2.3


From e03a2beeb67cc022056e2ac4caf8493661202d26 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Mon, 21 Dec 2009 17:56:10 +0200
Subject: fixed normal bug EXT-3562 MissingString(message) appears instead of
 warning about blocked text chat

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp                     | 10 +++++-----
 indra/newview/skins/default/xui/en/strings.xml | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index f5362acbfe..8917cc11e1 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1227,15 +1227,15 @@ LLIMMgr::showSessionEventError(
 	const std::string& error_string,
 	const LLUUID session_id)
 {
-	const LLFloater* floater = getFloaterBySessionID (session_id);
-	if (!floater) return;
-
 	LLSD args;
+	LLStringUtil::format_map_t event_args;
+
+	event_args["RECIPIENT"] = LLIMModel::getInstance()->getName(session_id);
+
 	args["REASON"] =
 		LLTrans::getString(error_string);
 	args["EVENT"] =
-		LLTrans::getString(event_string);
-	args["RECIPIENT"] = floater->getTitle();
+		LLTrans::getString(event_string, event_args);
 
 	LLNotificationsUtil::add(
 		"ChatterBoxSessionEventError",
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a1f2548f81..9aae04ba38 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2964,12 +2964,26 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="not_a_mod_error">
     You are not a session moderator.
   </string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. 
+  In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="muted" with the same value as "muted_error" -->
+  <string name="muted">
+    A group moderator disabled your text chat.
+  </string>
   <string name="muted_error">
     A group moderator disabled your text chat.
   </string>
   <string name="add_session_event">
     Unable to add users to chat session with [RECIPIENT].
   </string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. 
+  In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="message" with the same value as "message_session_event" -->
+  <string name="message">
+    Unable to send your message to the chat session with [RECIPIENT].
+  </string>  
   <string name="message_session_event">
     Unable to send your message to the chat session with [RECIPIENT].
   </string>
-- 
cgit v1.2.3


From 2305676fed6f1bbb0802a0e660f96874c54c2efd Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 21 Dec 2009 18:20:21 +0200
Subject: Fixed low bug EXT - 3464 ("You" should be shown for Nearby chat
 window instead of avatar's name)

--HG--
branch : product-engine
---
 indra/newview/llnearbychat.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 3a1ae5bf46..1a0183a8ba 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -178,6 +178,8 @@ void	LLNearbyChat::addMessage(const LLChat& chat,bool archive)
 	
 	if (!chat.mMuted)
 	{
+		tmp_chat.mFromName = chat.mFromID != gAgentID ? chat.mFromName : LLTrans::getString("You");
+
 		if (chat.mChatStyle == CHAT_STYLE_IRC)
 		{
 			LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
-- 
cgit v1.2.3


From d7dbab7535aa886143e270459910717d953f17cd Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 21 Dec 2009 18:28:49 +0200
Subject: removed diagnostic output

--HG--
branch : product-engine
---
 indra/newview/llpanelpeoplemenus.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index 0314642d9e..c1c10e6022 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -184,8 +184,6 @@ bool NearbyMenu::enableContextMenuItem(const LLSD& userdata)
 	else if (item == std::string("can_call"))
 	{
 		bool result = false;
-		int size = mUUIDs.size();
-		std::cout << size << std::endl;
 		std::vector<LLUUID>::const_iterator
 			id = mUUIDs.begin(),
 			uuids_end = mUUIDs.end();
-- 
cgit v1.2.3


From 50e5c4c3f372736fa50497cc598effe9a51c14d2 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 21 Dec 2009 18:30:46 +0200
Subject: Fixed major bug EXT-3581(Sort by Recent Speakers broken for Group
 Voice Call)

--HG--
branch : product-engine
---
 indra/newview/llpanelimcontrolpanel.cpp            |  4 ++
 indra/newview/llparticipantlist.cpp                | 75 +++++++++++++++++++++-
 indra/newview/llparticipantlist.h                  | 21 ++++++
 .../skins/default/xui/en/menu_participant_list.xml | 24 ++++++-
 4 files changed, 121 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index ae1c28c7ab..8d03f9e686 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -247,6 +247,10 @@ void LLPanelGroupControlPanel::draw()
 	//Remove event does not raised until speakerp->mActivityTimer.hasExpired() is false, see LLSpeakerManager::update()
 	//so we need update it to raise needed event
 	mSpeakerManager->update(true);
+	// Need to refresh participants to display ones not in voice as disabled and 
+	// resort the avatar list if it's in sort by recent speaker order.
+	if (mParticipantList)
+		mParticipantList->refreshVoiceState();
 	LLPanelChatControlPanel::draw();
 }
 
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index e8aa1e9831..8fb4063ea7 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -39,7 +39,6 @@
 #include "llimview.h"
 
 #include "llparticipantlist.h"
-#include "llavatarlist.h"
 #include "llspeakers.h"
 #include "llviewermenu.h"
 #include "llvoiceclient.h"
@@ -204,6 +203,11 @@ void LLParticipantList::setSortOrder(EParticipantSortOrder order)
 	}
 }
 
+LLParticipantList::EParticipantSortOrder LLParticipantList::getSortOrder()
+{
+	return mSortOrder;
+}
+
 void LLParticipantList::refreshVoiceState()
 {
 	LLSpeakerMgr::speaker_list_t speakers;
@@ -223,6 +227,12 @@ void LLParticipantList::refreshVoiceState()
 			item->setOnline(!is_in_voice);
 		}
 	}
+	if (E_SORT_BY_RECENT_SPEAKERS == getSortOrder())
+	{
+		// Resort avatar list
+		mAvatarList->setDirty(true);
+		sort();
+	}
 }
 
 bool LLParticipantList::onAddItemEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
@@ -312,7 +322,6 @@ void LLParticipantList::sort()
 	if ( !mAvatarList )
 		return;
 
-	// TODO: Implement more sorting orders after specs updating (EM)
 	switch ( mSortOrder ) {
 	case E_SORT_BY_NAME :
 		// if mExcludeAgent == true , then no need to keep agent on top of the list
@@ -326,6 +335,12 @@ void LLParticipantList::sort()
 			mAvatarList->sort();
 		}
 		break;
+	case E_SORT_BY_RECENT_SPEAKERS:
+		if (mSortByRecentSpeakers.isNull())
+			mSortByRecentSpeakers = new LLAvatarItemRecentSpeakerComparator(*this);
+		mAvatarList->setComparator(mSortByRecentSpeakers.get());
+		mAvatarList->sort();
+		break;
 	default :
 		llwarns << "Unrecognized sort order for " << mAvatarList->getName() << llendl;
 		return;
@@ -402,6 +417,7 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu()
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
 	
+	registrar.add("ParticipantList.Sort", boost::bind(&LLParticipantList::LLParticipantListMenu::sortParticipantList, this, _2));
 	registrar.add("ParticipantList.ToggleAllowTextChat", boost::bind(&LLParticipantList::LLParticipantListMenu::toggleAllowTextChat, this, _2));
 	registrar.add("ParticipantList.ToggleMuteText", boost::bind(&LLParticipantList::LLParticipantListMenu::toggleMuteText, this, _2));
 
@@ -447,6 +463,24 @@ void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const
 		LLMenuGL::sMenuContainer->childSetVisible("ModerateVoiceUnMuteSelected", false);
 		LLMenuGL::sMenuContainer->childSetVisible("ModerateVoiceUnMuteOthers", false);
 	}
+
+	// Don't show sort options for P2P chat
+	bool is_sort_visible = (mParent.mAvatarList && mParent.mAvatarList->size() > 1);
+	LLMenuGL::sMenuContainer->childSetVisible("SortByName", is_sort_visible);
+	LLMenuGL::sMenuContainer->childSetVisible("SortByRecentSpeakers", is_sort_visible);
+}
+
+void LLParticipantList::LLParticipantListMenu::sortParticipantList(const LLSD& userdata)
+{
+	std::string param = userdata.asString();
+	if ("sort_by_name" == param)
+	{
+		mParent.setSortOrder(E_SORT_BY_NAME);
+	}
+	else if ("sort_by_recent_speakers" == param)
+	{
+		mParent.setSortOrder(E_SORT_BY_RECENT_SPEAKERS);
+	}
 }
 
 void LLParticipantList::LLParticipantListMenu::toggleAllowTextChat(const LLSD& userdata)
@@ -616,8 +650,45 @@ bool LLParticipantList::LLParticipantListMenu::checkContextMenuItem(const LLSD&
 	{
 		return LLMuteList::getInstance()->isMuted(id, LLMute::flagVoiceChat);
 	}
+	else if(item == "is_sorted_by_name")
+	{
+		return E_SORT_BY_NAME == mParent.mSortOrder;
+	}
+	else if(item == "is_sorted_by_recent_speakers")
+	{
+		return E_SORT_BY_RECENT_SPEAKERS == mParent.mSortOrder;
+	}
 
 	return false;
 }
 
+bool LLParticipantList::LLAvatarItemRecentSpeakerComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const
+{
+	if (mParent.mSpeakerMgr)
+	{
+		LLPointer<LLSpeaker> lhs = mParent.mSpeakerMgr->findSpeaker(avatar_item1->getAvatarId());
+		LLPointer<LLSpeaker> rhs = mParent.mSpeakerMgr->findSpeaker(avatar_item2->getAvatarId());
+		if ( lhs.notNull() && rhs.notNull() )
+		{
+			// Compare by last speaking time
+			if( lhs->mLastSpokeTime != rhs->mLastSpokeTime )
+				return ( lhs->mLastSpokeTime > rhs->mLastSpokeTime );
+			else if ( lhs->mSortIndex != rhs->mSortIndex )
+				return ( lhs->mSortIndex < rhs->mSortIndex );
+		}
+		else if ( lhs.notNull() )
+		{
+			// True if only avatar_item1 speaker info available
+			return true;
+		}
+		else if ( rhs.notNull() )
+		{
+			// False if only avatar_item2 speaker info available
+			return false;
+		}
+	}
+	// By default compare by name.
+	return LLAvatarItemNameComparator::doCompare(avatar_item1, avatar_item2);
+}
+
 //EOF
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index b85d4c9bc4..21eda86edd 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -34,6 +34,7 @@
 #include "llevent.h"
 #include "llpanelpeoplemenus.h"
 #include "llimview.h"
+#include "llavatarlist.h" // for LLAvatarItemRecentSpeakerComparator
 
 class LLSpeakerMgr;
 class LLAvatarList;
@@ -49,12 +50,14 @@ class LLParticipantList
 
 		typedef enum e_participant_sort_oder {
 			E_SORT_BY_NAME = 0,
+			E_SORT_BY_RECENT_SPEAKERS = 1,
 		} EParticipantSortOrder;
 
 		/**
 		 * Set and sort Avatarlist by given order
 		 */
 		void setSortOrder(EParticipantSortOrder order = E_SORT_BY_NAME);
+		EParticipantSortOrder getSortOrder();
 
 		/**
 		 * Refreshes participants to display ones not in voice as disabled.
@@ -139,6 +142,7 @@ class LLParticipantList
 			bool enableContextMenuItem(const LLSD& userdata);
 			bool checkContextMenuItem(const LLSD& userdata);
 
+			void sortParticipantList(const LLSD& userdata);
 			void toggleAllowTextChat(const LLSD& userdata);
 			void toggleMute(const LLSD& userdata, U32 flags);
 			void toggleMuteText(const LLSD& userdata);
@@ -195,6 +199,21 @@ class LLParticipantList
 			void moderateVoiceOtherParticipants(const LLUUID& excluded_avatar_id, bool unmute);
 		};
 
+		/**
+		 * Comparator for comparing avatar items by last spoken time
+		 */
+		class LLAvatarItemRecentSpeakerComparator : public LLAvatarItemNameComparator, public LLRefCount
+		{
+			LOG_CLASS(LLAvatarItemRecentSpeakerComparator);
+		  public:
+			LLAvatarItemRecentSpeakerComparator(LLParticipantList& parent):mParent(parent){};
+			virtual ~LLAvatarItemRecentSpeakerComparator() {};
+		  protected:
+			virtual bool doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const;
+		  private:
+			LLParticipantList& mParent;
+		};
+
 	private:
 		void onAvatarListDoubleClicked(LLAvatarList* list);
 		void onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param);
@@ -240,4 +259,6 @@ class LLParticipantList
 		boost::signals2::connection mAvatarListDoubleClickConnection;
 		boost::signals2::connection mAvatarListRefreshConnection;
 		boost::signals2::connection mAvatarListReturnConnection;
+
+		LLPointer<LLAvatarItemRecentSpeakerComparator> mSortByRecentSpeakers;
 };
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index faf33bd1b1..31263fbea8 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -2,7 +2,29 @@
 <context_menu
  layout="topleft"
  name="Participant List Context Menu">
- <menu_item_call
+    <menu_item_check
+     label="Sort by Name"
+     layout="topleft"
+     name="SortByName">
+        <menu_item_check.on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_name" />
+        <menu_item_check.on_check
+         function="ParticipantList.CheckItem"
+         parameter="is_sorted_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort by Recent Speakers"
+     layout="topleft"
+     name="SortByRecentSpeakers">
+        <menu_item_check.on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_recent_speakers" />
+        <menu_item_check.on_check
+         function="ParticipantList.CheckItem"
+         parameter="is_sorted_by_recent_speakers" />
+    </menu_item_check>
+    <menu_item_call
      label="View Profile"
      layout="topleft"
      name="View Profile">
-- 
cgit v1.2.3


From 82b0a42f86b9eb0ce45635cd91d689e9400e7824 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Mon, 21 Dec 2009 16:45:23 +0000
Subject: DEV-44357: Close classified/pick details when closing Pick panel.

When we close the Pick panel, we now also close any specific
classified or pick that was opened from the pick panel.
---
 indra/newview/llpanelpicks.cpp | 12 ++++++++++++
 indra/newview/llpanelpicks.h   |  2 ++
 2 files changed, 14 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 4d22d96072..69fa110d11 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -485,6 +485,18 @@ void LLPanelPicks::onOpen(const LLSD& key)
 	LLPanelProfileTab::onOpen(key);
 }
 
+void LLPanelPicks::onClosePanel()
+{
+	if (mPanelClassifiedInfo)
+	{
+		onPanelClassifiedClose(mPanelClassifiedInfo);
+	}
+	if (mPanelPickInfo)
+	{
+		onPanelPickClose(mPanelPickInfo);
+	}
+}
+
 void LLPanelPicks::onListCommit(const LLFlatListView* f_list)
 {
 	// Make sure only one of the lists has selection.
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index fd8a9e6938..1b2e35ca46 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -74,6 +74,8 @@ public:
 
 	/*virtual*/ void onOpen(const LLSD& key);
 
+	/*virtual*/ void onClosePanel();
+
 	void processProperties(void* data, EAvatarProcessorType type);
 
 	void updateData();
-- 
cgit v1.2.3


From d894c7a0d8292ce2114e88f382dcf6187b0d2535 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Mon, 21 Dec 2009 16:55:41 +0000
Subject: DEV-43799: Increase the minimum floater size for Search.

Liana and the search team want the minimum size of the search floater
to be such that the web content appears at 650x600 pixels. Users can
resize the window larger, but not smaller, than this limit.
---
 indra/newview/skins/default/xui/en/floater_search.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 9c1a5499db..5a9e2ebe6e 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -4,8 +4,8 @@
  can_resize="true"
  height="646"
  layout="topleft"
- min_height="140"
- min_width="467"
+ min_height="646"
+ min_width="670"
  name="floater_search"
  help_topic="floater_search"
  save_rect="true"
-- 
cgit v1.2.3


From 83d29715544355e7c6e808e36385803fe23b35c9 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Dec 2009 11:57:19 -0500
Subject: EXT-3574 : CTRL+SHIFT+I doesn't bring up an InventoryFloater
 (Windows)

Took out CONTROL+SHIFT+I for bringing up test inspectors, per Erica request.
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b4ce32ea1d..8f1799688b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2975,14 +2975,6 @@
             <menu_item_call.on_click
              function="Advanced.SendTestIMs" />
           </menu_item_call>
-          <menu_item_call
-           label="Test Inspectors"
-           name="Test Inspectors"
-           shortcut="control|shift|I">
-            <menu_item_call.on_click
-             function="Floater.Show"
-             parameter="test_inspectors" />
-          </menu_item_call>
         </menu>
         <menu
          create_jump_keys="true"
-- 
cgit v1.2.3


From 0d6af2a01d64c44a3874446c5c9a4ede71d8a98e Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 21 Dec 2009 19:45:20 +0200
Subject: Additional commit for EXT-3581: the code of updating of speakers
 order is moved to a separate method

--HG--
branch : product-engine
---
 indra/newview/llcallfloater.cpp         | 4 ++++
 indra/newview/llpanelimcontrolpanel.cpp | 5 ++---
 indra/newview/llparticipantlist.cpp     | 4 ++++
 indra/newview/llparticipantlist.h       | 5 +++++
 4 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 1acdb96da6..2521bde8fa 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -153,6 +153,10 @@ void LLCallFloater::draw()
 		setModeratorMutedVoice(is_moderator_muted);
 	}
 
+	// Need to resort the participant list if it's in sort by recent speaker order.
+	if (mPaticipants)
+		mPaticipants->updateRecentSpeakersOrder();
+
 	LLDockableFloater::draw();
 }
 
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index 8d03f9e686..3f309b3bf5 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -247,10 +247,9 @@ void LLPanelGroupControlPanel::draw()
 	//Remove event does not raised until speakerp->mActivityTimer.hasExpired() is false, see LLSpeakerManager::update()
 	//so we need update it to raise needed event
 	mSpeakerManager->update(true);
-	// Need to refresh participants to display ones not in voice as disabled and 
-	// resort the avatar list if it's in sort by recent speaker order.
+	// Need to resort the participant list if it's in sort by recent speaker order.
 	if (mParticipantList)
-		mParticipantList->refreshVoiceState();
+		mParticipantList->updateRecentSpeakersOrder();
 	LLPanelChatControlPanel::draw();
 }
 
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 8fb4063ea7..dfe0b504bd 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -227,6 +227,10 @@ void LLParticipantList::refreshVoiceState()
 			item->setOnline(!is_in_voice);
 		}
 	}
+}
+
+void LLParticipantList::updateRecentSpeakersOrder()
+{
 	if (E_SORT_BY_RECENT_SPEAKERS == getSortOrder())
 	{
 		// Resort avatar list
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index 21eda86edd..515529452b 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -65,6 +65,11 @@ class LLParticipantList
 		 */
 		void refreshVoiceState();
 
+		/**
+		 * Refreshes the participant list if it's in sort by recent speaker order.
+		 */
+		void updateRecentSpeakersOrder();
+
 	protected:
 		/**
 		 * LLSpeakerMgr event handlers
-- 
cgit v1.2.3


From 5aaaa4e9473615c06fde9e19f34d309aa7b9fb0f Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Dec 2009 12:56:52 -0500
Subject: EXT-3567 : Folders hsould show as "Loading..." when contents are
 being fetched

Name change "DontShowInHierarchy"->"Hidden".
---
 indra/newview/llfolderview.cpp     |  6 +++---
 indra/newview/llfolderviewitem.cpp | 10 +++++-----
 indra/newview/llfolderviewitem.h   |  9 ++++++---
 indra/newview/llinventorypanel.cpp |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 8b05f8614d..9cca1b07db 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -751,7 +751,7 @@ void LLFolderView::sanitizeSelection()
 		}
 
 		// Don't allow invisible items (such as root folders) to be selected.
-		if (item->getDontShowInHierarchy())
+		if (item->getHidden())
 		{
 			items_to_remove.push_back(item);
 		}
@@ -774,7 +774,7 @@ void LLFolderView::sanitizeSelection()
 				parent_folder;
 				parent_folder = parent_folder->getParentFolder())
 			{
-				if (parent_folder->potentiallyVisible() && !parent_folder->getDontShowInHierarchy())
+				if (parent_folder->potentiallyVisible() && !parent_folder->getHidden())
 				{
 					// give initial selection to first ancestor folder that potentially passes the filter
 					if (!new_selection)
@@ -796,7 +796,7 @@ void LLFolderView::sanitizeSelection()
 			// nothing selected to start with, so pick "My Inventory" as best guess
 			new_selection = getItemByID(gInventory.getRootFolderID());
 			// ... except if it's hidden from the UI.
-			if (new_selection && new_selection->getDontShowInHierarchy())
+			if (new_selection && new_selection->getHidden())
 			{
 				new_selection = NULL;
 			}
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index bfd9d6dca7..0be449fc9f 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -136,7 +136,7 @@ LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
 	mListener(p.listener),
 	mArrowImage(p.folder_arrow_image),
 	mBoxImage(p.selection_image),
-	mDontShowInHierarchy(false),
+	mHidden(false),
 	mShowLoadStatus(false)
 {
 	refresh();
@@ -201,7 +201,7 @@ LLFolderViewItem* LLFolderViewItem::getPreviousOpenNode(BOOL include_children)
 	LLFolderViewItem* itemp = mParentFolder->getPreviousFromChild( this, include_children );
 
 	// Skip over items that are invisible or are hidden from the UI.
-	while(itemp && (!itemp->getVisible() || itemp->getDontShowInHierarchy()))
+	while(itemp && (!itemp->getVisible() || itemp->getHidden()))
 	{
 		LLFolderViewItem* next_itemp = itemp->mParentFolder->getPreviousFromChild( itemp, include_children );
 		if (itemp == next_itemp) 
@@ -418,7 +418,7 @@ S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation)
 
 S32 LLFolderViewItem::getItemHeight()
 {
-	if (mDontShowInHierarchy) return 0;
+	if (mHidden) return 0;
 
 	S32 icon_height = mIcon->getHeight();
 	S32 label_height = llround(getLabelFontForStyle(mLabelStyle)->getLineHeight());
@@ -823,7 +823,7 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 void LLFolderViewItem::draw()
 {
-	if (mDontShowInHierarchy) return;
+	if (mHidden) return;
 
 	static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
 	static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
@@ -1257,7 +1257,7 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter)
 			// filter self only on first pass through
 			LLFolderViewItem::filter( filter );
 		}
-		if (mDontShowInHierarchy)
+		if (mHidden)
 		{
 			setOpen();
 		}
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index a43096dcb2..21e24c2a4d 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -162,7 +162,7 @@ protected:
 	LLUIImagePtr				mBoxImage;
 	BOOL                        mIsLoading;
 	LLTimer                     mTimeSinceRequestStart;
-	bool						mDontShowInHierarchy;
+	bool						mHidden;
 	bool						mShowLoadStatus;
 
 	// helper function to change the selection from the root.
@@ -206,8 +206,11 @@ public:
 	// makes sure that this view and it's children are the right size.
 	virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
 	virtual S32 getItemHeight();
-	void setDontShowInHierarchy(bool dont_show) { mDontShowInHierarchy = dont_show; }
-	bool getDontShowInHierarchy() const { return mDontShowInHierarchy; }
+
+	// Hide the folder from the UI, such as if you want to hide the root
+	// folder in an inventory panel.
+	void setHidden(bool hidden) { mHidden = hidden; }
+	bool getHidden() const { return mHidden; }
 
 	// applies filters to control visibility of inventory items
 	virtual void filter( LLInventoryFilter& filter);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 3c34ba32e2..0bdad791a7 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -502,7 +502,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 				// but still have the parent folder present for listener-related operations.
 				if (id == mStartFolderID)
 				{
-					folderp->setDontShowInHierarchy(TRUE);
+					folderp->setHidden(TRUE);
 				}
 			}
 		}
-- 
cgit v1.2.3


From 3c7e1435fe58a2a34fa838addd7cf822e48d3aa2 Mon Sep 17 00:00:00 2001
From: Dmitry Oleshko <doleshko@productengine.com>
Date: Mon, 21 Dec 2009 20:14:39 +0200
Subject: workaround for (EXT-3599) No chiclets in the IM Well Window

- manually set rect for a chiclet in the IM Well Window

--HG--
branch : product-engine
---
 indra/newview/llsyswellwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 9b60f58be1..8c6ea59407 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -352,6 +352,7 @@ LLIMWellWindow::RowPanel::RowPanel(const LLSysWellWindow* parent, const LLUUID&
 	}
 
 	// Initialize chiclet.
+	mChiclet->setRect(LLRect(5, 28, 30, 3)); // *HACK: workaround for (EXT-3599)
 	mChiclet->setChicletSizeChangedCallback(boost::bind(&LLIMWellWindow::RowPanel::onChicletSizeChanged, this, mChiclet, _2));
 	mChiclet->enableCounterControl(true);
 	mChiclet->setCounter(chicletCounter);
-- 
cgit v1.2.3


From 7bfb8ec0503d7c31d9241b2e95f103fa66b14e1e Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 21 Dec 2009 20:42:34 +0200
Subject: Work on normal bug EXT-3434 	There is no difference between invited
 and left participants in a Group call (Voice Controls) -- implemented
 decorating of left participants in voice chat via italic font style (draft,
 harcoded)

--HG--
branch : product-engine
---
 indra/newview/llavatarlistitem.cpp  |  22 ++++
 indra/newview/llavatarlistitem.h    |   1 +
 indra/newview/llcallfloater.cpp     | 235 +++++++++++++++++++++++++++++++++++-
 indra/newview/llcallfloater.h       |  35 +++++-
 indra/newview/llparticipantlist.cpp |  21 ----
 indra/newview/llparticipantlist.h   |   6 -
 6 files changed, 289 insertions(+), 31 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index bbe5cdcc4a..76dce622ed 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -184,6 +184,28 @@ void LLAvatarListItem::setHighlight(const std::string& highlight)
 	setNameInternal(mAvatarName->getText(), mHighlihtSubstring = highlight);
 }
 
+void LLAvatarListItem::setStyle(const LLStyle::Params& new_style)
+{
+//	LLTextUtil::textboxSetHighlightedVal(mAvatarName, mAvatarNameStyle = new_style);
+
+	// Active group should be bold.
+	LLFontDescriptor new_desc(mAvatarName->getDefaultFont()->getFontDesc());
+
+	new_desc.setStyle(new_style.font()->getFontDesc().getStyle());
+	// *NOTE dzaporozhan
+	// On Windows LLFontGL::NORMAL will not remove LLFontGL::BOLD if font 
+	// is predefined as bold (SansSerifSmallBold, for example)
+//	new_desc.setStyle(active ? LLFontGL::BOLD : LLFontGL::NORMAL);
+	LLFontGL* new_font = LLFontGL::getFont(new_desc);
+
+//	
+	mAvatarNameStyle.font = new_font;
+
+	// *NOTE: You cannot set the style on a text box anymore, you must
+	// rebuild the text.  This will cause problems if the text contains
+	// hyperlinks, as their styles will be wrong.
+	mAvatarName->setText(mAvatarName->getText(), mAvatarNameStyle/* = new_style*/);
+}
 void LLAvatarListItem::setAvatarId(const LLUUID& id, bool ignore_status_changes)
 {
 	if (mAvatarId.notNull())
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index df8b04126e..ad85d5fa87 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -73,6 +73,7 @@ public:
 	void setOnline(bool online);
 	void setName(const std::string& name);
 	void setHighlight(const std::string& highlight);
+	void setStyle(const LLStyle::Params& new_style);
 	void setAvatarId(const LLUUID& id, bool ignore_status_changes = false);
 	void setLastInteractionTime(U32 secs_since);
 	//Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 2521bde8fa..fe4f0c5525 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -89,6 +89,7 @@ LLCallFloater::LLCallFloater(const LLSD& key)
 , mAgentPanel(NULL)
 , mSpeakingIndicator(NULL)
 , mIsModeratorMutedVoice(false)
+, mInitParticipantsVoiceState(false)
 {
 	mFactoryMap["non_avatar_caller"] = LLCallbackMap(create_non_avatar_caller, NULL);
 	LLVoiceClient::getInstance()->addObserver(this);
@@ -100,6 +101,8 @@ LLCallFloater::~LLCallFloater()
 	delete mPaticipants;
 	mPaticipants = NULL;
 
+	mAvatarListRefreshConnection.disconnect();
+
 	// Don't use LLVoiceClient::getInstance() here 
 	// singleton MAY have already been destroyed.
 	if(gVoiceClient)
@@ -114,6 +117,8 @@ BOOL LLCallFloater::postBuild()
 {
 	LLDockableFloater::postBuild();
 	mAvatarList = getChild<LLAvatarList>("speakers_list");
+	mAvatarListRefreshConnection = mAvatarList->setRefreshCompleteCallback(boost::bind(&LLCallFloater::onAvatarListRefreshed, this));
+
 	childSetAction("leave_call_btn", boost::bind(&LLCallFloater::leaveCall, this));
 
 	mNonAvatarCaller = getChild<LLNonAvatarCaller>("non_avatar_caller");
@@ -165,8 +170,7 @@ void LLCallFloater::onChange()
 {
 	if (NULL == mPaticipants) return;
 
-	mPaticipants->refreshVoiceState();
-
+	updateParticipantsVoiceState();
 }
 
 
@@ -291,7 +295,23 @@ void LLCallFloater::refreshPartisipantList()
 		{
 			mAvatarList->setNoItemsCommentText(getString("no_one_near"));
 		}
-		mPaticipants->refreshVoiceState();	
+
+		// we have to made delayed initialization of voice state of participant list.
+		// it will be performed after first LLAvatarList refreshing in the onAvatarListRefreshed().
+		mInitParticipantsVoiceState = true;
+	}
+}
+
+void LLCallFloater::onAvatarListRefreshed()
+{
+	if (mInitParticipantsVoiceState)
+	{
+		initParticipantsVoiceState();
+		mInitParticipantsVoiceState = false;
+	}
+	else
+	{
+		updateParticipantsVoiceState();
 	}
 }
 
@@ -393,4 +413,213 @@ void LLCallFloater::updateAgentModeratorState()
 	}
 	mAgentPanel->childSetValue("user_text", name);
 }
+
+void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids)
+{
+	// Get a list of participants from VoiceClient
+	LLVoiceClient::participantMap *voice_map = gVoiceClient->getParticipantList();
+	if (voice_map)
+	{
+		for (LLVoiceClient::participantMap::const_iterator iter = voice_map->begin();
+			iter != voice_map->end(); ++iter)
+		{
+			LLUUID id = (*iter).second->mAvatarID;
+			speakers_uuids.push_back(id);
+		}
+	}
+}
+
+void LLCallFloater::initParticipantsVoiceState()
+{
+	// Set initial status for each participant in the list.
+	std::vector<LLPanel*> items;
+	mAvatarList->getItems(items);
+	std::vector<LLPanel*>::const_iterator
+		it = items.begin(),
+		it_end = items.end();
+
+
+	std::vector<LLUUID> speakers_uuids;
+	get_voice_participants_uuids(speakers_uuids);
+
+	for(; it != it_end; ++it)
+	{
+		LLAvatarListItem *item = dynamic_cast<LLAvatarListItem*>(*it);
+		
+		if (!item)	continue;
+		
+		LLUUID speaker_id = item->getAvatarId();
+
+		std::vector<LLUUID>::const_iterator speaker_iter = std::find(speakers_uuids.begin(), speakers_uuids.end(), speaker_id);
+
+		// If an avatarID assigned to a panel is found in a speakers list
+		// obtained from VoiceClient we assign the JOINED status to the owner
+		// of this avatarID.
+		if (speaker_iter != speakers_uuids.end())
+		{
+			setState(item, STATE_JOINED);
+		}
+		else
+		{
+			LLPointer<LLSpeaker> speakerp = mSpeakerManager->findSpeaker(speaker_id);
+			// If someone has already left the call before, we create his
+			// avatar row panel with HAS_LEFT status and remove it after
+			// the timeout, otherwise we create a panel with INVITED status
+			if (speakerp.notNull() && speakerp.get()->mHasLeftCurrentCall)
+			{
+				setState(item, STATE_LEFT);
+			}
+			else
+			{
+				setState(item, STATE_INVITED);
+			}
+		}
+	}
+}
+
+void LLCallFloater::updateParticipantsVoiceState()
+{
+	std::vector<LLUUID> speakers_list;
+
+	// Get a list of participants from VoiceClient
+	LLVoiceClient::participantMap *map = gVoiceClient->getParticipantList();
+	if (!map) return;
+
+	for (LLVoiceClient::participantMap::const_iterator iter = map->begin();
+		iter != map->end(); ++iter)
+	{
+		LLUUID id = (*iter).second->mAvatarID;
+//		if ( id != gAgent.getID() )
+		{
+			speakers_list.push_back(id);
+/*
+			LLAvatarListItem* item = dynamic_cast<LLAvatarListItem*> (mAvatarList->getItemByValue(id));
+			if (item)
+			{
+				setState(item, STATE_JOINED);
+			}
+*/
+
+		}
+	}
+
+	// Updating the status for each participant.
+	std::vector<LLPanel*> items;
+	mAvatarList->getItems(items);
+	std::vector<LLPanel*>::const_iterator
+		it = items.begin(),
+		it_end = items.end();
+
+	for(; it != it_end; ++it)
+	{
+		LLAvatarListItem *item = dynamic_cast<LLAvatarListItem*>(*it);
+		if (!item) continue;
+
+		const LLUUID participant_id = item->getAvatarId();
+		bool found = false;
+
+		std::vector<LLUUID>::iterator speakers_iter = std::find(speakers_list.begin(), speakers_list.end(), participant_id);
+
+		lldebugs << "processing speaker: " << item->getAvatarName() << ", " << item->getAvatarId() << llendl;
+
+		// If an avatarID assigned to a panel is found in a speakers list
+		// obtained from VoiceClient we assign the JOINED status to the owner
+		// of this avatarID.
+		if (speakers_iter != speakers_list.end())
+		{
+			setState(item, STATE_JOINED);
+
+			LLPointer<LLSpeaker> speaker = mSpeakerManager->findSpeaker(participant_id);
+			if (speaker.isNull())
+				continue;
+			speaker->mHasLeftCurrentCall = FALSE;
+
+			speakers_list.erase(speakers_iter);
+			found = true;
+		}
+
+		// If an avatarID is not found in a speakers list from VoiceClient and
+		// a panel with this ID has a JOINED status this means that this person
+		// HAS LEFT the call.
+		if (!found)
+		{
+			if ((getState(participant_id) == STATE_JOINED))
+			{
+				setState(item, STATE_LEFT);
+
+				LLPointer<LLSpeaker> speaker = mSpeakerManager->findSpeaker(item->getAvatarId());
+				if (speaker.isNull())
+					continue;
+
+				speaker->mHasLeftCurrentCall = TRUE;
+			}
+			else if ((getState(participant_id) != STATE_LEFT))
+			{
+				setState(item, STATE_INVITED);
+			}
+
+/*
+			// If there is already a started timer for the current panel don't do anything.
+			bool no_timer_for_current_panel = true;
+			if (mTimersMap.size() > 0)
+			{
+				timers_map::iterator found_it = mTimersMap.find(participant_id);
+				if (found_it != mTimersMap.end())
+				{
+					no_timer_for_current_panel = false;
+				}
+			}
+
+			if (no_timer_for_current_panel)
+			{
+				// Starting a timer to remove an avatar row panel after timeout
+				// *TODO Make the timeout period adjustable
+				mTimersMap.insert(timer_pair(participant_id, new LLAvatarRowRemoveTimer(this->getHandle(), 10, participant_id)));
+			}
+*/
+		}
+	}
+
+}
+
+void LLCallFloater::setState(LLAvatarListItem* item, ESpeakerState state)
+{
+	setState(item->getAvatarId(), state);
+
+	LLStyle::Params speaker_style;
+	LLFontDescriptor new_desc(speaker_style.font()->getFontDesc());
+
+	switch (state)
+	{
+	case STATE_INVITED:
+//		status_str = "INVITED";			// *TODO: localize
+		new_desc.setStyle(LLFontGL::NORMAL);
+		break;
+	case STATE_JOINED:
+//		status_str = "JOINED";			// *TODO: localize
+		new_desc.setStyle(LLFontGL::NORMAL);
+		break;
+	case STATE_LEFT:
+		{
+			//		status_str = "HAS LEFT CALL";	// *TODO: localize
+			new_desc.setStyle(LLFontGL::ITALIC);
+
+		}
+		break;
+	default:
+		llwarns << "Unrecognized avatar panel state (" << state << ")" << llendl;
+		break;
+	}
+
+	LLFontGL* new_font = LLFontGL::getFont(new_desc);
+	speaker_style.font = new_font;
+	item->setStyle(speaker_style);
+
+//	if ()
+	{
+		// found speaker is in voice, mark him as online
+		item->setOnline(STATE_JOINED == state);
+	}
+}
+
 //EOF
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index ac45e283eb..21fba433c6 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -38,6 +38,7 @@
 #include "llvoiceclient.h"
 
 class LLAvatarList;
+class LLAvatarListItem;
 class LLNonAvatarCaller;
 class LLOutputMonitorCtrl;
 class LLParticipantList;
@@ -81,6 +82,16 @@ private:
 		VC_PEER_TO_PEER
 	}EVoiceControls;
 
+	typedef enum e_speaker_state
+	{
+		STATE_UNKNOWN,
+		STATE_INVITED,
+		STATE_JOINED,
+		STATE_LEFT,
+	} ESpeakerState;
+
+	typedef std::map<LLUUID, ESpeakerState> speaker_state_map_t;
+
 	void leaveCall();
 
 	/**
@@ -95,7 +106,7 @@ private:
 	 * Refreshes participant list according to current Voice Channel
 	 */
 	void refreshPartisipantList();
-
+	void onAvatarListRefreshed();
 
 	
 	void updateTitle();
@@ -103,7 +114,24 @@ private:
 	void setModeratorMutedVoice(bool moderator_muted);
 	void updateAgentModeratorState();
 
+	void initParticipantsVoiceState();
+	void updateParticipantsVoiceState();
+
+	void setState(LLAvatarListItem* item, ESpeakerState state);
+	void setState(const LLUUID& speaker_id, ESpeakerState state)
+	{
+		lldebugs << "Storing state: " << speaker_id << ", " << state << llendl;
+		mSpeakerStateMap[speaker_id] = state;
+	}
+
+	ESpeakerState getState(const LLUUID& speaker_id)
+	{
+		lldebugs << "Getting state: " << speaker_id << ", " << mSpeakerStateMap[speaker_id] << llendl;
+
+		return mSpeakerStateMap[speaker_id];
+	}
 private:
+	speaker_state_map_t mSpeakerStateMap;
 	LLSpeakerMgr* mSpeakerManager;
 	LLParticipantList* mPaticipants;
 	LLAvatarList* mAvatarList;
@@ -112,6 +140,11 @@ private:
 	LLPanel* mAgentPanel;
 	LLOutputMonitorCtrl* mSpeakingIndicator;
 	bool mIsModeratorMutedVoice;
+
+	bool mInitParticipantsVoiceState;
+
+	boost::signals2::connection mAvatarListRefreshConnection;
+
 };
 
 
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index dfe0b504bd..5941487c7d 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -208,27 +208,6 @@ LLParticipantList::EParticipantSortOrder LLParticipantList::getSortOrder()
 	return mSortOrder;
 }
 
-void LLParticipantList::refreshVoiceState()
-{
-	LLSpeakerMgr::speaker_list_t speakers;
-	mSpeakerMgr->getSpeakerList(&speakers, TRUE);
-
-	for (LLSpeakerMgr::speaker_list_t::iterator iter = speakers.begin();
-		iter != speakers.end(); ++iter)
-	{
-		LLSpeaker* speakerp = (*iter).get();
-		const LLUUID& speaker_id = speakerp->mID;
-		LLAvatarListItem* item = dynamic_cast<LLAvatarListItem*> (mAvatarList->getItemByValue(speaker_id));
-		if ( item )
-		{
-			// if voice is disabled for this speaker show non voice speakers as disabled
-			bool is_in_voice = speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE
-				&& speakerp->mStatus != LLSpeaker::STATUS_MUTED;
-			item->setOnline(!is_in_voice);
-		}
-	}
-}
-
 void LLParticipantList::updateRecentSpeakersOrder()
 {
 	if (E_SORT_BY_RECENT_SPEAKERS == getSortOrder())
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
index 515529452b..c4eb180917 100644
--- a/indra/newview/llparticipantlist.h
+++ b/indra/newview/llparticipantlist.h
@@ -59,12 +59,6 @@ class LLParticipantList
 		void setSortOrder(EParticipantSortOrder order = E_SORT_BY_NAME);
 		EParticipantSortOrder getSortOrder();
 
-		/**
-		 * Refreshes participants to display ones not in voice as disabled.
-		 * TODO: mantipov: probably should be moved into derived class for LLFloaterCall
-		 */
-		void refreshVoiceState();
-
 		/**
 		 * Refreshes the participant list if it's in sort by recent speaker order.
 		 */
-- 
cgit v1.2.3


From 7d308294e93c7d2a0ffb3f1b88386b96fcb7b42d Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 21 Dec 2009 20:45:27 +0200
Subject: Removed unused code (context menu handling in LLAvatarListItem).

--HG--
branch : product-engine
---
 indra/newview/llavatarlist.cpp     | 1 -
 indra/newview/llavatarlistitem.cpp | 1 -
 indra/newview/llavatarlistitem.h   | 3 ---
 3 files changed, 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 5865df3e26..5317cf2cd0 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -322,7 +322,6 @@ void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is
 	item->setAvatarId(id, mIgnoreOnlineStatus);
 	item->setOnline(mIgnoreOnlineStatus ? true : is_online);
 	item->showLastInteractionTime(mShowLastInteractionTime);
-	item->setContextMenu(mContextMenu);
 
 	item->childSetVisible("info_btn", false);
 	item->setAvatarIconVisible(mShowIcons);
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 76dce622ed..c8544bc3fb 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -57,7 +57,6 @@ LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/)
 	mSpeakingIndicator(NULL),
 	mInfoBtn(NULL),
 	mProfileBtn(NULL),
-	mContextMenu(NULL),
 	mOnlineStatus(E_UNKNOWN),
 	mShowInfoBtn(true),
 	mShowProfileBtn(true)
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index ad85d5fa87..0e058f75db 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -92,8 +92,6 @@ public:
 	void showInfoBtn(bool show_info_btn) {mInfoBtn->setVisible(show_info_btn); }
 	void showLastInteractionTime(bool show);
 
-	void setContextMenu(ContextMenu* menu) { mContextMenu = menu; }
-
 	/**
 	 * This method was added to fix EXT-2364 (Items in group/ad-hoc IM participant list (avatar names) should be reshaped when adding/removing the "(Moderator)" label)
 	 * But this is a *HACK. The real reason of it was in incorrect logic while hiding profile/info/speaker buttons
@@ -127,7 +125,6 @@ private:
 	
 	LLButton* mInfoBtn;
 	LLButton* mProfileBtn;
-	ContextMenu* mContextMenu;
 
 	LLUUID mAvatarId;
 	std::string mHighlihtSubstring; // substring to highlight
-- 
cgit v1.2.3


From 2e8902d591c44698622ab1d2b088694dbc873007 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Mon, 21 Dec 2009 18:51:50 +0000
Subject: DEV-44367: Put back help IDs for prefs, land, and water.

The help_topic tags for Preferences, About Land, and Advanced Water
Editor were removed for EXT-2766. However, this has the sideeffect
that those floaters no longer show the "?" Help button. So, I'm
reverting that change and putting these help IDs back again.
---
 indra/newview/skins/default/xui/en/floater_about_land.xml  | 1 +
 indra/newview/skins/default/xui/en/floater_preferences.xml | 1 +
 indra/newview/skins/default/xui/en/floater_water.xml       | 1 +
 3 files changed, 3 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index a581190d18..cc955369e2 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -4,6 +4,7 @@
  height="420"
  layout="topleft"
  name="floaterland"
+ help_topic="floaterland"
  save_rect="true"
  title="ABOUT LAND"
  width="490">
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 2f26e5d0c1..15655a920e 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -7,6 +7,7 @@
  height="460"
  layout="topleft"
  name="Preferences"
+ help_topic="preferences"
  single_instance="true"
  title="PREFERENCES"
  width="620">
diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
index 7f31692ad9..32739ac953 100644
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -4,6 +4,7 @@
  height="240"
  layout="topleft"
  name="Water Floater"
+ help_topic="water_floater"
  save_rect="true"
  title="ADVANCED WATER EDITOR"
  width="700">
-- 
cgit v1.2.3


From c72de2edf0a2f7590fd43d86c59e83afcf7e8bcf Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 21 Dec 2009 20:56:38 +0200
Subject: Added context menu to the group list (task EXT-3595).

--HG--
branch : product-engine
---
 indra/newview/llgrouplist.cpp                      | 71 ++++++++++++++++++++++
 indra/newview/llgrouplist.h                        |  6 ++
 .../skins/default/xui/en/menu_people_groups.xml    | 57 +++++++++++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_people_groups.xml

(limited to 'indra/newview')

diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index ab9db10f38..3ca459a403 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -37,6 +37,7 @@
 // libs
 #include "llbutton.h"
 #include "lliconctrl.h"
+#include "llmenugl.h"
 #include "lltextbox.h"
 #include "lltrans.h"
 
@@ -46,6 +47,7 @@
 #include "llfloaterreg.h"
 #include "lltextutil.h"
 #include "llviewercontrol.h"	// for gSavedSettings
+#include "llviewermenu.h"		// for gMenuHolder
 
 static LLDefaultChildRegistry::Register<LLGroupList> r("group_list");
 S32 LLGroupListItem::sIconWidth = 0;
@@ -88,11 +90,24 @@ LLGroupList::LLGroupList(const Params& p)
 
 	// Set default sort order.
 	setComparator(&GROUP_COMPARATOR);
+
+	// Set up context menu.
+	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
+
+	registrar.add("People.Groups.Action",			boost::bind(&LLGroupList::onContextMenuItemClick,	this, _2));
+	enable_registrar.add("People.Groups.Enable",	boost::bind(&LLGroupList::onContextMenuItemEnable,	this, _2));
+
+	LLMenuGL* context_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_people_groups.xml",
+			gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+	if(context_menu)
+		mContextMenuHandle = context_menu->getHandle();
 }
 
 LLGroupList::~LLGroupList()
 {
 	gAgent.removeListener(this);
+	LLView::deleteViewByHandle(mContextMenuHandle);
 }
 
 // virtual
@@ -104,6 +119,22 @@ void LLGroupList::draw()
 	LLFlatListView::draw();
 }
 
+// virtual
+BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
+
+	LLMenuGL* context_menu = (LLMenuGL*)mContextMenuHandle.get();
+	if (context_menu)
+	{
+		context_menu->buildDrawLabels();
+		context_menu->updateParent(LLMenuGL::sMenuContainer);
+		LLMenuGL::showPopup(this, context_menu, x, y);
+	}
+
+	return handled;
+}
+
 void LLGroupList::setNameFilter(const std::string& filter)
 {
 	if (mNameFilter != filter)
@@ -203,6 +234,46 @@ bool LLGroupList::handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD&
 	return false;
 }
 
+bool LLGroupList::onContextMenuItemClick(const LLSD& userdata)
+{
+	std::string action = userdata.asString();
+	LLUUID selected_group = getSelectedUUID();
+
+	if (action == "view_info")
+	{
+		LLGroupActions::show(selected_group);
+	}
+	else if (action == "chat")
+	{
+		LLGroupActions::startIM(selected_group);
+	}
+	else if (action == "call")
+	{
+		LLGroupActions::startCall(selected_group);
+	}
+	else if (action == "activate")
+	{
+		LLGroupActions::activate(selected_group);
+	}
+	else if (action == "leave")
+	{
+		LLGroupActions::leave(selected_group);
+	}
+
+	return true;
+}
+
+bool LLGroupList::onContextMenuItemEnable(const LLSD& userdata)
+{
+	LLUUID selected_group_id = getSelectedUUID();
+	bool real_group_selected = selected_group_id.notNull(); // a "real" (not "none") group is selected
+
+	if (userdata.asString() == "activate")
+		return real_group_selected && gAgent.getGroupID() != selected_group_id;
+
+	return real_group_selected;
+}
+
 /************************************************************************/
 /*          LLGroupListItem implementation                              */
 /************************************************************************/
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index 33cfe005b9..f7afe0c0b2 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -60,6 +60,7 @@ public:
 	virtual ~LLGroupList();
 
 	virtual void draw(); // from LLView
+	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); // from LLView
 
 	void setNameFilter(const std::string& filter);
 	void toggleIcons();
@@ -71,6 +72,11 @@ private:
 	void addNewItem(const LLUUID& id, const std::string& name, const LLUUID& icon_id, EAddPosition pos = ADD_BOTTOM);
 	bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); // called on agent group list changes
 
+	bool onContextMenuItemClick(const LLSD& userdata);
+	bool onContextMenuItemEnable(const LLSD& userdata);
+
+	LLHandle<LLView>	mContextMenuHandle;
+
 	bool mShowIcons;
 	bool mDirty;
 	std::string mNameFilter;
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
new file mode 100644
index 0000000000..afa680139d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="menu_group_plus"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
+  <menu_item_call
+   label="View Info"
+   name="View Info">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="view_info" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="view_info" />
+  </menu_item_call>
+  <menu_item_call
+   label="Chat"
+   name="Chat">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="chat" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="chat" />
+  </menu_item_call>
+  <menu_item_call
+   label="Call"
+   name="Call">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="call" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="call" />
+  </menu_item_call>
+  <menu_item_separator />
+  <menu_item_call
+   label="Activate"
+   name="Activate">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="activate" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="activate" />
+  </menu_item_call>
+  <menu_item_separator />
+  <menu_item_call
+   label="Leave"
+   name="Leave">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="leave" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="leave" />
+  </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From 0e44480705631ffe6a1f3086527411ecebfc0ec7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 21 Dec 2009 14:24:21 -0500
Subject: Add event API to enumerate registered LLCommandHandler instances.

---
 indra/newview/llcommanddispatcherlistener.cpp | 13 +++++++
 indra/newview/llcommanddispatcherlistener.h   |  1 +
 indra/newview/llcommandhandler.cpp            | 55 +++++++++++++++++++++++++++
 indra/newview/llcommandhandler.h              |  5 +++
 4 files changed, 74 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llcommanddispatcherlistener.cpp b/indra/newview/llcommanddispatcherlistener.cpp
index 00a20de30e..91baeaf989 100644
--- a/indra/newview/llcommanddispatcherlistener.cpp
+++ b/indra/newview/llcommanddispatcherlistener.cpp
@@ -31,6 +31,11 @@ LLCommandDispatcherListener::LLCommandDispatcherListener(/* LLCommandDispatcher*
         "[\"query\"] map of parameters, as if from ?key1=val&key2=val\n"
         "[\"trusted\"] boolean indicating trusted browser [default true]",
         &LLCommandDispatcherListener::dispatch);
+    add("enumerate",
+        "Post to [\"reply\"] a map of registered LLCommandHandler instances, containing\n"
+        "name key and (e.g.) untrusted flag",
+        &LLCommandDispatcherListener::enumerate,
+        LLSD().with("reply", LLSD()));
 }
 
 void LLCommandDispatcherListener::dispatch(const LLSD& params) const
@@ -45,3 +50,11 @@ void LLCommandDispatcherListener::dispatch(const LLSD& params) const
     LLCommandDispatcher::dispatch(params["cmd"], params["params"], params["query"], NULL,
                                   trusted_browser);
 }
+
+void LLCommandDispatcherListener::enumerate(const LLSD& params) const
+{
+    LLReqID reqID(params);
+    LLSD response(LLCommandDispatcher::enumerate());
+    reqID.stamp(response);
+    LLEventPumps::instance().obtain(params["reply"]).post(response);
+}
diff --git a/indra/newview/llcommanddispatcherlistener.h b/indra/newview/llcommanddispatcherlistener.h
index d0070ddd71..9bcddebcc1 100644
--- a/indra/newview/llcommanddispatcherlistener.h
+++ b/indra/newview/llcommanddispatcherlistener.h
@@ -23,6 +23,7 @@ public:
 
 private:
     void dispatch(const LLSD& params) const;
+    void enumerate(const LLSD& params) const;
 
     //LLCommandDispatcher* mDispatcher;
 };
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp
index 8c7e7bea83..dc506a1692 100644
--- a/indra/newview/llcommandhandler.cpp
+++ b/indra/newview/llcommandhandler.cpp
@@ -36,6 +36,7 @@
 #include "llcommandhandler.h"
 #include "llnotificationsutil.h"
 #include "llcommanddispatcherlistener.h"
+#include "stringize.h"
 
 // system includes
 #include <boost/tokenizer.hpp>
@@ -67,6 +68,7 @@ public:
 				  bool trusted_browser);
 
 private:
+	friend LLSD LLCommandDispatcher::enumerate();
 	std::map<std::string, LLCommandHandlerInfo> mMap;
 };
 
@@ -175,3 +177,56 @@ bool LLCommandDispatcher::dispatch(const std::string& cmd,
 	return LLCommandHandlerRegistry::instance().dispatch(
 		cmd, params, query_map, web, trusted_browser);
 }
+
+static std::string lookup(LLCommandHandler::EUntrustedAccess value);
+
+LLSD LLCommandDispatcher::enumerate()
+{
+	LLSD response;
+	LLCommandHandlerRegistry& registry(LLCommandHandlerRegistry::instance());
+	for (std::map<std::string, LLCommandHandlerInfo>::const_iterator chi(registry.mMap.begin()),
+																	 chend(registry.mMap.end());
+		 chi != chend; ++chi)
+	{
+		LLSD info;
+		info["untrusted"] = chi->second.mUntrustedBrowserAccess;
+		info["untrusted_str"] = lookup(chi->second.mUntrustedBrowserAccess);
+		response[chi->first] = info;
+	}
+	return response;
+}
+
+/*------------------------------ lookup stuff ------------------------------*/
+struct symbol_info
+{
+	const char* name;
+	LLCommandHandler::EUntrustedAccess value;
+};
+
+#define ent(SYMBOL)										\
+	{													\
+		#SYMBOL + 28, /* skip "LLCommandHandler::UNTRUSTED_" prefix */	\
+		SYMBOL											\
+	}
+
+symbol_info symbols[] =
+{
+	ent(LLCommandHandler::UNTRUSTED_ALLOW),		  // allow commands from untrusted browsers
+	ent(LLCommandHandler::UNTRUSTED_BLOCK),		  // ignore commands from untrusted browsers
+	ent(LLCommandHandler::UNTRUSTED_THROTTLE)	  // allow untrusted, but only a few per min.
+};
+
+#undef ent
+
+static std::string lookup(LLCommandHandler::EUntrustedAccess value)
+{
+	for (symbol_info *sii(symbols), *siend(symbols + (sizeof(symbols)/sizeof(symbols[0])));
+		 sii != siend; ++sii)
+	{
+		if (sii->value == value)
+		{
+			return sii->name;
+		}
+	}
+	return STRINGIZE("UNTRUSTED_" << value);
+}
diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h
index 1bae6d9414..a1d4c880f5 100644
--- a/indra/newview/llcommandhandler.h
+++ b/indra/newview/llcommandhandler.h
@@ -34,6 +34,8 @@
 #ifndef LLCOMMANDHANDLER_H
 #define LLCOMMANDHANDLER_H
 
+#include "llsd.h"
+
 /* Example:  secondlife:///app/foo/<uuid>
    Command "foo" that takes one parameter, a UUID.
 
@@ -103,6 +105,9 @@ public:
 		// Execute a command registered via the above mechanism,
 		// passing string parameters.
 		// Returns true if command was found and executed correctly.
+	/// Return an LLSD::Map of registered LLCommandHandlers and associated
+	/// info (e.g. EUntrustedAccess).
+	static LLSD enumerate();
 };
 
 #endif
-- 
cgit v1.2.3


From 37b04c150792bb3e53a5ba02c6631aa1d0f8686f Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Dec 2009 14:54:55 -0500
Subject: EXT-3582 : My Outfits populates from library if I delete my last
 outfit

Tracking a "Is this my first time in viewer2.0?" flag and only populating My Outfits folder if it's true.
---
 indra/newview/llagentwearables.cpp |  5 +----
 indra/newview/llinventorymodel.cpp | 17 +++++++++++++++++
 indra/newview/llinventorymodel.h   | 11 +++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 454e547155..79948abefd 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -875,9 +875,6 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs
 	LLUUID agent_id;
 	gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
 
-	const BOOL is_first_time_in_viewer2_0 = (gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, FALSE) == LLUUID::null);
-
-
 	LLVOAvatar* avatar = gAgent.getAvatarObject();
 	if (avatar && (agent_id == avatar->getID()))
 	{
@@ -957,7 +954,7 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs
 			gInventory.addObserver(outfit);
 		}
 		
-		if (is_first_time_in_viewer2_0)
+		if (LLInventoryModel::getIsFirstTimeInViewer2())
 			gAgentWearables.populateMyOutfitsFolder();
 	}
 }
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 0a8108899a..26a81ab084 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -67,6 +67,7 @@ F32  LLInventoryModel::sMaxTimeBetweenFetches = 10.f;
 BOOL LLInventoryModel::sTimelyFetchPending = FALSE;
 LLFrameTimer LLInventoryModel::sFetchTimer;
 S16 LLInventoryModel::sBulkFetchCount = 0;
+BOOL LLInventoryModel::sFirstTimeInViewer2 = TRUE;
 
 // Increment this if the inventory contents change in a non-backwards-compatible way.
 // For viewer 2, the addition of link items makes a pre-viewer-2 cache incorrect.
@@ -2614,6 +2615,9 @@ void LLInventoryModel::buildParentChildMap()
 			notifyObservers();
 		}
 	}
+
+	const BOOL COF_exists = (findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, FALSE) != LLUUID::null);
+	sFirstTimeInViewer2 = !COF_exists;
 }
 
 struct LLUUIDAndName
@@ -3530,6 +3534,19 @@ void LLInventoryModel::setLibraryOwnerID(const LLUUID& val)
 	mLibraryOwnerID = val;
 }
 
+// static
+BOOL LLInventoryModel::getIsFirstTimeInViewer2()
+{
+	// Do not call this before parentchild map is built.
+	if (!gInventory.mIsAgentInvUsable)
+	{
+		llwarns << "Parent Child Map not yet built; guessing as first time in viewer2." << llendl;
+		return TRUE;
+	}
+
+	return sFirstTimeInViewer2;
+}
+
 //----------------------------------------------------------------------------
 
 // *NOTE: DEBUG functionality
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 27bbca493d..29f2aec89e 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -499,9 +499,9 @@ public:
 	// *NOTE: DEBUG functionality
 	void dumpInventory() const;
 
-	////////////////////////////////////////////////////////////////////////////////
-	// Bulk / Background Fetch
 
+	////////////////////////////////////////////////////////////////////////////////
+	// Bulk fetch
 public:
 	// Start and stop background breadth-first fetching of inventory contents.
 	// This gets triggered when performing a filter-search
@@ -525,6 +525,13 @@ private:
 	// completing the fetch once per session should be sufficient
 	static BOOL sBackgroundFetchActive;
 	static S16 sBulkFetchCount;
+
+	////////////////////////////////////////////////////////////////////////////////
+	// Login status
+public:
+	static BOOL getIsFirstTimeInViewer2();
+private:
+	static BOOL sFirstTimeInViewer2;
 };
 
 // a special inventory model for the agent
-- 
cgit v1.2.3


From d74d0d5c41d5ea114cef19aa7e54834d1c3b554b Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 21 Dec 2009 13:02:42 -0800
Subject: DEV-44562 deferred rendering: crease noise sadness

---
 .../shaders/class2/deferred/blurLightF.glsl        | 52 +++++++---------------
 indra/newview/pipeline.cpp                         |  3 +-
 2 files changed, 19 insertions(+), 36 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/shaders/class2/deferred/blurLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/blurLightF.glsl
index 28908a311d..0fad5b4b50 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/blurLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/blurLightF.glsl
@@ -10,7 +10,6 @@
 uniform sampler2DRect depthMap;
 uniform sampler2DRect normalMap;
 uniform sampler2DRect lightMap;
-uniform sampler2DRect edgeMap;
 
 uniform float dist_factor;
 uniform float blur_size;
@@ -46,53 +45,36 @@ void main()
 	
 	dlt /= max(-pos.z*dist_factor, 1.0);
 	
-	vec2 defined_weight = kern[0].xy; // special case the kern[0] (centre) sample's weight in the blur; we have to sample it anyway so we get it for 'free'
+	vec2 defined_weight = kern[0].xy; // special case the first (centre) sample's weight in the blur; we have to sample it anyway so we get it for 'free'
 	vec4 col = defined_weight.xyxx * ccol;
-
-	float center_e = 1.0 - (texture2DRect(edgeMap, vary_fragcoord.xy).a+
-		      texture2DRect(edgeMap, vary_fragcoord.xy+dlt*0.333).a+
-	              texture2DRect(edgeMap, vary_fragcoord.xy-dlt*0.333).a);
 	
-	float e = center_e;
 	for (int i = 1; i < 4; i++)
 	{
 		vec2 tc = vary_fragcoord.xy + kern[i].z*dlt;
-		
-		e = max(e, 0.0);
-		
-		vec2 wght = kern[i].xy*e;
-		
-		col += texture2DRect(lightMap, tc)*wght.xyxx;
-		defined_weight += wght;
-		
-		e *= e;
-		e -= texture2DRect(edgeMap, tc.xy).a+
-			texture2DRect(edgeMap, tc.xy+dlt*0.333).a+
-			texture2DRect(edgeMap, tc.xy-dlt*0.333).a;
+	        vec3 samppos = getPosition(tc).xyz; 
+		float d = dot(norm.xyz, samppos.xyz-pos.xyz);// dist from plane
+		if (d*d <= 0.003)
+		{
+			col += texture2DRect(lightMap, tc)*kern[i].xyxx;
+			defined_weight += kern[i].xy;
+		}
 	}
-
-	e = center_e;
 	for (int i = 1; i < 4; i++)
 	{
 		vec2 tc = vary_fragcoord.xy - kern[i].z*dlt;
-		
-		e = max(e, 0.0);
-		
-		vec2 wght = kern[i].xy*e;
-		
-		col += texture2DRect(lightMap, tc)*wght.xyxx;
-		defined_weight += wght;
-		
-		e *= e;
-		e -= texture2DRect(edgeMap, tc.xy).a+
-			texture2DRect(edgeMap, tc.xy+dlt*0.333).a+
-			texture2DRect(edgeMap, tc.xy-dlt*0.333).a;
+	        vec3 samppos = getPosition(tc).xyz; 
+		float d = dot(norm.xyz, samppos.xyz-pos.xyz);// dist from plane
+		if (d*d <= 0.003)
+		{
+			col += texture2DRect(lightMap, tc)*kern[i].xyxx;
+			defined_weight += kern[i].xy;
+		}
 	}
 
 
+
 	col /= defined_weight.xyxx;
 	
 	gl_FragColor = col;
-	
-	//gl_FragColor = ccol;
 }
+
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 73b5222ee3..4f4fc83819 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6352,7 +6352,8 @@ void LLPipeline::renderDeferredLighting()
 
 			mDeferredLight[0].flush();
 
-			if (gSavedSettings.getBOOL("RenderDeferredBlurLight"))
+			if (gSavedSettings.getBOOL("RenderDeferredBlurLight") &&
+			    gSavedSettings.getBOOL("RenderDeferredGI"))
 			{
 				LLFastTimer ftm(FTM_EDGE_DETECTION);
 				//get edge map
-- 
cgit v1.2.3


From c26034531a25590e718edc4d7efa41c04aa42731 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Dec 2009 16:49:14 -0500
Subject: EXT-3582 : My Outfits populates from library if I delete my last
 outfit

Autopopulation logic is now smarter and only triggers if this is the first time you're logging into viewer2.0.
---
 indra/newview/llagentwearables.cpp | 18 +++++++++++++-----
 indra/newview/llinventorymodel.cpp |  7 ++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 79948abefd..e75d94bb2c 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -871,6 +871,13 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs
 	if (mInitialWearablesUpdateReceived)
 		return;
 	mInitialWearablesUpdateReceived = true;
+	
+	// If this is the very first time the user has logged into viewer2+ from a legacy viewer,
+	// then auto-populate outfits from the library into the My Outfits folder.
+	if (LLInventoryModel::getIsFirstTimeInViewer2())
+	{
+		gAgentWearables.populateMyOutfitsFolder();
+	}
 
 	LLUUID agent_id;
 	gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
@@ -880,12 +887,15 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs
 	{
 		gMessageSystem->getU32Fast(_PREHASH_AgentData, _PREHASH_SerialNum, gAgentQueryManager.mUpdateSerialNum);
 		
+		const S32 NUM_BODY_PARTS = 4;
 		S32 num_wearables = gMessageSystem->getNumberOfBlocksFast(_PREHASH_WearableData);
-		if (num_wearables < 4)
+		if (num_wearables < NUM_BODY_PARTS)
 		{
 			// Transitional state.  Avatars should always have at least their body parts (hair, eyes, shape and skin).
-			// The fact that they don't have any here (only a dummy is sent) implies that this account existed
-			// before we had wearables, or that the database has gotten messed up.
+			// The fact that they don't have any here (only a dummy is sent) implies that either:
+			// 1. This account existed before we had wearables
+			// 2. The database has gotten messed up
+			// 3. This is the account's first login (i.e. the wearables haven't been generated yet).
 			return;
 		}
 
@@ -954,8 +964,6 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs
 			gInventory.addObserver(outfit);
 		}
 		
-		if (LLInventoryModel::getIsFirstTimeInViewer2())
-			gAgentWearables.populateMyOutfitsFolder();
 	}
 }
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 26a81ab084..96925490cf 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2518,6 +2518,10 @@ void LLInventoryModel::buildParentChildMap()
 		llwarns << "Found  " << lost << " lost categories." << llendl;
 	}
 
+	const BOOL COF_exists = (findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, FALSE) != LLUUID::null);
+	sFirstTimeInViewer2 = !COF_exists || gAgent.isFirstLogin();
+
+
 	// Now the items. We allocated in the last step, so now all we
 	// have to do is iterate over the items and put them in the right
 	// place.
@@ -2615,9 +2619,6 @@ void LLInventoryModel::buildParentChildMap()
 			notifyObservers();
 		}
 	}
-
-	const BOOL COF_exists = (findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, FALSE) != LLUUID::null);
-	sFirstTimeInViewer2 = !COF_exists;
 }
 
 struct LLUUIDAndName
-- 
cgit v1.2.3


From 89eab35b8069c3e2652591c0dffe2b0214fc0666 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 21 Dec 2009 13:49:23 -0800
Subject: DEV-44564 'speak' button PTT-toggles and displays voice monitor even
 when voice disabled, gives wrong impression that you should be able to talk

---
 indra/newview/llspeakbutton.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index fd39bde118..90214a1bd7 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -61,7 +61,9 @@ void LLSpeakButton::draw()
 {
 	// gVoiceClient is the authoritative global source of info regarding our open-mic state, we merely reflect that state.
 	bool openmic = gVoiceClient->getUserPTTState();
-	mSpeakBtn->setToggleState(openmic);
+	bool voiceenabled = gVoiceClient->voiceEnabled();
+	mSpeakBtn->setToggleState(openmic && voiceenabled);
+	mOutputMonitor->setIsMuted(!voiceenabled);
 	LLUICtrl::draw();
 }
 
-- 
cgit v1.2.3


From a32f857fe68f6b191f8029b1a5b137aaa364395b Mon Sep 17 00:00:00 2001
From: Palmer Truelson <palmer@lindenlab.com>
Date: Mon, 21 Dec 2009 15:59:20 -0600
Subject: EXT-2973 : turned off RenderDelayVBUpdate for all platforms and
 bumped feature table to apply it.  Should solve index buff overflows.

Reviewed by Davep
---
 indra/newview/featuretable.txt       | 3 ++-
 indra/newview/featuretable_linux.txt | 3 ++-
 indra/newview/featuretable_mac.txt   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index d20c23df80..4029bf95a0 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 20
+version 21
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -28,6 +28,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
+RenderDelayVBUpdate			1	0
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderFogRatio				1	4.0
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 57d712ede7..61a8e51c50 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 20
+version 21
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -28,6 +28,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
+RenderDelayVBUpdate			1	0
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderFogRatio				1	4.0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 15974c0691..12d47a904c 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 20
+version 21
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -28,6 +28,7 @@ RenderAvatarCloth				0	0
 RenderAvatarLODFactor			1	1.0
 RenderAvatarVP					1	0
 RenderCubeMap					1	1
+RenderDelayVBUpdate				1	0
 RenderFarClip					1	256
 RenderFlexTimeFactor			1	1.0
 RenderFogRatio					1	4.0
-- 
cgit v1.2.3