diff options
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 291e3da13d..8a7f7e047f 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -39,7 +39,6 @@ #include "llfloateranimpreview.h" #include "llfloaterbuycurrency.h" #include "llfloaterimagepreview.h" -#include "llfloaterimport.h" #include "llfloaternamedesc.h" #include "llfloatersnapshot.h" #include "llinventorymodel.h" // gInventory @@ -53,6 +52,7 @@ #include "llviewerstats.h" #include "llviewerwindow.h" #include "llappviewer.h" +#include "lluploaddialog.h" // linden libraries @@ -210,18 +210,6 @@ const char* upload_pick(void* data) return filename; } -/* -void handle_upload_object(void* data) -{ - const char* filename = upload_pick(data); - if (filename) - { - // start the import - LLFloaterImport* floaterp = new LLFloaterImport(filename); - gUICtrlFactory->buildFloater(floaterp, "floater_import.xml"); - } -}*/ - class LLFileUploadImage : public view_listener_t { bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) @@ -410,6 +398,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t width, height, TRUE, + FALSE, gSavedSettings.getBOOL("RenderUIInSnapshot"), FALSE)) { |