diff options
Diffstat (limited to 'linden/indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index d3473df..f7742b9 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include "llfloaternamedesc.h" | 43 | #include "llfloaternamedesc.h" |
| 44 | #include "llfloatersnapshot.h" | 44 | #include "llfloatersnapshot.h" |
| 45 | #include "llinventorymodel.h" // gInventory | 45 | #include "llinventorymodel.h" // gInventory |
| 46 | #include "llinventoryview.h" // open_texture() | ||
| 46 | #include "llresourcedata.h" | 47 | #include "llresourcedata.h" |
| 47 | #include "llfloaterperms.h" | 48 | #include "llfloaterperms.h" |
| 48 | #include "llstatusbar.h" | 49 | #include "llstatusbar.h" |
| @@ -875,7 +876,9 @@ void temp_upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, | |||
| 875 | item->updateServer(TRUE); | 876 | item->updateServer(TRUE); |
| 876 | gInventory.updateItem(item); | 877 | gInventory.updateItem(item); |
| 877 | gInventory.notifyObservers(); | 878 | gInventory.notifyObservers(); |
| 878 | }else // if(result >= 0) | 879 | open_texture(item_id, std::string("Texture: ") + item->getName(), TRUE, LLUUID::null, FALSE); |
| 880 | } | ||
| 881 | else // if(result >= 0) | ||
| 879 | { | 882 | { |
| 880 | LLSD args; | 883 | LLSD args; |
| 881 | args["FILE"] = LLInventoryType::lookupHumanReadable(data->mInventoryType); | 884 | args["FILE"] = LLInventoryType::lookupHumanReadable(data->mInventoryType); |