merge changes for STORM-1259 and STORM-1175

doc/contributions.txt

@@ -255,6 +255,8 @@ Dale Glass
 	VWR-2502
 	VWR-1358
 	VWR-2041
+Draconis Neurocam
+	STORM-1259
 Drew Dri
 	VWR-19683
 Drewan Keats
@@ -368,6 +370,7 @@ Ian Kas
 Ima Mechanique
 	OPEN-50
 	OPEN-61
+	STORM-1175
 Irene Muni
 	CT-324
 	CT-352
@@ -436,6 +439,7 @@ Jonathan Yap
 	STORM-956
 	STORM-1095
 	STORM-1236
+	STORM-1259
 Kage Pixel
 	VWR-11
 Ken March
@@ -453,6 +457,7 @@ Kitty Barnett
 	STORM-799
 	STORM-800
 	STORM-1001
+	STORM-1175
     VWR-24217
 Kunnis Basiat
 	VWR-82

indra/llui/llnotifications.cpp

@@ -1532,7 +1532,7 @@ bool LLNotifications::loadVisibilityRules()
 // Add a simple notification (from XUI)
 void LLNotifications::addFromCallback(const LLSD& name)
 {
-	add(LLNotification::Params().name(name.asString()));	
+	add(name.asString(), LLSD(), LLSD());
 }
 
 LLNotificationPtr LLNotifications::add(const std::string& name, 

indra/newview/llviewermenu.cpp

@@ -1000,6 +1000,10 @@ U32 info_display_from_string(std::string info_display)
 	{
 		return LLPipeline::RENDER_DEBUG_AGENT_TARGET;
 	}
+	else if ("sculpt" == info_display)
+	{
+		return LLPipeline::RENDER_DEBUG_SCULPTED;
+	}
 	else
 	{
 		return 0;

indra/newview/skins/default/xui/en/menu_viewer.xml

@@ -2348,6 +2348,16 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="raycast" />
         </menu_item_check>
+		<menu_item_check
+         label="Sculpt"
+         name="Sculpt">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="sculpt" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="sculpt" />
+		</menu_item_check>
       </menu>
         <menu
          create_jump_keys="true"