diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-30 15:40:22 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-30 15:40:22 -0400 |
commit | b9a2a8b22395253af1508c09eca3c55aa54ee58e (patch) | |
tree | 2344dfc3ce4d2fb2df3134a3f09c481b1a31bc28 /indra/newview/llselectmgr.h | |
parent | 71ffed27c77e787cafe04ddf19df27495255cae5 (diff) | |
parent | e9fe0714ad422c2b9250c8ce13d3b2837dff5430 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-xcode-8.3
Diffstat (limited to 'indra/newview/llselectmgr.h')
-rw-r--r-- | indra/newview/llselectmgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 2a893af266..fbf889b2f1 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -233,6 +233,7 @@ protected: class LLObjectSelection : public LLRefCount { friend class LLSelectMgr; + friend class LLSafeHandle<LLObjectSelection>; protected: ~LLObjectSelection(); |