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

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

Browse Source
This commit is contained in:
Siana Gearz
2011-11-14 06:13:47 +01:00
parent a31fc8a612 6aa7f219cd
commit 0566bde61b
4 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llviewerwindow.cpp
View File

@@ -962,6 +962,17 @@ BOOL LLViewerWindow::handleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask)
BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window, LLCoordGL pos, MASK mask)
{
//From Phoenix
gSavedSettings.setBOOL("zmm_rightmousedown",1);
if(gAgentCamera.cameraMouselook()&&gSavedSettings.getBOOL("zmm_isinml")==0)
{
llinfos << "zmmisinml set to true" << llendl;
gSavedSettings.setBOOL("zmm_isinml",1);
F32 deffov=LLViewerCamera::getInstance()->getDefaultFOV();
gSavedSettings.setF32("zmm_deffov",deffov);
LLViewerCamera::getInstance()->setDefaultFOV(gSavedSettings.getF32("zmm_deffov")/gSavedSettings.getF32("zmm_mlfov"));
}
S32 x = pos.mX;
S32 y = pos.mY;
x = llround((F32)x / mDisplayScale.mV[VX]);
@@ -991,6 +1002,14 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window, LLCoordGL pos, MASK
BOOL LLViewerWindow::handleRightMouseUp(LLWindow *window, LLCoordGL pos, MASK mask)
{
gSavedSettings.setBOOL("zmm_rightmousedown",0);
if(gSavedSettings.getBOOL("zmm_isinml")==1)
{
llinfos << "zmmisinml set to false" << llendl;
gSavedSettings.setBOOL("zmm_isinml",0);
LLViewerCamera::getInstance()->setDefaultFOV(gSavedSettings.getF32("zmm_deffov"));
}
BOOL down = FALSE;
return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_RIGHT,down);
}