diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:39:56 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:39:56 +0100 |
commit | c872b2c85ca07e7e87dfb36d6bffe69fddd4660e (patch) | |
tree | 6888da946af2dbbfca629fac4b4fcfeae6d6c445 | |
parent | 5ee9cf0cac3f2641925266e3da919dee6bb21732 (diff) | |
parent | f15dc04e3884cf389c27ff8897ff67cdb2721d88 (diff) |
merge
-rw-r--r-- | indra/newview/llviewerobject.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 620e270177..bae84415d7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5235,15 +5235,15 @@ public: LLSD& currObjectData = objectData[i]; U32 localID = currObjectData["LocalID"].asInteger(); - // Iterate through nodes at end, since it can be on both the regular AND hover list - struct f : public LLSelectedNodeFunctor - { - U32 mID; - f(const U32& id) : mID(id) {} - virtual bool apply(LLSelectNode* node) - { - return (node->getObject() && node->getObject()->mLocalID == mID ); - } + // Iterate through nodes at end, since it can be on both the regular AND hover list
+ struct f : public LLSelectedNodeFunctor
+ {
+ U32 mID;
+ f(const U32& id) : mID(id) {}
+ virtual bool apply(LLSelectNode* node)
+ {
+ return (node->getObject() && node->getObject()->mLocalID == mID );
+ }
} func(localID); LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(&func); |