diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-10 20:13:17 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-10 20:13:17 +0200 |
| commit | ebbca6470aa04c29712d92f6b52467188663e055 (patch) | |
| tree | 13b62d698ebc48d9efa1d65991744c71f9ff407e /indra/newview/llpanelpick.cpp | |
| parent | f15767bbef4e0a87aa032e265b3a0a8d4db907e1 (diff) | |
| parent | c673ef4a913691cea8e94b688937084edb821f68 (diff) | |
merge
--HG--
branch : 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() |