Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client UUID thing for trying to identify new clients

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-10 20:03:09 -04:00
parent 74669be31a
commit c86769d657
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llviewermenu.cpp
View File

@@ -247,7 +247,6 @@
#include "llao.h" #include "llao.h"
#include "llfloatervfs.h" #include "llfloatervfs.h"
#include "llfloatervfsexplorer.h" #include "llfloatervfsexplorer.h"
#include "llfloaterexportregion.h"
// </edit> // </edit>
#include "scriptcounter.h" #include "scriptcounter.h"
@@ -2947,6 +2946,21 @@ class LLAvatarCopyUUID : public view_listener_t
} }
}; };
class LLAvatarClientUUID : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(!avatar) return true;
std::string clientID;
LLColor4 color;
avatar->getClientInfo(clientID, color, false);
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(clientID));
return true;
}
};
class LLAvatarEnableFreezeEject : public view_listener_t class LLAvatarEnableFreezeEject : public view_listener_t
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9789,6 +9803,7 @@ void initialize_menus()
addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend"); addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject"); addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject");
addMenu(new LLAvatarCopyUUID(), "Avatar.CopyUUID"); addMenu(new LLAvatarCopyUUID(), "Avatar.CopyUUID");
addMenu(new LLAvatarClientUUID(), "Avatar.ClientID");
// Object pie menu // Object pie menu
addMenu(new LLObjectOpen(), "Object.Open"); addMenu(new LLObjectOpen(), "Object.Open");

5
indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
View File

@@ -42,7 +42,10 @@
<on_visible function="Object.VisibleScriptCount" /> <on_visible function="Object.VisibleScriptCount" />
</menu_item_call> </menu_item_call>
<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID"> <menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
<on_click function="Avatar.CopyUUID" /> <on_click function="Avatar.CopyUUID" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="Client ID" mouse_opaque="true" name="ClientID">
<on_click function="Avatar.ClientID" />
</menu_item_call> </menu_item_call>
<menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender"> <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
<on_click function="Object.DERENDER" /> <on_click function="Object.DERENDER" />