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

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

Browse Source
This commit is contained in:
Shyotl
2013-05-31 05:33:41 -05:00
parent 641ada030e
commit ef3e918558
148 changed files with 15636 additions and 4633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterpreference.cpp
View File

@@ -93,7 +93,7 @@ class LLPreferencesHandler : public LLCommandHandler
{
public:
// requires trusted browser
LLPreferencesHandler() : LLCommandHandler("preferences", true) { }
LLPreferencesHandler() : LLCommandHandler("preferences", UNTRUSTED_BLOCK) { }
bool handle(const LLSD& tokens, const LLSD& query_map,
LLMediaCtrl* web)
{
@@ -469,7 +469,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
llinfos << "Can't close preferences!" << llendl;
}
LLPanelLogin::refreshLocation( false );
LLPanelLogin::updateLocationSelectorsVisibility();
}
@@ -480,14 +480,14 @@ void LLFloaterPreference::onBtnApply( void* userdata )
if (fp->hasFocus())
{
LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
if (cur_focus->acceptsTextInput())
if (cur_focus && cur_focus->acceptsTextInput())
{
cur_focus->onCommit();
}
}
fp->apply();
LLPanelLogin::refreshLocation( false );
LLPanelLogin::updateLocationSelectorsVisibility();
}