diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 16:08:10 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 16:08:10 -0800 |
| commit | d7b55d0fa7f7f00a3811e62a9874999e9e0d0a8a (patch) | |
| tree | 27e0077e9366389bd92397f05bf8ea35203bc58e /indra/newview/llpaneleditwearable.cpp | |
| parent | b10b7833ee160fa05a70922bffc191829bf0fb21 (diff) | |
| parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index d58d6d536c..d42056ef9d 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -835,11 +835,11 @@ BOOL LLPanelEditWearable::isDirty() const BOOL isDirty = FALSE; if (mWearablePtr) { - if (mWearablePtr->isDirty() || - mWearableItem->getName().compare(mNameEditor->getText()) != 0) - { - isDirty = TRUE; - } + if (mWearablePtr->isDirty() || + ( mWearableItem && mNameEditor && mWearableItem->getName().compare(mNameEditor->getText()) != 0 )) + { + isDirty = TRUE; + } } return isDirty; } |