diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
| commit | b7f8a2479249646c7fb38ead195d5197ab733c94 (patch) | |
| tree | c1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/newview/llviewerregion.cpp | |
| parent | c94756d92c7353cb91bfddb5e342f825457e1a7e (diff) | |
| parent | f8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff) | |
merge up to 3.4.1-release
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 493195aaa3..47a99d7ea4 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: @@ -1487,7 +1486,8 @@ void LLViewerRegion::unpackRegionHandshake() // all of our terrain stuff, by if (compp->getParamsReady()) { - getLand().dirtyAllPatches(); + //this line creates frame stalls on region crossing and removing it appears to have no effect + //getLand().dirtyAllPatches(); } else { |