diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-11 14:38:28 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-11 14:38:28 -0700 |
| commit | 52e306d575b38cb80fcda38efa83be32c251766b (patch) | |
| tree | ee96da14e6984c79351daf3793e2e9926ca2b6b5 /indra/newview/llviewerregion.cpp | |
| parent | 4174e9be5ea6262d7ad27ab64805990fd13670ee (diff) | |
| parent | 1709952adbb3ad3ba4eb7d5be39c0c67c389c7c5 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 755879f591..d86cf61f10 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -255,10 +255,9 @@ public: } } - static boost::intrusive_ptr<BaseCapabilitiesComplete> build( U64 region_handle, S32 id ) + static BaseCapabilitiesComplete* build( U64 region_handle, S32 id ) { - return boost::intrusive_ptr<BaseCapabilitiesComplete>( - new BaseCapabilitiesComplete(region_handle, id) ); + return new BaseCapabilitiesComplete(region_handle, id); } private: |