diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-19 12:07:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-19 12:07:41 -0400 |
| commit | 78cad5181839c530f32c7e50791933dc00a3df6d (patch) | |
| tree | 9648f16aa8297f6523995337ddb2ed50aa2330d9 | |
| parent | 196b4d5704e4284bdeca54362a09a4c1b33cbf5e (diff) | |
| parent | a461aedf2e3495ccbce4c74f7e7f9d8aed90adc0 (diff) | |
merge changes for STORM-1259 and STORM-1175
| -rw-r--r-- | doc/contributions.txt | 5 | ||||
| -rw-r--r-- | indra/llui/llnotifications.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 |
4 files changed, 20 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 1e30188559..d6890df1e1 100644 --- a/doc/contributions.txt +++ b/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 diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index bdac125eb0..6085c61f9a 100644 --- a/indra/llui/llnotifications.cpp +++ b/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, diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8cfe91203a..2ed208bad1 100644 --- a/indra/newview/llviewermenu.cpp +++ b/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; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index e8d5c97bbf..81046e99a0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/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" |