Skip to content
Snippets Groups Projects
Commit dd415625 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-17924 Don't clear pick's description when clicking on description for the first time

parent eab708da
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
...@@ -459,7 +459,6 @@ LLPanelProfilePick::LLPanelProfilePick() ...@@ -459,7 +459,6 @@ LLPanelProfilePick::LLPanelProfilePick()
, mRequestedId(LLUUID::null) , mRequestedId(LLUUID::null)
, mLocationChanged(false) , mLocationChanged(false)
, mNewPick(false) , mNewPick(false)
, mCurrentPickDescription("")
, mIsEditing(false) , mIsEditing(false)
{ {
} }
...@@ -579,7 +578,6 @@ void LLPanelProfilePick::onDescriptionFocusReceived() ...@@ -579,7 +578,6 @@ void LLPanelProfilePick::onDescriptionFocusReceived()
{ {
mIsEditing = true; mIsEditing = true;
mPickDescription->setParseHTML(false); mPickDescription->setParseHTML(false);
setPickDesc(mCurrentPickDescription);
} }
} }
...@@ -614,7 +612,6 @@ void LLPanelProfilePick::processProperties(const LLPickData* pick_info) ...@@ -614,7 +612,6 @@ void LLPanelProfilePick::processProperties(const LLPickData* pick_info)
setPickName(pick_info->name); setPickName(pick_info->name);
setPickDesc(pick_info->desc); setPickDesc(pick_info->desc);
setPosGlobal(pick_info->pos_global); setPosGlobal(pick_info->pos_global);
mCurrentPickDescription = pick_info->desc;
// Send remote parcel info request to get parcel name and sim (region) name. // Send remote parcel info request to get parcel name and sim (region) name.
sendParcelInfoRequest(); sendParcelInfoRequest();
......
...@@ -242,8 +242,6 @@ class LLPanelProfilePick ...@@ -242,8 +242,6 @@ class LLPanelProfilePick
bool mNewPick; bool mNewPick;
bool mIsEditing; bool mIsEditing;
std::string mCurrentPickDescription;
void onDescriptionFocusReceived(); void onDescriptionFocusReceived();
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment