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

Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Inusaito Sayori
2013-08-25 14:24:56 -04:00
parent a2b0731dd0 fdc855cd37
commit 67180f40fc
26 changed files with 122 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermenu.cpp
View File

@@ -2618,7 +2618,7 @@ class LLObjectCopyUUID : public view_listener_t
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if(object)
{
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(object->getID().asString()));
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(object->getID().asString()));
}
return true;
}
@@ -3266,7 +3266,7 @@ class LLAvatarCopyUUID : public view_listener_t
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(!avatar) return true;
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(avatar->getID().asString()));
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(avatar->getID().asString()));
return true;
}
};
@@ -3278,7 +3278,7 @@ class LLAvatarClientUUID : public view_listener_t
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(!avatar) return true;
const LLUUID clientID = SHClientTagMgr::instance().getClientID(avatar);
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(clientID.asString()));
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(clientID.asString()));
return true;
}
};