diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-14 16:04:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 16:04:22 -0400 |
| commit | 3e3e695341cf11cbcba1eb71f08bdc8e23808a6f (patch) | |
| tree | c8abccb3c9fa1835080e2c1713f60c48f391ccae | |
| parent | 3bed3966755cc31384b224405254d7f46c748b8e (diff) | |
| parent | ee3137b0ef416a43e6d786e36516b8311ba52fc3 (diff) | |
merge back beta fixes
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -354,5 +354,6 @@ a8b3eca451a9eaab59987efb0ab1c4217e3f2dcc DRTVWR-182 81f6b745ef27f5915fd07f988fdec9944f2bb73e DRTVWR-186 cc953f00956be52cc64c30637bbeec310eea603f DRTVWR-181 9ee9387789701d597130f879d9011a4958753862 DRTVWR-189 +33a2fc7a910ae29ff8b4850316ed7fbff9f64d33 DRTVWR-195 421126293dcbde918e0da027ca0ab9deb5b4fbf2 DRTVWR-192 4b2c52aecb7a75de31dbb12d9f5b9a251d8707be DRTVWR-191 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); |