QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 46 insertions, 37 deletions

diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 62c4d832cf..99f559cc79 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -765,7 +765,9 @@ void LLWorldMapView::draw()
 		}
 	}
 	
-	if (gSavedSettings.getBOOL("MapShowEvents"))
+	if (gSavedSettings.getBOOL("MapShowEvents") ||
+		gSavedSettings.getBOOL("ShowMatureEvents") ||
+		gSavedSettings.getBOOL("ShowAdultEvents") )
 	{
 		drawEvents();
 	}
@@ -965,18 +967,22 @@ void LLWorldMapView::drawEvents()
 	bool mature_enabled = gAgent.canAccessMature();
 	bool adult_enabled = gAgent.canAccessAdult();
 
+	BOOL show_pg = gSavedSettings.getBOOL("MapShowEvents");
     BOOL show_mature = mature_enabled && gSavedSettings.getBOOL("ShowMatureEvents");
 	BOOL show_adult = adult_enabled && gSavedSettings.getBOOL("ShowAdultEvents");
 
     // First the non-selected events
     LLWorldMap::item_info_list_t::const_iterator e;
-    for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
-    {
-        if (!e->mSelected)
-        {
-            drawGenericItem(*e, sEventImage);   
-        }
-    }
+	if (show_pg)
+	{
+		for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
+		{
+			if (!e->mSelected)
+			{
+				drawGenericItem(*e, sEventImage);   
+			}
+		}
+	}
     if (show_mature)
     {
         for (e = LLWorldMap::getInstance()->mMatureEvents.begin(); e != LLWorldMap::getInstance()->mMatureEvents.end(); ++e)
@@ -998,13 +1004,16 @@ void LLWorldMapView::drawEvents()
         }
     }
     // Then the selected events
-    for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
-    {
-        if (e->mSelected)
-        {
-            drawGenericItem(*e, sEventImage);
-        }
-    }
+	if (show_pg)
+	{
+		for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
+		{
+			if (e->mSelected)
+			{
+				drawGenericItem(*e, sEventImage);
+			}
+		}
+	}
     if (show_mature)
     {
         for (e = LLWorldMap::getInstance()->mMatureEvents.begin(); e != LLWorldMap::getInstance()->mMatureEvents.end(); ++e)
@@ -1638,34 +1647,34 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
 				return;
 			}
 		}
-		if (gSavedSettings.getBOOL("ShowMatureEvents"))
+	}
+	if (gSavedSettings.getBOOL("ShowMatureEvents"))
+	{
+		for (it = LLWorldMap::getInstance()->mMatureEvents.begin(); it != LLWorldMap::getInstance()->mMatureEvents.end(); ++it)
 		{
-			for (it = LLWorldMap::getInstance()->mMatureEvents.begin(); it != LLWorldMap::getInstance()->mMatureEvents.end(); ++it)
-			{
-				LLItemInfo& event = *it;
+			LLItemInfo& event = *it;
 
-				if (checkItemHit(x, y, event, id, false))
-				{
-					*hit_type = MAP_ITEM_MATURE_EVENT;
-					mItemPicked = TRUE;
-					gFloaterWorldMap->trackEvent(event);
-					return;
-				}
+			if (checkItemHit(x, y, event, id, false))
+			{
+				*hit_type = MAP_ITEM_MATURE_EVENT;
+				mItemPicked = TRUE;
+				gFloaterWorldMap->trackEvent(event);
+				return;
 			}
 		}
-		if (gSavedSettings.getBOOL("ShowAdultEvents"))
+	}
+	if (gSavedSettings.getBOOL("ShowAdultEvents"))
+	{
+		for (it = LLWorldMap::getInstance()->mAdultEvents.begin(); it != LLWorldMap::getInstance()->mAdultEvents.end(); ++it)
 		{
-			for (it = LLWorldMap::getInstance()->mAdultEvents.begin(); it != LLWorldMap::getInstance()->mAdultEvents.end(); ++it)
-			{
-				LLItemInfo& event = *it;
+			LLItemInfo& event = *it;
 
-				if (checkItemHit(x, y, event, id, false))
-				{
-					*hit_type = MAP_ITEM_ADULT_EVENT;
-					mItemPicked = TRUE;
-					gFloaterWorldMap->trackEvent(event);
-					return;
-				}
+			if (checkItemHit(x, y, event, id, false))
+			{
+				*hit_type = MAP_ITEM_ADULT_EVENT;
+				mItemPicked = TRUE;
+				gFloaterWorldMap->trackEvent(event);
+				return;
 			}
 		}
 	}