diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-14 14:38:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 14:38:52 -0400 |
| commit | ee3137b0ef416a43e6d786e36516b8311ba52fc3 (patch) | |
| tree | 3e281374158598b3a9bfd30c3149949e1f79903e | |
| parent | 9f6503a1fc1145e886cad0aaf9b964e32e6c5449 (diff) | |
| parent | 898b0fe2134859387d71a11b4c458ddc52b9d173 (diff) | |
merge changes for DRTVWR-195
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -351,4 +351,5 @@ ab2ffc547c8a8950ff187c4f6c95e5334fab597b 3.3.4-beta5 a8b3eca451a9eaab59987efb0ab1c4217e3f2dcc DRTVWR-182 1f27cdfdc54246484f8afbbe42ce48e954175cbd 3.4.0-beta1 9ee9387789701d597130f879d9011a4958753862 DRTVWR-189 +33a2fc7a910ae29ff8b4850316ed7fbff9f64d33 DRTVWR-195 421126293dcbde918e0da027ca0ab9deb5b4fbf2 DRTVWR-192 diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index ae9c31bfe7..2bb2e92279 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -545,9 +545,6 @@ LLParcelSelectionHandle LLViewerParcelMgr::selectLand(const LLVector3d &corner1, mRequestResult = PARCEL_RESULT_NO_DATA; - // clear the list of segments to prevent flashing - resetSegments(mHighlightSegments); - mFloatingParcelSelection->setParcel(mCurrentParcel); mCurrentParcelSelection->setParcel(NULL); mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel); |