diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-04 20:30:11 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-04 20:30:11 -0500 |
| commit | 7615ec497e7b69c8eefbf8ef1a464eaa22e77bf1 (patch) | |
| tree | 429230aab34fa8999dfad819f6d240b76223b173 /indra/newview/llsidepaneliteminfo.cpp | |
| parent | ec9da605c120b9df648eb163dc8647f955275f5f (diff) | |
EXT-2216 : Task properties sidepanel
EXT-2224 : Edit item then delete item -- edit panel still active
EXT-2228 : Buy/Pay/Open buttons for Task sidepanel
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index d36ffc9a9c..9d2960fbed 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -151,8 +151,16 @@ void LLSidepanelItemInfo::refresh() refreshFromItem(item);
updateVerbs();
}
+ else
+ {
+ if (getIsEditing())
+ {
+ setIsEditing(FALSE);
+ return;
+ }
+ }
- if (!getIsEditing() || !item)
+ if (!getIsEditing())
{
const std::string no_item_names[]={
"LabelItemName",
|