diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
| commit | d034d8d9289a9e5511d32ec048b75837b89264ad (patch) | |
| tree | c3fd25eb7d1096baef0290b5bf86321f7ed447ad /indra/newview/llremoteparcelrequest.cpp | |
| parent | 6150e4ed7cf86a2afc0061ba89b0cb049d6f036e (diff) | |
| parent | 97a9211d87fac90994846e5bf91a78a708ec5a9c (diff) | |
merge changes for vwr-24347
Diffstat (limited to 'indra/newview/llremoteparcelrequest.cpp')
| -rw-r--r-- | indra/newview/llremoteparcelrequest.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp index e5ef51bdd1..3862dac340 100644 --- a/indra/newview/llremoteparcelrequest.cpp +++ b/indra/newview/llremoteparcelrequest.cpp @@ -33,6 +33,7 @@ #include "llpanel.h" #include "llhttpclient.h" #include "llsdserialize.h" +#include "llurlentry.h" #include "llviewerregion.h" #include "llview.h" @@ -168,6 +169,18 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v { observers.erase(*i); } + + LLUrlEntryParcel::LLParcelData url_data; + url_data.parcel_id = parcel_data.parcel_id; + url_data.name = parcel_data.name; + url_data.sim_name = parcel_data.sim_name; + url_data.global_x = parcel_data.global_x; + url_data.global_y = parcel_data.global_y; + url_data.global_z = parcel_data.global_z; + + // Pass the parcel data to LLUrlEntryParcel to render + // human readable parcel name. + LLUrlEntryParcel::processParcelInfo(url_data); } void LLRemoteParcelInfoProcessor::sendParcelInfoRequest(const LLUUID& parcel_id) |
