diff options
| author | Callum Prentice <callum@gmail.com> | 2017-04-06 17:02:10 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-04-06 17:02:10 -0700 |
| commit | 510a7530969d9818a8ba7f82937afabc6403cc5f (patch) | |
| tree | a444dd6db6802cb8792ae365b4559dc01cc78c3f /indra/newview/llselectmgr.h | |
| parent | aee540787a823cf69c8991481986b8e4889f0267 (diff) | |
| parent | a83d66125012a18a395840d5e81cee08a548f1e9 (diff) | |
Automated merge with head of viewer64
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(); |