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

Merge remote-tracking branch 'aleric/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-15 18:36:51 +01:00
parent 8cec9c7b73 0eeea37662
commit 4928d29a8e
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloatersnapshot.cpp
View File

@@ -1688,8 +1688,8 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on)
LLSnapshotLivePreview* previewp = getPreviewView();
if (on)
{
// stop all mouse events at fullscreen preview layer
sInstance->getParent()->setMouseOpaque(TRUE);
// Stop all mouse events at fullscreen preview layer.
gSnapshotFloaterView->setMouseOpaque(TRUE);
// can see and interact with fullscreen preview now
if (previewp)
@@ -1716,7 +1716,8 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on)
}
else // turning off freeze frame mode
{
sInstance->getParent()->setMouseOpaque(FALSE);
gSnapshotFloaterView->setMouseOpaque(FALSE);
if (previewp)
{
previewp->setVisible(FALSE);

2
indra/newview/llwldaycycle.cpp
View File

@@ -348,7 +348,7 @@ bool LLWLDayCycle::hasReferencesTo(const LLWLParamKey& keyframe) const
void LLWLDayCycle::removeReferencesTo(const LLWLParamKey& keyframe)
{
lldebugs << "Removing references to key frame " << keyframe.toLLSD() << llendl;
F32 keytime;
F32 keytime = 0.f; // Avoid compiler warning.
bool might_exist;
do
{