diff options
Diffstat (limited to 'indra/newview/llpanelpick.h')
| -rw-r--r-- | indra/newview/llpanelpick.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h index 2cd4706dfe..7ce58b59af 100644 --- a/indra/newview/llpanelpick.h +++ b/indra/newview/llpanelpick.h @@ -56,9 +56,14 @@ public: /*virtual*/ BOOL postBuild(); - // Create a new pick, including creating an id, giving a sane - // initial position, etc. - void createNewPick(); + // Prepares a new pick, including creating an id, giving a sane + // initial position, etc (saved on clicking Save Pick button - onClickSave callback). + void prepareNewPick(); + void prepareNewPick(const LLVector3d pos_global, + const std::string& name, + const std::string& desc, + const LLUUID& snapshot_id, + const LLUUID& parcel_id); //initializes the panel with data of the pick with id = pick_id //owned by the avatar with id = creator_id @@ -87,9 +92,16 @@ public: protected: + /** + * "Location text" is actually the owner name, the original + * name that owner gave the parcel, and the location. + */ + static std::string createLocationText(const std::string& owner_name, const std::string& original_name, + const std::string& sim_name, const LLVector3d& pos_global); + void setPickName(std::string name); void setPickDesc(std::string desc); - void setPickLocation(std::string location); + void setPickLocation(const std::string& location); std::string getPickName(); std::string getPickDesc(); @@ -120,6 +132,7 @@ protected: BOOL mEditMode; LLTextureCtrl* mSnapshotCtrl; BOOL mDataReceived; + bool mIsPickNew; LLUUID mPickId; LLUUID mCreatorId; |