Second Life viewer sources 1.18.5.0-RC

1 files changed, 26 insertions, 4 deletions

diff --git a/linden/indra/newview/llpanelplace.h b/linden/indra/newview/llpanelplace.h
index 81a2a63..e7c17cf 100644
--- a/linden/indra/newview/llpanelplace.h
+++ b/linden/indra/newview/llpanelplace.h
@@ -43,6 +43,7 @@ class LLLineEditor;
 class LLTextEditor;
 class LLTextureCtrl;
 class LLMessageSystem;
+class LLInventoryItem;
 
 class LLPanelPlace : public LLPanel
 {
@@ -52,11 +53,26 @@ public:
 
         /*virtual*/ BOOL postBuild();
 
+        void resetLocation();
+                // Ignore all old location information, useful if you are 
+                // recycling an existing dialog and need to clear it.
 
         void setParcelID(const LLUUID& parcel_id);
+                // Sends a request for data about the given parcel, which will
+                // only update the location if there is none already available.
 
-        void sendParcelInfoRequest();
+        void displayItemInfo(const LLInventoryItem* pItem);
+        void setRegionID(const LLUUID& region_id) { mRegionID = region_id; }
+        void setSnapshot(const LLUUID& snapshot_id);
+        void setName(const std::string& name);
+        void setLocationString(const std::string& location);
+        void setErrorStatus(U32 status, const std::string& reason);
 
+        void sendParcelInfoRequest();
+        void displayParcelInfo(const LLVector3& pos_region,
+                        const LLUUID& landmark_asset_id,
+                        const LLUUID& region_id,
+                        const LLVector3d& pos_global);
         static void processParcelInfoReply(LLMessageSystem* msg, void**);
 
 protected:
@@ -71,16 +87,22 @@ protected:
 protected:
         LLUUID                  mParcelID;
         LLUUID                  mRequestedID;
+        LLUUID                  mRegionID;
+        LLUUID                  mLandmarkAssetID;
+        // Absolute position of the location for teleport, may not
+        // be available (hence zero)
         LLVector3d              mPosGlobal;
+        // Region-local position for teleport, always available.
+        LLVector3               mPosRegion;
         // Zero if this is not an auction
         S32                             mAuctionID;
 
         LLTextureCtrl* mSnapshotCtrl;
 
-        LLLineEditor* mNameEditor;
+        LLTextBox* mNameEditor;
         LLTextEditor* mDescEditor;
-        LLLineEditor* mInfoEditor;
-        LLLineEditor* mLocationEditor;
+        LLTextBox* mInfoEditor;
+        LLTextBox* mLocationEditor;
 
         LLButton*       mTeleportBtn;
         LLButton*       mMapBtn;