diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/llinventorybridge.cpp | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3ac7deb3df..0aa406dff1 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3883,7 +3883,7 @@ void wear_inventory_category_on_avatar( LLInventoryCategory* category, BOOL appe if( gFloaterCustomize ) { - gFloaterCustomize->askToSaveAllIfDirty( + gFloaterCustomize->askToSaveIfDirty( wear_inventory_category_on_avatar_step2, userdata); } @@ -4154,7 +4154,7 @@ void remove_inventory_category_from_avatar( LLInventoryCategory* category ) if( gFloaterCustomize ) { - gFloaterCustomize->askToSaveAllIfDirty( + gFloaterCustomize->askToSaveIfDirty( remove_inventory_category_from_avatar_step2, uuid); } |