diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-10 17:52:28 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-10 17:52:28 -0800 |
commit | 98ca90bed46591573f5072121a774d19cc69381f (patch) | |
tree | e11d8e8b4459b8513c0495f76932c71385b1e062 /indra/newview/llpanelpick.cpp | |
parent | 04eaf3f34fbc0b2ba7f6dd22600e8df1aaa63ed8 (diff) | |
parent | 2857dd026ce67f26f4da2f07ecffd8d6b754625c (diff) |
Merge changes from product-engine
Diffstat (limited to 'indra/newview/llpanelpick.cpp')
-rw-r--r-- | indra/newview/llpanelpick.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index f5c4f89702..da0c8d5020 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -440,7 +440,8 @@ void LLPanelPickEdit::resetDirty() BOOL LLPanelPickEdit::isDirty() const { - if( LLPanelPickInfo::isDirty() + if( mNewPick + || LLPanelPickInfo::isDirty() || mLocationChanged || mSnapshotCtrl->isDirty() || getChild<LLLineEditor>("pick_name")->isDirty() |