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

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

Browse Source
This commit is contained in:
Siana Gearz
2013-01-03 02:17:20 +01:00
parent 6e219f0a4e b0fe12f597
commit 1872337f5f
58 changed files with 3575 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llagentcamera.cpp
View File

@@ -2514,9 +2514,10 @@ void LLAgentCamera::setFocusObject(LLViewerObject* object)
//-----------------------------------------------------------------------------
void LLAgentCamera::setFocusGlobal(const LLPickInfo& pick)
{
static const LLCachedControl<bool> freeze_time("FreezeTime",false);
LLViewerObject* objectp = gObjectList.findObject(pick.mObjectID);
if (objectp)
if (objectp && !freeze_time)
{
// focus on object plus designated offset
// which may or may not be same as pick.mPosGlobal