diff options
author | Jacek Antonelli | 2008-08-15 23:45:02 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:02 -0500 |
commit | d644fc64407dcd14ffcee6a0e9fbe28ee3a4e9bd (patch) | |
tree | 7ed0c2c27d717801238a2e6b5749cd5bf88c3059 /linden/indra/newview/llviewermenufile.cpp | |
parent | Second Life viewer sources 1.17.3.0 (diff) | |
download | meta-impy-d644fc64407dcd14ffcee6a0e9fbe28ee3a4e9bd.zip meta-impy-d644fc64407dcd14ffcee6a0e9fbe28ee3a4e9bd.tar.gz meta-impy-d644fc64407dcd14ffcee6a0e9fbe28ee3a4e9bd.tar.bz2 meta-impy-d644fc64407dcd14ffcee6a0e9fbe28ee3a4e9bd.tar.xz |
Second Life viewer sources 1.18.0.6
Diffstat (limited to 'linden/indra/newview/llviewermenufile.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenufile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index 09b2baf..d0b8c73 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp | |||
@@ -206,6 +206,7 @@ const char* upload_pick(void* data) | |||
206 | return filename; | 206 | return filename; |
207 | } | 207 | } |
208 | 208 | ||
209 | /* | ||
209 | void handle_upload_object(void* data) | 210 | void handle_upload_object(void* data) |
210 | { | 211 | { |
211 | const char* filename = upload_pick(data); | 212 | const char* filename = upload_pick(data); |
@@ -215,7 +216,7 @@ void handle_upload_object(void* data) | |||
215 | LLFloaterImport* floaterp = new LLFloaterImport(filename); | 216 | LLFloaterImport* floaterp = new LLFloaterImport(filename); |
216 | gUICtrlFactory->buildFloater(floaterp, "floater_import.xml"); | 217 | gUICtrlFactory->buildFloater(floaterp, "floater_import.xml"); |
217 | } | 218 | } |
218 | } | 219 | }*/ |
219 | 220 | ||
220 | class LLFileUploadImage : public view_listener_t | 221 | class LLFileUploadImage : public view_listener_t |
221 | { | 222 | { |