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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source
This commit is contained in:
Lirusaito
2012-05-30 21:16:27 -04:00
parent c6120cd283 b15f2d1a56
commit 20f138b31f
16 changed files with 1044 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewermenu.cpp
View File

@@ -3192,11 +3192,8 @@ class LLAvatarClientUUID : public view_listener_t
{
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));
const LLUUID clientID = SHClientTagMgr::instance().getClientID(avatar);
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(clientID.asString()));
return true;
}
};