svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release

7 files changed, 11 insertions, 20 deletions

diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index b71772bd93..f7bf4de34f 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -162,7 +162,6 @@ BOOL LLFloaterTOS::postBuild()
 	childSetValue("tos_text", LLSD(mMessage));	
 #endif
 
-
 	return TRUE;
 }
 
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 5c32f8d90a..4fde8988f5 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -83,7 +83,7 @@ LLNetMap::LLNetMap(
 	LLRect major_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH, 0 );
 
 	mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
-	mTextBoxNorth->setDropshadowVisible( TRUE );
+	mTextBoxNorth->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
 	addChild( mTextBoxNorth );
 
 	LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index 30adea7d73..724ef8a847 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -87,9 +87,13 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 		return;
 	}
 
+	LLUUID group_id;			// used for SL-23488
+	gSelectMgr->selectGetGroup(group_id);  // sets group_id as a side effect SL-23488
+
 	// BUG? Check for all objects being editable?
 	BOOL editable = gAgent.isGodlike()
-					|| (objectp->permModify() && objectp->permYouOwner());
+					|| (objectp->permModify()
+					       && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
 	BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
 
 	// Edit script button - ok if object is editable and there's an
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 4cf103508d..51ead9c532 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -503,7 +503,7 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
 			mLiveHelpTimer.stop();
 		}
 	}
-	else
+	else if (immediate)
 	{
 		setHelpPage("");
 	}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index cb4077b21b..23e1ab6664 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1124,16 +1124,8 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 	if (from_task)
 	{
 		args["[OBJECTFROMNAME]"] = info->mFromName;
-		if (name_found)
-		{
-			LLNotifyBox::showXml("ObjectGiveItem", args,
-								&inventory_offer_callback, (void*)info);
-		}
-		else
-		{
-			LLNotifyBox::showXml("ObjectGiveItemUnknownUser", args,
-								&inventory_offer_callback, (void*)info);
-		}
+		LLNotifyBox::showXml(name_found ? "ObjectGiveItem" : "ObjectGiveItemUnknownUser",
+							args, &inventory_offer_callback, (void*)info);
 	}
 	else
 	{
@@ -1633,10 +1625,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			}
 			else
 			{
-				if (dialog == IM_TASK_INVENTORY_OFFERED)
-					inventory_offer_handler(info, TRUE);
-				else
-					inventory_offer_handler(info, FALSE);
+				inventory_offer_handler(info, dialog == IM_TASK_INVENTORY_OFFERED);
 			}
 		}
 		break;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f276999380..a9ed98e9db 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1708,7 +1708,7 @@ void LLViewerWindow::initBase()
 	mToolTip->setBorderVisible( FALSE );
 	mToolTip->setBackgroundColor( gColors.getColor( "ToolTipBgColor" ) );
 	mToolTip->setBackgroundVisible( TRUE );
-	mToolTip->setDropshadowVisible( FALSE );
+	mToolTip->setFontStyle(LLFontGL::NORMAL);
 	mToolTip->setBorderDropshadowVisible( TRUE );
 	mToolTip->setVisible( FALSE );
 
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 9d2fb122e5..6c99d99732 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -158,7 +158,6 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
 	LLRect major_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH, 0 );
 
 	mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
-	mTextBoxNorth->setDropshadowVisible( TRUE );
 	addChild( mTextBoxNorth );
 
 	LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );