diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-10 21:40:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-10 21:40:10 -0400 |
| commit | 1709952adbb3ad3ba4eb7d5be39c0c67c389c7c5 (patch) | |
| tree | ad71b6021639d4d9d89c9992aff13f000dd0248f /indra/newview/llviewerregion.cpp | |
| parent | cb5a0a5686799ec834f16a0bc273d24f62140753 (diff) | |
| parent | 3f45fa719e4c72e528801d4d8330a114e5458f30 (diff) | |
pull back 3.4.1-beta6 fixes
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 effa368b7a..5a5df7caf6 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: |