diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-04 17:03:41 -0800 |
| commit | 259fa5fd0b67459145eb5463d79f37271ee7af0a (patch) | |
| tree | 27c7eaddb0c6f7dd406228e3a61fc89b6fedb159 /indra/newview/llselectmgr.cpp | |
| parent | 80139d95adbcb2258c5541a4e0ace32f32b78ba5 (diff) | |
| parent | a4aed31ad9fd1874b134af87145ec93b283dbbfb (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 60a095506b..bf08756051 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -218,7 +218,8 @@ LLSelectMgr::LLSelectMgr() mHoverObjects = new LLObjectSelection(); mHighlightedObjects = new LLObjectSelection(); - + mForceSelection = FALSE; + mShowSelection = FALSE; } @@ -5093,6 +5094,7 @@ LLSelectNode::LLSelectNode(const LLSelectNode& nodep) mName = nodep.mName; mDescription = nodep.mDescription; mCategory = nodep.mCategory; + mInventorySerial = 0; mSavedPositionLocal = nodep.mSavedPositionLocal; mSavedPositionGlobal = nodep.mSavedPositionGlobal; mSavedScale = nodep.mSavedScale; |