From fc6f0f31be53d6adbc8e364ffdd4119943312578 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Wed, 29 Jun 2011 17:22:18 +0300 Subject: SH-1726 FIXED (Viewer modifications to advanced model upload to accommodate upload fee & prim equivalency) - Changed XUI according to the spec - Added requesting upload permission, physics weight and fee weight - Split requesting fee and uploading model steps in mesh repository --- indra/newview/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/CMakeLists.txt') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 523ea8a394..c4018cd79c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -204,6 +204,7 @@ set(viewer_SOURCE_FILES llfloatermediasettings.cpp llfloatermemleak.cpp llfloatermodelpreview.cpp + llfloatermodeluploadbase.cpp llfloatermodelwizard.cpp llfloaternamedesc.cpp llfloaternotificationsconsole.cpp @@ -496,6 +497,7 @@ set(viewer_SOURCE_FILES lltranslate.cpp lluilistener.cpp lluploaddialog.cpp + lluploadfloaterobservers.cpp llurl.cpp llurldispatcher.cpp llurldispatcherlistener.cpp @@ -758,6 +760,7 @@ set(viewer_HEADER_FILES llfloatermediasettings.h llfloatermemleak.h llfloatermodelpreview.h + llfloatermodeluploadbase.h llfloatermodelwizard.h llfloaternamedesc.h llfloaternotificationsconsole.h @@ -1047,6 +1050,7 @@ set(viewer_HEADER_FILES lluiconstants.h lluilistener.h lluploaddialog.h + lluploadfloaterobservers.h llurl.h llurldispatcher.h llurldispatcherlistener.h -- cgit v1.2.3 From aeb1f944aa423bd652f4e33a2e37aa19e80b9a8c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 4 Aug 2011 16:52:19 -0400 Subject: storm-1060 : add windows (thanks Kadah and Michelle), remove some files I think are no longer used --- indra/newview/CMakeLists.txt | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'indra/newview/CMakeLists.txt') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 935dd2e887..f87ecbd2f5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1248,6 +1248,31 @@ if (WINDOWS) set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp) endif(USE_PRECOMPILED_HEADERS) + # Replace the icons with the appropriate ones for the channel + set(ICON_PATH "test") + string(TOLOWER ${VIEWER_CHANNEL} channel_lower) + if(channel_lower MATCHES "^(release|beta|development)") + set(ICON_PATH ${channel_lower}) + elseif(channel_lower MATCHES "^(project.*)") + set(ICON_PATH "project") + endif() + message("Copying icons for ${ICON_PATH}") + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife.ico" + "${CMAKE_CURRENT_SOURCE_DIR}/res/ll_icon.ico" + ) + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife_256.BMP" + "${CMAKE_CURRENT_SOURCE_DIR}/res/ll_icon.BMP" + ) + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife_256.BMP" + "${CMAKE_CURRENT_SOURCE_DIR}/res-sdl/ll_icon.BMP" + ) + # Add resource files to the project. # viewerRes.rc is the only buildable file, but # the rest are all dependencies of it. @@ -1277,6 +1302,7 @@ if (WINDOWS) res/lltooltranslate.cur res/lltoolzoomin.cur res/lltoolzoomout.cur + res-sdl/ll_icon.BMP res/ll_icon.BMP res/ll_icon.ico res/resource.h -- cgit v1.2.3 From 881a215535d7bd3b9efc55b9f36722ceec4ccef1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 8 Aug 2011 23:23:34 -0400 Subject: more idiosyncracies for beta channel --- indra/newview/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/CMakeLists.txt') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f87ecbd2f5..f6ebf331bb 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1249,10 +1249,13 @@ if (WINDOWS) endif(USE_PRECOMPILED_HEADERS) # Replace the icons with the appropriate ones for the channel + # ('test' is the default) set(ICON_PATH "test") string(TOLOWER ${VIEWER_CHANNEL} channel_lower) - if(channel_lower MATCHES "^(release|beta|development)") + if(channel_lower MATCHES "^(release|development)") set(ICON_PATH ${channel_lower}) + elseif(channel_lower MATCHES "^(beta.*)") + set(ICON_PATH "beta") elseif(channel_lower MATCHES "^(project.*)") set(ICON_PATH "project") endif() -- cgit v1.2.3 From 1bf7869b0b697c287820293ffce9cf64c380a80c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 10 Aug 2011 09:15:29 -0400 Subject: storm-1060: yet another attempt to fix windows icons --- indra/newview/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview/CMakeLists.txt') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7e1d46f0e8..328cbf3936 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1256,11 +1256,13 @@ if (WINDOWS) # ('test' is the default) set(ICON_PATH "test") string(TOLOWER ${VIEWER_CHANNEL} channel_lower) - if(channel_lower MATCHES "^(release|development)") - set(ICON_PATH ${channel_lower}) - elseif(channel_lower MATCHES "^(beta.*)") + if(channel_lower MATCHES "^second life release") + set(ICON_PATH "release") + elseif(channel_lower MATCHES "^second life beta viewer") set(ICON_PATH "beta") - elseif(channel_lower MATCHES "^(project.*)") + elseif(channel_lower MATCHES "^second life development") + set(ICON_PATH "development") + elseif(channel_lower MATCHES "project") set(ICON_PATH "project") endif() message("Copying icons for ${ICON_PATH}") -- cgit v1.2.3