diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
| commit | 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (patch) | |
| tree | f89014544fc276b283a36eb2e0cb52e93806a44a /indra/newview/llviewermenufile.cpp | |
| parent | a6769f262ff910949a7e1c81cf98e52ddfc2d44a (diff) | |
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 600d7d3ca2..44f5cbb9db 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -186,6 +186,7 @@ const char* upload_pick(void* data) return filename; } +/* void handle_upload_object(void* data) { const char* filename = upload_pick(data); @@ -195,7 +196,7 @@ void handle_upload_object(void* data) LLFloaterImport* floaterp = new LLFloaterImport(filename); gUICtrlFactory->buildFloater(floaterp, "floater_import.xml"); } -} +}*/ class LLFileUploadImage : public view_listener_t { |