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

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

Browse Source
This commit is contained in:
Siana Gearz
2013-02-03 22:27:53 +01:00
parent 064601ae5e 0a6bebf9db
commit dc3f91b121
500 changed files with 1323 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewermenu.cpp
View File

@@ -6530,6 +6530,7 @@ class LLShowFloater : public view_listener_t
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
std::string floater_name = userdata.asString();
if (floater_name.empty()) return false;
if (floater_name == "gestures")
{
LLFloaterGesture::toggleVisibility();
@@ -6701,6 +6702,14 @@ class LLShowFloater : public view_listener_t
{
LLFloaterOutbox::toggleInstance(LLSD());
}
else // Simple codeless floater
{
LLFloater* floater = LLUICtrlFactory::getInstance()->getBuiltFloater(floater_name);
if (floater)
gFloaterView->bringToFront(floater);
else
LLUICtrlFactory::getInstance()->buildFloater(new LLFloater(), floater_name);
}
return true;
}
};