summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-06-18 15:48:48 -0700
committerRider Linden <rider@lindenlab.com>2018-06-18 15:48:48 -0700
commit2f655d117acca491270add307952042e8ab08aeb (patch)
treecd206389a4804b90a30e171200c07ec420f1a564 /indra
parentc07775798e0adb134a2b5df8295bdb0ed7d374bc (diff)
Request environment when parcel settings are changed.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index f4d14a39fe..d05d11625f 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -69,6 +69,8 @@
#include "llvieweraudio.h"
#include "llcorehttputil.h"
+#include "llenvironment.h"
+
const F32 PARCEL_COLLISION_DRAW_SECS = 1.f;
@@ -1811,6 +1813,27 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
}
}//if gAudiop
};
+
+ if (LLEnvironment::instance().isExtendedEnvironmentEnabled())
+ {
+ LL_WARNS("LAPRAS") << "TODO: Hey Rider! Fix this. 1) don't rerequest parcel information. 2) if sequent_id == -1 we are selecting a parcel. Deal with that correctly." << LL_ENDL;
+
+ if (sequence_id == SELECTED_PARCEL_SEQ_ID)
+ {
+ LL_WARNS("LAPRAS") << "TODO: Hay Rider! Fix this. Get environment for selected parcel." << LL_ENDL;
+ }
+ else if ((sequence_id == HOVERED_PARCEL_SEQ_ID) ||
+ (sequence_id == COLLISION_NOT_IN_GROUP_PARCEL_SEQ_ID) ||
+ (sequence_id == COLLISION_NOT_ON_LIST_PARCEL_SEQ_ID) ||
+ (sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID))
+ {
+ /*NoOp*/
+ }
+ else
+ {
+ LLEnvironment::instance().requestParcel(local_id);
+ }
+ }
}
void LLViewerParcelMgr::optionally_start_music(const std::string& music_url)