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

fix for SH-3640: Can not edit objects

meow-7.2.2
Xiaohong Bao 2012-12-19 23:21:31 -07:00
parent 4e22f3e3ef
commit 1fbd45672f
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llscenemonitor.cpp
View File

@ -211,6 +211,7 @@ void LLSceneMonitor::unfreezeScene()
void LLSceneMonitor::capture()
{
static U32 last_capture_time = 0;
if(last_capture_time == gFrameCount)
{
return;
@ -239,6 +240,11 @@ void LLSceneMonitor::capture()
mNeedsUpdateDiff = TRUE;
}
bool LLSceneMonitor::needsUpdate() const
{
return mNeedsUpdateDiff;
}
void LLSceneMonitor::compare()
{
if(!mNeedsUpdateDiff)

1
indra/newview/llscenemonitor.h
View File

@ -59,6 +59,7 @@ public:
F32 getSamplingTime() const { return mSamplingTime;}
F32 getDiffPixelRatio() const { return mDiffPixelRatio;}
bool isEnabled()const {return mEnabled;}
bool needsUpdate() const;
private:
void freezeScene();

2
indra/newview/llviewerdisplay.cpp
View File

@ -1228,10 +1228,12 @@ void render_ui(F32 zoom_factor, int subfield)
glh_set_current_modelview(glh_copy_matrix(gGLLastModelView));
}
if(LLSceneMonitor::getInstance()->needsUpdate())
{
gGL.pushMatrix();
gViewerWindow->setup2DRender();
LLSceneMonitor::getInstance()->compare();
gViewerWindow->setup3DRender();
gGL.popMatrix();
}