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

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

Browse Source 
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
Inusaito Sayori
2015-06-19 05:42:49 -04:00
parent 2bd2a7a64b 1c627317ec
commit b11511b7b9
634 changed files with 8198 additions and 12212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpanelavatar.cpp
View File

@@ -518,7 +518,7 @@ void LLPanelAvatarWeb::refresh()
{
if (!mNavigateTo.empty())
{
llinfos << "Loading " << mNavigateTo << llendl;
LL_INFOS() << "Loading " << mNavigateTo << LL_ENDL;
mWebBrowser->navigateTo(mNavigateTo);
mNavigateTo = "";
}
@@ -946,7 +946,7 @@ void LLPanelAvatarPicks::processProperties(void* data, EAvatarProcessorType type
panel_pick->markForServerRequest();
// The button should automatically truncate long names for us
llinfos << "Adding tab for " << mAvatarID << " " << (self ? "Self" : "Other") << ": '" << it->second << "'" << llendl;
LL_INFOS() << "Adding tab for " << mAvatarID << " " << (self ? "Self" : "Other") << ": '" << it->second << "'" << LL_ENDL;
tabs->addTabPanel(panel_pick, it->second);
}
@@ -1383,7 +1383,7 @@ void LLPanelAvatar::onClickCopy(const LLSD& val)
{
if (val.isUndefined())
{
llinfos << "Copy agent id: " << mAvatarID << llendl;
LL_INFOS() << "Copy agent id: " << mAvatarID << LL_ENDL;
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(mAvatarID.asString()));
}
else
@@ -1423,7 +1423,7 @@ void LLPanelAvatar::onClickCancel()
void LLPanelAvatar::sendAvatarPropertiesRequest()
{
lldebugs << "LLPanelAvatar::sendAvatarPropertiesRequest()" << llendl;
LL_DEBUGS() << "LLPanelAvatar::sendAvatarPropertiesRequest()" << LL_ENDL;
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mAvatarID);
}
@@ -1490,7 +1490,7 @@ void LLPanelAvatar::enableOKIfReady()
void LLPanelAvatar::sendAvatarPropertiesUpdate()
{
llinfos << "Sending avatarinfo update" << llendl;
LL_INFOS() << "Sending avatarinfo update" << LL_ENDL;
LLAvatarData avatar_data;
avatar_data.image_id = mPanelSecondLife->getChild<LLTextureCtrl>("img")->getImageAssetID();
avatar_data.fl_image_id = mPanelFirstLife ? mPanelFirstLife->getChild<LLTextureCtrl>("img")->getImageAssetID() : LLUUID::null;