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 | 3d86755b7e430be9b469dd66635b88650de9f31a (patch) | |
| tree | 0cbaee3e8d035b04121ccb74fb46ec25a618b407 | |
| parent | 82a7c943dfd3f6a43350d41d5d1dac77807db762 (diff) | |
| parent | a93dffc5d82555f1aa3da2054df88dbc49ac4d55 (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);  | 
