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

Dirty fix object import

Browse Source
This commit is contained in:
Siana Gearz
2013-02-25 23:58:43 +01:00
parent 8f5c58ff3c
commit e2659b801a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llselectmgr.h
View File

@@ -774,6 +774,8 @@ private:
BOOL mForceSelection; BOOL mForceSelection;
LLAnimPauseRequest mPauseRequest; LLAnimPauseRequest mPauseRequest;
friend class LLObjectBackup;
}; };
// *DEPRECATED: For callbacks or observers, use // *DEPRECATED: For callbacks or observers, use

2
indra/newview/llviewerobjectbackup.cpp
View File

@@ -1105,7 +1105,7 @@ void LLObjectBackup::primUpdate(LLViewerObject* object)
// Now link // Now link
LLSelectMgr::getInstance()->deselectAll(); LLSelectMgr::getInstance()->deselectAll();
LLSelectMgr::getInstance()->selectObjectAndFamily(mToSelect, true); LLSelectMgr::getInstance()->selectObjectAndFamily(mToSelect, true);
LLSelectMgr::getInstance()->linkObjects(); LLSelectMgr::getInstance()->sendLink();
LLViewerObject* root = mToSelect.back(); LLViewerObject* root = mToSelect.back();
root->setRotation(mRootRot); root->setRotation(mRootRot);
} }