livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-166 FIXED Front an Side Preset Views not accessible in Skylight viewer

master
Richard Nelson 2010-10-11 15:48:36 -07:00
parent 092e595b25
commit 7c256e5a13
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llbottomtray.cpp
View File

@ -220,6 +220,8 @@ LLBottomTray::LLBottomTray(const LLSD&)
buildFromFile("panel_bottomtray.xml");
LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraItem, _2));
//this is to fix a crash that occurs because LLBottomTray is a singleton
//and thus is deleted at the end of the viewers lifetime, but to be cleanly
//destroyed LLBottomTray requires some subsystems that are long gone

3
indra/newview/llfloatercamera.cpp
View File

@ -340,9 +340,6 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
mCurrMode(CAMERA_CTRL_MODE_PAN),
mPrevMode(CAMERA_CTRL_MODE_PAN)
{
LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
registrar.add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraItem, _2));
LLHints::registerHintTarget("view_popup", LLView::getHandle());
}