diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
| commit | a154ec72f759e20add6aacfab7f04e65b49051b9 (patch) | |
| tree | 6410887f2466911a7a28574e7778d6fc7d416c67 /indra/newview/llagent.cpp | |
| parent | 60a09f20f450ced238afc74e806d080b3c13cc33 (diff) | |
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 13fa29e242..9fa5244c39 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -6753,7 +6753,7 @@ void LLAgent::removeWearable( EWearableType type ) if( old_wearable->isDirty() ) { // Bring up view-modal dialog: Save changes? Yes, No, Cancel - gViewerWindow->alertXml("RemoveWearableSave", LLAgent::onRemoveWearableDialog, (void*)(S32)type ); + gViewerWindow->alertXml("WearableSave", LLAgent::onRemoveWearableDialog, (void*)(S32)type ); return; } else @@ -6983,7 +6983,7 @@ void LLAgent::setWearable( LLInventoryItem* new_item, LLWearable* new_wearable ) if( old_wearable->isDirty() ) { // Bring up modal dialog: Save changes? Yes, No, Cancel - gViewerWindow->alertXml( "SetWearableSave", LLAgent::onSetWearableDialog, + gViewerWindow->alertXml( "WearableSave", LLAgent::onSetWearableDialog, new LLSetWearableData( new_item->getUUID(), new_wearable )); return; } |