3 files changed, 39 insertions, 4 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4794bb7..1d8ea17 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2008-09-28  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llviewermenu.cpp: 
+        Added event callbacks for Attached Lights and Attached Particles.
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml: 
+        Updated XUI menu entries for Attached Lights and Attached Particles
+        to use the new event callbacks. Those menu entries now work.
+        
         * Updated to SL source 1.21.2.
 
 2008-09-22  Jacek Antonelli  <jacek.antonelli@gmail.com>
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 9687e11..8165e55 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -8295,6 +8295,33 @@ class LLAdvancedCheckDisableTextures : public view_listener_t
 
 
 
+////////////////////////////////////////
+// RENDER ATTACHED LIGHTS / PARTICLES //
+////////////////////////////////////////
+
+
+class LLToggleRenderAttachedLights : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+    menu_toggle_control((void *)"RenderAttachedLights");
+    LLPipeline::sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights");
+                return true;
+        }
+};
+
+class LLToggleRenderAttachedParticles : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+    menu_toggle_control((void *)"RenderAttachedParticles");
+    LLPipeline::sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles");
+                return true;
+        }
+};
+
+
+
 //////////////////////////
 // DUMP SCRIPTED CAMERA //
 //////////////////////////
@@ -9956,6 +9983,10 @@ void initialize_menus()
         addMenu(new LLAdvancedToggleDisableTextures(), "Advanced.ToggleDisableTextures");
         addMenu(new LLAdvancedCheckDisableTextures(), "Advanced.CheckDisableTextures");
 
+        // Advanced > Render (top level menu)
+        addMenu(new LLToggleRenderAttachedLights(), "ToggleRenderAttachedLights");
+        addMenu(new LLToggleRenderAttachedParticles(), "ToggleRenderAttachedParticles");
+
         // Advanced > World
         addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
         addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 40de54f..f82f254 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1418,13 +1418,11 @@
         <on_check control="CheesyBeacon" />
       </menu_item_check>
       <menu_item_check name="Attached Lights" label="Attached Lights">
-        <on_click function="ToggleControl"
-                  userdata="RenderAttachedLights" />
+        <on_click function="ToggleRenderAttachedLights" />
         <on_check control="RenderAttachedLights" />
       </menu_item_check>
       <menu_item_check name="Attached Particles" label="Attached Particles">
-        <on_click function="ToggleControl"
-                  userdata="RenderAttachedParticles" />
+        <on_click function="ToggleRenderAttachedParticles" />
         <on_check control="RenderAttachedParticles" />
       </menu_item_check>
     </menu>