diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-12 09:23:57 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-12 09:23:57 -0800 |
| commit | 3dd79ad226bc8e0aec18dba87223a3f50ecf360b (patch) | |
| tree | 2af4f4e5d50d35065dda3101b60b40a3c1c21aee /indra/newview/llpanelpick.cpp | |
| parent | 72af8dc3f0a249f69869bc6f52dd7a887702a964 (diff) | |
| parent | 7a45dec2d540581ef080386e4a967befd22b6adb (diff) | |
merge
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() |