diff options
| author | Bradley Payne <vir@lindenlab.com> | 2009-10-12 18:40:11 +0000 |
|---|---|---|
| committer | Bradley Payne <vir@lindenlab.com> | 2009-10-12 18:40:11 +0000 |
| commit | 3bd6c1919cc3a142a112278a6dc83bd8292bcb5a (patch) | |
| tree | 6ea3178f5aa587d6d2e445b6cf17f25a6127833b /indra/newview/llinventorybridge.cpp | |
| parent | 45a375c3feb3027d7a329ac1beb97fa30759dcfe (diff) | |
Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f2329c2ef5..d4a9324208 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4421,7 +4421,7 @@ void LLWearableBridge::onEditOnAvatar(void* user_data) void LLWearableBridge::editOnAvatar() { - const LLWearable* wearable = gAgentWearables.getWearableFromWearableItem(mUUID); + const LLWearable* wearable = gAgentWearables.getWearableFromItemID(mUUID); if( wearable ) { // Set the tab to the right wearable. |