diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-17 12:43:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-17 12:43:28 -0500 |
| commit | d7c8678c3aa46aed09dce6c1edfc196e72d4b428 (patch) | |
| tree | 538a1ef15c2e28676f6a7618bc1e0b5749e2bcea /indra/newview/llviewerparcelmgr.cpp | |
| parent | 9e4b977b2fbb565cef88f3d72e07dbdf8cb2cd69 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge 5.1.0-release
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index a61181bada..f4d14a39fe 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -2463,7 +2463,6 @@ void sanitize_corners(const LLVector3d &corner1, void LLViewerParcelMgr::cleanupGlobals() { - LLParcelSelection::sNullSelection = NULL; } LLViewerTexture* LLViewerParcelMgr::getBlockedImage() const |