1 files changed, 32 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7f00382..777a871 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -41,6 +41,7 @@
 
 // linden library includes
 #include "llaudioengine.h"
+#include "llavatarnamecache.h"
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llchat.h"
@@ -102,6 +103,7 @@
 #include "llfloatercustomize.h"
 #include "llfloaterdaycycle.h"
 #include "llfloaterdirectory.h"
+#include "llfloaterdisplayname.h"
 #include "llfloatereditui.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfriends.h"
@@ -3434,6 +3436,16 @@ class LLEditEnableCustomizeAvatar : public view_listener_t
         }
 };
 
+class LLEditEnableDisplayName : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = (LLAvatarNameCache::useDisplayNames() != 0);
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 // only works on pie menu
 bool handle_sit_or_stand()
 {
@@ -5959,6 +5971,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLToolBar::toggle(NULL);
                 }
+                else if (floater_name == "displayname")
+                {
+                        LLFloaterDisplayName::show();
+                }
                 else if (floater_name == "chat history")
                 {
                         LLFloaterChat::toggleInstance(LLSD());
@@ -10666,6 +10682,20 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
         }
 };
 
+///////////////////////////////////
+// Reload Avatar Cloud Particles //
+///////////////////////////////////
+
+
+class LLAdvancedReloadAvatarCloudParticle : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::initCloud();
+                return true;
+        }
+};
+
 ///////////
 // Crash //
 ///////////
@@ -11118,6 +11148,7 @@ void initialize_menus()
         addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
         addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
         addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
+        addMenu(new LLEditEnableDisplayName(), "Edit.EnableDisplayName");
         addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
 
         // View menu
@@ -11453,6 +11484,7 @@ void initialize_menus()
         addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
         addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
         addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
+        addMenu(new LLAdvancedReloadAvatarCloudParticle(), "Advanced.ReloadAvatarCloudParticle");
 
         // Advanced > Crash
         addMenu(new LLAdvancedCrash(), "Advanced.Crash");