From 08477892228084d955f498f170578a7d1e3c6ddc Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 15 Dec 2009 18:36:53 +0200 Subject: Fixed normal bug EXT-3409 "Places panel: pick for remote location created with current agent's coordinates". - Fixed storing global position for remote location pick. - Fixed setting current location to the pick. - Fixed pick location text. Added resolving remote parcel name from ID. - Cleaned up unused code in llpanelpick. --HG-- branch : product-engine --- indra/newview/llpanelpick.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview/llpanelpick.h') diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h index 2c0830f2ac..95add387d0 100644 --- a/indra/newview/llpanelpick.h +++ b/indra/newview/llpanelpick.h @@ -71,6 +71,11 @@ public: /*virtual*/ void processProperties(void* data, EAvatarProcessorType type); + /** + * Sends remote parcel info request to resolve parcel name from its ID. + */ + void sendParcelInfoRequest(); + /** * Sets "Back" button click callback */ @@ -81,9 +86,9 @@ public: */ virtual void setEditPickCallback(const commit_callback_t& cb); - //This stuff we got from LLRemoteParcelObserver, in the last two we intentionally do nothing + //This stuff we got from LLRemoteParcelObserver, in the last one we intentionally do nothing /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); - /*virtual*/ void setParcelID(const LLUUID& parcel_id) {}; + /*virtual*/ void setParcelID(const LLUUID& parcel_id) { mParcelId = parcel_id; } /*virtual*/ void setErrorStatus(U32 status, const std::string& reason) {}; protected: @@ -154,8 +159,7 @@ protected: LLVector3d mPosGlobal; LLUUID mParcelId; LLUUID mPickId; - std::string mSimName; - std::string mLocation; + LLUUID mRequestedId; }; /** -- cgit v1.2.3