diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index d5708ac45..f80c1a15e 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -70,10 +70,6 @@ if(STANDALONE) add_subdirectory(${LIBS_OPEN_PREFIX}llqtwebkit) endif(STANDALONE) -if (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE) - add_subdirectory(${LIBS_CLOSED_PREFIX}llkdu) -endif (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE) - #add_subdirectory(${LIBS_OPEN_PREFIX}lscript) if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) @@ -81,73 +77,43 @@ if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) add_custom_target(viewer) -if (VIEWER) - add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger) - add_subdirectory(${LIBS_OPEN_PREFIX}llplugin) - add_subdirectory(${LIBS_OPEN_PREFIX}llui) +add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger) +add_subdirectory(${LIBS_OPEN_PREFIX}llplugin) +add_subdirectory(${LIBS_OPEN_PREFIX}llui) - # viewer plugins directory - add_subdirectory(${LIBS_OPEN_PREFIX}plugins) +# viewer plugins directory +add_subdirectory(${LIBS_OPEN_PREFIX}plugins) - # llplugin testbed code (is this the right way to include it?) - #if (NOT LINUX) - # add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) - #endif (NOT LINUX) +# llplugin testbed code (is this the right way to include it?) +#if (NOT LINUX) +# add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) +#endif (NOT LINUX) - if (LINUX) - add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) - add_dependencies(viewer linux-crash-logger-strip-target) - elseif (DARWIN) - #add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) - #add_subdirectory(${VIEWER_PREFIX}mac_updater) - add_dependencies(viewer mac-crash-logger) - #add_dependencies(viewer mac-updater) - elseif (WINDOWS) - add_subdirectory(${VIEWER_PREFIX}win_crash_logger) - # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake - if (EXISTS ${VIEWER_DIR}win_setup) - add_subdirectory(${VIEWER_DIR}win_setup) - endif (EXISTS ${VIEWER_DIR}win_setup) - add_subdirectory(${VIEWER_PREFIX}win_updater) - add_dependencies(viewer windows-updater) - add_dependencies(viewer windows-crash-logger) - elseif (SOLARIS) - add_subdirectory(solaris_crash_logger) - add_dependencies(viewer solaris-crash-logger) - endif (LINUX) - - add_subdirectory(${VIEWER_PREFIX}newview/statemachine) - add_subdirectory(${VIEWER_PREFIX}newview) - add_dependencies(viewer secondlife-bin) -endif (VIEWER) - -# Linux builds the viewer and server in 2 separate projects -# In order for ./develop.py build server to work on linux, -# the viewer project needs a server target. -# This is not true for mac and windows. -if (LINUX) - add_custom_target(server) +if (LINUX) + add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) + add_dependencies(viewer linux-crash-logger-strip-target) +elseif (DARWIN) + #add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) + #add_subdirectory(${VIEWER_PREFIX}mac_updater) + add_dependencies(viewer mac-crash-logger) + #add_dependencies(viewer mac-updater) +elseif (WINDOWS) + add_subdirectory(${VIEWER_PREFIX}win_crash_logger) + # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake + if (EXISTS ${VIEWER_DIR}win_setup) + add_subdirectory(${VIEWER_DIR}win_setup) + endif (EXISTS ${VIEWER_DIR}win_setup) + add_subdirectory(${VIEWER_PREFIX}win_updater) + add_dependencies(viewer windows-updater) + add_dependencies(viewer windows-crash-logger) +elseif (SOLARIS) + add_subdirectory(solaris_crash_logger) + add_dependencies(viewer solaris-crash-logger) endif (LINUX) -if (SERVER) - if (NOT LINUX) - add_custom_target(server) - endif (NOT LINUX) - include(${SERVER_PREFIX}Server.cmake) -endif (SERVER) -# Windows builds include tools like VFS tool -if (SERVER) - if (WINDOWS) - add_subdirectory(${SERVER_PREFIX}tools) - endif (WINDOWS) -endif (SERVER) - -# Configure prebuilt binary download. This must be done last so that -# all subdirectories have a chance to list the packages they need. -# We need scp for proprietary downloads. -if(INSTALL_PROPRIETARY) - include(FindSCP) -endif(INSTALL_PROPRIETARY) +add_subdirectory(${VIEWER_PREFIX}newview/statemachine) +add_subdirectory(${VIEWER_PREFIX}newview) +add_dependencies(viewer secondlife-bin) # The use_prebuilt_binary macro in cmake/Prebuilt.cmake records # packages in the PREBUILT property of the 'prepare' target. diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index e5232abe4..6bfa9f9f6 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -2,6 +2,9 @@ # # Compilation options shared by all Second Life components. +if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) +set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") + include(Variables) @@ -309,8 +312,6 @@ else (STANDALONE) endif (STANDALONE) if(1 EQUAL 1) - add_definitions(-DOPENSIM_RULES=1) - add_definitions(-DMESH_ENABLED=1) add_definitions(-DENABLE_CLASSIC_CLOUDS=1) if (NOT "$ENV{SHY_MOD}" STREQUAL "") add_definitions(-DSHY_MOD=1) @@ -331,3 +332,5 @@ MARK_AS_ADVANCED( CMAKE_EXE_LINKER_FLAGS_RELEASE CMAKE_SHARED_LINKER_FLAGS_RELEASE ) + +endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 4acdc6426..cdc9c32a8 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -21,8 +21,6 @@ else (STANDALONE) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib ) - # Doesn't need to link with iconv.dll - set(APRICONV_LIBRARIES "") set(APRUTIL_LIBRARIES debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES} @@ -44,7 +42,7 @@ else (STANDALONE) endif (WINDOWS) set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) - if (LINUX AND VIEWER) + if (LINUX) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES}) - endif (LINUX AND VIEWER) + endif (LINUX) endif (STANDALONE) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 434dbff44..6bc9e6117 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -15,20 +15,8 @@ else (STANDALONE) if (WINDOWS) set(BOOST_VERSION 1_45) - - # SNOW-788 - # 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc - # The precompiled boost libs for VC71 use a different suffix to VS80 and VS90 - # This code should ensure the cmake rules are valid for any VS being used in future as long as the approprate - # boost libs are avaiable - RC. - - if (MSVC71) - set(BOOST_OPTIM_SUFFIX mt-s) - set(BOOST_DEBUG_SUFFIX mt-sgd) - else (MSVC71) - set(BOOST_OPTIM_SUFFIX mt) - set(BOOST_DEBUG_SUFFIX mt-gd) - endif (MSVC71) + set(BOOST_OPTIM_SUFFIX mt) + set(BOOST_DEBUG_SUFFIX mt-gd) set(Boost_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 20ffa15cd..f22beca51 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -8,79 +8,96 @@ set(cmake_SOURCE_FILES CMakeLists.txt 00-Common.cmake + AIStateMachine.cmake APR.cmake Audio.cmake + BasicPluginBase.cmake BerkeleyDB.cmake Boost.cmake BuildVersion.cmake CARes.cmake - CURL.cmake CMakeCopyIfDifferent.cmake + CURL.cmake + Colladadom.cmake + ConfigurePkgConfig.cmake + CopyBackToSource.cmake CopyWinLibs.cmake - CSharpMacros.cmake + Cwdebug.cmake DBusGlib.cmake DirectX.cmake DownloadPrebuilt.cmake.in ELFIO.cmake EXPAT.cmake + ExamplePlugin.cmake + FMOD.cmake + FMODEX.cmake FindAPR.cmake FindBerkeleyDB.cmake FindCARes.cmake + FindColladadom.cmake FindELFIO.cmake + FindGLOD.cmake FindGooglePerfTools.cmake FindHunSpell.cmake - FindMT.cmake + FindJsonCpp.cmake + FindLLQtWebkit.cmake FindNDOF.cmake FindOpenJPEG.cmake + FindTut.cmake FindXmlRpcEpi.cmake - FMOD.cmake - FMODEX.cmake FreeType.cmake GLOD.cmake GStreamer010Plugin.cmake + Glui.cmake + Glut.cmake GooglePerfTools.cmake Hunspell.cmake JPEG.cmake + JsonCpp.cmake LLAddBuildTest.cmake LLAppearance.cmake LLAudio.cmake LLCharacter.cmake LLCommon.cmake LLCrashLogger.cmake - LLDatabase.cmake LLImage.cmake LLImageJ2COJ.cmake LLInventory.cmake - LLKDU.cmake LLMath.cmake LLMessage.cmake + LLPhysicsExtensions.cmake LLPlugin.cmake LLPrimitive.cmake - LLPhysicsExtensions.cmake LLQtWebkit.cmake LLRender.cmake - LLScene.cmake LLUI.cmake LLVFS.cmake LLWindow.cmake LLXML.cmake -# LScript.cmake + LScript.cmake Linking.cmake + MediaPluginBase.cmake NDOF.cmake OPENAL.cmake OpenGL.cmake OpenJPEG.cmake OpenSSL.cmake PNG.cmake - Python.cmake + PluginAPI.cmake Prebuilt.cmake + PulseAudio.cmake + Python.cmake Qt4.cmake + QuickTimePlugin.cmake RunBuildTest.cmake + StateMachine.cmake TemplateCheck.cmake Tut.cmake UI.cmake UnixInstall.cmake Variables.cmake + ViewerMiscLibs.cmake + WebKitLibPlugin.cmake XmlRpcEpi.cmake ZLIB.cmake ) @@ -92,10 +109,6 @@ set(master_SOURCE_FILES ../develop.py ) -if (SERVER) - list(APPEND master_SOURCE_FILES ../Server.cmake) -endif (SERVER) - source_group("Master Rules" FILES ${master_SOURCE_FILES}) set_source_files_properties(${cmake_SOURCE_FILES} ${master_SOURCE_FILES} diff --git a/indra/cmake/CSharpMacros.cmake b/indra/cmake/CSharpMacros.cmake deleted file mode 100644 index a4dd81504..000000000 --- a/indra/cmake/CSharpMacros.cmake +++ /dev/null @@ -1,142 +0,0 @@ -# - This is a support module for easy Mono/C# handling with CMake -# It defines the following macros: -# -# ADD_CS_LIBRARY ( ) -# ADD_CS_EXECUTABLE ( ) -# INSTALL_GAC () -# -# Note that the order of the arguments is important. -# -# You can optionally set the variable CS_FLAGS to tell the macros whether -# to pass additional flags to the compiler. This is particularly useful to -# set assembly references, unsafe code, etc... These flags are always reset -# after the target was added so you don't have to care about that. -# -# copyright (c) 2007 Arno Rehn arno@arnorehn.de -# -# Redistribution and use is allowed according to the terms of the GPL license. - - -# ----- support macros ----- -MACRO(GET_CS_LIBRARY_TARGET_DIR) - IF (NOT LIBRARY_OUTPUT_PATH) - SET(CS_LIBRARY_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}) - ELSE (NOT LIBRARY_OUTPUT_PATH) - SET(CS_LIBRARY_TARGET_DIR ${LIBRARY_OUTPUT_PATH}) - ENDIF (NOT LIBRARY_OUTPUT_PATH) -ENDMACRO(GET_CS_LIBRARY_TARGET_DIR) - -MACRO(GET_CS_EXECUTABLE_TARGET_DIR) - IF (NOT EXECUTABLE_OUTPUT_PATH) - SET(CS_EXECUTABLE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}) - ELSE (NOT EXECUTABLE_OUTPUT_PATH) - SET(CS_EXECUTABLE_TARGET_DIR ${EXECUTABLE_OUTPUT_PATH}) - ENDIF (NOT EXECUTABLE_OUTPUT_PATH) -ENDMACRO(GET_CS_EXECUTABLE_TARGET_DIR) - -MACRO(MAKE_PROPER_FILE_LIST) - FOREACH(file ${ARGN}) - # first assume it's a relative path - FILE(GLOB globbed ${CMAKE_CURRENT_SOURCE_DIR}/${file}) - IF(globbed) - FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${file} native) - ELSE(globbed) - FILE(TO_NATIVE_PATH ${file} native) - ENDIF(globbed) - SET(proper_file_list ${proper_file_list} ${native}) - SET(native "") - ENDFOREACH(file) -ENDMACRO(MAKE_PROPER_FILE_LIST) -# ----- end support macros ----- - -MACRO(ADD_CS_LIBRARY target) - GET_CS_LIBRARY_TARGET_DIR() - - SET(target_DLL "${CS_LIBRARY_TARGET_DIR}/${target}.dll") - MAKE_PROPER_FILE_LIST(${ARGN}) - FILE(RELATIVE_PATH relative_path ${CMAKE_BINARY_DIR} ${target_DLL}) - - SET(target_KEY "${CMAKE_CURRENT_SOURCE_DIR}/${target}.key") - SET(target_CS_FLAGS "${CS_FLAGS}") - IF(${target}_CS_FLAGS) - LIST(APPEND target_CS_FLAGS ${${target}_CS_FLAGS}) - ENDIF(${target}_CS_FLAGS) - IF(EXISTS ${target_KEY}) - LIST(APPEND target_CS_FLAGS -keyfile:${target_KEY}) - ENDIF(EXISTS ${target_KEY}) - - FOREACH(ref ${${target}_REFS}) - SET(ref_DLL ${CMAKE_CURRENT_BINARY_DIR}/${ref}.dll) - IF(EXISTS ${ref_DLL}) - LIST(APPEND target_CS_FLAGS -r:${ref_DLL}) - ELSE(EXISTS ${ref_DLL}) - LIST(APPEND target_CS_FLAGS -r:${ref}) - ENDIF(EXISTS ${ref_DLL}) - ENDFOREACH(ref ${${target}_REFS}) - - ADD_CUSTOM_COMMAND (OUTPUT ${target_DLL} - COMMAND ${MCS_EXECUTABLE} ${target_CS_FLAGS} -out:${target_DLL} -target:library ${proper_file_list} - MAIN_DEPENDENCY ${proper_file_list} - DEPENDS ${ARGN} - COMMENT "Building ${relative_path}") - ADD_CUSTOM_TARGET (${target} ALL DEPENDS ${target_DLL}) - - FOREACH(ref ${${target}_REFS}) - GET_TARGET_PROPERTY(is_target ${ref} TYPE) - IF(is_target) - ADD_DEPENDENCIES(${target} ${ref}) - ENDIF(is_target) - ENDFOREACH(ref ${${target}_REFS}) - - SET(relative_path "") - SET(proper_file_list "") -ENDMACRO(ADD_CS_LIBRARY) - -MACRO(ADD_CS_EXECUTABLE target) - GET_CS_EXECUTABLE_TARGET_DIR() - - # Seems like cmake doesn't like the ".exe" ending for custom commands. - # If we call it ${target}.exe, 'make' will later complain about a missing rule. - # Create a fake target instead. - SET(target_EXE "${CS_EXECUTABLE_TARGET_DIR}/${target}.exe") - SET(target_TOUCH "${CS_EXECUTABLE_TARGET_DIR}/${target}.exe-built") - GET_DIRECTORY_PROPERTY(clean ADDITIONAL_MAKE_CLEAN_FILES) - LIST(APPEND clean ${target}.exe) - SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${clean}") - MAKE_PROPER_FILE_LIST(${ARGN}) - FILE(RELATIVE_PATH relative_path ${CMAKE_BINARY_DIR} ${target_EXE}) - SET(target_CS_FLAGS "${CS_FLAGS}") - - FOREACH(ref ${${target}_REFS}) - SET(ref_DLL ${CMAKE_CURRENT_SOURCE_DIR}/${ref}.dll) - IF(EXISTS ${ref_DLL}) - LIST(APPEND target_CS_FLAGS -r:${ref_DLL}) - ELSE(EXISTS ${ref_DLL}) - LIST(APPEND target_CS_FLAGS -r:${ref}) - ENDIF(EXISTS ${ref_DLL}) - ENDFOREACH(ref ${${target}_REFS}) - - ADD_CUSTOM_COMMAND (OUTPUT "${target_TOUCH}" - COMMAND ${MCS_EXECUTABLE} ${target_CS_FLAGS} -out:${target_EXE} ${proper_file_list} - COMMAND ${CMAKE_COMMAND} -E touch ${target_TOUCH} - MAIN_DEPENDENCY ${ARGN} - DEPENDS ${ARGN} - COMMENT "Building ${relative_path}") - ADD_CUSTOM_TARGET ("${target}" ALL DEPENDS "${target_TOUCH}") - - FOREACH(ref ${${target}_REFS}) - GET_TARGET_PROPERTY(is_target ${ref} TYPE) - IF(is_target) - ADD_DEPENDENCIES(${target} ${ref}) - ENDIF(is_target) - ENDFOREACH(ref ${${target}_REFS}) - - SET(relative_path "") - SET(proper_file_list "") -ENDMACRO(ADD_CS_EXECUTABLE) - -MACRO(INSTALL_GAC target) - GET_CS_LIBRARY_TARGET_DIR() - - INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i ${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0)") -ENDMACRO(INSTALL_GAC target) diff --git a/indra/cmake/ConfigurePkgConfig.cmake b/indra/cmake/ConfigurePkgConfig.cmake new file mode 100644 index 000000000..82ee3e7a5 --- /dev/null +++ b/indra/cmake/ConfigurePkgConfig.cmake @@ -0,0 +1,74 @@ +# -*- cmake -*- + +SET(DEBUG_PKG_CONFIG "YES") + +# Don't change this if manually set by user. +IF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "") + + # Guess at architecture-specific system library paths. + if (WORD_SIZE EQUAL 32) + SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib32 /usr/lib) + SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib32 /usr/local/lib) + SET(PKG_CONFIG_MULTI_GUESS /usr/lib/i386-linux-gnu) + SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/i386-linux-gnu) + else (WORD_SIZE EQUAL 32) + SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib64 /usr/lib) + SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib64 /usr/local/lib) + SET(PKG_CONFIG_MULTI_GUESS /usr/local/lib/x86_64-linux-gnu) + SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/x86_64-linux-gnu) + endif (WORD_SIZE EQUAL 32) + + # Use DPKG architecture, if available. + IF (${DPKG_ARCH}) + SET(PKG_CONFIG_MULTI_GUESS /usr/lib/${DPKG_ARCH}) + SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usrlocal/lib/${DPKG_ARCH}) + ENDIF (${DPKG_ARCH}) + + # Explicitly include anything listed in PKG_CONFIG_PATH + string(REPLACE ":" ";" PKG_CONFIG_PATH_LIST "$ENV{PKG_CONFIG_PATH}") + FOREACH(PKG_CONFIG_DIR ${PKG_CONFIG_PATH_LIST}) + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_DIR}/pkgconfig") + ENDFOREACH(PKG_CONFIG_DIR) + + # Look for valid pkgconfig directories. + FIND_PATH(PKG_CONFIG_ENV pkgconfig ENV LD_LIBRARY_PATH) + FIND_PATH(PKG_CONFIG_MULTI pkgconfig HINT ${PKG_CONFIG_MULTI_GUESS}) + FIND_PATH(PKG_CONFIG_MULTI_LOCAL pkgconfig HINT ${PKG_CONFIG_MULTI_LOCAL_GUESS}) + FIND_PATH(PKG_CONFIG_NO_MULTI pkgconfig HINT ${PKG_CONFIG_NO_MULTI_GUESS}) + FIND_PATH(PKG_CONFIG_NO_MULTI_LOCAL pkgconfig HINT ${PKG_CONFIG_NO_MULTI_LOCAL_GUESS}) + + # Add anything we found to our list. + IF(NOT PKG_CONFIG_ENV STREQUAL PKG_CONFIG_ENV-NOTFOUND) + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_ENV}/pkgconfig") + ENDIF(NOT PKG_CONFIG_ENV STREQUAL PKG_CONFIG_ENV-NOTFOUND) + + IF(NOT PKG_CONFIG_MULTI STREQUAL PKG_CONFIG_MULTI-NOTFOUND) + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_MULTI}/pkgconfig") + ENDIF(NOT PKG_CONFIG_MULTI STREQUAL PKG_CONFIG_MULTI-NOTFOUND) + + IF(NOT PKG_CONFIG_MULTI_LOCAL STREQUAL PKG_CONFIG_MULTI_LOCAL-NOTFOUND) + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_MULTI_LOCAL}/pkgconfig") + ENDIF(NOT PKG_CONFIG_MULTI_LOCAL STREQUAL PKG_CONFIG_MULTI_LOCAL-NOTFOUND) + + IF(NOT PKG_CONFIG_NO_MULTI STREQUAL PKG_CONFIG_NO_MULTI-NOTFOUND) + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_NO_MULTI}/pkgconfig") + ENDIF(NOT PKG_CONFIG_NO_MULTI STREQUAL PKG_CONFIG_NO_MULTI-NOTFOUND) + + IF(NOT PKG_CONFIG_NO_MULTI_LOCAL STREQUAL PKG_CONFIG_NO_MULTI_LOCAL-NOTFOUND) + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:${PKG_CONFIG_NO_MULTI_LOCAL}/pkgconfig") + ENDIF(NOT PKG_CONFIG_NO_MULTI_LOCAL STREQUAL PKG_CONFIG_NO_MULTI_LOCAL-NOTFOUND) + + # Also add some non-architecture specific package locations. + SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:/usr/share/pkgconfig:/usr/local/share/pkgconfig") + + # Remove first unwanted ':' + string(SUBSTRING ${VALID_PKG_LIBDIRS} 1 -1 VALID_PKG_LIBDIRS) + + # Set PKG_CONFIG_LIBDIR environment. + SET(ENV{PKG_CONFIG_LIBDIR} ${VALID_PKG_LIBDIRS}) +ENDIF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "") + +IF(DEBUG_PKG_CONFIG) + MESSAGE(STATUS "Using PKG_CONFIG_LIBDIR=$ENV{PKG_CONFIG_LIBDIR}") +ENDIF(DEBUG_PKG_CONFIG) + diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index 06f131796..d67fb077a 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -284,53 +284,6 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu") -if(EXISTS ${internal_llkdu_path}) - set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll") - set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll") - ADD_CUSTOM_COMMAND( - OUTPUT ${llkdu_dst} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst} - DEPENDS ${internal_llkdu_src} - COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" - ) - set(all_targets ${all_targets} ${llkdu_dst}) -else(EXISTS ${internal_llkdu_path}) - if (EXISTS "${debug_src_dir}/llkdu.dll") - set(debug_llkdu_src "${debug_src_dir}/llkdu.dll") - set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll") - ADD_CUSTOM_COMMAND( - OUTPUT ${debug_llkdu_dst} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst} - DEPENDS ${debug_llkdu_src} - COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug" - ) - set(all_targets ${all_targets} ${debug_llkdu_dst}) - endif (EXISTS "${debug_src_dir}/llkdu.dll") - - if (EXISTS "${release_src_dir}/llkdu.dll") - set(release_llkdu_src "${release_src_dir}/llkdu.dll") - set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll") - ADD_CUSTOM_COMMAND( - OUTPUT ${release_llkdu_dst} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst} - DEPENDS ${release_llkdu_src} - COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release" - ) - set(all_targets ${all_targets} ${release_llkdu_dst}) - - set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll") - ADD_CUSTOM_COMMAND( - OUTPUT ${relwithdebinfo_llkdu_dst} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst} - DEPENDS ${release_llkdu_src} - COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" - ) - set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst}) - endif (EXISTS "${release_src_dir}/llkdu.dll") - -endif (EXISTS ${internal_llkdu_path}) - # Copy MS C runtime dlls, required for packaging. # *TODO - Adapt this to support VC9 if (MSVC80) @@ -439,6 +392,3 @@ add_custom_target(copy_win_libs ALL ) add_dependencies(copy_win_libs prepare) -if(EXISTS ${internal_llkdu_path}) - add_dependencies(copy_win_libs llkdu) -endif(EXISTS ${internal_llkdu_path}) diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index e45575595..c10e7e344 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -1,6 +1,6 @@ # -*- cmake -*- -if (VIEWER AND WINDOWS) +if (WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" @@ -43,4 +43,4 @@ if (VIEWER AND WINDOWS) message(FATAL_ERROR "Could not find DirectX SDK Libraries") endif (DIRECTX_LIBRARY_DIR) -endif (VIEWER AND WINDOWS) +endif (WINDOWS) diff --git a/indra/cmake/FindMT.cmake b/indra/cmake/FindMT.cmake deleted file mode 100644 index babc68db5..000000000 --- a/indra/cmake/FindMT.cmake +++ /dev/null @@ -1,17 +0,0 @@ -#Find the windows manifest tool. -if (MSVC80) - FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt - PATHS - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin" - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin" - "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin") - IF(HAVE_MANIFEST_TOOL) - MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.") - ELSE(HAVE_MANIFEST_TOOL) - MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.") - ENDIF(HAVE_MANIFEST_TOOL) - - STRING(REPLACE "/MANIFEST " "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS - ${CMAKE_EXE_LINKER_FLAGS}) - -endif (MSVC80) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 2d7c16939..499089843 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES jsoncpp) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp) endif (STANDALONE) diff --git a/indra/cmake/LLDatabase.cmake b/indra/cmake/LLDatabase.cmake deleted file mode 100644 index 652610138..000000000 --- a/indra/cmake/LLDatabase.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# -*- cmake -*- - -include(MySQL) - -set(LLDATABASE_INCLUDE_DIRS - ${LIBS_SERVER_DIR}/lldatabase - ${MYSQL_INCLUDE_DIR} - ) - -set(LLDATABASE_LIBRARIES lldatabase) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake deleted file mode 100644 index f103dcf66..000000000 --- a/indra/cmake/LLKDU.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) - use_prebuilt_binary(kdu) - if (WINDOWS) - set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - else (WINDOWS) - set(KDU_LIBRARY kdu) - endif (WINDOWS) - - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - - set(LLKDU_LIBRARY llkdu) - set(LLKDU_STATIC_LIBRARY llkdu_static) - set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) - set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY}) -endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index c47e8878e..ab22e90ae 100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake @@ -6,27 +6,7 @@ set(LLRENDER_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llrender ) -if (SERVER AND LINUX) - set(LLRENDER_LIBRARIES - llrenderheadless - ) -else (SERVER AND LINUX) set(LLRENDER_LIBRARIES llrender ) -endif (SERVER AND LINUX) -# mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set -# differently for different object files. -macro (copy_server_sources ) - foreach (PREFIX ${ARGV}) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp - COMMAND ${CMAKE_COMMAND} - ARGS -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp - ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp - ) - list(APPEND server_SOURCE_FILES ${PREFIX}_server.cpp) - endforeach (PREFIX ${_copied_SOURCES}) -endmacro (copy_server_sources _copied_SOURCES) diff --git a/indra/cmake/LLScene.cmake b/indra/cmake/LLScene.cmake deleted file mode 100644 index 96ad5085a..000000000 --- a/indra/cmake/LLScene.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -*- cmake -*- - -set(LLSCENE_INCLUDE_DIRS - ${LIBS_SERVER_DIR}/llscene - ) - -set(LLSCENE_LIBRARIES llscene) diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index d75068402..a46d9c592 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -36,17 +36,12 @@ set(LLWINDOW_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llwindow ) -if (SERVER AND LINUX) - set(LLWINDOW_LIBRARIES - llwindowheadless - ) -else (SERVER AND LINUX) - set(LLWINDOW_LIBRARIES - llwindow - ) - if (WINDOWS) - list(APPEND LLWINDOW_LIBRARIES - comdlg32 - ) - endif (WINDOWS) -endif (SERVER AND LINUX) +set(LLWINDOW_LIBRARIES + llwindow + ) + +if (WINDOWS) + list(APPEND LLWINDOW_LIBRARIES + comdlg32 + ) +endif (WINDOWS) diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 91d949409..0bfc1a359 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -3,8 +3,5 @@ include(Prebuilt) if (NOT (STANDALONE OR DARWIN)) use_prebuilt_binary(glext) - # possible glh_linear should have its own .cmake file instead - #use_prebuilt_binary(glh_linear) - # actually... not any longer, it's now in git -SG set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) -endif () +endif (NOT (STANDALONE OR DARWIN)) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 9e7d411a2..8dfd70be3 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -8,41 +8,32 @@ # DARWIN - Mac OS X # LINUX - Linux # WINDOWS - Windows -# -# What to build: -# -# VIEWER - viewer and other viewer-side components -# SERVER - simulator and other server-side bits # Relative and absolute paths to subtrees. +if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) +set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") + +if(NOT DEFINED COMMON_CMAKE_DIR) + set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake") +endif(NOT DEFINED COMMON_CMAKE_DIR) + set(LIBS_CLOSED_PREFIX) set(LIBS_OPEN_PREFIX) -set(LIBS_SERVER_PREFIX) set(SCRIPTS_PREFIX ../scripts) -set(SERVER_PREFIX) set(VIEWER_PREFIX) set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX}) set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX}) -set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX}) set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX}) -set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX}) set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX}) set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)") set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)") -set(VISTA_ICON OFF CACHE BOOL "Allow vista icon with pre 2008 Visual Studio IDEs. (Assumes replacement old rcdll.dll with new rcdll.dll from win sdk 7.0 or later)") set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH "Location of prebuilt libraries.") -if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) - # We use this as a marker that you can try to use the proprietary libraries. - set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries") -endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) - - if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) set(ARCH i686) @@ -69,6 +60,26 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(WORD_SIZE 64) endif(CMAKE_SIZEOF_VOID_P MATCHES 4) endif (WORD_SIZE EQUAL 32) + if (WORD_SIZE EQUAL 32) + set(DEB_ARCHITECTURE i386) + set(FIND_LIBRARY_USE_LIB64_PATHS OFF) + set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib32 ${CMAKE_SYSTEM_LIBRARY_PATH}) + else (WORD_SIZE EQUAL 32) + set(DEB_ARCHITECTURE amd64) + set(FIND_LIBRARY_USE_LIB64_PATHS ON) + endif (WORD_SIZE EQUAL 32) + + execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH + RESULT_VARIABLE DPKG_RESULT + OUTPUT_VARIABLE DPKG_ARCH + OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) + #message (STATUS "DPKG_RESULT ${DPKG_RESULT}, DPKG_ARCH ${DPKG_ARCH}") + if (DPKG_RESULT EQUAL 0) + set(CMAKE_LIBRARY_ARCHITECTURE ${DPKG_ARCH}) + set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib/${DPKG_ARCH} /usr/local/lib/${DPKG_ARCH} ${CMAKE_SYSTEM_LIBRARY_PATH}) + endif (DPKG_RESULT EQUAL 0) + + include(ConfigurePkgConfig) set(LL_ARCH ${ARCH}_linux) set(LL_ARCH_DIR ${ARCH}-linux) @@ -77,39 +88,37 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - if(${CMAKE_GENERATOR} MATCHES Xcode) - #SDK Compiler and Deployment targets for XCode - if (${XCODE_VERSION} VERSION_LESS 4.0.0) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2") - else (${XCODE_VERSION} VERSION_LESS 4.0.0) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) + if(${CMAKE_GENERATOR} MATCHES Xcode) + execute_process( + COMMAND sh -c "xcodebuild -version | grep Xcode | cut -d ' ' -f2 | cut -d'.' -f1-2" + OUTPUT_VARIABLE XCODE_VERSION ) + + # To support a different SDK update these Xcode settings: + if (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") - endif (${XCODE_VERSION} VERSION_LESS 4.0.0) - else() - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) + else (XCODE_VERSION GREATER 4.2) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + endif (XCODE_VERSION GREATER 4.2) + else(${CMAKE_GENERATOR} MATCHES Xcode) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") endif(${CMAKE_GENERATOR} MATCHES Xcode) - ## We currently support only 32-bit i386 builds, so use these: - set(CMAKE_OSX_ARCHITECTURES i386) + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") + + set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) + + # Build only for i386 by default, system default on MacOSX 10.6 is x86_64 + if (NOT CMAKE_OSX_ARCHITECTURES) + set(CMAKE_OSX_ARCHITECTURES i386) + endif (NOT CMAKE_OSX_ARCHITECTURES) set(ARCH i386) set(WORD_SIZE 32) - ## But if you want to compile for mixed 32/64 bit, try these: - # set(CMAKE_OSX_ARCHITECTURES i386;x86_64) - # set(ARCH universal) - # set(WORD_SIZE 64) - - ## Finally, set up the build output directories set(LL_ARCH ${ARCH}_darwin) set(LL_ARCH_DIR universal-darwin) endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - if (WINDOWS) set(PREBUILT_TYPE windows) elseif(DARWIN) @@ -120,11 +129,9 @@ elseif(LINUX AND WORD_SIZE EQUAL 64) set(PREBUILT_TYPE linux64) endif(WINDOWS) - # Default deploy grid set(GRID agni CACHE STRING "Target Grid") -set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(VIEWER_CHANNEL "Singularity" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)") @@ -135,17 +142,6 @@ set(VIEWER_BRANDING_NAME_CAMELCASE "Singularity") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") -if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) - set(SERVER ON CACHE BOOL "Build Second Life server software.") -endif (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) - -if (LINUX AND SERVER AND VIEWER) - MESSAGE(FATAL_ERROR " -The indra source does not currently support building SERVER and VIEWER at the same time. -Please set one of these values to OFF in your CMake cache file. -(either by running ccmake or by editing CMakeCache.txt by hand) -For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both VIEWER and SERVER in one build environment - ") -endif (LINUX AND SERVER AND VIEWER) - source_group("CMake Rules" FILES CMakeLists.txt) + +endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) diff --git a/indra/develop.py b/indra/develop.py index 91db5cb97..a2215b3b0 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -81,7 +81,6 @@ class PlatformSetup(object): distcc = True cmake_opts = [] word_size = 32 - opensim_rules = 'OFF' #whether or not to use rules fit for opensim using_express = False def __init__(self): @@ -125,7 +124,6 @@ class PlatformSetup(object): standalone=self.standalone, unattended=self.unattended, word_size=self.word_size, - opensim_rules=self.opensim_rules, type=self.build_type.upper(), ) #if simple: @@ -134,7 +132,6 @@ class PlatformSetup(object): '-DSTANDALONE:BOOL=%(standalone)s ' '-DUNATTENDED:BOOL=%(unattended)s ' '-DWORD_SIZE:STRING=%(word_size)s ' - '-DOPENSIM_RULES:BOOL=%(opensim_rules)s ' '-G %(generator)r %(opts)s %(dir)r' % args) def run_cmake(self, args=[]): @@ -296,7 +293,6 @@ class LinuxSetup(UnixSetup): type=self.build_type.upper(), project_name=self.project_name, word_size=self.word_size, - opensim_rules=self.opensim_rules, ) if not self.is_internal_tree(): args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'}) @@ -323,7 +319,6 @@ class LinuxSetup(UnixSetup): '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s ' '-DUNATTENDED:BOOL=%(unattended)s ' '-DWORD_SIZE:STRING=%(word_size)s ' - '-DOPENSIM_RULES:BOOL=%(opensim_rules)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '%(opts)s %(dir)r') % args) @@ -437,7 +432,6 @@ class DarwinSetup(UnixSetup): unattended=self.unattended, project_name=self.project_name, universal=self.universal, - opensim_rules=self.opensim_rules, type=self.build_type.upper(), ) if self.universal == 'ON': @@ -449,7 +443,6 @@ class DarwinSetup(UnixSetup): '-DSTANDALONE:BOOL=%(standalone)s ' '-DUNATTENDED:BOOL=%(unattended)s ' '-DWORD_SIZE:STRING=%(word_size)s ' - '-DOPENSIM_RULES:BOOL=%(opensim_rules)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '%(universal)s ' '%(opts)s %(dir)r' % args) @@ -535,7 +528,6 @@ class WindowsSetup(PlatformSetup): unattended=self.unattended, project_name=self.project_name, word_size=self.word_size, - opensim_rules=self.opensim_rules, ) #if simple: # return 'cmake %(opts)s "%(dir)s"' % args @@ -543,7 +535,6 @@ class WindowsSetup(PlatformSetup): '-DSTANDALONE:BOOL=%(standalone)s ' '-DUNATTENDED:BOOL=%(unattended)s ' '-DWORD_SIZE:STRING=%(word_size)s ' - '-DOPENSIM_RULES:BOOL=%(opensim_rules)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '%(opts)s "%(dir)s"' % args) @@ -719,7 +710,6 @@ class CygwinSetup(WindowsSetup): unattended=self.unattended, project_name=self.project_name, word_size=self.word_size, - opensim_rules=self.opensim_rules, ) #if simple: # return 'cmake %(opts)s "%(dir)s"' % args @@ -727,7 +717,6 @@ class CygwinSetup(WindowsSetup): '-DUNATTENDED:BOOl=%(unattended)s ' '-DSTANDALONE:BOOL=%(standalone)s ' '-DWORD_SIZE:STRING=%(word_size)s ' - '-DOPENSIM_RULES:BOOL=%(opensim_rules)s ' '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' '%(opts)s "%(dir)s"' % args) @@ -766,21 +755,15 @@ Commands: Command-options for "configure": We use cmake variables to change the build configuration. - -DSERVER:BOOL=OFF Don't configure simulator/dataserver/etc - -DVIEWER:BOOL=OFF Don't configure the viewer -DPACKAGE:BOOL=ON Create "package" target to make installers -DLOCALIZESETUP:BOOL=ON Create one win_setup target per supported language -DLL_TESTS:BOOL=OFF Don't generate unit test projects -DEXAMPLEPLUGIN:BOOL=OFF Don't generate example plugin project -DDISABLE_TCMALLOC:BOOL=ON Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc) - -DVISTA_ICON:BOOL=ON Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!) Examples: - Set up a viewer-only project for your system: - develop.py configure -DSERVER:BOOL=OFF - - Set up a Visual Studio 2005 project with "package" target: - develop.py -G vc80 configure -DPACKAGE:BOOL=ON + Set up a Visual Studio 2010 project with "package" target: + develop.py -G vc100 configure -DPACKAGE:BOOL=ON ''' def main(arguments): diff --git a/indra/libhacd/hacdMeshDecimator.cpp b/indra/libhacd/hacdMeshDecimator.cpp index 3ca9ba87e..c487a4ef2 100644 --- a/indra/libhacd/hacdMeshDecimator.cpp +++ b/indra/libhacd/hacdMeshDecimator.cpp @@ -187,7 +187,7 @@ namespace HACD m_nTriangles--; } } - long idEdge; + long idEdge = 0; for(size_t itE = 0; itE < m_vertices[v2].m_edges.Size(); ++itE) { idEdge = m_vertices[v2].m_edges[itE]; @@ -529,7 +529,7 @@ namespace HACD long a, b; long idEdge1; long idEdge2; - long idEdgeV1V2; + long idEdgeV1V2 = 0; for(size_t itE1 = 0; itE1 < m_vertices[v1].m_edges.Size(); ++itE1) { idEdge1 = m_vertices[v1].m_edges[itE1]; diff --git a/indra/libhacd/hacdMicroAllocator.cpp b/indra/libhacd/hacdMicroAllocator.cpp index c49789842..47562f6a4 100644 --- a/indra/libhacd/hacdMicroAllocator.cpp +++ b/indra/libhacd/hacdMicroAllocator.cpp @@ -50,8 +50,9 @@ #include #endif - +#if defined(_WIN32) #pragma warning(disable:4100) +#endif namespace HACD { diff --git a/indra/libopenjpeg/CMakeLists.txt b/indra/libopenjpeg/CMakeLists.txt index 9ccc55126..da21fe8dc 100644 --- a/indra/libopenjpeg/CMakeLists.txt +++ b/indra/libopenjpeg/CMakeLists.txt @@ -14,8 +14,8 @@ set(OPENJPEG_VERSION set(openjpeg_SOURCE_FILES bio.c - cio.c cidx_manager.c + cio.c dwt.c event.c image.c @@ -26,8 +26,8 @@ set(openjpeg_SOURCE_FILES mct.c mqc.c openjpeg.c - pi.c phix_manager.c + pi.c ppix_manager.c raw.c t1.c @@ -40,8 +40,8 @@ set(openjpeg_SOURCE_FILES set(openjpeg_HEADER_FILES bio.h - cio.h cidx_manager.h + cio.h dwt.h event.h fix.h diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index d186ce79b..63c71990a 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -169,8 +169,6 @@ LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) : mRoot(NULL), mWearableData(wearable_data) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - llassert_always(mWearableData); mBakedTextureDatas.resize(LLAvatarAppearanceDefines::BAKED_NUM_INDICES); for (U32 i = 0; i < mBakedTextureDatas.size(); i++ ) @@ -496,8 +494,6 @@ void LLAvatarAppearance::computeBodySize() //----------------------------------------------------------------------------- BOOL LLAvatarAppearance::parseSkeletonFile(const std::string& filename) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - //------------------------------------------------------------------------- // parse the file //------------------------------------------------------------------------- @@ -539,8 +535,6 @@ BOOL LLAvatarAppearance::parseSkeletonFile(const std::string& filename) //----------------------------------------------------------------------------- BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent, S32 &volume_num, S32 &joint_num) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - LLJoint* joint = NULL; if (info->mIsJoint) @@ -628,9 +622,6 @@ BOOL LLAvatarAppearance::allocateCharacterJoints( U32 num ) //----------------------------------------------------------------------------- BOOL LLAvatarAppearance::buildSkeleton(const LLAvatarSkeletonInfo *info) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - - if (!info) return FALSE; //------------------------------------------------------------------------- @@ -685,8 +676,6 @@ void LLAvatarAppearance::clearSkeleton() //----------------------------------------------------------------------------- void LLAvatarAppearance::buildCharacter() { - LLMemType mt(LLMemType::MTYPE_AVATAR); - //------------------------------------------------------------------------- // remove all references to our existing skeleton // so we can rebuild it @@ -1471,6 +1460,7 @@ LLColor4 LLAvatarAppearance::getClothesColor( ETextureIndex te ) } return color; } + // static LLColor4 LLAvatarAppearance::getDummyColor() { diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp index 7ddfc874e..a6290d02a 100644 --- a/indra/llappearance/llpolymesh.cpp +++ b/indra/llappearance/llpolymesh.cpp @@ -749,8 +749,6 @@ const LLVector2 &LLPolyMeshSharedData::getUVs(U32 index) //----------------------------------------------------------------------------- LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_mesh) { - LLMemType mt(LLMemType::MTYPE_AVATAR_MESH); - llassert(shared_data); mSharedData = shared_data; diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index bd14fa548..22d814e03 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -40,9 +40,9 @@ include_directories( ) set(llaudio_SOURCE_FILES + llaudiodecodemgr.cpp llaudioengine.cpp lllistener.cpp - llaudiodecodemgr.cpp llvorbisdecode.cpp llvorbisencode.cpp ) @@ -50,9 +50,9 @@ set(llaudio_SOURCE_FILES set(llaudio_HEADER_FILES CMakeLists.txt + llaudiodecodemgr.h llaudioengine.h lllistener.h - llaudiodecodemgr.h llvorbisdecode.h llvorbisencode.h llwindgen.h diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt index b73626509..6652333ef 100644 --- a/indra/llcharacter/CMakeLists.txt +++ b/indra/llcharacter/CMakeLists.txt @@ -32,8 +32,8 @@ set(llcharacter_SOURCE_FILES llkeyframemotionparam.cpp llkeyframestandmotion.cpp llkeyframewalkmotion.cpp - llmotioncontroller.cpp llmotion.cpp + llmotioncontroller.cpp llmultigesture.cpp llpose.cpp llstatemachine.cpp @@ -45,8 +45,8 @@ set(llcharacter_HEADER_FILES CMakeLists.txt llanimationstates.h - llbvhloader.h llbvhconsts.h + llbvhloader.h llcharacter.h lleditingmotion.h llgesture.h diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index c7cf2655c..39260582a 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -35,8 +35,6 @@ //----------------------------------------------------------------------------- #include "linden_common.h" -#include "llmemtype.h" - #include "llmotioncontroller.h" #include "llkeyframemotion.h" #include "llmath.h" @@ -342,7 +340,6 @@ void LLMotionController::removeMotionInstance(LLMotion* motionp) //----------------------------------------------------------------------------- LLMotion* LLMotionController::createMotion( const LLUUID &id ) { - LLMemType mt(LLMemType::MTYPE_ANIMATION); // do we have an instance of this motion for this character? LLMotion *motion = findMotion(id); diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 43e4f030a..a6da6f0c3 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -19,6 +19,7 @@ set(llcommon_SOURCE_FILES aithreadid.cpp imageids.cpp indra_constants.cpp + ll_template_cast.h llallocator.cpp llallocator_heap_profile.cpp llapp.cpp @@ -54,22 +55,21 @@ set(llcommon_SOURCE_FILES llformat.cpp llframetimer.cpp llheartbeat.cpp + llindraconfigfile.cpp llinitparam.cpp llinstancetracker.cpp - llindraconfigfile.cpp llliveappconfig.cpp lllivefile.cpp lllog.cpp llmd5.cpp llmemory.cpp llmemorystream.cpp - llmemtype.cpp llmetrics.cpp llmortician.cpp lloptioninterface.cpp - llptrto.cpp llprocesslauncher.cpp llprocessor.cpp + llptrto.cpp llqueuedthread.cpp llrand.cpp llrefcount.cpp @@ -81,8 +81,8 @@ set(llcommon_SOURCE_FILES llsdutil.cpp llsecondlifeurls.cpp llsingleton.cpp - llstat.cpp llstacktrace.cpp + llstat.cpp llstreamtools.cpp llstring.cpp llstringtable.cpp @@ -93,7 +93,6 @@ set(llcommon_SOURCE_FILES lluri.cpp lluuid.cpp llworkerthread.cpp - ll_template_cast.h metaclass.cpp metaproperty.cpp reflective.cpp @@ -116,10 +115,9 @@ set(llcommon_HEADER_FILES linden_common.h linked_lists.h llaccountingcost.h + llagentconstants.h llallocator.h llallocator_heap_profile.h - llagentconstants.h - llavatarname.h llapp.h llapr.h llaprpool.h @@ -127,6 +125,7 @@ set(llcommon_HEADER_FILES llassoclist.h llatomic.h llavatarconstants.h + llavatarname.h llbase32.h llbase64.h llboost.h @@ -142,8 +141,8 @@ set(llcommon_HEADER_FILES lldarrayptr.h lldate.h lldefs.h - lldependencies.h lldeleteutils.h + lldependencies.h lldepthstack.h lldictionary.h lldlinked.h @@ -158,11 +157,11 @@ set(llcommon_HEADER_FILES lleventapi.h lleventcoro.h lleventdispatcher.h + lleventemitter.h lleventfilter.h llevents.h - lleventemitter.h - llextendedstatus.h lleventtimer.h + llextendedstatus.h llfasttimer.h llfasttimer_class.h llfile.h @@ -176,9 +175,9 @@ set(llcommon_HEADER_FILES llheartbeat.h llhttpstatuscodes.h llindexedqueue.h + llindraconfigfile.h llinitparam.h llinstancetracker.h - llindraconfigfile.h llkeythrottle.h lllinkedqueue.h llliveappconfig.h @@ -190,7 +189,6 @@ set(llcommon_HEADER_FILES llmd5.h llmemory.h llmemorystream.h - llmemtype.h llmetrics.h llmortician.h llnametable.h @@ -206,8 +204,8 @@ set(llcommon_HEADER_FILES llqueuedthread.h llrand.h llrefcount.h - llrun.h llrefcount.h + llrun.h llsafehandle.h llsd.h llsdserialize.h diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 255358260..8a0e0e66d 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -26,6 +26,7 @@ #ifndef LLMEMORY_H #define LLMEMORY_H +#include "linden_common.h" #include #include @@ -33,7 +34,7 @@ #include // uintptr_t #endif -#include "llmemtype.h" +class LLMutex ; #if LL_WINDOWS && LL_DEBUG #define LL_CHECK_MEMORY llassert(_CrtCheckMemory()); @@ -173,8 +174,8 @@ private: }; //---------------------------------------------------------------------------- -class LLMutex ; #if MEM_TRACK_MEM +class LLMutex ; class LL_COMMON_API LLMemTracker { private: diff --git a/indra/llcommon/llmemtype.cpp b/indra/llcommon/llmemtype.cpp deleted file mode 100644 index 614dee323..000000000 --- a/indra/llcommon/llmemtype.cpp +++ /dev/null @@ -1,234 +0,0 @@ -/** - * @file llmemtype.cpp - * @brief Simple memory allocation/deallocation tracking stuff here - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llmemtype.h" -#include "llallocator.h" - -#if MEM_TRACK_TYPE -std::vector LLMemType::DeclareMemType::mNameList; -#endif - -LLMemType::DeclareMemType LLMemType::MTYPE_INIT("Init"); -LLMemType::DeclareMemType LLMemType::MTYPE_STARTUP("Startup"); -LLMemType::DeclareMemType LLMemType::MTYPE_MAIN("Main"); -LLMemType::DeclareMemType LLMemType::MTYPE_FRAME("Frame"); - -LLMemType::DeclareMemType LLMemType::MTYPE_GATHER_INPUT("GatherInput"); -LLMemType::DeclareMemType LLMemType::MTYPE_JOY_KEY("JoyKey"); - -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE("Idle"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_PUMP("IdlePump"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_NETWORK("IdleNetwork"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_UPDATE_REGIONS("IdleUpdateRegions"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_UPDATE_VIEWER_REGION("IdleUpdateViewerRegion"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_UPDATE_SURFACE("IdleUpdateSurface"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_UPDATE_PARCEL_OVERLAY("IdleUpdateParcelOverlay"); -LLMemType::DeclareMemType LLMemType::MTYPE_IDLE_AUDIO("IdleAudio"); - -LLMemType::DeclareMemType LLMemType::MTYPE_CACHE_PROCESS_PENDING("CacheProcessPending"); -LLMemType::DeclareMemType LLMemType::MTYPE_CACHE_PROCESS_PENDING_ASKS("CacheProcessPendingAsks"); -LLMemType::DeclareMemType LLMemType::MTYPE_CACHE_PROCESS_PENDING_REPLIES("CacheProcessPendingReplies"); - -LLMemType::DeclareMemType LLMemType::MTYPE_MESSAGE_CHECK_ALL("MessageCheckAll"); -LLMemType::DeclareMemType LLMemType::MTYPE_MESSAGE_PROCESS_ACKS("MessageProcessAcks"); - -LLMemType::DeclareMemType LLMemType::MTYPE_RENDER("Render"); -LLMemType::DeclareMemType LLMemType::MTYPE_SLEEP("Sleep"); - -LLMemType::DeclareMemType LLMemType::MTYPE_NETWORK("Network"); -LLMemType::DeclareMemType LLMemType::MTYPE_PHYSICS("Physics"); -LLMemType::DeclareMemType LLMemType::MTYPE_INTERESTLIST("InterestList"); - -LLMemType::DeclareMemType LLMemType::MTYPE_IMAGEBASE("ImageBase"); -LLMemType::DeclareMemType LLMemType::MTYPE_IMAGERAW("ImageRaw"); -LLMemType::DeclareMemType LLMemType::MTYPE_IMAGEFORMATTED("ImageFormatted"); - -LLMemType::DeclareMemType LLMemType::MTYPE_APPFMTIMAGE("AppFmtImage"); -LLMemType::DeclareMemType LLMemType::MTYPE_APPRAWIMAGE("AppRawImage"); -LLMemType::DeclareMemType LLMemType::MTYPE_APPAUXRAWIMAGE("AppAuxRawImage"); - -LLMemType::DeclareMemType LLMemType::MTYPE_DRAWABLE("Drawable"); - -LLMemType::DeclareMemType LLMemType::MTYPE_OBJECT("Object"); -LLMemType::DeclareMemType LLMemType::MTYPE_OBJECT_PROCESS_UPDATE("ObjectProcessUpdate"); -LLMemType::DeclareMemType LLMemType::MTYPE_OBJECT_PROCESS_UPDATE_CORE("ObjectProcessUpdateCore"); - -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY("Display"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_UPDATE("DisplayUpdate"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_UPDATE_CAMERA("DisplayUpdateCam"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_UPDATE_GEOM("DisplayUpdateGeom"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_SWAP("DisplaySwap"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_UPDATE_HUD("DisplayUpdateHud"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_GEN_REFLECTION("DisplayGenRefl"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_IMAGE_UPDATE("DisplayImageUpdate"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_STATE_SORT("DisplayStateSort"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_SKY("DisplaySky"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_RENDER_GEOM("DisplayRenderGeom"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_RENDER_FLUSH("DisplayRenderFlush"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_RENDER_UI("DisplayRenderUI"); -LLMemType::DeclareMemType LLMemType::MTYPE_DISPLAY_RENDER_ATTACHMENTS("DisplayRenderAttach"); - -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_DATA("VertexData"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_CONSTRUCTOR("VertexConstr"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_DESTRUCTOR("VertexDestr"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_CREATE_VERTICES("VertexCreateVerts"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_CREATE_INDICES("VertexCreateIndices"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_DESTROY_BUFFER("VertexDestroyBuff"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_DESTROY_INDICES("VertexDestroyIndices"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_UPDATE_VERTS("VertexUpdateVerts"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_UPDATE_INDICES("VertexUpdateIndices"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_ALLOCATE_BUFFER("VertexAllocateBuffer"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_RESIZE_BUFFER("VertexResizeBuffer"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_MAP_BUFFER("VertexMapBuffer"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_MAP_BUFFER_VERTICES("VertexMapBufferVerts"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_MAP_BUFFER_INDICES("VertexMapBufferIndices"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_UNMAP_BUFFER("VertexUnmapBuffer"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_SET_STRIDE("VertexSetStride"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_SET_BUFFER("VertexSetBuffer"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_SETUP_VERTEX_BUFFER("VertexSetupVertBuff"); -LLMemType::DeclareMemType LLMemType::MTYPE_VERTEX_CLEANUP_CLASS("VertexCleanupClass"); - -LLMemType::DeclareMemType LLMemType::MTYPE_SPACE_PARTITION("SpacePartition"); - -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE("Pipeline"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_INIT("PipelineInit"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_CREATE_BUFFERS("PipelineCreateBuffs"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RESTORE_GL("PipelineRestroGL"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_UNLOAD_SHADERS("PipelineUnloadShaders"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_LIGHTING_DETAIL("PipelineLightingDetail"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_GET_POOL_TYPE("PipelineGetPoolType"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_ADD_POOL("PipelineAddPool"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_ALLOCATE_DRAWABLE("PipelineAllocDrawable"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_ADD_OBJECT("PipelineAddObj"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_CREATE_OBJECTS("PipelineCreateObjs"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_UPDATE_MOVE("PipelineUpdateMove"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_UPDATE_GEOM("PipelineUpdateGeom"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_MARK_VISIBLE("PipelineMarkVisible"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_MARK_MOVED("PipelineMarkMoved"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_MARK_SHIFT("PipelineMarkShift"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_SHIFT_OBJECTS("PipelineShiftObjs"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_MARK_TEXTURED("PipelineMarkTextured"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_MARK_REBUILD("PipelineMarkRebuild"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_UPDATE_CULL("PipelineUpdateCull"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_STATE_SORT("PipelineStateSort"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_POST_SORT("PipelinePostSort"); - -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_HUD_ELS("PipelineHudEls"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_HL("PipelineRenderHL"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_GEOM("PipelineRenderGeom"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_GEOM_DEFFERRED("PipelineRenderGeomDef"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_GEOM_POST_DEF("PipelineRenderGeomPostDef"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_GEOM_SHADOW("PipelineRenderGeomShadow"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_SELECT("PipelineRenderSelect"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_REBUILD_POOLS("PipelineRebuildPools"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_QUICK_LOOKUP("PipelineQuickLookup"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_OBJECTS("PipelineRenderObjs"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_GENERATE_IMPOSTOR("PipelineGenImpostors"); -LLMemType::DeclareMemType LLMemType::MTYPE_PIPELINE_RENDER_BLOOM("PipelineRenderBloom"); - -LLMemType::DeclareMemType LLMemType::MTYPE_UPKEEP_POOLS("UpkeepPools"); - -LLMemType::DeclareMemType LLMemType::MTYPE_AVATAR("Avatar"); -LLMemType::DeclareMemType LLMemType::MTYPE_AVATAR_MESH("AvatarMesh"); -LLMemType::DeclareMemType LLMemType::MTYPE_PARTICLES("Particles"); -LLMemType::DeclareMemType LLMemType::MTYPE_REGIONS("Regions"); - -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY("Inventory"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_DRAW("InventoryDraw"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_BUILD_NEW_VIEWS("InventoryBuildNewViews"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_DO_FOLDER("InventoryDoFolder"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_POST_BUILD("InventoryPostBuild"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_FROM_XML("InventoryFromXML"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_CREATE_NEW_ITEM("InventoryCreateNewItem"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_VIEW_INIT("InventoryViewInit"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_VIEW_SHOW("InventoryViewShow"); -LLMemType::DeclareMemType LLMemType::MTYPE_INVENTORY_VIEW_TOGGLE("InventoryViewToggle"); - -LLMemType::DeclareMemType LLMemType::MTYPE_ANIMATION("Animation"); -LLMemType::DeclareMemType LLMemType::MTYPE_VOLUME("Volume"); -LLMemType::DeclareMemType LLMemType::MTYPE_PRIMITIVE("Primitive"); - -LLMemType::DeclareMemType LLMemType::MTYPE_SCRIPT("Script"); -LLMemType::DeclareMemType LLMemType::MTYPE_SCRIPT_RUN("ScriptRun"); -LLMemType::DeclareMemType LLMemType::MTYPE_SCRIPT_BYTECODE("ScriptByteCode"); - -LLMemType::DeclareMemType LLMemType::MTYPE_IO_PUMP("IoPump"); -LLMemType::DeclareMemType LLMemType::MTYPE_IO_TCP("IoTCP"); -LLMemType::DeclareMemType LLMemType::MTYPE_IO_BUFFER("IoBuffer"); -LLMemType::DeclareMemType LLMemType::MTYPE_IO_HTTP_SERVER("IoHttpServer"); -LLMemType::DeclareMemType LLMemType::MTYPE_IO_SD_SERVER("IoSDServer"); -LLMemType::DeclareMemType LLMemType::MTYPE_IO_SD_CLIENT("IoSDClient"); - -LLMemType::DeclareMemType LLMemType::MTYPE_DIRECTX_INIT("DirectXInit"); - -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP1("Temp1"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP2("Temp2"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP3("Temp3"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP4("Temp4"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP5("Temp5"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP6("Temp6"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP7("Temp7"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP8("Temp8"); -LLMemType::DeclareMemType LLMemType::MTYPE_TEMP9("Temp9"); - -LLMemType::DeclareMemType LLMemType::MTYPE_OTHER("Other"); - -#if MEM_TRACK_TYPE -LLMemType::DeclareMemType::DeclareMemType(char const * st) -{ - mID = (S32)mNameList.size(); - mName = st; - - mNameList.push_back(mName); -} - -LLMemType::DeclareMemType::~DeclareMemType() -{ -} - -LLMemType::LLMemType(LLMemType::DeclareMemType& dt) -{ - mTypeIndex = dt.mID; - LLAllocator::pushMemType(dt.mID); -} - -LLMemType::~LLMemType() -{ - LLAllocator::popMemType(); -} - -char const * LLMemType::getNameFromID(S32 id) -{ - if (id < 0 || id >= (S32)DeclareMemType::mNameList.size()) - { - return "INVALID"; - } - - return DeclareMemType::mNameList[id]; -} - -//-------------------------------------------------------------------------------------------------- -#endif //MEM_TRACK_TYPE \ No newline at end of file diff --git a/indra/llcommon/llmemtype.h b/indra/llcommon/llmemtype.h deleted file mode 100644 index 9c3c98937..000000000 --- a/indra/llcommon/llmemtype.h +++ /dev/null @@ -1,251 +0,0 @@ -/** - * @file llmemtype.h - * @brief Runtime memory usage debugging utilities. - * - * $LicenseInfo:firstyear=2005&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_MEMTYPE_H -#define LL_MEMTYPE_H - -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- - -//---------------------------------------------------------------------------- - -#include "linden_common.h" -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// WARNING: Never commit with MEM_TRACK_MEM == 1 -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -#define MEM_TRACK_MEM (0 && LL_WINDOWS) - -#include - - -class LL_COMMON_API LLMemType -{ -public: - - // class we'll initialize all instances of as - // static members of MemType. Then use - // to construct any new mem type. - class LL_COMMON_API DeclareMemType - { - public: - -#if !MEM_TRACK_TYPE - DeclareMemType(char const * st) {}; //Do nothing -#else - DeclareMemType(char const * st); - ~DeclareMemType(); - - S32 mID; - char const * mName; - - // array so we can map an index ID to Name - static std::vector mNameList; -#endif - }; - -#if !MEM_TRACK_TYPE - LLMemType(DeclareMemType& dt){} //Do nothing -#else - LLMemType(DeclareMemType& dt); - ~LLMemType(); - - static char const * getNameFromID(S32 id); -#endif - - static DeclareMemType MTYPE_INIT; - static DeclareMemType MTYPE_STARTUP; - static DeclareMemType MTYPE_MAIN; - static DeclareMemType MTYPE_FRAME; - - static DeclareMemType MTYPE_GATHER_INPUT; - static DeclareMemType MTYPE_JOY_KEY; - - static DeclareMemType MTYPE_IDLE; - static DeclareMemType MTYPE_IDLE_PUMP; - static DeclareMemType MTYPE_IDLE_NETWORK; - static DeclareMemType MTYPE_IDLE_UPDATE_REGIONS; - static DeclareMemType MTYPE_IDLE_UPDATE_VIEWER_REGION; - static DeclareMemType MTYPE_IDLE_UPDATE_SURFACE; - static DeclareMemType MTYPE_IDLE_UPDATE_PARCEL_OVERLAY; - static DeclareMemType MTYPE_IDLE_AUDIO; - - static DeclareMemType MTYPE_CACHE_PROCESS_PENDING; - static DeclareMemType MTYPE_CACHE_PROCESS_PENDING_ASKS; - static DeclareMemType MTYPE_CACHE_PROCESS_PENDING_REPLIES; - - static DeclareMemType MTYPE_MESSAGE_CHECK_ALL; - static DeclareMemType MTYPE_MESSAGE_PROCESS_ACKS; - - static DeclareMemType MTYPE_RENDER; - static DeclareMemType MTYPE_SLEEP; - - static DeclareMemType MTYPE_NETWORK; - static DeclareMemType MTYPE_PHYSICS; - static DeclareMemType MTYPE_INTERESTLIST; - - static DeclareMemType MTYPE_IMAGEBASE; - static DeclareMemType MTYPE_IMAGERAW; - static DeclareMemType MTYPE_IMAGEFORMATTED; - - static DeclareMemType MTYPE_APPFMTIMAGE; - static DeclareMemType MTYPE_APPRAWIMAGE; - static DeclareMemType MTYPE_APPAUXRAWIMAGE; - - static DeclareMemType MTYPE_DRAWABLE; - - static DeclareMemType MTYPE_OBJECT; - static DeclareMemType MTYPE_OBJECT_PROCESS_UPDATE; - static DeclareMemType MTYPE_OBJECT_PROCESS_UPDATE_CORE; - - static DeclareMemType MTYPE_DISPLAY; - static DeclareMemType MTYPE_DISPLAY_UPDATE; - static DeclareMemType MTYPE_DISPLAY_UPDATE_CAMERA; - static DeclareMemType MTYPE_DISPLAY_UPDATE_GEOM; - static DeclareMemType MTYPE_DISPLAY_SWAP; - static DeclareMemType MTYPE_DISPLAY_UPDATE_HUD; - static DeclareMemType MTYPE_DISPLAY_GEN_REFLECTION; - static DeclareMemType MTYPE_DISPLAY_IMAGE_UPDATE; - static DeclareMemType MTYPE_DISPLAY_STATE_SORT; - static DeclareMemType MTYPE_DISPLAY_SKY; - static DeclareMemType MTYPE_DISPLAY_RENDER_GEOM; - static DeclareMemType MTYPE_DISPLAY_RENDER_FLUSH; - static DeclareMemType MTYPE_DISPLAY_RENDER_UI; - static DeclareMemType MTYPE_DISPLAY_RENDER_ATTACHMENTS; - - static DeclareMemType MTYPE_VERTEX_DATA; - static DeclareMemType MTYPE_VERTEX_CONSTRUCTOR; - static DeclareMemType MTYPE_VERTEX_DESTRUCTOR; - static DeclareMemType MTYPE_VERTEX_CREATE_VERTICES; - static DeclareMemType MTYPE_VERTEX_CREATE_INDICES; - static DeclareMemType MTYPE_VERTEX_DESTROY_BUFFER; - static DeclareMemType MTYPE_VERTEX_DESTROY_INDICES; - static DeclareMemType MTYPE_VERTEX_UPDATE_VERTS; - static DeclareMemType MTYPE_VERTEX_UPDATE_INDICES; - static DeclareMemType MTYPE_VERTEX_ALLOCATE_BUFFER; - static DeclareMemType MTYPE_VERTEX_RESIZE_BUFFER; - static DeclareMemType MTYPE_VERTEX_MAP_BUFFER; - static DeclareMemType MTYPE_VERTEX_MAP_BUFFER_VERTICES; - static DeclareMemType MTYPE_VERTEX_MAP_BUFFER_INDICES; - static DeclareMemType MTYPE_VERTEX_UNMAP_BUFFER; - static DeclareMemType MTYPE_VERTEX_SET_STRIDE; - static DeclareMemType MTYPE_VERTEX_SET_BUFFER; - static DeclareMemType MTYPE_VERTEX_SETUP_VERTEX_BUFFER; - static DeclareMemType MTYPE_VERTEX_CLEANUP_CLASS; - - static DeclareMemType MTYPE_SPACE_PARTITION; - - static DeclareMemType MTYPE_PIPELINE; - static DeclareMemType MTYPE_PIPELINE_INIT; - static DeclareMemType MTYPE_PIPELINE_CREATE_BUFFERS; - static DeclareMemType MTYPE_PIPELINE_RESTORE_GL; - static DeclareMemType MTYPE_PIPELINE_UNLOAD_SHADERS; - static DeclareMemType MTYPE_PIPELINE_LIGHTING_DETAIL; - static DeclareMemType MTYPE_PIPELINE_GET_POOL_TYPE; - static DeclareMemType MTYPE_PIPELINE_ADD_POOL; - static DeclareMemType MTYPE_PIPELINE_ALLOCATE_DRAWABLE; - static DeclareMemType MTYPE_PIPELINE_ADD_OBJECT; - static DeclareMemType MTYPE_PIPELINE_CREATE_OBJECTS; - static DeclareMemType MTYPE_PIPELINE_UPDATE_MOVE; - static DeclareMemType MTYPE_PIPELINE_UPDATE_GEOM; - static DeclareMemType MTYPE_PIPELINE_MARK_VISIBLE; - static DeclareMemType MTYPE_PIPELINE_MARK_MOVED; - static DeclareMemType MTYPE_PIPELINE_MARK_SHIFT; - static DeclareMemType MTYPE_PIPELINE_SHIFT_OBJECTS; - static DeclareMemType MTYPE_PIPELINE_MARK_TEXTURED; - static DeclareMemType MTYPE_PIPELINE_MARK_REBUILD; - static DeclareMemType MTYPE_PIPELINE_UPDATE_CULL; - static DeclareMemType MTYPE_PIPELINE_STATE_SORT; - static DeclareMemType MTYPE_PIPELINE_POST_SORT; - - static DeclareMemType MTYPE_PIPELINE_RENDER_HUD_ELS; - static DeclareMemType MTYPE_PIPELINE_RENDER_HL; - static DeclareMemType MTYPE_PIPELINE_RENDER_GEOM; - static DeclareMemType MTYPE_PIPELINE_RENDER_GEOM_DEFFERRED; - static DeclareMemType MTYPE_PIPELINE_RENDER_GEOM_POST_DEF; - static DeclareMemType MTYPE_PIPELINE_RENDER_GEOM_SHADOW; - static DeclareMemType MTYPE_PIPELINE_RENDER_SELECT; - static DeclareMemType MTYPE_PIPELINE_REBUILD_POOLS; - static DeclareMemType MTYPE_PIPELINE_QUICK_LOOKUP; - static DeclareMemType MTYPE_PIPELINE_RENDER_OBJECTS; - static DeclareMemType MTYPE_PIPELINE_GENERATE_IMPOSTOR; - static DeclareMemType MTYPE_PIPELINE_RENDER_BLOOM; - - static DeclareMemType MTYPE_UPKEEP_POOLS; - - static DeclareMemType MTYPE_AVATAR; - static DeclareMemType MTYPE_AVATAR_MESH; - static DeclareMemType MTYPE_PARTICLES; - static DeclareMemType MTYPE_REGIONS; - - static DeclareMemType MTYPE_INVENTORY; - static DeclareMemType MTYPE_INVENTORY_DRAW; - static DeclareMemType MTYPE_INVENTORY_BUILD_NEW_VIEWS; - static DeclareMemType MTYPE_INVENTORY_DO_FOLDER; - static DeclareMemType MTYPE_INVENTORY_POST_BUILD; - static DeclareMemType MTYPE_INVENTORY_FROM_XML; - static DeclareMemType MTYPE_INVENTORY_CREATE_NEW_ITEM; - static DeclareMemType MTYPE_INVENTORY_VIEW_INIT; - static DeclareMemType MTYPE_INVENTORY_VIEW_SHOW; - static DeclareMemType MTYPE_INVENTORY_VIEW_TOGGLE; - - static DeclareMemType MTYPE_ANIMATION; - static DeclareMemType MTYPE_VOLUME; - static DeclareMemType MTYPE_PRIMITIVE; - - static DeclareMemType MTYPE_SCRIPT; - static DeclareMemType MTYPE_SCRIPT_RUN; - static DeclareMemType MTYPE_SCRIPT_BYTECODE; - - static DeclareMemType MTYPE_IO_PUMP; - static DeclareMemType MTYPE_IO_TCP; - static DeclareMemType MTYPE_IO_BUFFER; - static DeclareMemType MTYPE_IO_HTTP_SERVER; - static DeclareMemType MTYPE_IO_SD_SERVER; - static DeclareMemType MTYPE_IO_SD_CLIENT; - - static DeclareMemType MTYPE_DIRECTX_INIT; - - static DeclareMemType MTYPE_TEMP1; - static DeclareMemType MTYPE_TEMP2; - static DeclareMemType MTYPE_TEMP3; - static DeclareMemType MTYPE_TEMP4; - static DeclareMemType MTYPE_TEMP5; - static DeclareMemType MTYPE_TEMP6; - static DeclareMemType MTYPE_TEMP7; - static DeclareMemType MTYPE_TEMP8; - static DeclareMemType MTYPE_TEMP9; - - static DeclareMemType MTYPE_OTHER; // Special; used by display code - -#if MEM_TRACK_TYPE - S32 mTypeIndex; -#endif -}; - -//---------------------------------------------------------------------------- - -#endif - diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt index b292fad2a..431744c42 100644 --- a/indra/llimage/CMakeLists.txt +++ b/indra/llimage/CMakeLists.txt @@ -22,8 +22,8 @@ include_directories( ) set(llimage_SOURCE_FILES - llimagebmp.cpp llimage.cpp + llimagebmp.cpp llimagedxt.cpp llimagej2c.cpp llimagejpeg.cpp @@ -35,6 +35,7 @@ set(llimage_SOURCE_FILES set(llimage_HEADER_FILES CMakeLists.txt + llimage.h llimagebmp.h llimagedxt.h diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 1f7b47298..6f3deba0c 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -30,7 +30,6 @@ #include "llmath.h" #include "v4coloru.h" -#include "llmemtype.h" #include "llimagebmp.h" #include "llimagetga.h" @@ -93,8 +92,7 @@ LLImageBase::LLImageBase() mHeight(0), mComponents(0), mBadBufferAllocation(false), - mAllowOverSize(false), - mMemType(LLMemType::MTYPE_IMAGEBASE) + mAllowOverSize(false) { } @@ -164,8 +162,6 @@ void LLImageBase::deleteData() // virtual U8* LLImageBase::allocateData(S32 size) { - LLMemType mt1(mMemType); - if (size < 0) { size = mWidth * mHeight * mComponents; @@ -226,7 +222,6 @@ U8* LLImageBase::reallocateData(S32 size) if(mData && (mDataSize == size)) return mData; - LLMemType mt1(mMemType); U8 *new_datap = (U8*)ALLOCATE_MEM(sPrivatePoolp, size); if (!new_datap) { @@ -293,14 +288,12 @@ S32 LLImageRaw::sRawImageCachedCount = 0; LLImageRaw::LLImageRaw() : LLImageBase(), mCacheEntries(0) { - mMemType = LLMemType::MTYPE_IMAGERAW; ++sRawImageCount; } LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) : LLImageBase(), mCacheEntries(0) { - mMemType = LLMemType::MTYPE_IMAGERAW; llassert( S32(width) * S32(height) * S32(components) <= MAX_IMAGE_DATA_SIZE ); allocateDataSize(width, height, components); ++sRawImageCount; @@ -309,7 +302,6 @@ LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components) : LLImageBase(), mCacheEntries(0) { - mMemType = LLMemType::MTYPE_IMAGERAW; if(allocateDataSize(width, height, components) && data) { memcpy(getData(), data, width*height*components); @@ -319,7 +311,6 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components) LLImageRaw::LLImageRaw(LLImageRaw const* src, U16 width, U16 height, U16 crop_offset, bool crop_vertically) : mCacheEntries(0) { - mMemType = LLMemType::MTYPE_IMAGERAW; llassert_always(src); S8 const components = src->getComponents(); U8 const* const data = src->getData(); @@ -343,11 +334,11 @@ LLImageRaw::LLImageRaw(LLImageRaw const* src, U16 width, U16 height, U16 crop_of ++sRawImageCount; } -/*LLImageRaw::LLImageRaw(const std::string& filename, bool j2c_lowest_mip_only) - : LLImageBase(), mCacheEntries(0) -{ - createFromFile(filename, j2c_lowest_mip_only); -}*/ +//LLImageRaw::LLImageRaw(const std::string& filename, bool j2c_lowest_mip_only) +// : LLImageBase(), mCacheEntries(0) +//{ +// createFromFile(filename, j2c_lowest_mip_only); +//} LLImageRaw::~LLImageRaw() { @@ -416,7 +407,6 @@ BOOL LLImageRaw::resize(U16 width, U16 height, S8 components) #if 0 U8 * LLImageRaw::getSubImage(U32 x_pos, U32 y_pos, U32 width, U32 height) const { - LLMemType mt1(mMemType); U8 *data = new U8[width*height*getComponents()]; // Should do some simple bounds checking @@ -500,7 +490,6 @@ void LLImageRaw::clear(U8 r, U8 g, U8 b, U8 a) // Reverses the order of the rows in the image void LLImageRaw::verticalFlip() { - LLMemType mt1(mMemType); S32 row_bytes = getWidth() * getComponents(); llassert(row_bytes > 0); try @@ -640,7 +629,6 @@ void LLImageRaw::composite( LLImageRaw* src ) // Src and dst can be any size. Src has 4 components. Dst has 3 components. void LLImageRaw::compositeScaled4onto3(LLImageRaw* src) { - LLMemType mt1(mMemType); llinfos << "compositeScaled4onto3" << llendl; LLImageRaw* dst = this; // Just for clarity. @@ -915,7 +903,6 @@ void LLImageRaw::copyUnscaled3onto4( LLImageRaw* src ) // Src and dst can be any size. Src and dst have same number of components. void LLImageRaw::copyScaled( LLImageRaw* src ) { - LLMemType mt1(mMemType); LLImageRaw* dst = this; // Just for clarity. llassert_always( (1 == src->getComponents()) || (3 == src->getComponents()) || (4 == src->getComponents()) ); @@ -956,8 +943,6 @@ void LLImageRaw::copyScaled( LLImageRaw* src ) //scale down image by not blending a pixel with its neighbors. BOOL LLImageRaw::scaleDownWithoutBlending( S32 new_width, S32 new_height) { - LLMemType mt1(mMemType); - S8 c = getComponents() ; llassert((1 == c) || (3 == c) || (4 == c) ); @@ -1002,7 +987,6 @@ BOOL LLImageRaw::scaleDownWithoutBlending( S32 new_width, S32 new_height) BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data ) { - LLMemType mt1(mMemType); llassert((1 == getComponents()) || (3 == getComponents()) || (4 == getComponents()) ); S32 old_width = getWidth(); @@ -1439,7 +1423,6 @@ LLImageFormatted::LLImageFormatted(S8 codec) mDecoded(0), mDiscardLevel(-1) { - mMemType = LLMemType::MTYPE_IMAGEFORMATTED; } // virtual diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 6d6844e0e..012031338 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -36,7 +36,6 @@ #include "lluuid.h" #include "llstring.h" #include "llthread.h" -#include "llmemtype.h" #include "aithreadsafe.h" const S32 MIN_IMAGE_MIP = 2; // 4x4, only used for expand/contract power of 2 @@ -163,8 +162,6 @@ private: bool mAllowOverSize ; static LLPrivateMemoryPool* sPrivatePoolp ; -public: - LLMemType::DeclareMemType& mMemType; // debug }; // Raw representation of an image (used for textures, and other uncompressed formats diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 987c95f3f..06e4290ca 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -35,7 +35,6 @@ #include "lldir.h" #include "../llxml/llcontrol.h" #include "llimagej2c.h" -#include "llmemtype.h" typedef LLImageJ2CImpl* (*CreateLLImageJ2CFunction)(); typedef void (*DestroyLLImageJ2CFunction)(LLImageJ2CImpl*); @@ -291,8 +290,6 @@ BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time) // Returns TRUE to mean done, whether successful or not. BOOL LLImageJ2C::decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count ) { - LLMemType mt1(mMemType); - BOOL res = TRUE; resetLastError(); @@ -341,7 +338,6 @@ BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, F32 encode_time) BOOL LLImageJ2C::encode(const LLImageRaw *raw_imagep, const char* comment_text, F32 encode_time) { - LLMemType mt1(mMemType); resetLastError(); BOOL res = mImpl->encodeImpl(*this, *raw_imagep, comment_text, encode_time, mReversible); if (!mLastError.empty()) @@ -518,8 +514,6 @@ BOOL LLImageJ2C::loadAndValidate(const std::string &filename) BOOL LLImageJ2C::validate(U8 *data, U32 file_size) { - LLMemType mt1(mMemType); - resetLastError(); setData(data, file_size); diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index fd362a6a2..a88894da9 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -30,7 +30,6 @@ #include "lldarray.h" #include "llfoldertype.h" #include "llinventorytype.h" -#include "llmemtype.h" #include "llpermissions.h" #include "llrefcount.h" #include "llsaleinfo.h" diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt index c168f7a89..1c43bb218 100644 --- a/indra/llmath/CMakeLists.txt +++ b/indra/llmath/CMakeLists.txt @@ -21,12 +21,12 @@ set(llmath_SOURCE_FILES llperlin.cpp llquaternion.cpp llrect.cpp + llsdutil_math.cpp llsphere.cpp llvector4a.cpp llvolume.cpp llvolumemgr.cpp llvolumeoctree.cpp - llsdutil_math.cpp m3math.cpp m4math.cpp raytrace.cpp @@ -66,6 +66,7 @@ set(llmath_HEADER_FILES llquaternion2.h llquaternion2.inl llrect.h + llsdutil_math.h llsimdmath.h llsimdtypes.h llsimdtypes.inl @@ -77,7 +78,6 @@ set(llmath_HEADER_FILES llvolume.h llvolumemgr.h llvolumeoctree.h - llsdutil_math.h m3math.h m4math.h raytrace.h diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 1d2b7c257..e3b39344d 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -507,7 +507,7 @@ public: //is it here? if (isInside(data->getPositionGroup())) { - if ((getElementCount() < gOctreeMaxCapacity && contains(data->getBinRadius()) || + if (((getElementCount() < gOctreeMaxCapacity && contains(data->getBinRadius())) || (data->getBinRadius() > getSize()[0] && parent && parent->getElementCount() >= gOctreeMaxCapacity))) { //it belongs here /*mElementCount++; diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 1f7862ea8..fdba388b1 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -35,7 +35,6 @@ #include #include "llerror.h" -#include "llmemtype.h" #include "llvolumemgr.h" #include "v2math.h" @@ -378,8 +377,6 @@ public: LLProfile::Face* LLProfile::addCap(S16 faceID) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - Face *face = vector_append(mFaces, 1); face->mIndex = 0; @@ -392,8 +389,6 @@ LLProfile::Face* LLProfile::addCap(S16 faceID) LLProfile::Face* LLProfile::addFace(S32 i, S32 count, F32 scaleU, S16 faceID, BOOL flat) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - Face *face = vector_append(mFaces, 1); face->mIndex = i; @@ -409,7 +404,6 @@ LLProfile::Face* LLProfile::addFace(S32 i, S32 count, F32 scaleU, S16 faceID, BO //static S32 LLProfile::getNumNGonPoints(const LLProfileParams& params, S32 sides, F32 offset, F32 bevel, F32 ang_scale, S32 split) { // this is basically LLProfile::genNGon stripped down to only the operations that influence the number of points - LLMemType m1(LLMemType::MTYPE_VOLUME); S32 np = 0; // Generate an n-sided "circular" path. @@ -475,8 +469,6 @@ S32 LLProfile::getNumNGonPoints(const LLProfileParams& params, S32 sides, F32 of // filleted and chamfered corners void LLProfile::genNGon(const LLProfileParams& params, S32 sides, F32 offset, F32 bevel, F32 ang_scale, S32 split) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - // Generate an n-sided "circular" path. // 0 is (1,0), and we go counter-clockwise along a circular path from there. const F32 tableScale[] = { 1, 1, 1, 0.5f, 0.707107f, 0.53f, 0.525f, 0.5f }; @@ -730,8 +722,6 @@ LLProfile::Face* LLProfile::addHole(const LLProfileParams& params, BOOL flat, F3 S32 LLProfile::getNumPoints(const LLProfileParams& params, BOOL path_open,F32 detail, S32 split, BOOL is_sculpted, S32 sculpt_size) { // this is basically LLProfile::generate stripped down to only operations that influence the number of points - LLMemType m1(LLMemType::MTYPE_VOLUME); - if (detail < MIN_LOD) { detail = MIN_LOD; @@ -842,8 +832,6 @@ S32 LLProfile::getNumPoints(const LLProfileParams& params, BOOL path_open,F32 de BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detail, S32 split, BOOL is_sculpted, S32 sculpt_size) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - if ((!mDirty) && (!is_sculpted)) { return FALSE; @@ -1116,8 +1104,6 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai BOOL LLProfileParams::importFile(LLFILE *fp) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - const S32 BUFSIZE = 16384; char buffer[BUFSIZE]; /* Flawfinder: ignore */ // *NOTE: changing the size or type of these buffers will require @@ -1193,8 +1179,6 @@ BOOL LLProfileParams::exportFile(LLFILE *fp) const BOOL LLProfileParams::importLegacyStream(std::istream& input_stream) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - const S32 BUFSIZE = 16384; char buffer[BUFSIZE]; /* Flawfinder: ignore */ // *NOTE: changing the size or type of these buffers will require @@ -1286,7 +1270,6 @@ bool LLProfileParams::fromLLSD(LLSD& sd) void LLProfileParams::copyParams(const LLProfileParams ¶ms) { - LLMemType m1(LLMemType::MTYPE_VOLUME); setCurveType(params.getCurveType()); setBegin(params.getBegin()); setEnd(params.getEnd()); @@ -1503,8 +1486,6 @@ const LLVector2 LLPathParams::getEndScale() const S32 LLPath::getNumPoints(const LLPathParams& params, F32 detail) { // this is basically LLPath::generate stripped down to only the operations that influence the number of points - LLMemType m1(LLMemType::MTYPE_VOLUME); - if (detail < MIN_LOD) { detail = MIN_LOD; @@ -1554,8 +1535,6 @@ S32 LLPath::getNumPoints(const LLPathParams& params, F32 detail) BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL is_sculpted, S32 sculpt_size) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - if ((!mDirty) && (!is_sculpted)) { return FALSE; @@ -1683,8 +1662,6 @@ BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL is_sculpted, S32 sculpt_size) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - mOpen = TRUE; // Draw end caps if (getPathLength() == 0) { @@ -1706,8 +1683,6 @@ BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL LLPathParams::importFile(LLFILE *fp) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - const S32 BUFSIZE = 16384; char buffer[BUFSIZE]; /* Flawfinder: ignore */ // *NOTE: changing the size or type of these buffers will require @@ -1852,8 +1827,6 @@ BOOL LLPathParams::exportFile(LLFILE *fp) const BOOL LLPathParams::importLegacyStream(std::istream& input_stream) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - const S32 BUFSIZE = 16384; char buffer[BUFSIZE]; /* Flawfinder: ignore */ // *NOTE: changing the size or type of these buffers will require @@ -2061,8 +2034,6 @@ S32 LLVolume::sNumMeshPoints = 0; LLVolume::LLVolume(const LLVolumeParams ¶ms, const F32 detail, const BOOL generate_single_face, const BOOL is_unique) : mParams(params) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - mUnique = is_unique; mFaceMask = 0x0; mDetail = detail; @@ -2134,7 +2105,6 @@ LLVolume::~LLVolume() BOOL LLVolume::generate() { - LLMemType m1(LLMemType::MTYPE_VOLUME); llassert_always(mProfilep); //Added 10.03.05 Dave Parks @@ -2171,7 +2141,7 @@ BOOL LLVolume::generate() mLODScaleBias.setVec(0.6f, 0.6f, 0.6f); } - // ******************************************************************** + //******************************************************************** //debug info, to be removed if((U32)(mPathp->mPath.size() * mProfilep->mProfile.size()) > (1u << 20)) { @@ -2183,7 +2153,7 @@ BOOL LLVolume::generate() llerrs << "LLVolume corrupted!" << llendl ; } - // ******************************************************************** + //******************************************************************** BOOL regenPath = mPathp->generate(mParams.getPathParams(), path_detail, split); BOOL regenProf = mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(),profile_detail, split); @@ -2193,7 +2163,7 @@ BOOL LLVolume::generate() S32 sizeS = mPathp->mPath.size(); S32 sizeT = mProfilep->mProfile.size(); - // ******************************************************************** + //******************************************************************** //debug info, to be removed if((U32)(sizeS * sizeT) > (1u << 20)) { @@ -2206,7 +2176,7 @@ BOOL LLVolume::generate() llerrs << "LLVolume corrupted!" << llendl ; } - // ******************************************************************** + //******************************************************************** sNumMeshPoints -= mMesh.size(); mMesh.resize(sizeT * sizeS); @@ -2730,8 +2700,6 @@ S32 LLVolume::getNumFaces() const void LLVolume::createVolumeFaces() { - LLMemType m1(LLMemType::MTYPE_VOLUME); - if (mGenerateSingleFace) { // do nothing @@ -2903,8 +2871,6 @@ F32 LLVolume::sculptGetSurfaceArea() // create placeholder shape void LLVolume::sculptGeneratePlaceholder() { - LLMemType m1(LLMemType::MTYPE_VOLUME); - S32 sizeS = mPathp->mPath.size(); S32 sizeT = mProfilep->mProfile.size(); @@ -2940,10 +2906,7 @@ void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT; BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR; BOOL reverse_horizontal = (sculpt_invert ? !sculpt_mirror : sculpt_mirror); // XOR - - - LLMemType m1(LLMemType::MTYPE_VOLUME); - + S32 sizeS = mPathp->mPath.size(); S32 sizeT = mProfilep->mProfile.size(); @@ -3117,7 +3080,6 @@ bool sculpt_calc_mesh_resolution(U16 width, U16 height, U8 type, F32 detail, S32 // sculpt replaces generate() for sculpted surfaces void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level) { - LLMemType m1(LLMemType::MTYPE_VOLUME); U8 sculpt_type = mParams.getSculptType(); BOOL data_is_empty = FALSE; @@ -3268,7 +3230,6 @@ bool LLVolumeParams::operator<(const LLVolumeParams ¶ms) const void LLVolumeParams::copyParams(const LLVolumeParams ¶ms) { - LLMemType m1(LLMemType::MTYPE_VOLUME); mProfileParams.copyParams(params.mProfileParams); mPathParams.copyParams(params.mPathParams); mSculptID = params.getSculptID(); @@ -3640,8 +3601,6 @@ bool LLVolumeParams::validate(U8 prof_curve, F32 prof_begin, F32 prof_end, F32 h S32 *LLVolume::getTriangleIndices(U32 &num_indices) const { - LLMemType m1(LLMemType::MTYPE_VOLUME); - S32 expected_num_triangle_indices = getNumTriangleIndices(); if (expected_num_triangle_indices > MAX_VOLUME_TRIANGLE_INDICES) { @@ -4369,8 +4328,6 @@ void LLVolume::generateSilhouetteVertices(std::vector &vertices, const LLMatrix3& norm_mat_in, S32 face_mask) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - LLMatrix4a mat; mat.loadu(mat_in); @@ -4832,8 +4789,6 @@ BOOL equalTriangle(const S32 *a, const S32 *b) BOOL LLVolumeParams::importFile(LLFILE *fp) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - //llinfos << "importing volume" << llendl; const S32 BUFSIZE = 16384; char buffer[BUFSIZE]; /* Flawfinder: ignore */ @@ -4888,8 +4843,6 @@ BOOL LLVolumeParams::exportFile(LLFILE *fp) const BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - //llinfos << "importing volume" << llendl; const S32 BUFSIZE = 16384; // *NOTE: changing the size or type of this buffer will require @@ -4929,8 +4882,6 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream) BOOL LLVolumeParams::exportLegacyStream(std::ostream& output_stream) const { - LLMemType m1(LLMemType::MTYPE_VOLUME); - output_stream <<"\tshape 0\n"; output_stream <<"\t{\n"; mPathParams.exportLegacyStream(output_stream); @@ -6146,8 +6097,6 @@ void LerpPlanarVertex(LLVolumeFace::VertexData& v0, BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - const std::vector& mesh = volume->getMesh(); const std::vector& profile = volume->getProfile().mProfile; S32 max_s = volume->getProfile().getTotal(); @@ -6293,8 +6242,6 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build) BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - if (!(mTypeMask & HOLLOW_MASK) && !(mTypeMask & OPEN_MASK) && ((volume->getParams().getPathParams().getBegin()==0.0f)&& @@ -6681,8 +6628,6 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build) void LLVolumeFace::createBinormals() { - LLMemType m1(LLMemType::MTYPE_VOLUME); - if (!mBinormals) { allocateBinormals(mNumVertices); @@ -6954,8 +6899,6 @@ void LLVolumeFace::appendFace(const LLVolumeFace& face, LLMatrix4& mat_in, LLMat BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build) { - LLMemType m1(LLMemType::MTYPE_VOLUME); - BOOL flat = mTypeMask & FLAT_MASK; U8 sculpt_type = volume->getParams().getSculptType(); diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp index 42180197f..dcc2d81cf 100644 --- a/indra/llmath/llvolumemgr.cpp +++ b/indra/llmath/llvolumemgr.cpp @@ -26,7 +26,6 @@ #include "linden_common.h" #include "llvolumemgr.h" -#include "llmemtype.h" #include "llvolume.h" @@ -182,7 +181,6 @@ void LLVolumeMgr::insertGroup(LLVolumeLODGroup* volgroup) // protected LLVolumeLODGroup* LLVolumeMgr::createNewGroup(const LLVolumeParams& volume_params) { - LLMemType m1(LLMemType::MTYPE_VOLUME); LLVolumeLODGroup* volgroup = new LLVolumeLODGroup(volume_params); insertGroup(volgroup); return volgroup; @@ -297,7 +295,6 @@ LLVolume* LLVolumeLODGroup::refLOD(const S32 detail) mRefs++; if (mVolumeLODs[detail].isNull()) { - LLMemType m1(LLMemType::MTYPE_VOLUME); mVolumeLODs[detail] = new LLVolume(mVolumeParams, mDetailScales[detail]); } mLODRefs[detail]++; diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index f3e68b53b..ebee8c548 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -30,7 +30,6 @@ set(llmessage_SOURCE_FILES aihttptimeout.cpp aihttptimeoutpolicy.cpp debug_libcurl.cpp - llhttpclient.cpp llares.cpp llareslistener.cpp llassetstorage.cpp @@ -46,6 +45,7 @@ set(llmessage_SOURCE_FILES lldispatcher.cpp llfiltersd2xmlrpc.cpp llhost.cpp + llhttpclient.cpp llhttpnode.cpp llhttpsender.cpp llinstantmessage.cpp @@ -91,9 +91,9 @@ set(llmessage_SOURCE_FILES lluseroperation.cpp llxfer.cpp llxfer_file.cpp - llxfermanager.cpp llxfer_mem.cpp llxfer_vfile.cpp + llxfermanager.cpp llxorcipher.cpp machine.cpp message.cpp @@ -111,8 +111,8 @@ set(llmessage_HEADER_FILES aicurl.h aicurleasyrequeststatemachine.h - aicurlprivate.h aicurlperhost.h + aicurlprivate.h aicurlthread.h aihttpheaders.h aihttptimeout.h @@ -166,8 +166,8 @@ set(llmessage_HEADER_FILES llpacketbuffer.h llpacketring.h llpartdata.h - llpumpio.h llproxy.h + llpumpio.h llqueryflags.h llregionflags.h llregionhandle.h @@ -193,10 +193,10 @@ set(llmessage_HEADER_FILES lluseroperation.h llvehicleparams.h llxfer.h - llxfermanager.h llxfer_file.h llxfer_mem.h llxfer_vfile.h + llxfermanager.h llxorcipher.h machine.h mean_collision_data.h diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp index b9ca7ceb6..41db8be23 100644 --- a/indra/llmessage/llbuffer.cpp +++ b/indra/llmessage/llbuffer.cpp @@ -30,7 +30,6 @@ #include "llbuffer.h" #include "llmath.h" -#include "llmemtype.h" #include "llstl.h" #include "llthread.h" @@ -44,7 +43,6 @@ LLSegment::LLSegment() : mData(NULL), mSize(0) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } LLSegment::LLSegment(S32 channel, U8* data, S32 data_len) : @@ -52,12 +50,10 @@ LLSegment::LLSegment(S32 channel, U8* data, S32 data_len) : mData(data), mSize(data_len) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } LLSegment::~LLSegment() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } bool LLSegment::isOnChannel(S32 channel) const @@ -104,7 +100,6 @@ LLHeapBuffer::LLHeapBuffer() : mNextFree(NULL), mReclaimedBytes(0) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); const S32 DEFAULT_HEAP_BUFFER_SIZE = 16384; allocate(DEFAULT_HEAP_BUFFER_SIZE); } @@ -115,7 +110,6 @@ LLHeapBuffer::LLHeapBuffer(S32 size) : mNextFree(NULL), mReclaimedBytes(0) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); allocate(size); } @@ -125,7 +119,6 @@ LLHeapBuffer::LLHeapBuffer(const U8* src, S32 len) : mNextFree(NULL), mReclaimedBytes(0) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); if((len > 0) && src) { allocate(len); @@ -139,7 +132,6 @@ LLHeapBuffer::LLHeapBuffer(const U8* src, S32 len) : // virtual LLHeapBuffer::~LLHeapBuffer() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); delete[] mBuffer; mBuffer = NULL; mSize = 0; @@ -157,7 +149,6 @@ bool LLHeapBuffer::createSegment( S32 size, LLSegment& segment) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); // get actual size of the segment. S32 actual_size = llmin(size, (mSize - S32(mNextFree - mBuffer))); @@ -212,7 +203,6 @@ bool LLHeapBuffer::containsSegment(const LLSegment& segment) const void LLHeapBuffer::allocate(S32 size) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); mReclaimedBytes = 0; mBuffer = new U8[size]; if(mBuffer) @@ -230,12 +220,10 @@ LLBufferArray::LLBufferArray() : mNextBaseChannel(0), mMutexp(NULL) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } LLBufferArray::~LLBufferArray() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); std::for_each(mBuffers.begin(), mBuffers.end(), DeletePointer()); delete mMutexp; @@ -314,7 +302,6 @@ bool LLBufferArray::append(S32 channel, const U8* src, S32 len) { LLMutexLock lock(mMutexp) ; - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); std::vector segments; if(copyIntoBuffers(channel, src, len, segments)) { @@ -329,7 +316,6 @@ bool LLBufferArray::prepend(S32 channel, const U8* src, S32 len) { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); std::vector segments; if(copyIntoBuffers(channel, src, len, segments)) { @@ -345,7 +331,6 @@ bool LLBufferArray::insertAfter( const U8* src, S32 len) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); std::vector segments; LLMutexLock lock(mMutexp) ; @@ -366,7 +351,6 @@ LLBufferArray::segment_iterator_t LLBufferArray::splitAfter(U8* address) { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); segment_iterator_t end = mSegments.end(); segment_iterator_t it = getSegment(address); if(it == end) @@ -428,7 +412,6 @@ LLBufferArray::segment_iterator_t LLBufferArray::constructSegmentAfter( LLSegment& segment) { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); segment_iterator_t rv = mSegments.begin(); segment_iterator_t end = mSegments.end(); if(!address) @@ -592,7 +575,6 @@ U8* LLBufferArray::readAfter( U8* dest, S32& len) const { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); U8* rv = start; if(!dest || len <= 0) { @@ -652,7 +634,6 @@ U8* LLBufferArray::readAfter( void LLBufferArray::writeChannelTo(std::ostream& ostr, S32 channel) const { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); LLMutexLock lock(mMutexp) ; const_segment_iterator_t const end = mSegments.end(); for (const_segment_iterator_t it = mSegments.begin(); it != end; ++it) @@ -670,7 +651,6 @@ U8* LLBufferArray::seek( S32 delta) const { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); const_segment_iterator_t it; const_segment_iterator_t end = mSegments.end(); U8* rv = start; @@ -814,8 +794,6 @@ U8* LLBufferArray::seek( //test use only bool LLBufferArray::takeContents(LLBufferArray& source) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); - LLMutexLock lock(mMutexp); source.lock(); @@ -841,7 +819,7 @@ LLBufferArray::segment_iterator_t LLBufferArray::makeSegment( S32 len) { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); + // start at the end of the buffers, because it is the most likely // to have free space. LLSegment segment; @@ -880,7 +858,6 @@ LLBufferArray::segment_iterator_t LLBufferArray::makeSegment( bool LLBufferArray::eraseSegment(const segment_iterator_t& erase_iter) { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); // Find out which buffer contains the segment, and if it is found, // ask it to reclaim the memory. @@ -913,7 +890,6 @@ bool LLBufferArray::copyIntoBuffers( std::vector& segments) { ASSERT_LLBUFFERARRAY_MUTEX_LOCKED - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); if(!src || !len) return false; S32 copied = 0; LLSegment segment; diff --git a/indra/llmessage/llbufferstream.cpp b/indra/llmessage/llbufferstream.cpp index 8d8ad05ad..a51a48edc 100644 --- a/indra/llmessage/llbufferstream.cpp +++ b/indra/llmessage/llbufferstream.cpp @@ -30,7 +30,6 @@ #include "llbufferstream.h" #include "llbuffer.h" -#include "llmemtype.h" #include "llthread.h" static const S32 DEFAULT_OUTPUT_SEGMENT_SIZE = 1024 * 4; @@ -44,19 +43,16 @@ LLBufferStreamBuf::LLBufferStreamBuf( mChannels(channels), mBuffer(buffer) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } LLBufferStreamBuf::~LLBufferStreamBuf() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); sync(); } // virtual int LLBufferStreamBuf::underflow() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); //lldebugs << "LLBufferStreamBuf::underflow()" << llendl; if(!mBuffer) { @@ -129,7 +125,6 @@ int LLBufferStreamBuf::underflow() // virtual int LLBufferStreamBuf::overflow(int c) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); if(!mBuffer) { return EOF; @@ -169,7 +164,6 @@ int LLBufferStreamBuf::overflow(int c) // virtual int LLBufferStreamBuf::sync() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); int return_value = -1; if(!mBuffer) { @@ -251,7 +245,6 @@ streampos LLBufferStreamBuf::seekoff( std::ios::openmode which) #endif { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); if(!mBuffer || ((way == std::ios::beg) && (off < 0)) || ((way == std::ios::end) && (off > 0))) @@ -343,10 +336,8 @@ LLBufferStream::LLBufferStream( std::iostream(&mStreamBuf), mStreamBuf(channels, buffer) { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } LLBufferStream::~LLBufferStream() { - LLMemType m1(LLMemType::MTYPE_IO_BUFFER); } diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 4c972749f..59af2b244 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -36,7 +36,6 @@ #include "llsdserialize.h" #include "lluuid.h" #include "message.h" -#include "llmemtype.h" #include @@ -692,7 +691,6 @@ bool LLCacheName::getIfThere(const LLUUID& id, std::string& fullname, BOOL& is_g void LLCacheName::processPending() { - LLMemType mt_pp(LLMemType::MTYPE_CACHE_PROCESS_PENDING); const F32 SECS_BETWEEN_PROCESS = 0.1f; if(!impl.mProcessTimer.checkExpirationAndReset(SECS_BETWEEN_PROCESS)) { @@ -798,7 +796,6 @@ std::string LLCacheName::getDefaultLastName() void LLCacheName::Impl::processPendingAsks() { - LLMemType mt_ppa(LLMemType::MTYPE_CACHE_PROCESS_PENDING_ASKS); sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue); sendRequest(_PREHASH_UUIDGroupNameRequest, mAskGroupQueue); mAskNameQueue.clear(); @@ -807,7 +804,6 @@ void LLCacheName::Impl::processPendingAsks() void LLCacheName::Impl::processPendingReplies() { - LLMemType mt_ppr(LLMemType::MTYPE_CACHE_PROCESS_PENDING_REPLIES); // First call all the callbacks, because they might send messages. for(ReplyQueue::iterator it = mReplyQueue.begin(); it != mReplyQueue.end(); ++it) { diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 9ce06f147..8037b005d 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -37,7 +37,6 @@ #include "lliopipe.h" #include "lliosocket.h" #include "llioutil.h" -#include "llmemtype.h" #include "llmemorystream.h" #include "llpumpio.h" #include "llsd.h" @@ -449,7 +448,6 @@ LLIOPipe::EStatus LLHTTPResponseHeader::process_impl( { LLFastTimer t(FTM_PROCESS_HTTP_HEADER); PUMP_DEBUG; - LLMemType m1(LLMemType::MTYPE_IO_HTTP_SERVER); if(eos) { PUMP_DEBUG; @@ -593,13 +591,11 @@ LLHTTPResponder::LLHTTPResponder(const LLHTTPNode& tree, const LLSD& ctx) : mContentLength(0), mRootNode(tree) { - LLMemType m1(LLMemType::MTYPE_IO_HTTP_SERVER); } // virtual LLHTTPResponder::~LLHTTPResponder() { - LLMemType m1(LLMemType::MTYPE_IO_HTTP_SERVER); //lldebugs << "destroying LLHTTPResponder" << llendl; } @@ -609,7 +605,6 @@ bool LLHTTPResponder::readHeaderLine( U8* dest, S32& len) { - LLMemType m1(LLMemType::MTYPE_IO_HTTP_SERVER); --len; U8* last = buffer->readAfter(channels.in(), mLastRead, dest, len); dest[len] = '\0'; @@ -634,7 +629,6 @@ void LLHTTPResponder::markBad( const LLChannelDescriptors& channels, buffer_ptr_t buffer) { - LLMemType m1(LLMemType::MTYPE_IO_HTTP_SERVER); mState = STATE_SHORT_CIRCUIT; LLBufferStream out(channels, buffer.get()); out << HTTP_VERSION_STR << " 400 Bad Request\r\n\r\n\n" @@ -654,7 +648,6 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl( { LLFastTimer t(FTM_PROCESS_HTTP_RESPONDER); PUMP_DEBUG; - LLMemType m1(LLMemType::MTYPE_IO_HTTP_SERVER); LLIOPipe::EStatus status = STATUS_OK; // parsing headers diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp index 0c815c681..065f457ee 100644 --- a/indra/llmessage/lliosocket.cpp +++ b/indra/llmessage/lliosocket.cpp @@ -33,7 +33,6 @@ #include "llbuffer.h" #include "llhost.h" -#include "llmemtype.h" #include "llpumpio.h" #include "llthread.h" @@ -101,7 +100,6 @@ void ll_debug_socket(const char* msg, apr_socket_t* apr_sock) // static LLSocket::ptr_t LLSocket::create(EType type, U16 port) { - LLMemType m1(LLMemType::MTYPE_IO_TCP); apr_status_t status = APR_EGENERAL; LLSocket::ptr_t rv(new LLSocket); @@ -179,7 +177,6 @@ LLSocket::ptr_t LLSocket::create(EType type, U16 port) // static LLSocket::ptr_t LLSocket::create(apr_status_t& status, LLSocket::ptr_t& listen_socket) { - LLMemType m1(LLMemType::MTYPE_IO_TCP); if (!listen_socket->getSocket()) { status = APR_ENOSOCKET; @@ -232,7 +229,6 @@ LLSocket::LLSocket() : LLSocket::~LLSocket() { - LLMemType m1(LLMemType::MTYPE_IO_TCP); // *FIX: clean up memory we are holding. if(mSocket) { @@ -248,7 +244,6 @@ LLSocket::~LLSocket() void LLSocket::setBlocking(S32 timeout) { - LLMemType m1(LLMemType::MTYPE_IO_TCP); // set up the socket options ll_apr_warn_status(apr_socket_timeout_set(mSocket, timeout)); ll_apr_warn_status(apr_socket_opt_set(mSocket, APR_SO_NONBLOCK, 0)); @@ -259,7 +254,6 @@ void LLSocket::setBlocking(S32 timeout) void LLSocket::setNonBlocking() { - LLMemType m1(LLMemType::MTYPE_IO_TCP); // set up the socket options ll_apr_warn_status(apr_socket_timeout_set(mSocket, 0)); ll_apr_warn_status(apr_socket_opt_set(mSocket, APR_SO_NONBLOCK, 1)); @@ -276,12 +270,10 @@ LLIOSocketReader::LLIOSocketReader(LLSocket::ptr_t socket) : mSource(socket), mInitialized(false) { - LLMemType m1(LLMemType::MTYPE_IO_TCP); } LLIOSocketReader::~LLIOSocketReader() { - LLMemType m1(LLMemType::MTYPE_IO_TCP); //lldebugs << "Destroying LLIOSocketReader" << llendl; } @@ -297,7 +289,6 @@ LLIOPipe::EStatus LLIOSocketReader::process_impl( { LLFastTimer t(FTM_PROCESS_SOCKET_READER); PUMP_DEBUG; - LLMemType m1(LLMemType::MTYPE_IO_TCP); if(!mSource) return STATUS_PRECONDITION_NOT_MET; if(!mInitialized) { @@ -379,12 +370,10 @@ LLIOSocketWriter::LLIOSocketWriter(LLSocket::ptr_t socket) : mLastWritten(NULL), mInitialized(false) { - LLMemType m1(LLMemType::MTYPE_IO_TCP); } LLIOSocketWriter::~LLIOSocketWriter() { - LLMemType m1(LLMemType::MTYPE_IO_TCP); //lldebugs << "Destroying LLIOSocketWriter" << llendl; } @@ -399,7 +388,6 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl( { LLFastTimer t(FTM_PROCESS_SOCKET_WRITER); PUMP_DEBUG; - LLMemType m1(LLMemType::MTYPE_IO_TCP); if(!mDestination) return STATUS_PRECONDITION_NOT_MET; if(!mInitialized) { @@ -531,12 +519,10 @@ LLIOServerSocket::LLIOServerSocket( mInitialized(false), mResponseTimeout(DEFAULT_CHAIN_EXPIRY_SECS) { - LLMemType m1(LLMemType::MTYPE_IO_TCP); } LLIOServerSocket::~LLIOServerSocket() { - LLMemType m1(LLMemType::MTYPE_IO_TCP); //lldebugs << "Destroying LLIOServerSocket" << llendl; } @@ -556,7 +542,6 @@ LLIOPipe::EStatus LLIOServerSocket::process_impl( { LLFastTimer t(FTM_PROCESS_SERVER_SOCKET); PUMP_DEBUG; - LLMemType m1(LLMemType::MTYPE_IO_TCP); if(!pump) { llwarns << "Need a pump for server socket." << llendl; diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index d4f6f59b1..588265f97 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -35,7 +35,6 @@ #include "llapr.h" #include "llfasttimer.h" -#include "llmemtype.h" #include "llstl.h" #include "llstat.h" #include "llthread.h" @@ -155,7 +154,6 @@ struct ll_delete_apr_pollset_fd_client_data typedef std::pair pipe_conditional_t; void operator()(const pipe_conditional_t& conditional) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); S32* client_id = (S32*)conditional.second.client_data; delete client_id; } @@ -177,13 +175,11 @@ LLPumpIO::LLPumpIO(void) : { mCurrentChain = mRunningChains.end(); - LLMemType m1(LLMemType::MTYPE_IO_PUMP); initialize(); } LLPumpIO::~LLPumpIO() { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); #if LL_THREADS_APR if (mChainsMutex) apr_thread_mutex_destroy(mChainsMutex); if (mCallbackMutex) apr_thread_mutex_destroy(mCallbackMutex); @@ -200,8 +196,6 @@ LLPumpIO::~LLPumpIO() bool LLPumpIO::addChain(chain_t const& chain, F32 timeout) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); - chain_t::const_iterator it = chain.begin(); chain_t::const_iterator const end = chain.end(); if (it == end) return false; @@ -237,8 +231,6 @@ bool LLPumpIO::addChain( LLSD context, F32 timeout) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); - // remember that if the caller is providing a full link // description, we need to have that description matched to a // particular buffer. @@ -325,7 +317,6 @@ static std::string events_2_string(apr_int16_t events) bool LLPumpIO::setConditional(LLIOPipe* pipe, const apr_pollfd_t* poll) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); if(!pipe) return false; ll_debug_poll_fd("Set conditional", poll); @@ -436,7 +427,6 @@ bool LLPumpIO::sleepChain(F64 seconds) bool LLPumpIO::copyCurrentLinkInfo(links_t& links) const { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); if(mRunningChains.end() == mCurrentChain) { return false; @@ -468,7 +458,6 @@ LLPumpIO::current_chain_t LLPumpIO::removeRunningChain(LLPumpIO::current_chain_t //timeout is in microseconds void LLPumpIO::pump(const S32& poll_timeout) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); LLFastTimer t1(FTM_PUMP_IO); //llinfos << "LLPumpIO::pump()" << llendl; @@ -761,7 +750,6 @@ void LLPumpIO::pump(const S32& poll_timeout) bool LLPumpIO::respond(LLIOPipe* pipe) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); if(NULL == pipe) return false; #if LL_THREADS_APR @@ -780,7 +768,6 @@ bool LLPumpIO::respond( LLIOPipe::buffer_ptr_t data, LLSD context) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); // if the caller is providing a full link description, we need to // have that description matched to a particular buffer. if(!data) return false; @@ -803,7 +790,6 @@ static LLFastTimer::DeclareTimer FTM_PUMP_CALLBACK_CHAIN("Chain"); void LLPumpIO::callback() { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); //llinfos << "LLPumpIO::callback()" << llendl; if(true) { @@ -854,7 +840,6 @@ void LLPumpIO::control(LLPumpIO::EControl op) void LLPumpIO::initialize(void) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); mPool.create(); #if LL_THREADS_APR // SJB: Windows defaults to NESTED and OSX defaults to UNNESTED, so use UNNESTED explicitly. @@ -865,7 +850,6 @@ void LLPumpIO::initialize(void) void LLPumpIO::rebuildPollset() { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); // lldebugs << "LLPumpIO::rebuildPollset()" << llendl; if(mPollset) { @@ -916,7 +900,6 @@ void LLPumpIO::rebuildPollset() void LLPumpIO::processChain(LLChainInfo& chain) { PUMP_DEBUG; - LLMemType m1(LLMemType::MTYPE_IO_PUMP); LLIOPipe::EStatus status = LLIOPipe::STATUS_OK; links_t::iterator it = chain.mHead; links_t::iterator end = chain.mChainLinks.end(); @@ -1120,7 +1103,6 @@ bool LLPumpIO::handleChainError( { DoutEntering(dc::notice, "LLPumpIO::handleChainError(" << (void*)&chain << ", " << LLIOPipe::lookupStatusString(error) << ")"); - LLMemType m1(LLMemType::MTYPE_IO_PUMP); links_t::reverse_iterator rit; if(chain.mHead == chain.mChainLinks.end()) { @@ -1185,13 +1167,11 @@ LLPumpIO::LLChainInfo::LLChainInfo() : mHasExpiration(false), mDescriptorsPool(new LLAPRPool(LLThread::tldata().mRootPool)) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); mTimer.setTimerExpirySec(DEFAULT_CHAIN_EXPIRY_SECS); } void LLPumpIO::LLChainInfo::setTimeoutSeconds(F32 timeout) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); if(timeout > 0.0f) { mTimer.start(timeout); @@ -1204,7 +1184,6 @@ void LLPumpIO::LLChainInfo::setTimeoutSeconds(F32 timeout) void LLPumpIO::LLChainInfo::adjustTimeoutSeconds(F32 delta) { - LLMemType m1(LLMemType::MTYPE_IO_PUMP); if(mTimer.getStarted()) { F64 expiry = mTimer.expiresAt(); diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 429a93627..8893972c6 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -38,7 +38,6 @@ #include #include "aicurleasyrequeststatemachine.h" #include "llioutil.h" -#include "llmemtype.h" #include "llpumpio.h" #include "llsd.h" #include "llstring.h" diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 3f9c95dc8..8f60d2a7d 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -80,7 +80,6 @@ #include "v3math.h" #include "v4math.h" #include "lltransfertargetvfile.h" -#include "llmemtype.h" #include "llpacketring.h" class AIHTTPTimeoutPolicy; @@ -799,7 +798,6 @@ S32 LLMessageSystem::getReceiveBytes() const void LLMessageSystem::processAcks() { - LLMemType mt_pa(LLMemType::MTYPE_MESSAGE_PROCESS_ACKS); F64 mt_sec = getMessageTimeSeconds(); { gTransferManager.updateTransfers(); @@ -4031,7 +4029,6 @@ void LLMessageSystem::setTimeDecodesSpamThreshold( F32 seconds ) // TODO: babbage: move gServicePump in to LLMessageSystem? bool LLMessageSystem::checkAllMessages(S64 frame_count, LLPumpIO* http_pump) { - LLMemType mt_cam(LLMemType::MTYPE_MESSAGE_CHECK_ALL); if(checkMessages(frame_count)) { return true; diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 6aa771cfb..0234c9e59 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -44,8 +44,8 @@ set(llprimitive_HEADER_FILES llprimtexturelist.h lltextureanim.h lltextureentry.h - lltreeparams.h lltree_common.h + lltreeparams.h llvolumemessage.h llvolumexml.h material_codes.h diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 6d7720117..e038a7a52 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -27,7 +27,6 @@ #include "linden_common.h" #include "material_codes.h" -#include "llmemtype.h" #include "llerror.h" #include "message.h" #include "llprimitive.h" @@ -188,7 +187,6 @@ void LLPrimitive::clearTextureList() // static LLPrimitive *LLPrimitive::createPrimitive(LLPCode p_code) { - LLMemType m1(LLMemType::MTYPE_PRIMITIVE); LLPrimitive *retval = new LLPrimitive(); if (retval) @@ -206,7 +204,6 @@ LLPrimitive *LLPrimitive::createPrimitive(LLPCode p_code) //=============================================================== void LLPrimitive::init_primitive(LLPCode p_code) { - LLMemType m1(LLMemType::MTYPE_PRIMITIVE); clearTextureList(); mPrimitiveCode = p_code; } @@ -698,7 +695,6 @@ S32 face_index_from_id(LLFaceID face_ID, const std::vector& fac BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume) { - LLMemType m1(LLMemType::MTYPE_VOLUME); LLVolume *volumep; if (unique_volume) { diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index 36e04df7b..7ef87ed38 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -28,7 +28,6 @@ #include "llprimtexturelist.h" #include "lltextureentry.h" -#include "llmemtype.h" // static //int (TMyClass::*pt2Member)(float, char, char) = NULL; // C++ @@ -367,7 +366,6 @@ S32 LLPrimTextureList::size() const // sets the size of the mEntryList container void LLPrimTextureList::setSize(S32 new_size) { - LLMemType m1(LLMemType::MTYPE_PRIMITIVE); if (new_size < 0) { new_size = 0; diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index 22d9d54f1..38adb7dd0 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -25,17 +25,20 @@ include_directories( set(llrender_SOURCE_FILES llcubemap.cpp - llfont.cpp - llfontgl.cpp llfontbitmapcache.cpp + llfontfreetype.cpp + llfontgl.cpp llfontregistry.cpp + llgl.cpp llgldbg.cpp llglslshader.cpp llgltexture.cpp llimagegl.cpp llpostprocess.cpp + llrender.cpp llrender2dutils.cpp llrendersphere.cpp + llrendertarget.cpp llshadermgr.cpp lltexture.cpp lluiimage.cpp @@ -46,9 +49,9 @@ set(llrender_HEADER_FILES CMakeLists.txt llcubemap.h - llfontgl.h - llfont.h llfontbitmapcache.h + llfontfreetype.h + llfontgl.h llfontregistry.h llgl.h llgldbg.h @@ -73,29 +76,5 @@ set_source_files_properties(${llrender_HEADER_FILES} list(APPEND llrender_SOURCE_FILES ${llrender_HEADER_FILES}) -if (SERVER AND NOT WINDOWS AND NOT DARWIN) - copy_server_sources( - llgl - llrender - ) - - - set_source_files_properties( - ${server_SOURCE_FILES} - PROPERTIES - COMPILE_FLAGS "-DLL_MESA=1 -DLL_MESA_HEADLESS=1" - ) - add_library (llrenderheadless - ${llrender_SOURCE_FILES} - ${server_SOURCE_FILES} - ) - add_dependencies(llrenderheadless prepare) -else (SERVER AND NOT WINDOWS AND NOT DARWIN) - list(APPEND llrender_SOURCE_FILES - llgl.cpp - llrender.cpp - llrendertarget.cpp - ) -endif (SERVER AND NOT WINDOWS AND NOT DARWIN) add_library (llrender ${llrender_SOURCE_FILES}) add_dependencies(llrender prepare) diff --git a/indra/llrender/llfont.cpp b/indra/llrender/llfontfreetype.cpp similarity index 87% rename from indra/llrender/llfont.cpp rename to indra/llrender/llfontfreetype.cpp index fecdafe45..36515c48a 100644 --- a/indra/llrender/llfont.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -1,6 +1,6 @@ /** - * @file llfont.cpp - * @brief Font library wrapper + * @file llfontfreetype.cpp + * @brief Freetype font library wrapper * * $LicenseInfo:firstyear=2002&license=viewergpl$ * @@ -32,18 +32,10 @@ #include "linden_common.h" -#include "llfont.h" +#include "llfontfreetype.h" // Freetype stuff -#if !defined(LL_LINUX) || defined(LL_STANDALONE) -# include -#else -// I had to do some work to avoid the system-installed FreeType headers... --ryan. -//This path no longer exists. -//# include "llfreetype2/freetype/ft2build.h" -//This works fine. -# include "../include/ft2build.h" -#endif +#include // For some reason, this won't work if it's not wrapped in the ifdef #ifdef FT_FREETYPE_H @@ -65,12 +57,15 @@ LLFontManager *gFontManagerp = NULL; FT_Library gFTLibrary = NULL; -bool LLFont::sOpenGLcrashOnRestart = false; +bool LLFontFreetype::sOpenGLcrashOnRestart = false; //static void LLFontManager::initClass() { - gFontManagerp = new LLFontManager; + if (!gFontManagerp) + { + gFontManagerp = new LLFontManager; + } } //static @@ -92,7 +87,6 @@ LLFontManager::LLFontManager() } } - LLFontManager::~LLFontManager() { FT_Done_FreeType(gFTLibrary); @@ -101,14 +95,14 @@ LLFontManager::~LLFontManager() LLFontGlyphInfo::LLFontGlyphInfo(U32 index) : mGlyphIndex(index), - mXBitmapOffset(0), // Offset to the origin in the bitmap - mYBitmapOffset(0), // Offset to the origin in the bitmap - mXBearing(0), // Distance from baseline to left in pixels - mYBearing(0), // Distance from baseline to top in pixels mWidth(0), // In pixels mHeight(0), // In pixels mXAdvance(0.f), // In pixels mYAdvance(0.f), // In pixels + mXBitmapOffset(0), // Offset to the origin in the bitmap + mYBitmapOffset(0), // Offset to the origin in the bitmap + mXBearing(0), // Distance from baseline to left in pixels + mYBearing(0), // Distance from baseline to top in pixels mIsRendered(FALSE), mMetricsValid(FALSE) {} @@ -126,33 +120,29 @@ LLFontList::~LLFontList() // The (now dangling) pointers in the vector will be cleaned up when the vector is deleted by the superclass destructor. } } -void LLFontList::addAtEnd(LLFont *font) +void LLFontList::addAtEnd(LLFontFreetype *font) { // Purely a convenience function this->push_back(font); } -LLFont::LLFont() +LLFontFreetype::LLFontFreetype() +: mFontBitmapCachep(new LLFontBitmapCache), + mValid(FALSE), + mAscender(0.f), + mDescender(0.f), + mLineHeight(0.f), + mFallbackFontp(NULL), + mIsFallback(FALSE), + mFTFace(NULL), + mRenderGlyphCount(0), + mAddGlyphCount(0), + mPointSize(0) { - mFontBitmapCachep = new LLFontBitmapCache; - - mValid = FALSE; - mAscender = 0.f; - mDescender = 0.f; - mLineHeight = 0.f; - - mFallbackFontp = NULL; - mIsFallback = FALSE; - mFTFace = NULL; - - mRenderGlyphCount = 0; - mAddGlyphCount = 0; - - mPointSize = 0; } -LLFont::~LLFont() +LLFontFreetype::~LLFontFreetype() { // Clean up freetype libs. if (mFTFace) @@ -165,25 +155,7 @@ LLFont::~LLFont() // mFontBitmapCachep will be cleaned up by LLPointer destructor. } -// virtual -F32 LLFont::getLineHeight() const -{ - return mLineHeight; -} - -// virtual -F32 LLFont::getAscenderHeight() const -{ - return mAscender; -} - -// virtual -F32 LLFont::getDescenderHeight() const -{ - return mDescender; -} - -BOOL LLFont::loadFace(const std::string& filename, const F32 point_size, const F32 vert_dpi, const F32 horz_dpi, const S32 components, BOOL is_fallback) +BOOL LLFontFreetype::loadFace(const std::string& filename, const F32 point_size, const F32 vert_dpi, const F32 horz_dpi, const S32 components, BOOL is_fallback) { // Don't leak face objects. This is also needed to deal with // changed font file names. @@ -260,38 +232,115 @@ BOOL LLFont::loadFace(const std::string& filename, const F32 point_size, const F return TRUE; } -void LLFont::resetBitmapCache() +//virtual +F32 LLFontFreetype::getLineHeight() const { - // Iterate through glyphs and clear the mIsRendered flag - for (char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.begin(); - iter != mCharGlyphInfoMap.end(); ++iter) - { - iter->second->mIsRendered = FALSE; - //FIXME: this is only strictly necessary when resetting the entire font, - //not just flushing the bitmap - iter->second->mMetricsValid = FALSE; - } - mFontBitmapCachep->reset(); - - if (!mIsFallback || !sOpenGLcrashOnRestart) // because this often crashes under Linux... - { - // Add the empty glyph`5 - addGlyph(0, 0); - } + return mLineHeight; } -LLFontGlyphInfo* LLFont::getGlyphInfo(const llwchar wch) const +//virtual +F32 LLFontFreetype::getAscenderHeight() const { - char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch); - if (iter != mCharGlyphInfoMap.end()) - { - return iter->second; - } - return NULL; + return mAscender; } +//virtual +F32 LLFontFreetype::getDescenderHeight() const +{ + return mDescender; +} -BOOL LLFont::hasGlyph(const llwchar wch) const +F32 LLFontFreetype::getXAdvance(const llwchar wch) const +{ + if (mFTFace == NULL) + return 0.0; + + llassert(!mIsFallback); + U32 glyph_index; + + // Return existing info only if it is current + LLFontGlyphInfo* gi = getGlyphInfo(wch); + if (gi && gi->mMetricsValid) + { + return gi->mXAdvance; + } + + const LLFontFreetype* fontp = this; + + // Initialize char to glyph map + glyph_index = FT_Get_Char_Index(mFTFace, wch); + if (glyph_index == 0 && mFallbackFontp) + { + LLFontList::iterator iter; + for(iter = mFallbackFontp->begin(); (iter != mFallbackFontp->end()) && (glyph_index == 0); iter++) + { + glyph_index = FT_Get_Char_Index((*iter)->mFTFace, wch); + if(glyph_index) + { + fontp = *iter; + } + } + } + + if (glyph_index) + { + // This font has this glyph + fontp->renderGlyph(glyph_index); + + // Create the entry if it's not there + char_glyph_info_map_t::iterator iter2 = mCharGlyphInfoMap.find(wch); + if (iter2 == mCharGlyphInfoMap.end()) + { + gi = new LLFontGlyphInfo(glyph_index); + insertGlyphInfo(wch, gi); + } + else + { + gi = iter2->second; + } + + gi->mWidth = fontp->mFTFace->glyph->bitmap.width; + gi->mHeight = fontp->mFTFace->glyph->bitmap.rows; + + // Convert these from 26.6 units to float pixels. + gi->mXAdvance = fontp->mFTFace->glyph->advance.x / 64.f; + gi->mYAdvance = fontp->mFTFace->glyph->advance.y / 64.f; + gi->mMetricsValid = TRUE; + return gi->mXAdvance; + } + else + { + gi = get_if_there(mCharGlyphInfoMap, (llwchar)0, (LLFontGlyphInfo*)NULL); + if (gi) + { + return gi->mXAdvance; + } + } + + // Last ditch fallback - no glyphs defined at all. + return (F32)mFontBitmapCachep->getMaxCharWidth(); +} + +F32 LLFontFreetype::getXKerning(const llwchar char_left, const llwchar char_right) const +{ + if (mFTFace == NULL) + return 0.0; + + llassert(!mIsFallback); + LLFontGlyphInfo* left_glyph_info = get_if_there(mCharGlyphInfoMap, char_left, (LLFontGlyphInfo*)NULL); + U32 left_glyph = left_glyph_info ? left_glyph_info->mGlyphIndex : 0; + // Kern this puppy. + LLFontGlyphInfo* right_glyph_info = get_if_there(mCharGlyphInfoMap, char_right, (LLFontGlyphInfo*)NULL); + U32 right_glyph = right_glyph_info ? right_glyph_info->mGlyphIndex : 0; + + FT_Vector delta; + + llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta)); + + return delta.x*(1.f/64.f); +} + +BOOL LLFontFreetype::hasGlyph(const llwchar wch) const { llassert(!mIsFallback); const LLFontGlyphInfo* gi = getGlyphInfo(wch); @@ -305,7 +354,7 @@ BOOL LLFont::hasGlyph(const llwchar wch) const } } -BOOL LLFont::addChar(const llwchar wch) const +BOOL LLFontFreetype::addChar(const llwchar wch) const { if (mFTFace == NULL) return FALSE; @@ -345,21 +394,7 @@ BOOL LLFont::addChar(const llwchar wch) const return FALSE; } -void LLFont::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const -{ - char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch); - if (iter != mCharGlyphInfoMap.end()) - { - delete iter->second; - iter->second = gi; - } - else - { - mCharGlyphInfoMap[wch] = gi; - } -} - -BOOL LLFont::addGlyphFromFont(const LLFont *fontp, const llwchar wch, const U32 glyph_index) const +BOOL LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, const llwchar wch, const U32 glyph_index) const { if (mFTFace == NULL) return FALSE; @@ -460,120 +495,69 @@ BOOL LLFont::addGlyphFromFont(const LLFont *fontp, const llwchar wch, const U32 return TRUE; } -BOOL LLFont::addGlyph(const llwchar wch, const U32 glyph_index) const +LLFontGlyphInfo* LLFontFreetype::getGlyphInfo(const llwchar wch) const +{ + char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch); + if (iter != mCharGlyphInfoMap.end()) + { + return iter->second; + } + return NULL; +} + +void LLFontFreetype::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const +{ + char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch); + if (iter != mCharGlyphInfoMap.end()) + { + delete iter->second; + iter->second = gi; + } + else + { + mCharGlyphInfoMap[wch] = gi; + } +} + +BOOL LLFontFreetype::addGlyph(const llwchar wch, const U32 glyph_index) const { return addGlyphFromFont(this, wch, glyph_index); } - -F32 LLFont::getXAdvance(const llwchar wch) const -{ - if (mFTFace == NULL) - return 0.0; - - llassert(!mIsFallback); - U32 glyph_index; - - // Return existing info only if it is current - LLFontGlyphInfo* gi = getGlyphInfo(wch); - if (gi && gi->mMetricsValid) - { - return gi->mXAdvance; - } - - const LLFont* fontp = this; - - // Initialize char to glyph map - glyph_index = FT_Get_Char_Index(mFTFace, wch); - if (glyph_index == 0 && mFallbackFontp) - { - LLFontList::iterator iter; - for(iter = mFallbackFontp->begin(); (iter != mFallbackFontp->end()) && (glyph_index == 0); iter++) - { - glyph_index = FT_Get_Char_Index((*iter)->mFTFace, wch); - if(glyph_index) - { - fontp = *iter; - } - } - } - - if (glyph_index) - { - // This font has this glyph - fontp->renderGlyph(glyph_index); - - // Create the entry if it's not there - char_glyph_info_map_t::iterator iter2 = mCharGlyphInfoMap.find(wch); - if (iter2 == mCharGlyphInfoMap.end()) - { - gi = new LLFontGlyphInfo(glyph_index); - insertGlyphInfo(wch, gi); - } - else - { - gi = iter2->second; - } - - gi->mWidth = fontp->mFTFace->glyph->bitmap.width; - gi->mHeight = fontp->mFTFace->glyph->bitmap.rows; - - // Convert these from 26.6 units to float pixels. - gi->mXAdvance = fontp->mFTFace->glyph->advance.x / 64.f; - gi->mYAdvance = fontp->mFTFace->glyph->advance.y / 64.f; - gi->mMetricsValid = TRUE; - return gi->mXAdvance; - } - else - { - gi = get_if_there(mCharGlyphInfoMap, (llwchar)0, (LLFontGlyphInfo*)NULL); - if (gi) - { - return gi->mXAdvance; - } - } - - // Last ditch fallback - no glyphs defined at all. - return (F32)mFontBitmapCachep->getMaxCharWidth(); -} - - -void LLFont::renderGlyph(const U32 glyph_index) const +void LLFontFreetype::renderGlyph(const U32 glyph_index) const { if (mFTFace == NULL) return; - int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT ); - llassert(!error); + llassert_always(! FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT)); - error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode); + llassert_always(! FT_Render_Glyph(mFTFace->glyph, gFontRenderMode) ); mRenderGlyphCount++; - - llassert(!error); } - -F32 LLFont::getXKerning(const llwchar char_left, const llwchar char_right) const +void LLFontFreetype::resetBitmapCache() { - if (mFTFace == NULL) - return 0.0; + // Iterate through glyphs and clear the mIsRendered flag + for (char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.begin(); + iter != mCharGlyphInfoMap.end(); ++iter) + { + iter->second->mIsRendered = FALSE; + //FIXME: this is only strictly necessary when resetting the entire font, + //not just flushing the bitmap + iter->second->mMetricsValid = FALSE; + } + mFontBitmapCachep->reset(); - llassert(!mIsFallback); - LLFontGlyphInfo* left_glyph_info = get_if_there(mCharGlyphInfoMap, char_left, (LLFontGlyphInfo*)NULL); - U32 left_glyph = left_glyph_info ? left_glyph_info->mGlyphIndex : 0; - // Kern this puppy. - LLFontGlyphInfo* right_glyph_info = get_if_there(mCharGlyphInfoMap, char_right, (LLFontGlyphInfo*)NULL); - U32 right_glyph = right_glyph_info ? right_glyph_info->mGlyphIndex : 0; - - FT_Vector delta; - - llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta)); - - return delta.x*(1.f/64.f); + if (!mIsFallback || !sOpenGLcrashOnRestart) // because this often crashes under Linux... + { + // Add the empty glyph`5 + addGlyph(0, 0); + } } -void LLFont::setSubImageLuminanceAlpha(const U32 x, + +void LLFontFreetype::setSubImageLuminanceAlpha(const U32 x, const U32 y, const U32 bitmap_num, const U32 width, diff --git a/indra/llrender/llfont.h b/indra/llrender/llfontfreetype.h similarity index 92% rename from indra/llrender/llfont.h rename to indra/llrender/llfontfreetype.h index 68bfad641..ea92a64b2 100644 --- a/indra/llrender/llfont.h +++ b/indra/llrender/llfontfreetype.h @@ -30,11 +30,10 @@ * $/LicenseInfo$ */ -#ifndef LL_LLFONT_H -#define LL_LLFONT_H +#ifndef LL_LLFONTFREETYPE_H +#define LL_LLFONTFREETYPE_H #include -//#include "lllocalidhashmap.h" #include "llmemory.h" #include "llstl.h" @@ -43,7 +42,7 @@ class LLImageRaw; class LLFontManager; -class LLFont; +class LLFontFreetype; // Hack. FT_Face is just a typedef for a pointer to a struct, // but there's no simple forward declarations file for FreeType, @@ -59,7 +58,7 @@ class LLFontManager public: static void initClass(); static void cleanupClass(); - + public: LLFontManager(); virtual ~LLFontManager(); @@ -88,19 +87,19 @@ public: }; // Used for lists of fallback fonts -class LLFontList : public std::vector +class LLFontList : public std::vector { public: LLFontList(); ~LLFontList(); - void addAtEnd(LLFont *font); + void addAtEnd(LLFontFreetype *font); }; -class LLFont +class LLFontFreetype { public: - LLFont(); - virtual ~LLFont(); + LLFontFreetype(); + ~LLFontFreetype(); // is_fallback should be true for fallback fonts that aren't used // to render directly (Unicode backup, primarily) @@ -157,7 +156,7 @@ protected: virtual BOOL hasGlyph(const llwchar wch) const; // Has a glyph for this character virtual BOOL addChar(const llwchar wch) const; // Add a new character to the font if necessary virtual BOOL addGlyph(const llwchar wch, const U32 glyph_index) const; // Add a new glyph to the existing font - virtual BOOL addGlyphFromFont(const LLFont *fontp, const llwchar wch, const U32 glyph_index) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found) + virtual BOOL addGlyphFromFont(const LLFontFreetype *fontp, const llwchar wch, const U32 glyph_index) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found) virtual LLFontGlyphInfo* getGlyphInfo(const llwchar wch) const; @@ -195,4 +194,4 @@ protected: mutable S32 mAddGlyphCount; }; -#endif // LL_FONT_ +#endif // LL_FONTFREETYPE_H diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 1e88768e9..14b9d0685 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -26,10 +26,12 @@ #include "linden_common.h" -#include -#include "llfont.h" + #include "llfontgl.h" + +// Linden library includes +#include "llfontfreetype.h" #include "llfontbitmapcache.h" #include "llfontregistry.h" #include "llgl.h" @@ -38,6 +40,9 @@ #include "llstl.h" #include "llfasttimer.h" +// Third party library includes +#include + const S32 BOLD_OFFSET = 1; // static class members @@ -79,7 +84,7 @@ F32 llfont_round_y(F32 y) } LLFontGL::LLFontGL() - : LLFont() + : LLFontFreetype() { clearEmbeddedChars(); } @@ -128,7 +133,7 @@ void LLFontGL::destroyGL() BOOL LLFontGL::loadFace(const std::string& filename, const F32 point_size, const F32 vert_dpi, const F32 horz_dpi, const S32 components, BOOL is_fallback) { - if (!LLFont::loadFace(filename, point_size, vert_dpi, horz_dpi, components, is_fallback)) + if (!LLFontFreetype::loadFace(filename, point_size, vert_dpi, horz_dpi, components, is_fallback)) { return FALSE; } @@ -138,7 +143,7 @@ BOOL LLFontGL::loadFace(const std::string& filename, const F32 point_size, const BOOL LLFontGL::addChar(const llwchar wch) const { - if (!LLFont::addChar(wch)) + if (!LLFontFreetype::addChar(wch)) { return FALSE; } @@ -288,7 +293,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons F32 inv_width = 1.f / mFontBitmapCachep->getBitmapWidth(); F32 inv_height = 1.f / mFontBitmapCachep->getBitmapHeight(); - const S32 LAST_CHARACTER = LLFont::LAST_CHAR_FULL; + const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL; BOOL draw_ellipses = FALSE; @@ -546,7 +551,7 @@ F32 LLFontGL::getWidthF32(const std::string& utf8text, const S32 begin_offset, c F32 LLFontGL::getWidthF32(const llwchar* wchars, const S32 begin_offset, const S32 max_chars, BOOL use_embedded) const { - const S32 LAST_CHARACTER = LLFont::LAST_CHAR_FULL; + const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL; F32 cur_x = 0; const S32 max_index = begin_offset + max_chars; @@ -981,7 +986,7 @@ void LLFontGL::destroyAllGL() { if (sFontRegistry) { - if (LLFont::sOpenGLcrashOnRestart) + if (LLFontFreetype::sOpenGLcrashOnRestart) { // This will leak memory but will prevent a crash... sFontRegistry = NULL; diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index abf1009ea..9476382eb 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -28,7 +28,7 @@ #ifndef LL_LLFONTGL_H #define LL_LLFONTGL_H -#include "llfont.h" +#include "llfontfreetype.h" #include "lltexture.h" #include "v2math.h" #include "llcoord.h" @@ -44,7 +44,7 @@ class LLFontDescriptor; // Structure used to store previously requested fonts. class LLFontRegistry; -class LLFontGL : public LLFont +class LLFontGL : public LLFontFreetype { public: enum HAlign @@ -66,12 +66,11 @@ public: enum StyleFlags { - // text style to render. May be combined (these are bit flags) // text style to render. May be combined (these are bit flags) NORMAL = 0x00, BOLD = 0x01, ITALIC = 0x02, - UNDERLINE = 0x04, + UNDERLINE = 0x04 }; enum ShadowType diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 3391862f6..fcfbc4c84 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -27,6 +27,7 @@ #include "linden_common.h" #include "llgl.h" +#include "llfontfreetype.h" #include "llfontgl.h" #include "llfontregistry.h" #include @@ -188,21 +189,20 @@ bool LLFontRegistry::parseFontInfo(const std::string& xml_filename) path_it != xml_paths.end(); ++path_it) { - LLXMLNodePtr root; std::string full_filename = gDirUtilp->findSkinnedFilename(*path_it, xml_filename); bool parsed_file = LLXMLNode::parseFile(full_filename, root, NULL); if (!parsed_file) continue; - + if ( root.isNull() || ! root->hasName( "fonts" ) ) { llwarns << "Bad font info file: " << full_filename << llendl; continue; } - + std::string root_name; root->getAttributeString("name",root_name); if (root->hasName("fonts")) @@ -214,7 +214,7 @@ bool LLFontRegistry::parseFontInfo(const std::string& xml_filename) } if (success) dump(); - + return success; } diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 7dba1e0b4..dcde319d2 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -44,7 +44,6 @@ #include "llmath.h" #include "m4math.h" #include "llstring.h" -#include "llmemtype.h" #include "llstacktrace.h" #include "llglheaders.h" @@ -603,11 +602,12 @@ bool LLGLManager::initGL() if (mGLVendor.substr(0,4) == "ATI ") { mGLVendorShort = "ATI"; - BOOL mobile = FALSE; - if (mGLRenderer.find("MOBILITY") != std::string::npos) - { - mobile = TRUE; - } + // "mobile" appears to be unused, and this code was causing warnings. + //BOOL mobile = FALSE; + //if (mGLRenderer.find("MOBILITY") != std::string::npos) + //{ + // mobile = TRUE; + //} mIsATI = TRUE; #if LL_WINDOWS && !LL_MESA_HEADLESS @@ -1444,8 +1444,7 @@ void assert_glerror() void clear_glerror() { // Create or update texture to be used with this data - GLenum error; - error = glGetError(); + glGetError(); } /////////////////////////////////////////////////////////////// @@ -2266,7 +2265,6 @@ void LLGLNamePool::release(GLuint name) //static void LLGLNamePool::upkeepPools() { - LLMemType mt(LLMemType::MTYPE_UPKEEP_POOLS); for (tracker_t::instance_iter iter = beginInstances(); iter != endInstances(); ++iter) { LLGLNamePool & pool = *iter; diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index f45892a5a..bdc31c9e4 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -65,9 +65,9 @@ bool LLImageGL::sCompressTextures = false; std::set LLImageGL::sImageList; -// **************************************************************************************************** +//**************************************************************************************************** //The below for texture auditing use only -// **************************************************************************************************** +//**************************************************************************************************** //----------------------- //debug use BOOL gAuditTexture = FALSE ; @@ -816,8 +816,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) S32 w = width, h = height; const U8* prev_mip_data = 0; const U8* cur_mip_data = 0; - S32 prev_mip_size = 0; +#ifdef SHOW_ASSERT S32 cur_mip_size = 0; +#endif mMipLevels = nummips; @@ -826,18 +827,24 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) if (m==0) { cur_mip_data = data_in; +#ifdef SHOW_ASSERT cur_mip_size = width * height * mComponents; +#endif } else { S32 bytes = w * h * mComponents; +#ifdef SHOW_ASSERT llassert(prev_mip_data); - llassert(prev_mip_size == bytes*4); + llassert(cur_mip_size == bytes*4); +#endif U8* new_data = new U8[bytes]; llassert_always(new_data); LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents); cur_mip_data = new_data; +#ifdef SHOW_ASSERT cur_mip_size = bytes; +#endif } llassert(w > 0 && h > 0 && cur_mip_data); { @@ -870,7 +877,6 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) delete[] prev_mip_data; } prev_mip_data = cur_mip_data; - prev_mip_size = cur_mip_size; w >>= 1; h >>= 1; } diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index d10a9c6bb..502d8a53c 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -31,7 +31,6 @@ #include "llvertexbuffer.h" // #include "llrender.h" #include "llglheaders.h" -#include "llmemtype.h" #include "llrender.h" #include "llvector4a.h" #include "llshadermgr.h" @@ -325,7 +324,6 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask) { if (sLastMask != data_mask) { - bool error = false; if (gGLManager.mGLSLVersionMajor < 2 && gGLManager.mGLSLVersionMinor < 30) { @@ -392,7 +390,6 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask) { if (gDebugSession) { - error = true; gFailLog << "Bad client state! " << array[i] << " disabled." << std::endl; } else @@ -412,7 +409,6 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask) { //needs to be disabled, make sure it was (DEBUG TEMPORARY) if (gDebugSession) { - error = true; gFailLog << "Bad client state! " << array[i] << " enabled." << std::endl; } else @@ -779,7 +775,6 @@ void LLVertexBuffer::unbind() //static void LLVertexBuffer::cleanupClass() { - LLMemType mt2(LLMemType::MTYPE_VERTEX_CLEANUP_CLASS); unbind(); sStreamIBOPool.cleanup(); @@ -860,8 +855,6 @@ LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) : mMappable(false), mFence(NULL) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_CONSTRUCTOR); - mMappable = (mUsage == GL_DYNAMIC_DRAW_ARB && !sDisableVBOMapping); //zero out offsets @@ -921,7 +914,6 @@ S32 LLVertexBuffer::getSize() const //virtual LLVertexBuffer::~LLVertexBuffer() { - LLMemType mt2(LLMemType::MTYPE_VERTEX_DESTRUCTOR); destroyGLBuffer(); destroyGLIndices(); @@ -1041,8 +1033,6 @@ void LLVertexBuffer::releaseIndices() void LLVertexBuffer::createGLBuffer(U32 size) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_CREATE_VERTICES); - if (mGLBuffer) { destroyGLBuffer(); @@ -1072,8 +1062,6 @@ void LLVertexBuffer::createGLBuffer(U32 size) void LLVertexBuffer::createGLIndices(U32 size) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_CREATE_INDICES); - if (mGLIndices) { destroyGLIndices(); @@ -1108,7 +1096,6 @@ void LLVertexBuffer::createGLIndices(U32 size) void LLVertexBuffer::destroyGLBuffer() { - LLMemType mt2(LLMemType::MTYPE_VERTEX_DESTROY_BUFFER); if (mGLBuffer) { if (mMappedDataUsingVBOs) @@ -1129,7 +1116,6 @@ void LLVertexBuffer::destroyGLBuffer() void LLVertexBuffer::destroyGLIndices() { - LLMemType mt2(LLMemType::MTYPE_VERTEX_DESTROY_INDICES); if (mGLIndices) { if (mMappedIndexDataUsingVBOs) @@ -1150,8 +1136,6 @@ void LLVertexBuffer::destroyGLIndices() void LLVertexBuffer::updateNumVerts(S32 nverts) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_UPDATE_VERTS); - llassert(nverts >= 0); if (nverts > 65536) @@ -1174,8 +1158,6 @@ void LLVertexBuffer::updateNumVerts(S32 nverts) void LLVertexBuffer::updateNumIndices(S32 nindices) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_UPDATE_INDICES); - llassert(nindices >= 0); U32 needed_size = sizeof(U16) * (U32)nindices; @@ -1192,8 +1174,6 @@ void LLVertexBuffer::updateNumIndices(S32 nindices) void LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_ALLOCATE_BUFFER); - stop_glerror(); if (nverts < 0 || nindices < 0 || @@ -1344,8 +1324,6 @@ void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices) llassert(newnverts >= 0); llassert(newnindices >= 0); - LLMemType mt2(LLMemType::MTYPE_VERTEX_RESIZE_BUFFER); - updateNumVerts(newnverts); updateNumIndices(newnindices); @@ -1393,7 +1371,6 @@ static LLFastTimer::DeclareTimer FTM_VBO_MAP_BUFFER("VBO Map"); volatile U8* LLVertexBuffer::mapVertexBuffer(S32 type, S32 index, S32 count, bool map_range) { bindGLBuffer(true); - LLMemType mt2(LLMemType::MTYPE_VERTEX_MAP_BUFFER); if (mFinal) { llerrs << "LLVertexBuffer::mapVeretxBuffer() called on a finalized buffer." << llendl; @@ -1442,7 +1419,6 @@ volatile U8* LLVertexBuffer::mapVertexBuffer(S32 type, S32 index, S32 count, boo if (!mVertexLocked) { - LLMemType mt_v(LLMemType::MTYPE_VERTEX_MAP_BUFFER_VERTICES); mVertexLocked = true; sMappedCount++; stop_glerror(); @@ -1573,7 +1549,6 @@ static LLFastTimer::DeclareTimer FTM_VBO_MAP_INDEX("IBO Map"); volatile U8* LLVertexBuffer::mapIndexBuffer(S32 index, S32 count, bool map_range) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_MAP_BUFFER); bindGLIndices(true); if (mFinal) { @@ -1620,8 +1595,6 @@ volatile U8* LLVertexBuffer::mapIndexBuffer(S32 index, S32 count, bool map_range if (!mIndexLocked) { - LLMemType mt_v(LLMemType::MTYPE_VERTEX_MAP_BUFFER_INDICES); - mIndexLocked = true; sMappedCount++; stop_glerror(); @@ -1744,7 +1717,6 @@ static LLFastTimer::DeclareTimer FTM_IBO_FLUSH_RANGE("Flush IBO Range"); void LLVertexBuffer::unmapBuffer() { - LLMemType mt2(LLMemType::MTYPE_VERTEX_UNMAP_BUFFER); if (!useVBOs()) { return; //nothing to unmap @@ -2098,7 +2070,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask) { flush(); - LLMemType mt2(LLMemType::MTYPE_VERTEX_SET_BUFFER); //set up pointers if the data mask is different ... bool setup = (sLastMask != data_mask); @@ -2144,7 +2115,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask) setup = setup || bindBuffer || bindIndices; } - bool error = false; if (gDebugGL && !mGLArray) { GLint buff; @@ -2153,7 +2123,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask) { if (gDebugSession) { - error = true; gFailLog << "Invalid GL vertex buffer bound: " << buff << std::endl; } else @@ -2169,7 +2138,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask) { if (gDebugSession) { - error = true; gFailLog << "Invalid GL index buffer bound: " << buff << std::endl; } else @@ -2240,7 +2208,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask) // virtual (default) void LLVertexBuffer::setupVertexBuffer(U32 data_mask) { - LLMemType mt2(LLMemType::MTYPE_VERTEX_SETUP_VERTEX_BUFFER); stop_glerror(); volatile U8* base = useVBOs() ? (U8*) mAlignedOffset : mMappedData; diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index e35d5b5dd..a13c0c3ca 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -30,7 +30,6 @@ set(llui_SOURCE_FILES llclipboard.cpp llcombobox.cpp llctrlselectioninterface.cpp - lldelayeduidelete.cpp lldraghandle.cpp lleditmenuhandler.cpp llfloater.cpp @@ -73,9 +72,9 @@ set(llui_SOURCE_FILES lluictrlfactory.cpp lluistring.cpp llundo.cpp + llview.cpp llviewborder.cpp llviewmodel.cpp - llview.cpp llviewquery.cpp ) @@ -90,7 +89,6 @@ set(llui_HEADER_FILES llclipboard.h llcombobox.h llctrlselectioninterface.h - lldelayeduidelete.h lldraghandle.h lleditmenuhandler.h llfloater.h @@ -105,8 +103,8 @@ set(llui_HEADER_FILES llmenugl.h llmodaldialog.h llmultifloater.h - llmultisliderctrl.h llmultislider.h + llmultisliderctrl.h llnotificationptr.h llnotifications.h llnotificationsutil.h @@ -122,8 +120,8 @@ set(llui_HEADER_FILES llscrollcontainer.h llscrollingpanellist.h llscrolllistctrl.h - llsliderctrl.h llslider.h + llsliderctrl.h llspinctrl.h llstyle.h lltabcontainer.h @@ -131,18 +129,18 @@ set(llui_HEADER_FILES lltexteditor.h lltextparser.h lltrans.h - lluiconstants.h - lluictrlfactory.h - lluictrl.h - lluifwd.h llui.h lluicolor.h + lluiconstants.h + lluictrl.h + lluictrlfactory.h + lluifwd.h lluistring.h lluixmltags.h llundo.h + llview.h llviewborder.h llviewmodel.h - llview.h llviewquery.h ) diff --git a/indra/llui/lldelayeduidelete.cpp b/indra/llui/lldelayeduidelete.cpp deleted file mode 100644 index 4f679c486..000000000 --- a/indra/llui/lldelayeduidelete.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// -#include "linden_common.h" -#include "lldelayeduidelete.h" -#define DELETE_DELAY 0.1f -#define DELETES_PER_DELAY 512 - -LLDeleteScheduler* gDeleteScheduler; - -std::list LLDeleteScheduler::sJobs; -LLDeleteScheduler::LLDeleteScheduler() : LLEventTimer(DELETE_DELAY) -{ -} -void LLDeleteScheduler::addViewDeleteJob(std::list views) -{ - if(!views.empty()) - { - LLViewDeleteJob* job = new LLViewDeleteJob(views); - sJobs.push_back(job); - } -} -BOOL LLDeleteScheduler::tick() // IMPORTANT: never return TRUE -{ - if(!sJobs.empty()) - { - U32 completed = 0; - do - { - LLDeleteJob* job = sJobs.front(); - if(job->work(completed)) - { - delete job; - sJobs.pop_front(); - } - } while((completed < DELETES_PER_DELAY) && !sJobs.empty()); - } - return FALSE; // EVER -} -BOOL LLDeleteJob::work(U32& completed) -{ - llwarns << "THIS IS SPOSED TO BE OVERRIDDEN" << llendl; - return TRUE; -} -LLViewDeleteJob::LLViewDeleteJob(std::list views) -: mList(views) -{ -} -LLViewDeleteJob::~LLViewDeleteJob() -{ -} -BOOL LLViewDeleteJob::work(U32& completed) -{ - do - { - if(!mList.empty()) - { - LLView* view = mList.front(); - delete view; - mList.pop_front(); - } - else - { - return TRUE; // job done - } - } while(++completed < DELETES_PER_DELAY); - return FALSE; -} -// diff --git a/indra/llui/lldelayeduidelete.h b/indra/llui/lldelayeduidelete.h deleted file mode 100644 index 131e43424..000000000 --- a/indra/llui/lldelayeduidelete.h +++ /dev/null @@ -1,32 +0,0 @@ -// -#ifndef LL_LLDELAYEDUIDELETE_H -#define LL_LLDELAYEDUIDELETE_H -#include "lleventtimer.h" -#include "llview.h" -class LLDeleteJob -{ -public: - virtual BOOL work(U32& completed); - virtual ~LLDeleteJob() {} -}; -class LLViewDeleteJob : public LLDeleteJob -{ -public: - LLViewDeleteJob(std::list views); - virtual ~LLViewDeleteJob(); - virtual BOOL work(U32& completed); -private: - std::list mList; -}; -class LLDeleteScheduler : public LLEventTimer -{ -public: - LLDeleteScheduler(); - void addViewDeleteJob(std::list views); - BOOL tick(); -private: - static std::list sJobs; -}; -extern LLDeleteScheduler* gDeleteScheduler; -#endif -// diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index b91b0df43..fde30fa6b 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -277,30 +277,14 @@ void LLFloater::initFloater(const std::string& title, mMinimized = FALSE; mExpandedRect.set(0,0,0,0); - S32 close_pad; // space to the right of close box S32 close_box_size; // For layout purposes, how big is the close box? if (close_btn) { close_box_size = LLFLOATER_CLOSE_BOX_SIZE; - close_pad = 0; } else { close_box_size = 0; - close_pad = 0; - } - - S32 minimize_box_size; - S32 minimize_pad; - if (minimizable && !drag_on_left) - { - minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE; - minimize_pad = 0; - } - else - { - minimize_box_size = 0; - minimize_pad = 0; } // Drag Handle diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 588a36a0f..8a22df234 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -1065,7 +1065,6 @@ struct LLLayoutStack::LLEmbeddedPanel mVisibleAmt(1.f) // default to fully visible { LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM; - LLRect resize_bar_rect = panelp->getRect(); S32 min_dim; if (orientation == HORIZONTAL) diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp index 593f7207c..9dbdb8a8e 100644 --- a/indra/llui/llprogressbar.cpp +++ b/indra/llui/llprogressbar.cpp @@ -83,9 +83,6 @@ void LLProgressBar::draw() bar_bg_imagep->draw(getLocalRect(), background_color); - F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32())); - LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor"); - bar_color.mV[3] = alpha; LLRect progress_rect = getLocalRect(); progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f)); bar_fg_imagep->draw(progress_rect); diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index 0cf96ff0d..04e4b8cf2 100644 --- a/indra/llui/llslider.cpp +++ b/indra/llui/llslider.cpp @@ -261,7 +261,6 @@ void LLSlider::draw() F32 opacity = getEnabled() ? 1.f : 0.3f; LLColor4 center_color = (mThumbCenterColor % opacity); - LLColor4 track_color = (mTrackColor % opacity); // Track LLRect track_rect(mThumbImage->getWidth() / 2, diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index 613d2e426..72c991c63 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -35,7 +35,7 @@ #include "v4color.h" #include "llresmgr.h" -#include "llfont.h" +#include "llfontfreetype.h" #include "llui.h" #include "lluiimage.h" diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 3be654b4a..59fbd367b 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2228,7 +2228,7 @@ void LLTextEditor::pasteHelper(bool is_primary) for( S32 i = 0; i < len; i++ ) { llwchar wc = clean_string[i]; - if( (wc < LLFont::FIRST_CHAR) && (wc != LF) ) + if( (wc < LLFontFreetype::FIRST_CHAR) && (wc != LF) ) { clean_string[i] = LL_UNKNOWN_CHAR; } diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 570f668e8..3123092f9 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -348,8 +348,10 @@ public: // even if their constructors have side effects void reference() { +#if LL_WINDOWS S32 dummy; dummy = 0; +#endif /*LL_WINDOWS*/ } }; diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 6c1bce689..e3edbcc6f 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -59,10 +59,6 @@ #include "lltextbox.h" #include "llfasttimer.h" -// -#include "lldelayeduidelete.h" -// - using namespace LLOldEvents; //HACK: this allows you to instantiate LLView from xml with "" which we don't want @@ -1420,7 +1416,7 @@ void LLView::updateBoundingRect() { if (isDead()) return; - LLRect cur_rect = mBoundingRect; + //LLRect cur_rect = mBoundingRect; if (getUseBoundingRect()) { diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt index 8dabf5b91..ca491529b 100644 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt @@ -41,12 +41,12 @@ if (LINUX) LIST(APPEND llvfs_SOURCE_FILES lldir_linux.cpp) LIST(APPEND llvfs_HEADER_FILES lldir_linux.h) - if (VIEWER AND INSTALL) + if (INSTALL) set_source_files_properties(lldir_linux.cpp PROPERTIES COMPILE_FLAGS "-DAPP_RO_DATA_DIR=\\\"${APP_SHARE_DIR}\\\"" ) - endif (VIEWER AND INSTALL) + endif (INSTALL) endif (LINUX) if (WINDOWS) diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 12c778cd8..c7d9509e1 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -18,6 +18,7 @@ include(LLMath) include(LLRender) include(LLVFS) include(LLWindow) +include(LLXML) include(UI) include_directories( @@ -27,13 +28,16 @@ include_directories( ${LLRENDER_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} ${LLWINDOW_INCLUDE_DIRS} + ${LLXML_INCLUDE_DIRS} + ${DIRECTX_INCLUDE_DIR} ) set(llwindow_SOURCE_FILES llkeyboard.cpp llkeyboardheadless.cpp - llwindowheadless.cpp + llwindow.cpp llwindowcallbacks.cpp + llwindowheadless.cpp ) set(llwindow_HEADER_FILES @@ -41,30 +45,47 @@ set(llwindow_HEADER_FILES llkeyboard.h llkeyboardheadless.h - llwindowheadless.h llwindowcallbacks.h + llwindowheadless.h ) set(viewer_SOURCE_FILES - llwindow.cpp llmousehandler.cpp ) set(viewer_HEADER_FILES - llwindow.h - llpreeditor.h llmousehandler.h + llpreeditor.h + llwindow.h ) # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level -if (LINUX AND VIEWER) +if (LINUX) set(llwindow_LINK_LIBRARIES + ${LLCOMMON_LIBRARIES} + ${LLIMAGE_LIBRARIES} + ${LLMATH_LIBRARIES} + ${LLRENDER_LIBRARIES} + ${LLVFS_LIBRARIES} + ${LLWINDOW_LIBRARIES} + ${LLXML_LIBRARIES} ${UI_LIBRARIES} # for GTK ${SDL_LIBRARY} fontconfig # For FCInit and other FC* functions. ) -endif (LINUX AND VIEWER) + + list(APPEND viewer_SOURCE_FILES + llkeyboardsdl.cpp + llwindowsdl.cpp + ) + list(APPEND viewer_HEADER_FILES + llkeyboardsdl.h + llwindowsdl.h + ) + + +endif (LINUX) if (DARWIN) list(APPEND llwindow_SOURCE_FILES @@ -87,29 +108,19 @@ if (DARWIN) ) endif (DARWIN) -if (LINUX AND VIEWER) - list(APPEND viewer_SOURCE_FILES - llkeyboardsdl.cpp - llwindowsdl.cpp - ) - list(APPEND viewer_HEADER_FILES - llkeyboardsdl.h - llwindowsdl.h - ) -endif (LINUX AND VIEWER) if (WINDOWS) list(APPEND llwindow_SOURCE_FILES - llwindowwin32.cpp + lldragdropwin32.cpp lldxhardware.cpp llkeyboardwin32.cpp - lldragdropwin32.cpp + llwindowwin32.cpp ) list(APPEND llwindow_HEADER_FILES - llwindowwin32.h + lldragdropwin32.h lldxhardware.h llkeyboardwin32.h - lldragdropwin32.h + llwindowwin32.h ) list(APPEND llwindow_LINK_LIBRARIES comdlg32 # Common Dialogs for ChooseColor @@ -129,41 +140,16 @@ endif (SOLARIS) set_source_files_properties(${llwindow_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) -if (SERVER AND NOT WINDOWS AND NOT DARWIN) - set(server_SOURCE_FILES - llwindowmesaheadless.cpp - ) - set(server_HEADER_FILES - llwindowmesaheadless.h - ) - copy_server_sources( - llwindow - ) - - - set_source_files_properties( - ${server_SOURCE_FILES} - PROPERTIES - COMPILE_FLAGS "-DLL_MESA=1 -DLL_MESA_HEADLESS=1" - ) - add_library (llwindowheadless - ${llwindow_SOURCE_FILES} - ${server_SOURCE_FILES} - ) - target_link_libraries (llwindowheadless ${llwindow_LINK_LIBRARIES}) -endif (SERVER AND NOT WINDOWS AND NOT DARWIN) - if (llwindow_HEADER_FILES) list(APPEND llwindow_SOURCE_FILES ${llwindow_HEADER_FILES}) endif (llwindow_HEADER_FILES) list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) -if (VIEWER) - add_library (llwindow +add_library (llwindow ${llwindow_SOURCE_FILES} ${viewer_SOURCE_FILES} ) - add_dependencies(llwindow prepare) - target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) -endif (VIEWER) +add_dependencies(llwindow prepare) +target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) + diff --git a/indra/llwindow/GL/glh_extensions.h b/indra/llwindow/GL/glh_extensions.h index b936b5d30..554cb1731 100644 --- a/indra/llwindow/GL/glh_extensions.h +++ b/indra/llwindow/GL/glh_extensions.h @@ -1,5 +1,7 @@ /* * glh_extensions.h + * $LicenseInfo:firstyear=2006&license=mit$ (mit used here to satisfy validity checker) + * Copyright (C) 2006, NVIDIA * From nVidia Corporation, downloaded 2006-12-18 from: * http://developer.nvidia.com/attach/8196 * ("NVParse Library with Source (.zip) (2390 KB)") @@ -8,6 +10,8 @@ * "The files bison.exe, bison.simple, and flex.exe are covered by * the GPL. All other files in this distribution can be used however * you want." + * $/LicenseInfo$ + */ #ifndef GLH_EXTENSIONS @@ -109,7 +113,7 @@ static const char* EatNonWhiteSpace(const char *str) int glh_init_extensions(const char *origReqExts) { // Length of requested extensions string - unsigned reqExtsLen; + //unsigned reqExtsLen; char *reqExts; // Ptr for individual extensions within reqExts char *reqExt; @@ -151,8 +155,8 @@ int glh_init_extensions(const char *origReqExts) return TRUE; } reqExts = strdup(origReqExts); - reqExtsLen = (S32)strlen(reqExts); /* + reqExtsLen = (S32)strlen(reqExts); if (NULL == gGLHExts.mUnsupportedExts) { gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index f69400191..80a272789 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -1619,24 +1619,24 @@ void check_vm_bloat() const long long significant_vm_difference = 250 * 1024*1024; const long long significant_rss_difference = 50 * 1024*1024; - ssize_t res; size_t dummy; char *ptr; - for (int i=0; i<22; ++i) // parse past the values we don't want + size_t delim_result = 0; + for (int i=0; i<22 && delim_result > -1; ++i) // parse past the values we don't want { ptr = NULL; - res = getdelim(&ptr, &dummy, ' ', fp); + delim_result = getdelim(&ptr, &dummy, ' ', fp); free(ptr); } // 23rd space-delimited entry is vsize ptr = NULL; - res = getdelim(&ptr, &dummy, ' ', fp); + delim_result = getdelim(&ptr, &dummy, ' ', fp); llassert(ptr); long long this_vm_size = atoll(ptr); free(ptr); // 24th space-delimited entry is RSS ptr = NULL; - res = getdelim(&ptr, &dummy, ' ', fp); + delim_result = getdelim(&ptr, &dummy, ' ', fp); llassert(ptr); long long this_rss_size = getpagesize() * atoll(ptr); free(ptr); diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 12b32129c..7bb3a8950 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -42,10 +42,8 @@ include(GooglePerfTools) include(StateMachine) include(TemplateCheck) include(UI) -include(LLKDU) include(ViewerMiscLibs) include(GLOD) -include(ViewerArtwork.cmake) include(LLAppearance) if (WINDOWS) @@ -58,7 +56,7 @@ include_directories( ${DBUSGLIB_INCLUDE_DIRS} ${HUNSPELL_INCLUDE_DIR} ${ELFIO_INCLUDE_DIR} - ${JSONCPP_INCLUDE_DIRS} + ${JSONCPP_INCLUDE_DIR} ${GLOD_INCLUDE_DIRS} ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} @@ -81,6 +79,7 @@ include_directories( ) set(viewer_SOURCE_FILES + NACLantispam.cpp aoremotectrl.cpp ascentfloatercontactgroups.cpp ascentkeyword.cpp @@ -93,7 +92,6 @@ set(viewer_SOURCE_FILES floaterlocalassetbrowse.cpp floatervoicelicense.cpp hbfloatergrouptitles.cpp - hgfloatertexteditor.cpp hippofloaterxml.cpp hippogridmanager.cpp hippolimits.cpp @@ -122,7 +120,6 @@ set(viewer_SOURCE_FILES llaudiosourcevo.cpp llavatarpropertiesprocessor.cpp llbox.cpp - llbuildnewviewsscheduler.cpp llcallbacklist.cpp llcallingcard.cpp llcapabilitylistener.cpp @@ -259,8 +256,6 @@ set(viewer_SOURCE_FILES llfloatertos.cpp llfloaterurldisplay.cpp llfloaterurlentry.cpp - llfloatervfs.cpp - llfloatervfsexplorer.cpp llfloatervoicedevicesettings.cpp llfloaterwater.cpp llfloaterwindlight.cpp @@ -293,7 +288,6 @@ set(viewer_SOURCE_FILES llimpanel.cpp llimview.cpp llinventoryactions.cpp - llinventorybackup.cpp llinventorybridge.cpp llinventoryclipboard.cpp llinventoryfilter.cpp @@ -319,7 +313,6 @@ set(viewer_SOURCE_FILES llmarketplacenotifications.cpp llmediactrl.cpp llmediaremotectrl.cpp - llmemoryview.cpp llmenucommands.cpp llmenuoptionpathfindingrebakenavmesh.cpp llmeshrepository.cpp @@ -348,8 +341,8 @@ set(viewer_SOURCE_FILES llpaneldirland.cpp llpaneldirpeople.cpp llpaneldirplaces.cpp - llpaneldisplay.cpp llpaneldirpopular.cpp + llpaneldisplay.cpp llpaneleditwearable.cpp llpanelevent.cpp llpanelface.cpp @@ -552,11 +545,10 @@ set(viewer_SOURCE_FILES llworld.cpp llworldmap.cpp llworldmapmessage.cpp - llworldmipmap.cpp llworldmapview.cpp + llworldmipmap.cpp llxmlrpcresponder.cpp m7wlinterface.cpp - NACLantispam.cpp noise.cpp pipeline.cpp qtoolalign.cpp @@ -584,6 +576,8 @@ set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING set(viewer_HEADER_FILES CMakeLists.txt ViewerInstall.cmake + + NACLantispam.h aoremotectrl.h ascentfloatercontactgroups.h ascentkeyword.h @@ -596,7 +590,6 @@ set(viewer_HEADER_FILES floaterlocalassetbrowse.h floatervoicelicense.h hbfloatergrouptitles.h - hgfloatertexteditor.h hippofloaterxml.h hippogridmanager.h hippolimits.h @@ -626,7 +619,6 @@ set(viewer_HEADER_FILES llaudiosourcevo.h llavatarpropertiesprocessor.h llbox.h - llbuildnewviewsscheduler.h llcallbacklist.h llcallingcard.h llcapabilitylistener.h @@ -703,9 +695,9 @@ set(viewer_HEADER_FILES llfloaterdisplayname.h llfloatereditui.h llfloaterenvsettings.h + llfloaterevent.h llfloaterexploreanimations.h llfloaterexploresounds.h - llfloaterevent.h llfloaterfeed.h llfloaterfonttest.h llfloaterfriends.h @@ -763,8 +755,6 @@ set(viewer_HEADER_FILES llfloatertos.h llfloaterurldisplay.h llfloaterurlentry.h - llfloatervfs.h - llfloatervfsexplorer.h llfloatervoicedevicesettings.h llfloaterwater.h llfloaterwindlight.h @@ -796,7 +786,6 @@ set(viewer_HEADER_FILES llhudview.h llimpanel.h llimview.h - llinventorybackup.h llinventorybridge.h llinventoryclipboard.h llinventoryfilter.h @@ -823,9 +812,8 @@ set(viewer_HEADER_FILES llmarketplacenotifications.h llmediactrl.h llmediaremotectrl.h - llmemoryview.h - llmenuoptionpathfindingrebakenavmesh.h llmenucommands.h + llmenuoptionpathfindingrebakenavmesh.h llmeshrepository.h llmimetypes.h llmorphview.h @@ -1063,12 +1051,11 @@ set(viewer_HEADER_FILES llworld.h llworldmap.h llworldmapmessage.h - llworldmipmap.h llworldmapview.h + llworldmipmap.h llxmlrpcresponder.h m7wlinterface.h macmain.h - NACLantispam.h noise.h pipeline.h qtoolalign.h @@ -1088,9 +1075,9 @@ set(viewer_HEADER_FILES shcommandhandler.h shfloatermediaticker.h slfloatermediafilter.h + wlfPanel_AdvSettings.h VertexCache.h VorbisFramework.h - wlfPanel_AdvSettings.h ) source_group("CMake Rules" FILES ViewerInstall.cmake) @@ -1176,66 +1163,53 @@ if (WINDOWS) # viewerRes.rc is the only buildable file, but # the rest are all dependencies of it. set(viewer_RESOURCE_FILES - ${ARTWORK_DIR}/res/arrow.cur - ${ARTWORK_DIR}/res/arrowcop.cur - ${ARTWORK_DIR}/res/arrowcopmulti.cur - ${ARTWORK_DIR}/res/arrowdrag.cur - ${ARTWORK_DIR}/res/circleandline.cur - ${ARTWORK_DIR}/res/icon1.ico - ${ARTWORK_DIR}/res/llarrow.cur - ${ARTWORK_DIR}/res/llarrowdrag.cur - ${ARTWORK_DIR}/res/llarrowdragmulti.cur - ${ARTWORK_DIR}/res/llarrowlocked.cur - ${ARTWORK_DIR}/res/llgrablocked.cur - ${ARTWORK_DIR}/res/llno.cur - ${ARTWORK_DIR}/res/llnolocked.cur - ${ARTWORK_DIR}/res/lltoolcamera.cur - ${ARTWORK_DIR}/res/lltoolcreate.cur - ${ARTWORK_DIR}/res/lltoolfocus.cur - ${ARTWORK_DIR}/res/lltoolgrab.cur - ${ARTWORK_DIR}/res/lltoolland.cur - ${ARTWORK_DIR}/res/lltoolpan.cur - ${ARTWORK_DIR}/res/lltoolpipette.cur - ${ARTWORK_DIR}/res/lltoolrotate.cur - ${ARTWORK_DIR}/res/lltoolscale.cur - ${ARTWORK_DIR}/res/lltooltranslate.cur - ${ARTWORK_DIR}/res/lltoolzoomin.cur - ${ARTWORK_DIR}/res/lltoolzoomout.cur - ${ARTWORK_DIR}/res/snowglobe_icon.BMP - ${ARTWORK_DIR}/res/snowglobe_icon.ico - ${ARTWORK_DIR}/res/resource.h - ${ARTWORK_DIR}/res/toolpickobject.cur - ${ARTWORK_DIR}/res/toolpickobject2.cur - ${ARTWORK_DIR}/res/toolpickobject3.cur - ${ARTWORK_DIR}/res/toolpipette.cur - ${ARTWORK_DIR}/res/toolbuy.cur - ${ARTWORK_DIR}/res/toolopen.cur - ${ARTWORK_DIR}/res/toolpay.cur - ${ARTWORK_DIR}/res/toolsit.cur + res/arrow.cur + res/arrowcop.cur + res/arrowcopmulti.cur + res/arrowdrag.cur + res/circleandline.cur + res/icon1.ico + res/llarrow.cur + res/llarrowdrag.cur + res/llarrowdragmulti.cur + res/llarrowlocked.cur + res/llgrablocked.cur + res/llno.cur + res/llnolocked.cur + res/lltoolcamera.cur + res/lltoolcreate.cur + res/lltoolfocus.cur + res/lltoolgrab.cur + res/lltoolland.cur + res/lltoolpan.cur + res/lltoolpipette.cur + res/lltoolrotate.cur + res/lltoolscale.cur + res/lltooltranslate.cur + res/lltoolzoomin.cur + res/lltoolzoomout.cur + res/snowglobe_icon.BMP + res/snowglobe_icon.ico + res/resource.h + res/toolpickobject.cur + res/toolpickobject2.cur + res/toolpickobject3.cur + res/toolpipette.cur + res/toolbuy.cur + res/toolopen.cur + res/toolpay.cur + res/toolsit.cur ) set_source_files_properties(${viewer_RESOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) - if(NOT ARTWORK_IN_SOURCE) - # The resource compiler needs to find resources here. - include_directories(${ARTWORK_DIR}/res) - endif(NOT ARTWORK_IN_SOURCE) + set(viewer_RESOURCE_FILES + res/resource.h + res/viewerRes.rc + ${viewer_RESOURCE_FILES} + ) - if (MSVC71 OR MSVC80 AND NOT VISTA_ICON) - set(viewer_RESOURCE_FILES - res/resource.h - res/viewerRes_bc.rc - ${viewer_RESOURCE_FILES} - ) - else (MSVC71 OR MSVC80 AND NOT VISTA_ICON) - set(viewer_RESOURCE_FILES - res/resource.h - res/viewerRes.rc - ${viewer_RESOURCE_FILES} - ) - endif (MSVC71 OR MSVC80 AND NOT VISTA_ICON) - SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES}) list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES}) @@ -1341,22 +1315,20 @@ set_source_files_properties(${viewer_APPSETTINGS_FILES} list(APPEND viewer_SOURCE_FILES ${viewer_APPSETTINGS_FILES}) -if(ARTWORK_EXISTS) - set(viewer_CHARACTER_FILES - ${ARTWORK_DIR}/character/attentions.xml - ${ARTWORK_DIR}/character/attentionsN.xml - ${ARTWORK_DIR}/character/avatar_lad.xml - ${ARTWORK_DIR}/character/avatar_skeleton.xml - ${ARTWORK_DIR}/character/genepool.xml +set(viewer_CHARACTER_FILES + character/attentions.xml + character/attentionsN.xml + character/avatar_lad.xml + character/avatar_skeleton.xml + character/genepool.xml ) - source_group("Character File" FILES ${viewer_CHARACTER_FILES}) +source_group("Character File" FILES ${viewer_CHARACTER_FILES}) - set_source_files_properties(${viewer_CHARACTER_FILES} - PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties(${viewer_CHARACTER_FILES} + PROPERTIES HEADER_FILE_ONLY TRUE) - list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES}) -endif(ARTWORK_EXISTS) +list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES}) if (WINDOWS) file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi) @@ -1422,10 +1394,6 @@ if (!DISABLE_TEMPLATE_CHECK) check_message_template(${VIEWER_BINARY_NAME}) endif (!DISABLE_TEMPLATE_CHECK) -if (LLKDU_LIBRARY) - add_dependencies(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARY}) -endif (LLKDU_LIBRARY) - # We package by default on Linux so we can run from newview/packaged. if (LINUX) set(PACKAGE_DEFAULT ON) diff --git a/indra/newview/ViewerArtwork.cmake b/indra/newview/ViewerArtwork.cmake deleted file mode 100644 index e9ed5a5b9..000000000 --- a/indra/newview/ViewerArtwork.cmake +++ /dev/null @@ -1,62 +0,0 @@ -set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH - "Path to artwork files.") - -# Hide the ARTWORK_REQUIRED cache option by default. -set(doc "Require artwork?") -if(DEFINED ARTWORK_REQUIRED) - set(ARTWORK_REQUIRED "${ARTWORK_REQUIRED}" CACHE INTERNAL "${doc}") -endif(DEFINED ARTWORK_REQUIRED) - -# Check if artwork is available. -if(EXISTS "${ARTWORK_DIR}/res/arrow.cur") - set(ARTWORK_EXISTS 1) -else(EXISTS "${ARTWORK_DIR}/res/arrow.cur") - set(ARTWORK_EXISTS 0) - if(PACKAGE) - set(ARTWORK_REQUIRED 1) - set(_ARTWORK_MESSAGE "Artwork is required to build a PACKAGE.") - elseif(WINDOWS) - set(ARTWORK_REQUIRED 1) - set(_ARTWORK_MESSAGE "Artwork is required to build on Windows.") - else() - option(ARTWORK_REQUIRED "${doc}" ON) - set(_ARTWORK_MESSAGE "Alternatively, disable ARTWORK_REQUIRED.") - # Show the option. - set(ARTWORK_REQUIRED "${ARTWORK_REQUIRED}" CACHE BOOL "${doc}" FORCE) - endif() -endif(EXISTS "${ARTWORK_DIR}/res/arrow.cur") - -# Verify artwork setting. -if(NOT ARTWORK_EXISTS AND ARTWORK_REQUIRED) - # Try to report the artwork asset URL. - set(asset_urls_file "${CMAKE_SOURCE_DIR}/../doc/asset_urls.txt") - if(EXISTS "${asset_urls_file}") - file(STRINGS "${asset_urls_file}" art_line REGEX "SLASSET_ART=") - string(REPLACE "SLASSET_ART=" "" SLASSET_ART "${art_line}") - endif(EXISTS "${asset_urls_file}") - if(NOT SLASSET_ART) - set(SLASSET_ART "http://wiki.secondlife.com/wiki/Source_downloads") - endif(NOT SLASSET_ART) - - # Report missing artwork. - message(FATAL_ERROR - "The artwork directory\n" - " ARTWORK_DIR = ${ARTWORK_DIR}\n" - "does not appear to contain the viewer artwork. " - "Download artwork files from\n" - " ${SLASSET_ART}\n" - "and extract the zip file. " - "Then set the ARTWORK_DIR cache entry to point at " - "linden/indra/newview within the extracted directory. " - "See the wiki for further help:\n" - " http://wiki.secondlife.com/wiki/Get_source_and_compile\n" - "${_ARTWORK_MESSAGE}" - ) -endif(NOT ARTWORK_EXISTS AND ARTWORK_REQUIRED) - -# Check if the artwork is in the source tree. -if(EXISTS "${ARTWORK_DIR}/app_settings/CA.pem") - set(ARTWORK_IN_SOURCE 1) -else(EXISTS "${ARTWORK_DIR}/app_settings/CA.pem") - set(ARTWORK_IN_SOURCE 0) -endif(EXISTS "${ARTWORK_DIR}/app_settings/CA.pem") diff --git a/indra/newview/app_settings/default_grids.xml b/indra/newview/app_settings/default_grids.xml old mode 100755 new mode 100644 diff --git a/indra/newview/app_settings/windlight/skies/%5BEUPHORIA%5D%20smoky%20blue%20sky%20%253A%20reverse.xml b/indra/newview/app_settings/windlight/skies/%5BEUPHORIA%5D%20smoky%20blue%20sky%20%253A%20reverse.xml old mode 100755 new mode 100644 diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp index 6d19d693c..52f1a712f 100644 --- a/indra/newview/chatbar_as_cmdline.cpp +++ b/indra/newview/chatbar_as_cmdline.cpp @@ -244,7 +244,6 @@ bool cmd_line_chat(std::string revised_text, EChatType type) { if (i >> z) { - LLVector3 agentPos = gAgent.getPositionAgent(); LLViewerRegion* agentRegionp = gAgent.getRegion(); if(agentRegionp) { diff --git a/indra/newview/fonts/DroidSans-Bold.ttf b/indra/newview/fonts/DroidSans-Bold.ttf index 7ac04b6f0..d065b64eb 100644 Binary files a/indra/newview/fonts/DroidSans-Bold.ttf and b/indra/newview/fonts/DroidSans-Bold.ttf differ diff --git a/indra/newview/fonts/DroidSans.ttf b/indra/newview/fonts/DroidSans.ttf index 2537cc3ae..ad1efca88 100644 Binary files a/indra/newview/fonts/DroidSans.ttf and b/indra/newview/fonts/DroidSans.ttf differ diff --git a/indra/newview/hgfloatertexteditor.cpp b/indra/newview/hgfloatertexteditor.cpp deleted file mode 100644 index fdda09ea3..000000000 --- a/indra/newview/hgfloatertexteditor.cpp +++ /dev/null @@ -1,399 +0,0 @@ -/** - * @file hgfloatertexteditor.cpp - * @brief Asset Text Editor floater made by Hazim Gazov (based on hex editor floater by Day Oh) - * @author Hazim Gazov - * - * $LicenseInfo:firstyear=2010&license=WTFPLV2$ - * - */ - -// - -#include "llviewerprecompiledheaders.h" - -#include "hgfloatertexteditor.h" -#include "lluictrlfactory.h" -#include "llinventorybackup.h" // for downloading -#include "llviewercontrol.h" // gSavedSettings -#include "llviewerwindow.h" // alertXML -#include "llagent.h" // gAgent getID -#include "llviewermenufile.h" -#include "llviewerregion.h" // getCapability -#include "llassetuploadresponders.h" // LLUpdateAgentInventoryResponder -#include "llinventorymodel.h" // gInventory.updateItem -#include "llappviewer.h" // System Folders -#include "llfloaterperms.h" //get default perms -#include "lllocalinventory.h" -#include "llnotificationsutil.h" - -std::list HGFloaterTextEditor::sInstances; -S32 HGFloaterTextEditor::sUploadAmount = 10; - -HGFloaterTextEditor::HGFloaterTextEditor(LLInventoryItem* item) -: LLFloater() -{ - sInstances.push_back(this); - mItem = item; - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_asset_text_editor.xml"); -} - -// static -void HGFloaterTextEditor::show(LLUUID item_id) -{ - LLInventoryItem* item = (LLInventoryItem*)gInventory.getItem(item_id); - if(item) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("FloaterAssetTextEditorRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - HGFloaterTextEditor* floaterp = new HGFloaterTextEditor(item); - floaterp->setRect(rect); - gFloaterView->adjustToFitScreen(floaterp, FALSE); - } -} - -HGFloaterTextEditor::~HGFloaterTextEditor() -{ - sInstances.remove(this); -} - -void HGFloaterTextEditor::close(bool app_quitting) -{ - LLFloater::close(app_quitting); -} - -BOOL HGFloaterTextEditor::postBuild(void) -{ - LLTextEditor* editor = getChild("text_editor"); - mEditor = editor; - - childSetEnabled("upload_btn", false); - childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload")); - childSetAction("upload_btn", onClickUpload, this); - childSetEnabled("save_btn", false); - childSetAction("save_btn", onClickSave, this); - - if(mItem) - { - std::string title = "Text editor: " + mItem->getName(); - const char* asset_type_name = LLAssetType::lookup(mItem->getType()); - if(asset_type_name) - { - title.append(" (" + std::string(asset_type_name) + ")"); - } - setTitle(title); - } -#if OPENSIM_RULES!=1 - if(mItem->getCreatorUUID() == gAgentID) - { -#endif /* OPENSIM_RULES!=1 */ - // Load the asset - editor->setVisible(FALSE); - childSetText("status_text", std::string("Loading...")); - LLInventoryBackup::download(mItem, this, imageCallback, assetCallback); -#if OPENSIM_RULES!=1 - } else { - this->close(false); - } -#endif /* OPENSIM_RULES!=1 */ - - return TRUE; -} - -// static -void HGFloaterTextEditor::imageCallback(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata) -{ - if(final) - { - LLInventoryBackup::callbackdata* data = static_cast(userdata); - HGFloaterTextEditor* floater = (HGFloaterTextEditor*)(data->floater); - if(!floater) return; - if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash - //LLInventoryItem* item = data->item; - - if(!success) - { - floater->childSetText("status_text", std::string("Unable to download asset.")); - return; - } - - U8* src_data = src->getData(); - S32 size = src->getDataSize(); - std::string new_data; - for(S32 i = 0; i < size; i++) - new_data += (char)src_data[i]; - - delete[] src_data; - - floater->mEditor->setValue(new_data); - floater->mEditor->setVisible(TRUE); - floater->childSetText("status_text", std::string("Note: Image data shown isn't the actual asset data, yet")); - - floater->childSetEnabled("save_btn", false); - floater->childSetEnabled("upload_btn", true); - floater->childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload (L$10)")); - } - else - { - src_vi->setBoostLevel(LLGLTexture::BOOST_UI); - } -} - -// static -void HGFloaterTextEditor::assetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status) -{ - LLInventoryBackup::callbackdata* data = static_cast(user_data); - HGFloaterTextEditor* floater = (HGFloaterTextEditor*)(data->floater); - if(!floater) return; - if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash - LLInventoryItem* item = data->item; - - if(status != 0 && item->getType() != LLAssetType::AT_NOTECARD) - { - floater->childSetText("status_text", std::string("Unable to download asset.")); - return; - } - - // Todo: this doesn't work for static vfs shit - LLVFile file(vfs, asset_uuid, type, LLVFile::READ); - S32 size = file.getSize(); - - std::string new_data(""); - if(size > 0) - { - char* buffer = new char[size + 1]; - if (buffer == NULL) - { - llerrs << "Memory Allocation Failed" << llendl; - return; - } - - file.read((U8*)buffer, size); - buffer[size - 1] = 0; - - new_data = std::string(buffer); - delete[] buffer; - } - - - floater->mEditor->setText(LLStringExplicit(new_data)); - floater->mEditor->setVisible(TRUE); - floater->childSetText("status_text", llformat("File Size: %d", size)); - - floater->childSetEnabled("upload_btn", true); - floater->childSetEnabled("save_btn", false); - if(item->getPermissions().allowModifyBy(gAgent.getID())) - { - switch(item->getType()) - { - case LLAssetType::AT_TEXTURE: - case LLAssetType::AT_ANIMATION: - case LLAssetType::AT_SOUND: - floater->childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload (L$10)")); - break; - case LLAssetType::AT_LANDMARK: - case LLAssetType::AT_CALLINGCARD: - floater->childSetEnabled("upload_btn", false); - floater->childSetEnabled("save_btn", false); - break; - default: - floater->childSetEnabled("save_btn", true); - break; - } - } - else - { - switch(item->getType()) - { - case LLAssetType::AT_TEXTURE: - case LLAssetType::AT_ANIMATION: - case LLAssetType::AT_SOUND: - floater->childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload (L$10)")); - break; - default: - break; - } - } - - // Never enable save if it's a pretend item - if(gInventory.isObjectDescendentOf(item->getUUID(), gSystemFolderRoot)) - { - floater->childSetEnabled("save_btn", false); - } -} - -// static -void HGFloaterTextEditor::onClickUpload(void* user_data) -{ - HGFloaterTextEditor* floater = (HGFloaterTextEditor*)user_data; - LLInventoryItem* item = floater->mItem; - - LLTransactionID transaction_id; - transaction_id.generate(); - LLUUID fake_asset_id = transaction_id.makeAssetID(gAgent.getSecureSessionID()); - - const char* value = floater->mEditor->getText().c_str(); - int size = strlen(value); - U8* buffer = new U8[size]; - for(int i = 0; i < size; i++) - buffer[i] = (U8)value[i]; - - delete[] value; - - LLVFile file(gVFS, fake_asset_id, item->getType(), LLVFile::APPEND); - file.setMaxSize(size); - if (!file.write(buffer, size)) - { - LLSD args; - args["ERROR_MESSAGE"] = "Couldn't write data to file"; - LLNotificationsUtil::add("ErrorMessage", args); - return; - } - - LLAssetStorage::LLStoreAssetCallback callback = NULL; - void *fake_user_data = NULL; - - if(item->getType() != LLAssetType::AT_GESTURE && item->getType() != LLAssetType::AT_LSL_TEXT - && item->getType() != LLAssetType::AT_NOTECARD) - { - upload_new_resource(transaction_id, - item->getType(), - item->getName(), - item->getDescription(), - 0, - LLFolderType::assetTypeToFolderType(item->getType()), - item->getInventoryType(), - LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(), - item->getName(), - callback, - sUploadAmount, - fake_user_data); - } - else // gestures and scripts, create an item first - { // AND notecards - //if(item->getType() == LLAssetType::AT_NOTECARD) gDontOpenNextNotecard = true; - create_inventory_item( gAgent.getID(), - gAgent.getSessionID(), - item->getParentUUID(), //gInventory.findCategoryUUIDForType(item->getType()), - LLTransactionID::tnull, - item->getName(), - fake_asset_id.asString(), - item->getType(), - item->getInventoryType(), - (LLWearableType::EType)item->getFlags(), - PERM_ITEM_UNRESTRICTED, - new NewResourceItemCallback); - } -} - -struct LLSaveInfo -{ - LLSaveInfo(HGFloaterTextEditor* floater, LLTransactionID transaction_id) - : mFloater(floater), mTransactionID(transaction_id) - { - } - - HGFloaterTextEditor* mFloater; - LLTransactionID mTransactionID; -}; - -// static -void HGFloaterTextEditor::onClickSave(void* user_data) -{ - HGFloaterTextEditor* floater = (HGFloaterTextEditor*)user_data; - LLInventoryItem* item = floater->mItem; - - LLTransactionID transaction_id; - transaction_id.generate(); - LLUUID fake_asset_id = transaction_id.makeAssetID(gAgent.getSecureSessionID()); - - const char* value = floater->mEditor->getText().c_str(); - int size = strlen(value); - U8* buffer = new U8[size]; - for(int i = 0; i < size; i++) - buffer[i] = (U8)value[i]; - - LLVFile file(gVFS, fake_asset_id, item->getType(), LLVFile::APPEND); - file.setMaxSize(size); - if (!file.write(buffer, size)) - { - LLSD args; - args["ERROR_MESSAGE"] = "Couldn't write data to file"; - LLNotificationsUtil::add("ErrorMessage", args); - return; - } - - bool caps = false; - std::string url; - LLSD body; - body["item_id"] = item->getUUID(); - - switch(item->getType()) - { - case LLAssetType::AT_GESTURE: - url = gAgent.getRegion()->getCapability("UpdateGestureAgentInventory"); - caps = true; - break; - case LLAssetType::AT_LSL_TEXT: - url = gAgent.getRegion()->getCapability("UpdateScriptAgent"); - body["target"] = "mono"; - caps = true; - break; - case LLAssetType::AT_NOTECARD: - url = gAgent.getRegion()->getCapability("UpdateNotecardAgentInventory"); - caps = true; - break; - default: // wearables & notecards, Oct 12 2009 - // ONLY WEARABLES, Oct 15 2009 - floater->childSetText("status_text", std::string("Saving...")); - LLSaveInfo* info = new LLSaveInfo(floater, transaction_id); - gAssetStorage->storeAssetData(transaction_id, item->getType(), onSaveComplete, info); - caps = false; - break; - } - - if(caps) - { - LLHTTPClient::post(url, body, - new LLUpdateAgentInventoryResponder(body, fake_asset_id, item->getType())); - } -} - -void HGFloaterTextEditor::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) -{ - LLSaveInfo* info = (LLSaveInfo*)user_data; - HGFloaterTextEditor* floater = info->mFloater; - if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash - LLInventoryItem* item = floater->mItem; - - floater->childSetText("status_text", std::string("")); - - if(item && (status == 0)) - { - LLPointer new_item = new LLViewerInventoryItem(item); - new_item->setDescription(item->getDescription()); - new_item->setTransactionID(info->mTransactionID); - new_item->setAssetUUID(asset_uuid); - new_item->updateServer(FALSE); - gInventory.updateItem(new_item); - gInventory.notifyObservers(); - } - else - { - LLSD args; - args["ERROR_MESSAGE"] = llformat("Upload failed with status %d, also %d", status, ext_status); - LLNotificationsUtil::add("ErrorMessage", args); - } -} - -// diff --git a/indra/newview/hgfloatertexteditor.h b/indra/newview/hgfloatertexteditor.h deleted file mode 100644 index fe6d36709..000000000 --- a/indra/newview/hgfloatertexteditor.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @file hgfloatertexteditor.h - * @brief Asset Text Editor floater made by Hazim Gazov (based on hex editor floater by Day Oh) - * @author Hazim Gazov - * - * $LicenseInfo:firstyear=2010&license=WTFPLV2$ - * - */ - - -#ifndef HG_HGFLOATERTEXT_H -#define HG_HGFLOATERTEXT_H - -#include "llfloater.h" -#include "lltexteditor.h" -#include "llinventory.h" -#include "llviewertexture.h" - -class HGFloaterTextEditor -: public LLFloater -{ -public: - HGFloaterTextEditor(LLInventoryItem* item); - static void show(LLUUID item_id); - BOOL postBuild(void); - void close(bool app_quitting); - static void imageCallback(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata); - static void assetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); - static void onClickSave(void* user_data); - static void onClickUpload(void* user_data); - static void onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status); - LLInventoryItem* mItem; - LLTextEditor* mEditor; - static std::list sInstances; -private: - virtual ~HGFloaterTextEditor(); -protected: - static S32 sUploadAmount; -}; - -#endif diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index a5d67e356..60a3788d6 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3964,7 +3964,7 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b //to cause appearance of the agent to be updated bool result = false; - if (result = gAgentWearables.moveWearable(item, closer_to_body)) + if ((result = gAgentWearables.moveWearable(item, closer_to_body))) { gAgentAvatarp->wearableUpdated(item->getWearableType(), FALSE); } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3f0297fee..7ded08e1a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -80,7 +80,7 @@ #include "llfirstuse.h" #include "llrender.h" #include "llvector4a.h" -#include "llfont.h" +#include "llfontfreetype.h" #include "llvocache.h" #include "llvopartgroup.h" #include "llfloaterteleporthistory.h" @@ -117,8 +117,6 @@ #include "llimageworker.h" // -#include "lldelayeduidelete.h" -#include "llbuildnewviewsscheduler.h" #include "aicurleasyrequeststatemachine.h" #include "aihttptimeoutpolicy.h" // @@ -641,9 +639,6 @@ bool LLAppViewer::init() // Logging is initialized. Now it's safe to start the error thread. startErrorThread(); - gDeleteScheduler = new LLDeleteScheduler(); - gBuildNewViewsScheduler = new LLBuildNewViewsScheduler(); - // // // OK to write stuff to logs now, we've now crash reported if necessary // @@ -808,7 +803,7 @@ bool LLAppViewer::init() // Modify settings based on system configuration and compile options settings_modify(); // Work around for a crash bug when changing OpenGL settings - LLFont::sOpenGLcrashOnRestart = (getenv("LL_OPENGL_RESTART_CRASH_BUG") != NULL); + LLFontFreetype::sOpenGLcrashOnRestart = (getenv("LL_OPENGL_RESTART_CRASH_BUG") != NULL); // Find partition serial number (Windows) or hardware serial (Mac) mSerialNumber = generateSerialNumber(); @@ -1096,7 +1091,6 @@ static LLFastTimer::DeclareTimer FTM_STATEMACHINE("State Machine"); bool LLAppViewer::mainLoop() { - LLMemType mt1(LLMemType::MTYPE_MAIN); mMainloopTimeout = new LLWatchdogTimeout(); // *FIX:Mani - Make this a setting, once new settings exist in this branch. @@ -1216,7 +1210,6 @@ bool LLAppViewer::mainLoop() && !gViewerWindow->getShowProgress() && !gFocusMgr.focusLocked()) { - LLMemType mjk(LLMemType::MTYPE_JOY_KEY); joystick->scanJoystick(); gKeyboard->scanKeyboard(); if(isCrouch) @@ -1236,7 +1229,6 @@ bool LLAppViewer::mainLoop() if (gAres != NULL && gAres->isInitialized()) { - LLMemType mt_ip(LLMemType::MTYPE_IDLE_PUMP); pingMainloopTimeout("Main:ServicePump"); LLFastTimer t4(FTM_PUMP); { @@ -1285,7 +1277,6 @@ bool LLAppViewer::mainLoop() // Sleep and run background threads { - LLMemType mt_sleep(LLMemType::MTYPE_SLEEP); LLFastTimer t2(FTM_SLEEP); static const LLCachedControl run_multiple_threads("RunMultipleThreads",false); static const LLCachedControl yield_time("YieldTime", -1); @@ -3823,7 +3814,6 @@ static LLFastTimer::DeclareTimer FTM_VLMANAGER("VL Manager"); /////////////////////////////////////////////////////// void LLAppViewer::idle() { - LLMemType mt_idle(LLMemType::MTYPE_IDLE); pingMainloopTimeout("Main:Idle"); // Update frame timers @@ -4446,7 +4436,6 @@ static LLFastTimer::DeclareTimer FTM_DYNAMIC_THROTTLE("Dynamic Throttle"); static LLFastTimer::DeclareTimer FTM_CHECK_REGION_CIRCUIT("Check Region Circuit"); void LLAppViewer::idleNetwork() { - LLMemType mt_in(LLMemType::MTYPE_IDLE_NETWORK); pingMainloopTimeout("idleNetwork"); gObjectList.mNumNewObjects = 0; diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 154e38de3..29f8cfe8e 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -37,7 +37,6 @@ #include "llcommandlineparser.h" #include "lldiriterator.h" -#include "llmemtype.h" #include "llurldispatcher.h" // SLURL from other app instance #include "llviewernetwork.h" #include "llviewercontrol.h" @@ -102,8 +101,6 @@ int main( int argc, char **argv ) Debug(debug::init()); Debug(libcw_do.on()); - LLMemType mt1(LLMemType::MTYPE_STARTUP); - #if LL_SOLARIS && defined(__sparc) asm ("ta\t6"); // NOTE: Make sure memory alignment is enforced on SPARC #endif diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index 67e5b8d78..da03fc76e 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -39,8 +39,6 @@ #include "llappviewermacosx.h" #include "llcommandlineparser.h" -#include "llmemtype.h" - #include "lldiriterator.h" #include "llviewernetwork.h" #include "llviewercontrol.h" @@ -74,8 +72,6 @@ namespace int main( int argc, char **argv ) { - LLMemType mt1(LLMemType::MTYPE_STARTUP); - #if LL_SOLARIS && defined(__sparc) asm ("ta\t6"); // NOTE: Make sure memory alignment is enforced on SPARC #endif diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 79da09dfc..0d71bc3f4 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -40,8 +40,6 @@ #include "llappviewerwin32.h" -#include "llmemtype.h" - #include "llwindowwin32.cpp" // *FIX: for setting gIconResource. #include "res/resource.h" // *FIX: for setting gIconResource. @@ -159,8 +157,6 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) { - LLMemType mt1(LLMemType::MTYPE_STARTUP); - const S32 MAX_HEAPS = 255; DWORD heap_enable_lfh_error[MAX_HEAPS]; S32 num_heaps = 0; diff --git a/indra/newview/llbuildnewviewsscheduler.cpp b/indra/newview/llbuildnewviewsscheduler.cpp deleted file mode 100644 index 16d2900ed..000000000 --- a/indra/newview/llbuildnewviewsscheduler.cpp +++ /dev/null @@ -1,151 +0,0 @@ -// -#include "llviewerprecompiledheaders.h" -#include "llbuildnewviewsscheduler.h" -#include "llinventorybridge.h" -#define BUILD_DELAY 0.1f -#define BUILD_PER_DELAY 512 - -LLBuildNewViewsScheduler* gBuildNewViewsScheduler; - -std::list LLBuildNewViewsScheduler::sJobs; -LLBuildNewViewsScheduler::LLBuildNewViewsScheduler() : LLEventTimer(BUILD_DELAY) -{ -} -void LLBuildNewViewsScheduler::addJob(LLInventoryPanel* inventory_panel, LLInventoryObject* inventory_object) -{ - LLBuildNewViewsScheduler::job j; - j.mInventoryPanel = inventory_panel; - j.mInventoryObject = inventory_object; - sJobs.push_back(j); -} -void LLBuildNewViewsScheduler::cancel(LLInventoryPanel* inventory_panel) -{ - for(std::list::iterator iter = sJobs.begin(); - iter != sJobs.end(); ) - { - LLInventoryPanel* job_panel = (*iter).mInventoryPanel; - if(job_panel == inventory_panel) - { - iter = sJobs.erase(iter); - } - else - { - ++iter; - } - } -} -BOOL LLBuildNewViewsScheduler::tick() -{ - U32 i = 0; - while(!sJobs.empty() && (i < BUILD_PER_DELAY)) - { - LLBuildNewViewsScheduler::job j = sJobs.front(); - buildNewViews(j.mInventoryPanel, j.mInventoryObject); - sJobs.pop_front(); - ++i; - } - return FALSE; -} -void LLBuildNewViewsScheduler::buildNewViews(LLInventoryPanel* panelp, LLInventoryObject* objectp) -{ - LLFolderViewItem* itemp = NULL; - - if (objectp) - { - if (objectp->getType() <= LLAssetType::AT_NONE || - objectp->getType() >= LLAssetType::AT_COUNT) - { - llwarns << "called with objectp->mType == " - << ((S32) objectp->getType()) - << " (shouldn't happen)" << llendl; - } - else if (objectp->getType() == LLAssetType::AT_CATEGORY) // build new view for category - { - LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(objectp->getType(), - objectp->getType(), - LLInventoryType::IT_CATEGORY, - panelp, - panelp->getRootFolder(), - objectp->getUUID()); - - if (new_listener) - { - LLFolderViewFolder* folderp = new LLFolderViewFolder(new_listener->getDisplayName(), - new_listener->getIcon(), - new_listener->getIcon(), - NULL, - panelp->getRootFolder(), - new_listener); - - folderp->setItemSortOrder(panelp->getSortOrder()); - itemp = folderp; - } - } - else // build new view for item - { - LLInventoryItem* item = (LLInventoryItem*)objectp; - LLInvFVBridge* new_listener = LLInvFVBridge::createBridge( - item->getType(), - item->getActualType(), - item->getInventoryType(), - panelp, - panelp->getRootFolder(), - item->getUUID(), - item->getFlags()); - if (new_listener) - { - itemp = new LLFolderViewItem(new_listener->getDisplayName(), - new_listener->getIcon(), - NULL, - NULL, - new_listener->getCreationDate(), - panelp->getRootFolder(), - new_listener); - } - } - - LLFolderViewFolder* parent_folder = (LLFolderViewFolder*)panelp->getRootFolder()->getItemByID(objectp->getParentUUID()); - - if (itemp) - { - //itemp->mDelayedDelete = TRUE; - if (parent_folder) - { - itemp->addToFolder(parent_folder, panelp->getRootFolder()); - } - else - { - llwarns << "Couldn't find parent folder for child " << itemp->getLabel() << llendl; - delete itemp; - } - } - } - - if (!objectp || (objectp && (objectp->getType() == LLAssetType::AT_CATEGORY))) - { - LLViewerInventoryCategory::cat_array_t* categories; - LLViewerInventoryItem::item_array_t* items; - - panelp->getModel()->lockDirectDescendentArrays((objectp != NULL) ? objectp->getUUID() : LLUUID::null, categories, items); - if(categories) - { - S32 count = categories->count(); - for(S32 i = 0; i < count; ++i) - { - LLInventoryCategory* cat = categories->get(i); - addJob(panelp, cat); - } - } - if(items) - { - S32 count = items->count(); - for(S32 i = 0; i < count; ++i) - { - LLInventoryItem* item = items->get(i); - addJob(panelp, item); - } - } - panelp->getModel()->unlockDirectDescendentArrays(objectp->getUUID()); - } -} -// diff --git a/indra/newview/llbuildnewviewsscheduler.h b/indra/newview/llbuildnewviewsscheduler.h deleted file mode 100644 index 83169d925..000000000 --- a/indra/newview/llbuildnewviewsscheduler.h +++ /dev/null @@ -1,22 +0,0 @@ -// -#include "llinventorypanel.h" -#include "llinventory.h" -#include "lleventtimer.h" -class LLBuildNewViewsScheduler : public LLEventTimer -{ - typedef struct - { - LLInventoryPanel* mInventoryPanel; - LLInventoryObject* mInventoryObject; - } job; -public: - LLBuildNewViewsScheduler(); - void addJob(LLInventoryPanel* inventory_panel, LLInventoryObject* inventory_object); - void cancel(LLInventoryPanel* inventory_panel); - BOOL tick(); -private: - static std::list sJobs; - void buildNewViews(LLInventoryPanel* panelp, LLInventoryObject* objectp); -}; -extern LLBuildNewViewsScheduler* gBuildNewViewsScheduler; -// diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 1aa85644e..bce3853d2 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -426,8 +426,6 @@ void LLChatBar::sendChat( EChatType type ) { if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1)) { - // Chalice - OOC autoclosing patch based on code by Henri Beauchamp - int needsClosingType=0; //Check if it needs the end-of-chat brackets -HgB if (utf8text.find("((") == 0 && utf8text.find("))") == -1) { @@ -441,8 +439,7 @@ void LLChatBar::sendChat( EChatType type ) utf8text+=" "; utf8text+="]]"; } - //Check if it needs the start-of-chat brackets -HgB - needsClosingType=0; + if (utf8text.find("((") == -1 && utf8text.find("))") == (utf8text.length() - 2)) { if(utf8text.at(0) == '(') diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index e6fed3c30..92ed63027 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -37,7 +37,6 @@ // library includes #include "llframestatview.h" #include "llfasttimerview.h" -#include "llmemoryview.h" #include "llconsole.h" #include "lltextureview.h" #include "llresmgr.h" @@ -84,13 +83,6 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) mFastTimerView->setVisible(FALSE); // start invisible addChild(mFastTimerView); - r.set(25, rect.getHeight() - 50, rect.getWidth()/2, rect.getHeight() - 450); - mMemoryView = new LLMemoryView("memory", r); - mMemoryView->setFollowsTop(); - mMemoryView->setFollowsLeft(); - mMemoryView->setVisible(FALSE); // start invisible - addChild(mMemoryView); - r.set(150, rect.getHeight() - 50, 870, 100); gTextureView = new LLTextureView("gTextureView", r); gTextureView->setRect(r); diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 947422310..81cc087cc 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -762,8 +762,6 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) void LLDrawable::updateTexture() { - LLMemType mt(LLMemType::MTYPE_DRAWABLE); - if (isDead()) { llwarns << "Dead drawable updating texture!" << llendl; diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index a9bec244f..c502d0f9f 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -44,7 +44,6 @@ #include "llvector4a.h" #include "llquaternion.h" #include "xform.h" -#include "llmemtype.h" #include "lldarray.h" #include "llviewerobject.h" #include "llrect.h" diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 0092f5277..bbd4426f0 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -265,8 +265,6 @@ void LLFace::setPool(LLFacePool* pool) void LLFace::setPool(LLFacePool* new_pool, LLViewerTexture *texturep) { - LLMemType mt1(LLMemType::MTYPE_DRAWABLE); - if (!new_pool) { llerrs << "Setting pool to null!" << llendl; @@ -442,8 +440,6 @@ U16 LLFace::getGeometryAvatar( LLStrider &vertex_weights, LLStrider &clothing_weights) { - LLMemType mt1(LLMemType::MTYPE_DRAWABLE); - if (mVertexBuffer.notNull()) { mVertexBuffer->getVertexStrider (vertices, mGeomIndex, mGeomCount); @@ -459,8 +455,6 @@ U16 LLFace::getGeometryAvatar( U16 LLFace::getGeometry(LLStrider &vertices, LLStrider &normals, LLStrider &tex_coords, LLStrider &indicesp) { - LLMemType mt1(LLMemType::MTYPE_DRAWABLE); - if (mVertexBuffer.notNull()) { mVertexBuffer->getVertexStrider(vertices, mGeomIndex, mGeomCount); @@ -776,8 +770,6 @@ bool less_than_max_mag(const LLVector4a& vec) BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f, const LLMatrix4& mat_vert_in, const LLMatrix3& mat_normal_in, BOOL global_volume) { - LLMemType mt1(LLMemType::MTYPE_DRAWABLE); - //get bounding box if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION | LLDrawable::REBUILD_RIGGED)) { diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 22539595e..6dc930df1 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -420,7 +420,7 @@ void LLFastTimerView::draw() S32 left, top, right, bottom; S32 x, y, barw, barh, dx, dy; - S32 texth, textw; + S32 texth; LLPointer box_imagep = LLUI::getUIImage("rounded_square.tga"); // Draw the window background @@ -461,7 +461,6 @@ void LLFastTimerView::draw() tdesc = llformat("Full bar = %s [Click to pause/reset] [SHIFT-Click to toggle]",modedesc[mDisplayMode]); LLFontGL::getFontMonospace()->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); - textw = LLFontGL::getFontMonospace()->getWidth(tdesc); x = xleft, y -= (texth + 2); tdesc = llformat("Justification = %s [CTRL-Click to toggle]",centerdesc[mDisplayCenter]); @@ -600,8 +599,6 @@ void LLFastTimerView::draw() y -= (texth + 2); - textw = dx + LLFontGL::getFontMonospace()->getWidth(idp->getName()) + 40; - if (idp->getCollapsed()) { it.skipDescendants(); diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp index 78aefe250..92b8e8eeb 100644 --- a/indra/newview/llfloaterbulkpermission.cpp +++ b/indra/newview/llfloaterbulkpermission.cpp @@ -378,8 +378,6 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInv void LLFloaterBulkPermission::updateInventory(LLViewerObject* object, LLViewerInventoryItem* item, U8 key, bool is_new) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - // This slices the object into what we're concerned about on the viewer. // The simulator will take the permissions and transfer ownership. LLPointer task_item = diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 3a4e829cf..0873c0351 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -370,14 +370,12 @@ bool LLFloaterDayCycle::deleteAlertCallback(const LLSD& notification, const LLSD "DayCyclePresetsCombo"); LLFloaterDayCycle* day_cycle = NULL; LLComboBox* key_combo = NULL; - LLMultiSliderCtrl* mult_sldr = NULL; if(LLFloaterDayCycle::isOpen()) { day_cycle = LLFloaterDayCycle::instance(); key_combo = day_cycle->getChild( "WLKeyPresets"); - mult_sldr = day_cycle->getChild("WLDayCycleKeys"); } std::string name(combo_box->getSelectedValue().asString()); diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp index 1e05c6629..0bd358d4c 100644 --- a/indra/newview/llfloaterdirectory.cpp +++ b/indra/newview/llfloaterdirectory.cpp @@ -93,19 +93,29 @@ public: /*virtual*/ BOOL postBuild() { if (gHippoGridManager->getConnectedGrid()->isSecondLife()) + { mMarketplaceURL = getString("default_search_page"); + } else + { getChild("reset_btn")->setCommitCallback(boost::bind(&LLPanelDirMarket::navigateToDefaultPage, this)); + } return LLPanelDirFind::postBuild(); } void handleRegionChange(LLTabContainer* container) { if (LLViewerRegion* region = gAgent.getRegion()) + { if (region->getFeaturesReceived()) + { setMarketplaceURL(container); + } else + { region->setFeaturesReceivedCallback(boost::bind(&LLPanelDirMarket::setMarketplaceURL, this, container)); + } + } } void setMarketplaceURL(LLTabContainer* container) diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp index 19e1b3e2c..88fbc64e8 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -96,7 +96,6 @@ BOOL LLFloaterJoystick::postBuild() if (child) { LLRect r = child->getRect(); - LLRect f = getRect(); rect = LLRect(350, r.mTop, r.mRight + 200, 0); } diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 8ff747187..5bba956c3 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -729,7 +729,6 @@ void LLFloaterModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit) void LLFloaterModelPreview::draw() { LLFloater::draw(); - LLRect r = getRect(); mModelPreview->update(); @@ -4934,14 +4933,8 @@ BOOL LLModelPreview::render() bool upload_skin = mFMP->childGetValue("upload_skin").asBoolean(); bool upload_joints = mFMP->childGetValue("upload_joints").asBoolean(); - bool resetJoints = false; - if (upload_joints != mLastJointUpdate) + if ( upload_joints != mLastJointUpdate ) { - if (mLastJointUpdate) - { - resetJoints = true; - } - mLastJointUpdate = upload_joints; } diff --git a/indra/newview/llfloatervfs.cpp b/indra/newview/llfloatervfs.cpp deleted file mode 100644 index 12dc0e08c..000000000 --- a/indra/newview/llfloatervfs.cpp +++ /dev/null @@ -1,374 +0,0 @@ -// -#include "llviewerprecompiledheaders.h" -#include "llfloatervfs.h" -#include "lluictrlfactory.h" -#include "llscrolllistctrl.h" -#include "llcheckboxctrl.h" -#include "statemachine/aifilepicker.h" -#include "lllocalinventory.h" -#include "llviewerwindow.h" -#include "llassetconverter.h" -#include "llviewertexturelist.h" -#include "llimagej2c.h" - -LLFloaterVFS* LLFloaterVFS::sInstance; -std::list LLFloaterVFS::mFiles; -LLFloaterVFS::LLFloaterVFS() -: LLFloater(), - mEditID(LLUUID::null) -{ - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_vfs.xml"); -} -LLFloaterVFS::~LLFloaterVFS() -{ - sInstance = NULL; -} -// static -void LLFloaterVFS::show() -{ - if(sInstance) - sInstance->open(); - else - { - sInstance = new LLFloaterVFS(); - sInstance->open(); - } -} -BOOL LLFloaterVFS::postBuild() -{ - childSetAction("add_btn", onClickAdd, this); - childSetAction("clear_btn", onClickClear, this); - childSetAction("reload_all_btn", onClickReloadAll, this); - childSetCommitCallback("file_list", onCommitFileList, this); - childSetCommitCallback("name_edit", onCommitEdit, this); - childSetCommitCallback("id_edit", onCommitEdit, this); - childSetCommitCallback("type_combo", onCommitEdit, this); - childSetAction("copy_uuid_btn", onClickCopyUUID, this); - childSetAction("item_btn", onClickItem, this); - childSetAction("reload_btn", onClickReload, this); - childSetAction("remove_btn", onClickRemove, this); - refresh(); - return TRUE; -} -void LLFloaterVFS::refresh() -{ - LLScrollListCtrl* list = getChild("file_list"); - list->clearRows(); - std::list::iterator end = mFiles.end(); - for(std::list::iterator iter = mFiles.begin(); iter != end; ++iter) - { - entry file = (*iter); - LLSD element; - element["id"] = file.mID; - LLSD& name_column = element["columns"][0]; - name_column["column"] = "name"; - name_column["value"] = file.mName.empty() ? file.mID.asString() : file.mName; - LLSD& type_column = element["columns"][1]; - type_column["column"] = "type"; - type_column["value"] = std::string(LLAssetType::lookup(file.mType)); - list->addElement(element, ADD_BOTTOM); - } - setMassEnabled(!mFiles.empty()); - setEditID(mEditID); -} -void LLFloaterVFS::add(entry file) -{ - mFiles.push_back(file); - refresh(); -} -void LLFloaterVFS::clear() -{ - std::list::iterator end = mFiles.end(); - for(std::list::iterator iter = mFiles.begin(); iter != end; ++iter) - { - gVFS->removeFile((*iter).mID, (*iter).mType); - } - mFiles.clear(); - refresh(); -} -void LLFloaterVFS::reloadAll() -{ - std::list::iterator end = mFiles.end(); - for(std::list::iterator iter = mFiles.begin(); iter != end; ++iter) - { - entry file = (*iter); - reloadEntry(file); - } - refresh(); -} -void LLFloaterVFS::reloadEntry(entry file) -{ - LLUUID asset_id = file.mID; - LLAssetType::EType asset_type = file.mType; - gVFS->removeFile(file.mID, file.mType); - std::string file_name = file.mFilename; - S32 file_size; - LLAPRFile fp(file_name, LL_APR_RB, &file_size); - if(fp.getFileHandle()) - { - LLVFile file(gVFS, asset_id, asset_type, LLVFile::WRITE); - file.setMaxSize(file_size); - const S32 buf_size = 65536; - U8 copy_buf[buf_size]; - while ((file_size = fp.read(copy_buf, buf_size))) - file.write(copy_buf, file_size); - fp.close(); - } - else - { - // todo: show a warning, couldn't open the original file - return; - } - refresh(); -} -void LLFloaterVFS::setEditID(LLUUID edit_id) -{ - LLScrollListCtrl* list = getChild("file_list"); - bool found_in_list = (list->getItemIndex(edit_id) != -1); - bool found_in_files = false; - entry file; - std::list::iterator end = mFiles.end(); - for(std::list::iterator iter = mFiles.begin(); iter != end; ++iter) - { - if((*iter).mID == edit_id) - { - found_in_files = true; - file = (*iter); - break; - } - } - if(found_in_files && found_in_list) - { - mEditID = edit_id; - list->selectByID(edit_id); - setEditEnabled(true); - childSetText("name_edit", file.mName); - childSetText("id_edit", file.mID.asString()); - childSetValue("type_combo", std::string(LLAssetType::lookup(file.mType))); - } - else - { - mEditID = LLUUID::null; - list->deselectAllItems(TRUE); - setEditEnabled(false); - childSetText("name_edit", std::string("")); - childSetText("id_edit", std::string("")); - childSetValue("type_combo", std::string("animatn")); - } -} -LLFloaterVFS::entry LLFloaterVFS::getEditEntry() -{ - std::list::iterator end = mFiles.end(); - for(std::list::iterator iter = mFiles.begin(); iter != end; ++iter) - { - if((*iter).mID == mEditID) - return (*iter); - } - entry file; - file.mID = LLUUID::null; - return file; -} -void LLFloaterVFS::commitEdit() -{ - bool found = false; - entry file; - std::list::iterator iter; - std::list::iterator end = mFiles.end(); - for(iter = mFiles.begin(); iter != end; ++iter) - { - if((*iter).mID == mEditID) - { - found = true; - file = (*iter); - break; - } - } - if(!found) return; - entry edited_file; - edited_file.mName = childGetValue("name_edit").asString(); - edited_file.mID = LLUUID(childGetValue("id_edit").asString()); - edited_file.mType = LLAssetType::lookup(getChild("type_combo")->getValue().asString()); - if((edited_file.mID != file.mID) || (edited_file.mType != file.mType)) - { - gVFS->renameFile(file.mID, file.mType, edited_file.mID, edited_file.mType); - mEditID = edited_file.mID; - } - - (*iter) = edited_file; - refresh(); -} -void LLFloaterVFS::removeEntry() -{ - for(std::list::iterator iter = mFiles.begin(); iter != mFiles.end(); ) - { - if((*iter).mID == mEditID) - { - if((*iter).mType == LLAssetType::AT_TEXTURE) - gTextureList.deleteImage(gTextureList.findImage( (*iter).mID )); - else - gVFS->removeFile((*iter).mID, (*iter).mType); - iter = mFiles.erase(iter); - } - else ++iter; - } - refresh(); -} -void LLFloaterVFS::setMassEnabled(bool enabled) -{ - childSetEnabled("clear_btn", enabled); - childSetEnabled("reload_all_btn", enabled); // SHOULD WORK NOW! -} -void LLFloaterVFS::setEditEnabled(bool enabled) -{ - childSetEnabled("name_edit", enabled); - childSetEnabled("id_edit", false); // DOESN'T WORK - childSetEnabled("type_combo", false); // DOESN'T WORK - childSetEnabled("copy_uuid_btn", enabled); - childSetEnabled("item_btn", enabled); - childSetEnabled("reload_btn", enabled); // WORKS! - childSetEnabled("remove_btn", enabled); -} - -// static -void LLFloaterVFS::onClickAdd(void* user_data) -{ - if(!user_data) return; - AIFilePicker* filepicker = AIFilePicker::create(); - filepicker->open(); - filepicker->run(boost::bind(&LLFloaterVFS::onClickAdd_continued, user_data, filepicker)); -} - -// static -void LLFloaterVFS::onClickAdd_continued(void* user_data, AIFilePicker* filepicker) -{ - LLFloaterVFS* self = (LLFloaterVFS*)user_data; - if (filepicker->hasFilename()) - { - std::string file_name = filepicker->getFilename(); - std::string temp_filename = file_name + ".tmp"; - LLAssetType::EType asset_type = LLAssetConverter::convert(file_name, temp_filename); - if(asset_type == LLAssetType::AT_NONE) - { - // todo: show a warning - return; - } - LLUUID asset_id; - asset_id.generate(); - S32 file_size; - LLAPRFile fp(temp_filename, LL_APR_RB, &file_size); - if(fp.getFileHandle()) - { - if(asset_type == LLAssetType::AT_TEXTURE) - { - fp.close(); - //load the texture using built in functions - LLPointer image_j2c = new LLImageJ2C; - if( !image_j2c->loadAndValidate( temp_filename ) ) - { - llinfos << "Image: " << file_name << " is corrupt." << llendl; - return; - } - LLPointer image_raw = new LLImageRaw; - if( !image_j2c->decode(image_raw,0.0f) ) - { - llinfos << "Image: " << file_name << " is corrupt." << llendl; - return; - } - LLPointer imagep = new LLViewerFetchedTexture(asset_id); - imagep->createGLTexture(0, image_raw, 0, TRUE, LLGLTexture::BOOST_NONE); - gTextureList.addImage(imagep); - } - else - { - LLVFile file(gVFS, asset_id, asset_type, LLVFile::WRITE); - file.setMaxSize(file_size); - const S32 buf_size = 65536; - U8 copy_buf[buf_size]; - while ((file_size = fp.read(copy_buf, buf_size))) - file.write(copy_buf, file_size); - fp.close(); - } - } - else - { - if(temp_filename != file_name) - { - LLFile::remove(temp_filename); - } - // todo: show a warning, couldn't open the selected file - return; - } - if(temp_filename != file_name) - { - LLFile::remove(temp_filename); - } - entry file; - file.mFilename = file_name; - file.mID = asset_id; - file.mType = asset_type; - file.mName = gDirUtilp->getBaseFileName(file_name, true); - self->add(file); - /*if(self->getChild("create_pretend_item")->get()) - { - LLLocalInventory::addItem(file.mName, (int)file.mType, file.mID, true); - }*/ - } -} -// static -void LLFloaterVFS::onClickClear(void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - if(!floaterp) return; - floaterp->clear(); -} -// static -void LLFloaterVFS::onClickReloadAll(void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - if(!floaterp) return; - floaterp->reloadAll(); -} -// static -void LLFloaterVFS::onCommitFileList(LLUICtrl* ctrl, void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - LLScrollListCtrl* list = floaterp->getChild("file_list"); - LLUUID selected_id(LLUUID::null); - if(list->getFirstSelected()) - selected_id = list->getFirstSelected()->getUUID(); - floaterp->setEditID(selected_id); -} -// static -void LLFloaterVFS::onCommitEdit(LLUICtrl* ctrl, void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - floaterp->commitEdit(); -} -// static -void LLFloaterVFS::onClickCopyUUID(void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - entry file = floaterp->getEditEntry(); - gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(file.mID.asString())); -} -// static -void LLFloaterVFS::onClickItem(void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - entry file = floaterp->getEditEntry(); - LLLocalInventory::addItem(file.mName, (int)file.mType, file.mID, true); -} -// static -void LLFloaterVFS::onClickReload(void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - entry file = floaterp->getEditEntry(); - floaterp->reloadEntry(file); -} -// static -void LLFloaterVFS::onClickRemove(void* user_data) -{ - LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data; - floaterp->removeEntry(); -} -// diff --git a/indra/newview/llfloatervfs.h b/indra/newview/llfloatervfs.h deleted file mode 100644 index 47d1d8755..000000000 --- a/indra/newview/llfloatervfs.h +++ /dev/null @@ -1,50 +0,0 @@ -// -#ifndef LL_LLFLOATERVFS_H -#define LL_LLFLOATERVFS_H -#include "llfloater.h" -#include "llassettype.h" - -class AIFilePicker; - -class LLFloaterVFS : LLFloater -{ -typedef struct -{ - std::string mFilename; - std::string mName; - LLUUID mID; - LLAssetType::EType mType; -} entry; -public: - LLFloaterVFS(); - ~LLFloaterVFS(); - static void show(); - BOOL postBuild(); - void refresh(); - void add(entry file); - void clear(); - void reloadAll(); - void setEditID(LLUUID edit_id); - entry getEditEntry(); - void commitEdit(); - void reloadEntry(entry file); - void removeEntry(); - static void onClickAdd(void* user_data); - static void onClickAdd_continued(void* user_data, AIFilePicker* filepicker); - static void onClickClear(void* user_data); - static void onClickReloadAll(void* user_data); - static void onCommitFileList(LLUICtrl* ctrl, void* user_data); - static void onCommitEdit(LLUICtrl* ctrl, void* user_data); - static void onClickCopyUUID(void* user_data); - static void onClickItem(void* user_data); - static void onClickReload(void* user_data); - static void onClickRemove(void* user_data); -private: - static LLFloaterVFS* sInstance; - static std::list mFiles; - LLUUID mEditID; - void setMassEnabled(bool enabled); - void setEditEnabled(bool enabled); -}; -#endif -// diff --git a/indra/newview/llfloatervfsexplorer.cpp b/indra/newview/llfloatervfsexplorer.cpp deleted file mode 100644 index 9c4030bee..000000000 --- a/indra/newview/llfloatervfsexplorer.cpp +++ /dev/null @@ -1,182 +0,0 @@ -// -//A lot of bad things going on in here, needs a rewrite. -#include "llviewerprecompiledheaders.h" -#include "llfloatervfsexplorer.h" -#include "lluictrlfactory.h" -#include "llscrolllistctrl.h" -#include "llcheckboxctrl.h" -#include "llvfs.h" -#include "lllocalinventory.h" -#include "llviewerwindow.h" -#include "llassetconverter.h" - -LLFloaterVFSExplorer* LLFloaterVFSExplorer::sInstance; -std::map LLFloaterVFSExplorer::sVFSFileMap; - -LLFloaterVFSExplorer::LLFloaterVFSExplorer() -: LLFloater(), - mEditID(LLUUID::null) -{ - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_vfs_explorer.xml"); -} -LLFloaterVFSExplorer::~LLFloaterVFSExplorer() -{ - sInstance = NULL; -} -// static -void LLFloaterVFSExplorer::show() -{ - if(sInstance) - sInstance->open(); - else - { - sInstance = new LLFloaterVFSExplorer(); - sInstance->open(); - } -} -BOOL LLFloaterVFSExplorer::postBuild() -{ - childSetCommitCallback("file_list", onCommitFileList, this); - childSetAction("remove_btn", onClickRemove, this); - childSetAction("reload_all_btn", onClickReload, this); - childSetAction("copy_uuid_btn", onClickCopyUUID, this); - childSetAction("item_btn", onClickItem, this); - refresh(); - return TRUE; -} -void LLFloaterVFSExplorer::refresh() -{ - LLScrollListCtrl* list = getChild("file_list"); - list->clearRows(); - sVFSFileMap = gVFS->getFileList(); - std::map::iterator end = sVFSFileMap.end(); - for(std::map::iterator iter = sVFSFileMap.begin(); iter != end; ++iter) - { - LLVFSFileSpecifier file_spec = iter->first; - LLSD element; - element["id"] = file_spec.mFileID; - LLSD& name_column = element["columns"][0]; - name_column["column"] = "name"; - name_column["value"] = file_spec.mFileID.asString(); - LLSD& type_column = element["columns"][1]; - type_column["column"] = "type"; - type_column["value"] = std::string(LLAssetType::lookup(file_spec.mFileType)); - list->addElement(element, ADD_BOTTOM); - } - setEditID(mEditID); -} -void LLFloaterVFSExplorer::reloadAll() -{ - //get our magic from gvfs here - //this should re-request all assets from the server if possible. - refresh(); -} -void LLFloaterVFSExplorer::setEditID(LLUUID edit_id) -{ - LLScrollListCtrl* list = getChild("file_list"); - bool found_in_list = (list->getItemIndex(edit_id) != -1); - bool found_in_files = false; - LLVFSFileSpecifier file; - std::map::iterator end = sVFSFileMap.end(); - for(std::map::iterator iter = sVFSFileMap.begin(); iter != end; ++iter) - { - if((*iter).first.mFileID == edit_id) - { - found_in_files = true; - file = (*iter).first; - break; - } - } - if(found_in_files && found_in_list) - { - mEditID = edit_id; - list->selectByID(edit_id); - setEditEnabled(true); - childSetText("name_edit", file.mFileID.asString()); - childSetText("id_edit", file.mFileID.asString()); - childSetValue("type_combo", std::string(LLAssetType::lookup(file.mFileType))); - } - else - { - mEditID = LLUUID::null; - list->deselectAllItems(TRUE); - setEditEnabled(false); - childSetText("name_edit", std::string("")); - childSetText("id_edit", std::string("")); - childSetValue("type_combo", std::string("animatn")); - } -} -LLVFSFileSpecifier LLFloaterVFSExplorer::getEditEntry() -{ - LLVFSFileSpecifier file; - std::map::iterator end = sVFSFileMap.end(); - for(std::map::iterator iter = sVFSFileMap.begin(); iter != end; ++iter) - { - if((*iter).first.mFileID == mEditID) - return (*iter).first; - } - file.mFileID = LLUUID::null; - return file; -} - -void LLFloaterVFSExplorer::removeEntry() -{ - std::map::iterator end = sVFSFileMap.end(); - for(std::map::iterator iter = sVFSFileMap.begin(); iter != end; ++iter) - { - if((*iter).first.mFileID == mEditID) - { - gVFS->removeFile((*iter).first.mFileID, (*iter).first.mFileType); - sVFSFileMap.erase(iter); - break; - } - else ++iter; - } - refresh(); -} -void LLFloaterVFSExplorer::setEditEnabled(bool enabled) -{ - childSetEnabled("name_edit", false); - childSetEnabled("id_edit", false); - childSetEnabled("type_combo", false); - childSetEnabled("edit_data_btn", enabled); - childSetEnabled("remove_btn", enabled); - childSetEnabled("copy_uuid_btn", enabled); -} -// static -void LLFloaterVFSExplorer::onCommitFileList(LLUICtrl* ctrl, void* user_data) -{ - LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data; - LLScrollListCtrl* list = floaterp->getChild("file_list"); - LLUUID selected_id(LLUUID::null); - if(list->getFirstSelected()) - selected_id = list->getFirstSelected()->getUUID(); - floaterp->setEditID(selected_id); -} -// static -void LLFloaterVFSExplorer::onClickCopyUUID(void* user_data) -{ - LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data; - LLVFSFileSpecifier file = floaterp->getEditEntry(); - gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(file.mFileID.asString())); -} -// static -void LLFloaterVFSExplorer::onClickRemove(void* user_data) -{ - LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data; - floaterp->removeEntry(); -} -// static -void LLFloaterVFSExplorer::onClickReload(void* user_data) -{ - LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data; - floaterp->reloadAll(); -} -// static -void LLFloaterVFSExplorer::onClickItem(void* user_data) -{ - LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data; - LLVFSFileSpecifier file = floaterp->getEditEntry(); - LLLocalInventory::addItem(file.mFileID.asString(),file.mFileType,file.mFileID,true); -} -// diff --git a/indra/newview/llfloatervfsexplorer.h b/indra/newview/llfloatervfsexplorer.h deleted file mode 100644 index 34fd8e2d4..000000000 --- a/indra/newview/llfloatervfsexplorer.h +++ /dev/null @@ -1,41 +0,0 @@ -// -#ifndef LL_LLFLOATERVFSEXPLORER_H -#define LL_LLFLOATERVFSEXPLORER_H - -#include "llfloater.h" -#include "llassettype.h" -#include "llvfs.h" - -class LLFloaterVFSExplorer : LLFloater -{ -typedef struct -{ - std::string mFilename; - std::string mName; - LLUUID mID; - LLAssetType::EType mType; -} entry; -public: - LLFloaterVFSExplorer(); - ~LLFloaterVFSExplorer(); - static void show(); - BOOL postBuild(); - void refresh(); - void reloadAll(); - void removeEntry(); - void setEditID(LLUUID edit_id); - LLVFSFileSpecifier getEditEntry(); - static void onCommitFileList(LLUICtrl* ctrl, void* user_data); - static void onClickCopyUUID(void* user_data); - static void onClickRemove(void* user_data); - static void onClickReload(void* user_data); - static void onClickEditData(void* user_data); - static void onClickItem(void* user_data); -private: - static LLFloaterVFSExplorer* sInstance; - static std::map sVFSFileMap; - LLUUID mEditID; - void setEditEnabled(bool enabled); -}; -#endif -// diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp index c893efc58..5da4452e3 100644 --- a/indra/newview/llfloaterwater.cpp +++ b/indra/newview/llfloaterwater.cpp @@ -689,13 +689,11 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r { LLFloaterDayCycle* day_cycle = NULL; LLComboBox* key_combo = NULL; - LLMultiSliderCtrl* mult_sldr = NULL; if(LLFloaterDayCycle::isOpen()) { day_cycle = LLFloaterDayCycle::instance(); key_combo = day_cycle->getChild("WaterKeyPresets"); - mult_sldr = day_cycle->getChild("WaterDayCycleKeys"); } std::string name = sWaterMenu->mWaterPresetCombo->getSelectedValue().asString(); diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index a907baee3..116ecbdec 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -875,14 +875,11 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS { LLFloaterDayCycle* day_cycle = NULL; LLComboBox* key_combo = NULL; - LLMultiSliderCtrl* mult_sldr = NULL; if(LLFloaterDayCycle::isOpen()) { day_cycle = LLFloaterDayCycle::instance(); - key_combo = day_cycle->getChild( - "WLKeyPresets"); - mult_sldr = day_cycle->getChild("WLDayCycleKeys"); + key_combo = day_cycle->getChild("WLKeyPresets"); } std::string name(mSkyPresetCombo->getSelectedValue().asString()); diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index e474dec9e..8c84104f2 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2046,7 +2046,6 @@ void LLFolderView::scrollToShowItem(LLFolderViewItem* item, const LLRect& constr { LLRect local_rect = item->getLocalRect(); LLRect item_scrolled_rect; // item position relative to display area of scroller - LLRect visible_doc_rect = mScrollContainer->getVisibleContentRect(); S32 icon_height = mIcon.isNull() ? 0 : mIcon->getHeight(); S32 label_height = llround(getLabelFontForStyle(mLabelStyle)->getLineHeight()); diff --git a/indra/newview/llhoverview.cpp b/indra/newview/llhoverview.cpp index fa922a94b..2427a89cb 100644 --- a/indra/newview/llhoverview.cpp +++ b/indra/newview/llhoverview.cpp @@ -505,14 +505,10 @@ void LLHoverView::updateText() LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel(); LLUUID owner; - S32 width = 0; - S32 height = 0; if ( hover_parcel ) { owner = hover_parcel->getOwnerID(); - width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth()); - height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight()); } // Line: "Land" @@ -636,15 +632,6 @@ void LLHoverView::updateText() } } - // Line: "Size: 1x4" - // Only show for non-public land - /* - if ( hover_parcel && LLUUID::null != owner) - { - line = llformat("Size: %dx%d", width, height ); - mText.push_back(line); - } - */ if (hover_parcel && hover_parcel->getParcelFlag(PF_FOR_SALE)) { LLStringUtil::format_map_t args; diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 338bf45cf..d81d9e6f2 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -197,11 +197,8 @@ void LLHUDText::renderText() LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec); } - LLVector2 border_scale_vec((F32)border_width / (F32)imagep->getTextureWidth(), (F32)border_height / (F32)imagep->getTextureHeight()); LLVector3 width_vec = mWidth * x_pixel_vec; LLVector3 height_vec = mHeight * y_pixel_vec; - LLVector3 scaled_border_width = (F32)llfloor(border_scale * (F32)border_width) * x_pixel_vec; - LLVector3 scaled_border_height = (F32)llfloor(border_scale * (F32)border_height) * y_pixel_vec; mRadius = (width_vec + height_vec).magVec() * 0.5f; @@ -492,7 +489,7 @@ LLVector2 LLHUDText::updateScreenPos(LLVector2 &offset) LLVector3 x_pixel_vec; LLVector3 y_pixel_vec; LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec); - LLVector3 world_pos = mPositionAgent + (offset.mV[VX] * x_pixel_vec) + (offset.mV[VY] * y_pixel_vec); +// LLVector3 world_pos = mPositionAgent + (offset.mV[VX] * x_pixel_vec) + (offset.mV[VY] * y_pixel_vec); // if (!LLViewerCamera::getInstance()->projectPosAgentToScreen(world_pos, screen_pos, FALSE) && mVisibleOffScreen) // { // // bubble off-screen, so find a spot for it along screen edge diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index c2aee105b..953f7c097 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -2145,8 +2145,6 @@ void LLFloaterIMPanel::sendMsg() std::string prefix = utf8text.substr(0, 4); if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1) && !mRPMode) { - // Chalice - OOC autoclosing patch based on code by Henri Beauchamp - int needsClosingType=0; //Check if it needs the end-of-chat brackets -HgB if (utf8text.find("((") == 0 && utf8text.find("))") == std::string::npos) { @@ -2160,8 +2158,7 @@ void LLFloaterIMPanel::sendMsg() utf8text+=" "; utf8text+="]]"; } - //Check if it needs the start-of-chat brackets -HgB - needsClosingType=0; + if (prefix != "/me " && prefix != "/me'") //Allow /me to end with )) or ]] { if (utf8text.find("((") == std::string::npos && utf8text.find("))") == (utf8text.length() - 2)) diff --git a/indra/newview/llinventoryactions.cpp b/indra/newview/llinventoryactions.cpp index 46a92a09d..5f0c183ee 100644 --- a/indra/newview/llinventoryactions.cpp +++ b/indra/newview/llinventoryactions.cpp @@ -95,9 +95,6 @@ // #include "lllocalinventory.h" -#include "llinventorybackup.h" -//#include "llcheats.h" -//#include "llnotecardmagic.h" #include "statemachine/aifilepicker.h" // diff --git a/indra/newview/llinventorybackup.cpp b/indra/newview/llinventorybackup.cpp deleted file mode 100644 index 0976daf8a..000000000 --- a/indra/newview/llinventorybackup.cpp +++ /dev/null @@ -1,790 +0,0 @@ -// -#include "llviewerprecompiledheaders.h" - -#include "llinventorybackup.h" -#include "llinventorymodel.h" -#include "llviewerinventory.h" -#include "statemachine/aifilepicker.h" -#include "statemachine/aidirpicker.h" -#include "llviewertexturelist.h" // gTextureList -#include "llagent.h" // gAgent -#include "llviewerwindow.h" // gViewerWindow -#include "llfloater.h" -#include "lluictrlfactory.h" -#include "llscrolllistctrl.h" -#include "llimagetga.h" -#include "llnotificationsutil.h" - -std::list LLFloaterInventoryBackup::sInstances; - -LLInventoryBackupOrder::LLInventoryBackupOrder() -{ - // My personal defaults based on what is assumed to not work - mDownloadTextures = true; - mDownloadSounds = true; - mDownloadCallingCards = false; - mDownloadLandmarks = true; - mDownloadScripts = true; - mDownloadWearables = true; - mDownloadObjects = false; - mDownloadNotecards = true; - mDownloadAnimations = true; - mDownloadGestures = true; - //mDownloadOthers = true; -} - -LLFloaterInventoryBackupSettings::LLFloaterInventoryBackupSettings(LLInventoryBackupOrder* order) -: LLFloater(), - mOrder(order) -{ - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_backup_settings.xml"); -} - -LLFloaterInventoryBackupSettings::~LLFloaterInventoryBackupSettings() -{ -} - -BOOL LLFloaterInventoryBackupSettings::postBuild(void) -{ - childSetValue("chk_textures", mOrder->mDownloadTextures); - childSetValue("chk_sounds", mOrder->mDownloadSounds); - childSetValue("chk_callingcards", mOrder->mDownloadCallingCards); - childSetValue("chk_landmarks", mOrder->mDownloadLandmarks); - childSetValue("chk_scripts", mOrder->mDownloadScripts); - childSetValue("chk_wearables", mOrder->mDownloadWearables); - childSetValue("chk_objects", mOrder->mDownloadObjects); - childSetValue("chk_notecards", mOrder->mDownloadNotecards); - childSetValue("chk_animations", mOrder->mDownloadAnimations); - childSetValue("chk_gestures", mOrder->mDownloadGestures); - //childSetValue("chk_others", mOrder->mDownloadOthers); - - childSetAction("next_btn", LLFloaterInventoryBackupSettings::onClickNext, this); - - return TRUE; -} - -// static -void LLFloaterInventoryBackupSettings::onClickNext(void* userdata) -{ - LLFloaterInventoryBackupSettings* floater = (LLFloaterInventoryBackupSettings*)userdata; - LLInventoryBackupOrder* order = floater->mOrder; - - // Apply changes to filters - order->mDownloadAnimations = floater->childGetValue("chk_animations"); - order->mDownloadCallingCards = floater->childGetValue("chk_callingcards"); - order->mDownloadGestures = floater->childGetValue("chk_gestures"); - order->mDownloadLandmarks = floater->childGetValue("chk_landmarks"); - order->mDownloadNotecards = floater->childGetValue("chk_notecards"); - order->mDownloadObjects = floater->childGetValue("chk_objects"); - //order->mDownloadOthers = floater->childGetValue("chk_others"); - order->mDownloadScripts = floater->childGetValue("chk_scripts"); - order->mDownloadSounds = floater->childGetValue("chk_sounds"); - order->mDownloadTextures = floater->childGetValue("chk_textures"); - order->mDownloadWearables = floater->childGetValue("chk_wearables"); - - // Make filters - std::map type_remove; - type_remove[LLAssetType::AT_ANIMATION] = !order->mDownloadAnimations; - type_remove[LLAssetType::AT_BODYPART] = !order->mDownloadWearables; - type_remove[LLAssetType::AT_CALLINGCARD] = !order->mDownloadCallingCards; - type_remove[LLAssetType::AT_CLOTHING] = !order->mDownloadWearables; - type_remove[LLAssetType::AT_GESTURE] = !order->mDownloadGestures; - type_remove[LLAssetType::AT_IMAGE_JPEG] = !order->mDownloadTextures; - type_remove[LLAssetType::AT_IMAGE_TGA] = !order->mDownloadTextures; - type_remove[LLAssetType::AT_LANDMARK] = !order->mDownloadLandmarks; - type_remove[LLAssetType::AT_LSL_TEXT] = !order->mDownloadScripts; - type_remove[LLAssetType::AT_NOTECARD] = !order->mDownloadNotecards; - type_remove[LLAssetType::AT_OBJECT] = !order->mDownloadObjects; - type_remove[LLAssetType::AT_SCRIPT] = !order->mDownloadScripts; - type_remove[LLAssetType::AT_SOUND] = !order->mDownloadSounds; - type_remove[LLAssetType::AT_SOUND_WAV] = !order->mDownloadSounds; - type_remove[LLAssetType::AT_TEXTURE] = !order->mDownloadTextures; - type_remove[LLAssetType::AT_TEXTURE_TGA] = !order->mDownloadTextures; - - // Apply filters - std::vector::iterator item_iter = order->mItems.begin(); - for( ; item_iter != order->mItems.end(); ) - { - if(type_remove[(*item_iter)->getType()]) - item_iter = order->mItems.erase(item_iter); - else - ++item_iter; - } - - if(order->mItems.size() < 1) - { - LLSD args; - args["ERROR_MESSAGE"] = "No items passed the filter \\o/"; - LLNotificationsUtil::add("ErrorMessage", args); - return; - } - - // Get dir name - AIDirPicker* dirpicker = new AIDirPicker("New Folder"); - dirpicker->run(boost::bind(&LLFloaterInventoryBackupSettings::onClickNext_continued, userdata, dirpicker)); -} - -// static -void LLFloaterInventoryBackupSettings::onClickNext_continued(void* userdata, AIDirPicker* dirpicker) -{ - LLFloaterInventoryBackupSettings* floater = (LLFloaterInventoryBackupSettings*)userdata; - LLInventoryBackupOrder* order = floater->mOrder; - - if (!dirpicker->hasDirname()) - { - floater->close(); - return; - } - std::string dirname = dirpicker->getDirname(); - - // Make local directory tree - LLFile::mkdir(dirname); - std::vector::iterator _cat_iter = order->mCats.begin(); - std::vector::iterator _cat_end = order->mCats.end(); - for( ; _cat_iter != _cat_end; ++_cat_iter) - { - std::string path = dirname + OS_SEP + LLInventoryBackup::getPath(*_cat_iter, order->mCats); - LLFile::mkdir(path); - } - - // Go go backup floater - LLFloaterInventoryBackup* backup_floater = new LLFloaterInventoryBackup(dirname, order->mCats, order->mItems); - backup_floater->center(); - - // Close myself - floater->close(); -} - -// static -bool LLInventoryBackup::itemIsFolder(LLInventoryItem* item) -{ - return ((item->getInventoryType() == LLInventoryType::IT_CATEGORY) - || (item->getInventoryType() == LLInventoryType::IT_ROOT_CATEGORY)); -} - -// static -ESaveFilter LLInventoryBackup::getSaveFilter(LLInventoryItem* item) -{ - LLAssetType::EType type = item->getType(); - LLWearableType::EType wear = (LLWearableType::EType)(item->getFlags() & 0xFF); - switch(type) - { - case LLAssetType::AT_TEXTURE: - return FFSAVE_TGA; - case LLAssetType::AT_SOUND: - return FFSAVE_OGG; - case LLAssetType::AT_SCRIPT: - case LLAssetType::AT_LSL_TEXT: - return FFSAVE_SCRIPT; - case LLAssetType::AT_ANIMATION: - return FFSAVE_ANIMATN; - case LLAssetType::AT_GESTURE: - return FFSAVE_GESTURE; - case LLAssetType::AT_NOTECARD: - return FFSAVE_NOTECARD; - case LLAssetType::AT_LANDMARK: - return FFSAVE_LANDMARK; - case LLAssetType::AT_BODYPART: - case LLAssetType::AT_CLOTHING: - switch(wear) - { - case LLWearableType::WT_EYES: - return FFSAVE_EYES; - case LLWearableType::WT_GLOVES: - return FFSAVE_GLOVES; - case LLWearableType::WT_HAIR: - return FFSAVE_HAIR; - case LLWearableType::WT_JACKET: - return FFSAVE_JACKET; - case LLWearableType::WT_PANTS: - return FFSAVE_PANTS; - case LLWearableType::WT_SHAPE: - return FFSAVE_SHAPE; - case LLWearableType::WT_SHIRT: - return FFSAVE_SHIRT; - case LLWearableType::WT_SHOES: - return FFSAVE_SHOES; - case LLWearableType::WT_SKIN: - return FFSAVE_SKIN; - case LLWearableType::WT_SKIRT: - return FFSAVE_SKIRT; - case LLWearableType::WT_SOCKS: - return FFSAVE_SOCKS; - case LLWearableType::WT_UNDERPANTS: - return FFSAVE_UNDERPANTS; - case LLWearableType::WT_UNDERSHIRT: - return FFSAVE_UNDERSHIRT; - case LLWearableType::WT_PHYSICS: - return FFSAVE_PHYSICS; - default: - return FFSAVE_ALL; - } - default: - return FFSAVE_ALL; - } -} - -// static -std::string LLInventoryBackup::getExtension(LLInventoryItem* item) -{ - LLAssetType::EType type = item->getType(); - LLWearableType::EType wear = (LLWearableType::EType)(item->getFlags() & 0xFF); - std::string scratch; - switch(type) - { - case LLAssetType::AT_TEXTURE: - return ".tga"; - case LLAssetType::AT_SOUND: - return ".ogg"; - case LLAssetType::AT_SCRIPT: - case LLAssetType::AT_LSL_TEXT: - return ".lsl"; - case LLAssetType::AT_ANIMATION: - return ".animatn"; - case LLAssetType::AT_GESTURE: - return ".gesture"; - case LLAssetType::AT_NOTECARD: - return ".notecard"; - case LLAssetType::AT_LANDMARK: - return ".landmark"; - case LLAssetType::AT_BODYPART: - case LLAssetType::AT_CLOTHING: - scratch = LLWearableType::getTypeName(wear); - if(scratch == "invalid") - { - if(type == LLAssetType::AT_BODYPART) - scratch = "bodypart"; - else - scratch = "clothing"; - } - return "." + scratch; - default: - return ""; - } -} - -// static -std::string LLInventoryBackup::getUniqueFilename(std::string filename, std::string extension) -{ - if(LLFile::isfile( (filename + extension).c_str() )) - { - int i = 1; - while(LLFile::isfile( (filename + llformat(" %d", i) + extension).c_str() )) - { - i++; - } - return filename + llformat(" %d", i) + extension; - } - return filename + extension; -} - -// static -std::string LLInventoryBackup::getUniqueDirname(std::string dirname) -{ - if(LLFile::isdir(dirname.c_str())) - { - int i = 1; - while(LLFile::isdir( (dirname + llformat(" %d", i)).c_str() )) - { - i++; - } - return dirname + llformat(" %d", i); - } - return dirname; -} - - -// static -void LLInventoryBackup::download(LLInventoryItem* item, LLFloater* floater, loaded_callback_func onImage, LLGetAssetCallback onAsset) -{ - LLInventoryBackup::callbackdata* userdata = new LLInventoryBackup::callbackdata(); - userdata->floater = floater; - userdata->item = item; - LLViewerFetchedTexture* imagep; - - switch(item->getType()) - { - case LLAssetType::AT_TEXTURE: - imagep = LLViewerTextureManager::getFetchedTexture(item->getAssetUUID(), MIPMAP_TRUE, LLGLTexture::BOOST_UI); - imagep->setLoadedCallback( onImage, 0, TRUE, FALSE, userdata, NULL ); // was setLoadedCallbackNoAuth - break; - case LLAssetType::AT_NOTECARD: - case LLAssetType::AT_SCRIPT: - case LLAssetType::AT_LSL_TEXT: // normal script download - case LLAssetType::AT_LSL_BYTECODE: - gAssetStorage->getInvItemAsset(LLHost::invalid, - gAgent.getID(), - gAgent.getSessionID(), - item->getPermissions().getOwner(), - LLUUID::null, - item->getUUID(), - item->getAssetUUID(), - item->getType(), - onAsset, - userdata, // user_data - TRUE); - break; - case LLAssetType::AT_SOUND: - case LLAssetType::AT_CLOTHING: - case LLAssetType::AT_BODYPART: - case LLAssetType::AT_ANIMATION: - case LLAssetType::AT_GESTURE: - default: - gAssetStorage->getAssetData(item->getAssetUUID(), item->getType(), onAsset, userdata, TRUE); - break; - } -} - -// static -void LLInventoryBackup::imageCallback(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata) -{ - if(final) - { - LLInventoryBackup::callbackdata* data = static_cast(userdata); - LLInventoryItem* item = data->item; - - if(!success) - { - LLSD args; - args["ERROR_MESSAGE"] = "Download didn't work on " + item->getName() + "."; - LLNotificationsUtil::add("ErrorMessage", args); - return; - } - - AIFilePicker* filepicker = AIFilePicker::create(); - filepicker->open(LLDir::getScrubbedFileName(item->getName()), getSaveFilter(item)); - filepicker->run(boost::bind(&LLInventoryBackup::imageCallback_continued, src, filepicker)); - } - else - { - src_vi->setBoostLevel(LLGLTexture::BOOST_UI); - } -} - -void LLInventoryBackup::imageCallback_continued(LLImageRaw* src, AIFilePicker* filepicker) -{ - if (!filepicker->hasFilename()) - return; - - std::string filename = filepicker->getFilename(); - - LLPointer image_tga = new LLImageTGA; - if( !image_tga->encode( src ) ) - { - LLSD args; - args["ERROR_MESSAGE"] = "Couldn't encode file."; - LLNotificationsUtil::add("ErrorMessage", args); - } - else if( !image_tga->save( filename ) ) - { - LLSD args; - args["ERROR_MESSAGE"] = "Couldn't write file."; - LLNotificationsUtil::add("ErrorMessage", args); - } -} - -// static -void LLInventoryBackup::assetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status) -{ - LLInventoryBackup::callbackdata* data = static_cast(user_data); - LLInventoryItem* item = data->item; - - if(status != 0) - { - LLSD args; - args["ERROR_MESSAGE"] = "Download didn't work on " + item->getName() + "."; - LLNotificationsUtil::add("ErrorMessage", args); - return; - } - - // Todo: this doesn't work for static vfs shit - LLVFile file(vfs, asset_uuid, type, LLVFile::READ); - S32 size = file.getSize(); - - char* buffer = new char[size]; // Deleted in assetCallback_continued. - if (buffer == NULL) - { - llerrs << "Memory Allocation Failed" << llendl; - return; - } - - file.read((U8*)buffer, size); - - // Write it back out... - - AIFilePicker* filepicker = AIFilePicker::create(); - filepicker->open(LLDir::getScrubbedFileName(item->getName()), getSaveFilter(item)); - filepicker->run(boost::bind(&LLInventoryBackup::assetCallback_continued, buffer, size, filepicker)); -} - -// static -void LLInventoryBackup::assetCallback_continued(char* buffer, S32 size, AIFilePicker* filepicker) -{ - if (filepicker->hasFilename()) - { - std::string filename = filepicker->getFilename(); - std::ofstream export_file(filename.c_str(), std::ofstream::binary); - export_file.write(buffer, size); - export_file.close(); - } - delete [] buffer; -} - -// static -void LLInventoryBackup::climb(LLInventoryCategory* cat, - std::vector& cats, - std::vector& items) -{ - LLInventoryModel* model = &gInventory; - - // Add this category - cats.push_back(cat); - - LLInventoryModel::cat_array_t *direct_cats; - LLInventoryModel::item_array_t *direct_items; - model->getDirectDescendentsOf(cat->getUUID(), direct_cats, direct_items); - - // Add items - LLInventoryModel::item_array_t::iterator item_iter = direct_items->begin(); - LLInventoryModel::item_array_t::iterator item_end = direct_items->end(); - for( ; item_iter != item_end; ++item_iter) - { - items.push_back(*item_iter); - } - - // Do subcategories - LLInventoryModel::cat_array_t::iterator cat_iter = direct_cats->begin(); - LLInventoryModel::cat_array_t::iterator cat_end = direct_cats->end(); - for( ; cat_iter != cat_end; ++cat_iter) - { - climb(*cat_iter, cats, items); - } -} - -// static -std::string LLInventoryBackup::getPath(LLInventoryCategory* cat, std::vector cats) -{ - LLInventoryModel* model = &gInventory; - std::string path = LLDir::getScrubbedFileName(cat->getName()); - LLInventoryCategory* parent = model->getCategory(cat->getParentUUID()); - while(parent && (std::find(cats.begin(), cats.end(), parent) != cats.end())) - { - path = LLDir::getScrubbedFileName(parent->getName()) + OS_SEP + path; - parent = model->getCategory(parent->getParentUUID()); - } - return path; -} - -// static -void LLInventoryBackup::save(LLFolderView* folder) -{ - LLInventoryModel* model = &gInventory; - - std::set selected_items = folder->getSelectionList(); - - if(selected_items.size() < 1) - { - // No items selected? Omg - return; - } - else if(selected_items.size() == 1) - { - // One item. See if it's a folder - LLUUID id = *(selected_items.begin()); - LLInventoryItem* item = model->getItem(id); - if(item) - { - if(!itemIsFolder(item)) - { - // Single item, save it now - LLInventoryBackup::download((LLViewerInventoryItem*)item, NULL, imageCallback, assetCallback); - return; - } - } - } - - // We got here? We need to save multiple items or at least make a folder - - std::vector cats; - std::vector items; - - // Make complete lists of child categories and items - std::set::iterator sel_iter = selected_items.begin(); - std::set::iterator sel_end = selected_items.end(); - for( ; sel_iter != sel_end; ++sel_iter) - { - LLInventoryCategory* cat = model->getCategory(*sel_iter); - if(cat) - { - climb(cat, cats, items); - } - } - - // And what about items inside a folder that wasn't selected? - // I guess I will just add selected items, so long as they aren't already added - for(sel_iter = selected_items.begin(); sel_iter != sel_end; ++sel_iter) - { - LLInventoryItem* item = model->getItem(*sel_iter); - if(item) - { - if(std::find(items.begin(), items.end(), item) == items.end()) - { - items.push_back(item); - LLInventoryCategory* parent = model->getCategory(item->getParentUUID()); - if(std::find(cats.begin(), cats.end(), parent) == cats.end()) - { - cats.push_back(parent); - } - } - } - } - - LLInventoryBackupOrder* order = new LLInventoryBackupOrder(); - order->mCats = cats; - order->mItems = items; - LLFloaterInventoryBackupSettings* floater = new LLFloaterInventoryBackupSettings(order); - floater->center(); -} - - - -LLFloaterInventoryBackup::LLFloaterInventoryBackup(std::string path, std::vector cats, std::vector items) -: LLFloater(), - mPath(path), - mCats(cats), - mItems(items), - mBusy(0) -{ - mItemsTotal = mItems.size(); - mItemsCompleted = 0; - - LLFloaterInventoryBackup::sInstances.push_back(this); - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_backup.xml"); -} - - -LLFloaterInventoryBackup::~LLFloaterInventoryBackup() -{ - LLFloaterInventoryBackup::sInstances.remove(this); -} - -BOOL LLFloaterInventoryBackup::postBuild(void) -{ - // Make progress bar - - /* - LLLineEditor* line = new LLLineEditor( - std::string("progress_line"), - LLRect(4, 80, 396, 60), - std::string("Progress")); - line->setEnabled(FALSE); - addChild(line); - - LLViewBorder* border = new LLViewBorder( - "progress_border", - LLRect(4, 79, 395, 60)); - addChild(border); - */ - - // Add all items to the list - - LLScrollListCtrl* list = getChild("item_list"); - - std::vector::iterator item_iter = mItems.begin(); - std::vector::iterator item_end = mItems.end(); - for( ; item_iter != item_end; ++item_iter) - { - LLSD element; - element["id"] = (*item_iter)->getUUID(); - - LLSD& type_column = element["columns"][LIST_TYPE]; - type_column["column"] = "type"; - type_column["type"] = "icon"; - type_column["value"] = "move_down_in.tga"; // FIXME - - LLSD& name_column = element["columns"][LIST_NAME]; - name_column["column"] = "name"; - name_column["value"] = (*item_iter)->getName(); - - LLSD& status_column = element["columns"][LIST_STATUS]; - status_column["column"] = "status"; - status_column["value"] = "Pending"; - - /*LLScrollListItem* scroll_itemp = */list->addElement(element, ADD_BOTTOM); - - //hack to stop crashing - //LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(LIST_TYPE); - //icon->setClickCallback(NULL); - } - - // Setup and go! - mBusy = 1; - mItemIter = mItems.begin(); - setStatus((*mItemIter)->getUUID(), "Downloading"); - LLInventoryBackup::download(*mItemIter, this, LLFloaterInventoryBackup::imageCallback, LLFloaterInventoryBackup::assetCallback); - advance(); - - return TRUE; -} - -void LLFloaterInventoryBackup::advance() -{ - while((mItemIter != mItems.end()) && (mBusy < 4)) - { - mBusy++; - mItemIter++; - if(mItemIter >= mItems.end()) break; - setStatus((*mItemIter)->getUUID(), "Downloading"); - LLInventoryBackup::download(*mItemIter, this, LLFloaterInventoryBackup::imageCallback, LLFloaterInventoryBackup::assetCallback); - } -} - -void LLFloaterInventoryBackup::setStatus(LLUUID itemid, std::string status) -{ - LLScrollListCtrl* list = getChild("item_list"); - std::vector items = list->getAllData(); - std::vector::iterator iter = items.begin(); - std::vector::iterator end = items.end(); - for( ; iter != end; ++iter) - { - if((*iter)->getUUID() == itemid) - { - (*iter)->getColumn(LIST_STATUS)->setValue(status); - break; - } - } -} - -void LLFloaterInventoryBackup::finishItem(LLUUID itemid, std::string status) -{ - // Update big happy progress bar - mItemsCompleted++; - LLView* progress_background = getChildView("progress_background", TRUE, TRUE); - LLRect rect = progress_background->getRect(); - float item_count = (float)mItemsTotal; - float item_pos = (float)mItemsCompleted; - float rect_width = (float)rect.getWidth(); - float incr = rect_width / item_count; - incr *= item_pos; - rect.mRight = rect.mLeft + (S32)incr; - LLView* progress_foreground = getChildView("progress_foreground", TRUE, TRUE); - progress_foreground->setRect(rect); - - if(mItemsCompleted >= mItemsTotal) - { - childSetText("progress_background", llformat("Completed %d items.", mItemsTotal)); - childSetVisible("progress_foreground", false); - } - - // Update item status - setStatus(itemid, status); - - // And advance - mBusy--; - advance(); -} - -// static -void LLFloaterInventoryBackup::imageCallback(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata) -{ - if(final) - { - LLInventoryBackup::callbackdata* data = static_cast(userdata); - LLFloaterInventoryBackup* floater = (LLFloaterInventoryBackup*)(data->floater); - LLInventoryItem* item = data->item; - - if(std::find(LLFloaterInventoryBackup::sInstances.begin(), LLFloaterInventoryBackup::sInstances.end(), floater) == LLFloaterInventoryBackup::sInstances.end()) - { - return; - } - - if(!success) - { - floater->finishItem(item->getUUID(), "Failed download"); - return; - } - - std::string filename = floater->mPath + OS_SEP + LLInventoryBackup::getPath(gInventory.getCategory(item->getParentUUID()), floater->mCats) + OS_SEP + LLDir::getScrubbedFileName(item->getName()); - filename = LLInventoryBackup::getUniqueFilename(filename, LLInventoryBackup::getExtension(item)); - - LLPointer image_tga = new LLImageTGA; - if( !image_tga->encode( src ) ) - { - floater->finishItem(item->getUUID(), "Failed tga encode"); - } - else if( !image_tga->save( filename ) ) - { - floater->finishItem(item->getUUID(), "Failed save"); - } - else - { - floater->finishItem(item->getUUID(), "Done"); - } - } - else - { - src_vi->setBoostLevel(LLGLTexture::BOOST_UI); - } -} - -// static -void LLFloaterInventoryBackup::assetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status) -{ - LLInventoryBackup::callbackdata* data = static_cast(user_data); - LLFloaterInventoryBackup* floater = (LLFloaterInventoryBackup*)(data->floater); - LLInventoryItem* item = data->item; - - if(std::find(LLFloaterInventoryBackup::sInstances.begin(), LLFloaterInventoryBackup::sInstances.end(), floater) == LLFloaterInventoryBackup::sInstances.end()) - { - return; - } - - if(status != 0) - { - floater->finishItem(item->getUUID(), "Failed download"); - return; - } - - // Todo: this doesn't work for static vfs shit - LLVFile file(vfs, asset_uuid, type, LLVFile::READ); - S32 size = file.getSize(); - - char* buffer = new char[size]; - if (buffer == NULL) - { - //llerrs << "Memory Allocation Failed" << llendl; - floater->finishItem(item->getUUID(), "Failed memory allocation"); - return; - } - - file.read((U8*)buffer, size); - - // Write it back out... - std::string filename = floater->mPath + OS_SEP + LLInventoryBackup::getPath(gInventory.getCategory(item->getParentUUID()), floater->mCats) + OS_SEP + LLDir::getScrubbedFileName(item->getName()); - filename = LLInventoryBackup::getUniqueFilename(filename, LLInventoryBackup::getExtension(item)); - - std::ofstream export_file(filename.c_str(), std::ofstream::binary); - export_file.write(buffer, size); - export_file.close(); - - floater->finishItem(item->getUUID(), "Done"); -} -// diff --git a/indra/newview/llinventorybackup.h b/indra/newview/llinventorybackup.h deleted file mode 100644 index 2ee0c197c..000000000 --- a/indra/newview/llinventorybackup.h +++ /dev/null @@ -1,141 +0,0 @@ -// -#ifndef LL_LLINVENTORYBACKUP_H -#define LL_LLINVENTORYBACKUP_H - -#if LL_WINDOWS -#define OS_SEP "\\" -#else -#define OS_SEP "/" -#endif - - -#include "llviewerinventory.h" -#include "llfolderview.h" -#include "statemachine/aifilepicker.h" -#include "llviewertexture.h" -#include "llfloater.h" - -class AIDirPicker; - -class LLInventoryBackupOrder -{ -public: - LLInventoryBackupOrder(); - - std::string mPath; - std::vector mCats; - std::vector mItems; - - bool mDownloadTextures; - bool mDownloadSounds; - bool mDownloadCallingCards; - bool mDownloadLandmarks; - bool mDownloadScripts; - bool mDownloadWearables; - bool mDownloadObjects; - bool mDownloadNotecards; - bool mDownloadAnimations; - bool mDownloadGestures; - //bool mDownloadOthers; -}; - -class LLFloaterInventoryBackupSettings -: public LLFloater -{ -public: - LLFloaterInventoryBackupSettings(LLInventoryBackupOrder* order); - BOOL postBuild(void); - static void onClickNext(void* userdata); - static void onClickNext_continued(void* userdata, AIDirPicker* dirpicker); - - LLInventoryBackupOrder* mOrder; - virtual ~LLFloaterInventoryBackupSettings(); -}; - -class LLFloaterInventoryBackup -: public LLFloater -{ -public: - LLFloaterInventoryBackup(std::string path, std::vector cats, std::vector items); - BOOL postBuild(void); - - std::string mPath; - std::vector mCats; - std::vector mItems; - std::vector::iterator mItemIter; - int mBusy; - - static std::list sInstances; - -private: - virtual ~LLFloaterInventoryBackup(); - void setStatus(LLUUID itemid, std::string status); - void finishItem(LLUUID itemid, std::string status); - void advance(); - static void imageCallback(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata); - static void assetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); - - int mItemsTotal; - int mItemsCompleted; - - enum LIST_COLUMN_ORDER - { - LIST_TYPE, - LIST_NAME, - LIST_STATUS - }; - -}; - -class AIFilePicker; - -class LLInventoryBackup -{ -public: - static ESaveFilter getSaveFilter(LLInventoryItem* item); - static std::string getExtension(LLInventoryItem* item); - static std::string getUniqueFilename(std::string filename, std::string extension); - static std::string getUniqueDirname(std::string dirname); - static bool itemIsFolder(LLInventoryItem* item); - static void save(LLFolderView* folder); - static void download(LLInventoryItem* item, LLFloater* floater, loaded_callback_func onImage, LLGetAssetCallback onAsset); - static std::string getPath(LLInventoryCategory* cat, std::vector cats); - - struct callbackdata - { - LLFloater* floater; - LLInventoryItem* item; - }; - -private: - static void imageCallback(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata); - static void imageCallback_continued(LLImageRaw* src, AIFilePicker* filepicker); - static void assetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); - static void assetCallback_continued(char* buffer, S32 size, AIFilePicker* filepicker); - static void climb(LLInventoryCategory* cat, - std::vector& cats, - std::vector& items); -}; - - - -#endif -// diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index d792118e4..6316714b1 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -108,8 +108,6 @@ #include "llappviewer.h" // System Folders #include "llfloateranimpreview.h" // for reuploads #include "llfloaterimagepreview.h" // for reuploads -//#include "llcheats.h" -#include "hgfloatertexteditor.h" #include "statemachine/aifilepicker.h" // diff --git a/indra/newview/lllocalinventory.cpp b/indra/newview/lllocalinventory.cpp index 1bb9cf102..edab999ff 100644 --- a/indra/newview/lllocalinventory.cpp +++ b/indra/newview/lllocalinventory.cpp @@ -11,7 +11,6 @@ #include "llpreviewtexture.h" #include "llpreviewgesture.h" #include "llpreviewlandmark.h" -#include "hgfloatertexteditor.h" #include "llappviewer.h" diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp deleted file mode 100644 index e4815fbb1..000000000 --- a/indra/newview/llmemoryview.cpp +++ /dev/null @@ -1,346 +0,0 @@ -/** - * @file llmemoryview.cpp - * @brief LLMemoryView class implementation - * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * - * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 - * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at - * http://secondlifegrid.net/programs/open_source/licensing/flossexception - * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. - * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llmemoryview.h" - -#include "llappviewer.h" -#include "llallocator_heap_profile.h" -#include "llgl.h" // LLGLSUIDefault -#include "llviewerwindow.h" -#include "llviewercontrol.h" - -#include -#include - -#include "llmemory.h" - - - -LLMemoryView::LLMemoryView(const std::string& name, const LLRect& rect) -: LLView(name, rect, TRUE), - mPaused(FALSE), - //mDelay(120), - mAlloc(NULL) -{ - setVisible(FALSE); -} - -LLMemoryView::~LLMemoryView() -{ -} - -BOOL LLMemoryView::handleMouseDown(S32 x, S32 y, MASK mask) -{ - if (mask & MASK_SHIFT) - { - } - else if (mask & MASK_CONTROL) - { - } - else - { - mPaused = !mPaused; - } - return TRUE; -} - -BOOL LLMemoryView::handleMouseUp(S32 x, S32 y, MASK mask) -{ - return TRUE; -} - - -BOOL LLMemoryView::handleHover(S32 x, S32 y, MASK mask) -{ - return FALSE; -} - -void LLMemoryView::refreshProfile() -{ - /* - LLAllocator & alloc = LLAppViewer::instance()->getAllocator(); - if(alloc.isProfiling()) { - std::string profile_text = alloc.getRawProfile(); - - boost::algorithm::split(mLines, profile_text, boost::bind(std::equal_to(), '\n', _1)); - } else { - mLines.clear(); - } - */ - if (mAlloc == NULL) { - mAlloc = &LLAppViewer::instance()->getAllocator(); - } - - mLines.clear(); - -#if MEM_TRACK_MEM - if(mAlloc->isProfiling()) - { - const LLAllocatorHeapProfile &prof = mAlloc->getProfile(); - for(size_t i = 0; i < prof.mLines.size(); ++i) - { - std::stringstream ss; - ss << "Unfreed Mem: " << (prof.mLines[i].mLiveSize >> 20) << " M Trace: "; - for(size_t k = 0; k < prof.mLines[i].mTrace.size(); ++k) - { - ss << LLMemType::getNameFromID(prof.mLines[i].mTrace[k]) << " "; - } - mLines.push_back(utf8string_to_wstring(ss.str())); - } - } -#endif -} - -void LLMemoryView::draw() -{ - const S32 UPDATE_INTERVAL = 60; - const S32 MARGIN_AMT = 10; - static S32 curUpdate = UPDATE_INTERVAL; - static const LLCachedControl console_background(gColors,"ConsoleBackground"); - static LLColor4 s_console_color = console_background; - - // setup update interval - if (curUpdate >= UPDATE_INTERVAL) - { - refreshProfile(); - curUpdate = 0; - } - curUpdate++; - - // setup window properly - S32 height = (S32) (gViewerWindow->getWindowRectScaled().getHeight()*0.75f); - S32 width = (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.9f); - setRect(LLRect().setLeftTopAndSize(getRect().mLeft, getRect().mTop, width, height)); - - // setup window color - static const LLCachedControl console_background_opacity("ConsoleBackgroundOpacity"); - F32 console_opacity = llclamp(console_background_opacity.get(), 0.f, 1.f); - LLColor4 color = s_console_color; - color.mV[VALPHA] *= console_opacity; - - LLGLSUIDefault gls_ui; - gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gl_rect_2d(0, height, width, 0, color); - - LLFontGL * font = LLFontGL::getFontSansSerifSmall(); - - // draw remaining lines - F32 y_pos = 0.f; - F32 y_off = 0.f; - - F32 line_height = font->getLineHeight(); - S32 target_width = width - 2 * MARGIN_AMT; - - // cut off lines on bottom - U32 max_lines = U32((height - 2 * line_height) / line_height); - y_pos = height - MARGIN_AMT - line_height; - y_off = 0.f; - -#if !MEM_TRACK_MEM - std::vector::const_iterator end = mLines.end(); - if(mLines.size() > max_lines) { - end = mLines.begin() + max_lines; - } - for (std::vector::const_iterator i = mLines.begin(); i != end; ++i) - { - font->render(*i, 0, MARGIN_AMT, y_pos - y_off, - LLColor4::white, - LLFontGL::LEFT, - LLFontGL::BASELINE, - LLFontGL::NORMAL, - LLFontGL::DROP_SHADOW, - S32_MAX, - target_width - ); - y_off += line_height; - } - -#else - LLMemTracker::getInstance()->preDraw(mPaused) ; - - { - F32 x_pos = MARGIN_AMT ; - U32 lines = 0 ; - const char* str = LLMemTracker::getInstance()->getNextLine() ; - while(str != NULL) - { - lines++ ; - font->renderUTF8(str, 0, x_pos, y_pos - y_off, - LLColor4::white, - LLFontGL::LEFT, - LLFontGL::BASELINE, - LLFontGL::NORMAL, - LLFontGL::DROP_SHADOW, - S32_MAX, - target_width, - NULL, FALSE); - - str = LLMemTracker::getInstance()->getNextLine() ; - y_off += line_height; - - if(lines >= max_lines) - { - lines = 0 ; - x_pos += 512.f ; - if(x_pos + 512.f > target_width) - { - break ; - } - - y_pos = height - MARGIN_AMT - line_height; - y_off = 0.f; - } - } - } - - LLMemTracker::getInstance()->postDraw() ; -#endif - -#if MEM_TRACK_TYPE - - S32 left, top, right, bottom; - S32 x, y; - - S32 margin = 10; - S32 texth = (S32)LLFontGL::getFontMonospace()->getLineHeight(); - - S32 xleft = margin; - S32 ytop = height - margin; - S32 labelwidth = 0; - S32 maxmaxbytes = 1; - - // Make sure all timers are accounted for - // Set 'MT_OTHER' to unaccounted ticks last frame - { - S32 display_memtypes[LLMemType::MTYPE_NUM_TYPES]; - for (S32 i=0; i < LLMemType::MTYPE_NUM_TYPES; i++) - { - display_memtypes[i] = 0; - } - for (S32 i=0; i < MTV_DISPLAY_NUM; i++) - { - S32 tidx = mtv_display_table[i].memtype; - display_memtypes[tidx]++; - } - LLMemType::sMemCount[LLMemType::MTYPE_OTHER] = 0; - LLMemType::sMaxMemCount[LLMemType::MTYPE_OTHER] = 0; - for (S32 tidx = 0; tidx < LLMemType::MTYPE_NUM_TYPES; tidx++) - { - if (display_memtypes[tidx] == 0) - { - LLMemType::sMemCount[LLMemType::MTYPE_OTHER] += LLMemType::sMemCount[tidx]; - LLMemType::sMaxMemCount[LLMemType::MTYPE_OTHER] += LLMemType::sMaxMemCount[tidx]; - } - } - } - - // Labels - { - y = ytop; - S32 peak = 0; - for (S32 i=0; i> 20; - - tdesc = llformat("%s [%4d MB] in %06d NEWS",mtv_display_table[i].desc,mbytes, LLMemType::sNewCount[tidx]); - LLFontGL::getFontMonospace()->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); - - y -= (texth + 2); - - S32 textw = LLFontGL::getFontMonospace()->getWidth(tdesc); - if (textw > labelwidth) - labelwidth = textw; - } - - S32 num_avatars = 0; - S32 num_motions = 0; - S32 num_loading_motions = 0; - S32 num_loaded_motions = 0; - S32 num_active_motions = 0; - S32 num_deprecated_motions = 0; - for (std::vector::iterator iter = LLCharacter::sInstances.begin(); - iter != LLCharacter::sInstances.end(); ++iter) - { - num_avatars++; - (*iter)->getMotionController().incMotionCounts(num_motions, num_loading_motions, num_loaded_motions, num_active_motions, num_deprecated_motions); - } - - x = xleft; - tdesc = llformat("Total Bytes: %d MB Overhead: %d KB Avs %d Motions:%d Loading:%d Loaded:%d Active:%d Dep:%d", - LLMemType::sTotalMem >> 20, LLMemType::sOverheadMem >> 10, - num_avatars, num_motions, num_loading_motions, num_loaded_motions, num_active_motions, num_deprecated_motions); - LLFontGL::getFontMonospace()->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); - } - - // Bars - y = ytop; - labelwidth += 8; - S32 barw = width - labelwidth - xleft - margin; - for (S32 i=0; i mLines; - LLAllocator* mAlloc; - BOOL mPaused ; - -}; - -#endif diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 61ebb135d..32fad66b2 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3028,6 +3028,7 @@ void LLPhysicsDecomp::doDecomposition() param_map[params[i].mName] = params+i; } + LLCDResult ret = LLCD_OK; //set parameter values for (decomp_params::iterator iter = mCurRequest->mParams.begin(); iter != mCurRequest->mParams.end(); ++iter) { @@ -3041,8 +3042,6 @@ void LLPhysicsDecomp::doDecomposition() continue; } - U32 ret = LLCD_OK; - if (param->mType == LLCDParam::LLCD_FLOAT) { ret = LLConvexDecomposition::getInstance()->setParam(param->mName, (F32) value.asReal()); @@ -3060,8 +3059,6 @@ void LLPhysicsDecomp::doDecomposition() mCurRequest->setStatusMessage("Executing."); - LLCDResult ret = LLCD_OK; - if (LLConvexDecomposition::getInstance() != NULL) { ret = LLConvexDecomposition::getInstance()->executeStage(stage); diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index ca19b2caa..2fc014216 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -75,7 +75,6 @@ BOOL LLPanelFace::postBuild() { - LLRect rect = this->getRect(); LLTextureCtrl* mTextureCtrl; LLColorSwatchCtrl* mColorSwatch; diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index 5ad7ad7a1..64f48e0c5 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -1388,13 +1388,11 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, S32 cur_land_tax; S32 cur_group_tax; S32 cur_parcel_dir_fee; - S32 cur_total_tax; S32 proj_object_tax; S32 proj_light_tax; S32 proj_land_tax; S32 proj_group_tax; S32 proj_parcel_dir_fee; - S32 proj_total_tax; S32 non_exempt_members; msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days ); @@ -1418,9 +1416,6 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date); msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date); - cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax + cur_parcel_dir_fee; - proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee; - if (interval_days != mImplementationp->mIntervalLength || current_interval != mImplementationp->mCurrentInterval) { diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 097d0fda6..dac3c99ce 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -115,7 +115,6 @@ LLInventoryView::LLInventoryView(const std::string& name, void LLInventoryView::init(LLInventoryModel* inventory) { - LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_INIT); // Callbacks init_inventory_actions(this); @@ -879,7 +878,6 @@ void LLInventoryView::setFilterTextFromFilter() void LLInventoryView::toggleFindOptions() { - LLMemType mt(LLMemType::MTYPE_INVENTORY_VIEW_TOGGLE); LLFloater *floater = getFinder(); if (!floater) { @@ -1011,7 +1009,6 @@ void LLFloaterInventoryFinder::updateElementsFromFilter() void LLFloaterInventoryFinder::draw() { - LLMemType mt(LLMemType::MTYPE_INVENTORY_DRAW); U32 filter = 0xffffffff; BOOL filtered_by_all_types = TRUE; diff --git a/indra/newview/llpanelmediahud.cpp b/indra/newview/llpanelmediahud.cpp index e56e976f5..ad47eb732 100644 --- a/indra/newview/llpanelmediahud.cpp +++ b/indra/newview/llpanelmediahud.cpp @@ -355,8 +355,6 @@ void LLPanelMediaHUD::updateShape() media_hud_rect.mTop += getRect().getHeight() - media_region->getRect().mTop; media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight; - - LLRect old_hud_rect = media_hud_rect; // keep all parts of HUD on-screen media_hud_rect.intersectWith(getParent()->getLocalRect()); diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 8fbd83515..9e9be1c74 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1205,7 +1205,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount()) { //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject()); - LLBBox bbox = mSavedSelectionBBox; mGridOrigin = mSavedSelectionBBox.getCenterAgent(); mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f; @@ -1223,7 +1222,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) { mGridRotation = first_grid_object->getRenderRotation(); - LLVector3 first_grid_obj_pos = first_grid_object->getRenderPosition(); LLVector4a min_extents(F32_MAX); LLVector4a max_extents(-F32_MAX); diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2a7758bc6..728ffeb12 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -383,7 +383,6 @@ LLSpatialGroup::~LLSpatialGroup() } } - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); clearDrawMap(); } @@ -499,8 +498,6 @@ void LLSpatialGroup::validateDrawMap() BOOL LLSpatialGroup::updateInGroup(LLDrawable *drawablep, BOOL immediate) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - drawablep->updateSpatialExtents(); OctreeNode* parent = mOctreeNode->getOctParent(); @@ -522,7 +519,6 @@ BOOL LLSpatialGroup::updateInGroup(LLDrawable *drawablep, BOOL immediate) BOOL LLSpatialGroup::addObject(LLDrawable *drawablep, BOOL add_all, BOOL from_octree) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); if (!from_octree) { mOctreeNode->insert(drawablep); @@ -548,7 +544,6 @@ BOOL LLSpatialGroup::addObject(LLDrawable *drawablep, BOOL add_all, BOOL from_oc void LLSpatialGroup::rebuildGeom() { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); if (!isDead()) { mSpatialPartition->rebuildGeom(this); @@ -759,7 +754,6 @@ LLSpatialGroup* LLSpatialGroup::getParent() BOOL LLSpatialGroup::removeObject(LLDrawable *drawablep, BOOL from_octree) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); unbound(); if (mOctreeNode && !from_octree) { @@ -796,7 +790,6 @@ BOOL LLSpatialGroup::removeObject(LLDrawable *drawablep, BOOL from_octree) void LLSpatialGroup::shift(const LLVector4a &offset) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); LLVector4a t = mOctreeNode->getCenter(); t.add(offset); mOctreeNode->setCenter(t); @@ -853,8 +846,6 @@ void LLSpatialGroup::setState(eSpatialState state) void LLSpatialGroup::setState(eSpatialState state, S32 mode) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - llassert(state <= LLSpatialGroup::STATE_MASK); if (mode > STATE_MODE_SINGLE) @@ -911,8 +902,6 @@ void LLSpatialGroup::clearState(eSpatialState state, S32 mode) { llassert(state <= LLSpatialGroup::STATE_MASK); - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - if (mode > STATE_MODE_SINGLE) { if (mode == STATE_MODE_DIFF) @@ -969,8 +958,6 @@ public: void LLSpatialGroup::setOcclusionState(eOcclusionState state, S32 mode) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - if (mode > STATE_MODE_SINGLE) { if (mode == STATE_MODE_DIFF) @@ -1035,8 +1022,6 @@ public: void LLSpatialGroup::clearOcclusionState(eOcclusionState state, S32 mode) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - if (mode > STATE_MODE_SINGLE) { if (mode == STATE_MODE_DIFF) @@ -1084,7 +1069,6 @@ LLSpatialGroup::LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part) : ll_assert_aligned(this,16); sNodeCount++; - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); mViewAngle.splat(0.f); mLastUpdateViewAngle.splat(-1.f); @@ -1271,7 +1255,6 @@ BOOL LLSpatialGroup::changeLOD() void LLSpatialGroup::handleInsertion(const TreeNode* node, LLDrawable* drawablep) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); addObject(drawablep, FALSE, TRUE); unbound(); setState(OBJECT_DIRTY); @@ -1279,14 +1262,12 @@ void LLSpatialGroup::handleInsertion(const TreeNode* node, LLDrawable* drawablep void LLSpatialGroup::handleRemoval(const TreeNode* node, LLDrawable* drawable) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); removeObject(drawable, TRUE); setState(OBJECT_DIRTY); } void LLSpatialGroup::handleDestruction(const TreeNode* node) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); setState(DEAD); {OctreeGuard guard(mOctreeNode); @@ -1330,7 +1311,6 @@ void LLSpatialGroup::handleStateChange(const TreeNode* node) void LLSpatialGroup::handleChildAddition(const OctreeNode* parent, OctreeNode* child) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); if (child->getListenerCount() == 0) { new LLSpatialGroup(child, mSpatialPartition); @@ -1681,7 +1661,6 @@ void LLSpatialGroup::doOcclusion(LLCamera* camera) LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL render_by_group, U32 buffer_usage) : mRenderByGroup(render_by_group), mBridge(NULL) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); mOcclusionEnabled = TRUE; mDrawableType = 0; mPartitionType = LLViewerRegion::PARTITION_NONE; @@ -1705,8 +1684,6 @@ LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL render_by_group, U32 LLSpatialPartition::~LLSpatialPartition() { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - delete mOctree; mOctree = NULL; } @@ -1714,8 +1691,6 @@ LLSpatialPartition::~LLSpatialPartition() LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep, BOOL was_visible) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - drawablep->updateSpatialExtents(); //keep drawable from being garbage collected @@ -1737,8 +1712,6 @@ LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep, BOOL was_visible) BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - if (!curp->removeObject(drawablep)) { OCT_ERRS << "Failed to remove drawable from octree!" << llendl; @@ -1757,8 +1730,6 @@ BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp) void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - // sanity check submitted by open source user bushing Spatula // who was seeing crashing here. (See VWR-424 reported by Bunny Mayne) if (!drawablep) @@ -1815,7 +1786,6 @@ public: void LLSpatialPartition::shift(const LLVector4a &offset) { //shift octree node bounding boxes by offset - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); LLSpatialShift shifter(offset); shifter.traverse(mOctree); } @@ -2232,7 +2202,6 @@ public: void LLSpatialPartition::restoreGL() { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); } void LLSpatialPartition::resetVertexBuffers() @@ -2274,7 +2243,6 @@ BOOL LLSpatialPartition::visibleObjectsInFrustum(LLCamera& camera) S32 LLSpatialPartition::cull(LLCamera &camera, std::vector* results, BOOL for_select) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); #if LL_OCTREE_PARANOIA_CHECK ((LLSpatialGroup*)mOctree->getListener(0))->checkStates(); #endif @@ -4240,8 +4208,6 @@ void LLSpatialPartition::renderDebug() sCurMaxTexPriority = 0.f; } - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - LLGLDisable cullface(GL_CULL_FACE); LLGLEnable blend(GL_BLEND); gGL.setSceneBlendType(LLRender::BT_ALPHA); @@ -4374,9 +4340,6 @@ public: virtual bool check(LLDrawable* drawable) { - LLVector3 local_start = mStart; - LLVector3 local_end = mEnd; - if (!drawable || !gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible()) { return false; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 490298172..2df9556a2 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -376,13 +376,10 @@ void hooked_process_sound_trigger(LLMessageSystem *msg, void **) // true when all initialization done. bool idle_startup() { - LLMemType mt1(LLMemType::MTYPE_STARTUP); - const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay"); const F32 TIMEOUT_SECONDS = 5.f; const S32 MAX_TIMEOUT_COUNT = 3; static LLTimer timeout; - static S32 timeout_count = 0; static LLTimer login_time; @@ -404,7 +401,6 @@ bool idle_startup() // last location by default static S32 agent_location_id = START_LOCATION_ID_LAST; - static S32 location_which = START_LOCATION_ID_LAST; static bool show_connect_box = true; @@ -845,9 +841,6 @@ bool idle_startup() gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); - timeout_count = 0; - - // *NOTE: This is where LLViewerParcelMgr::getInstance() used to get allocated before becoming LLViewerParcelMgr::getInstance(). // *NOTE: This is where gHUDManager used to bet allocated before becoming LLHUDManager::getInstance(). @@ -1132,7 +1125,6 @@ bool idle_startup() { // Force login at the last location agent_location_id = START_LOCATION_ID_LAST; - location_which = START_LOCATION_ID_LAST; gSavedSettings.setBOOL("LoginLastLocation", FALSE); // Clear some things that would cause us to divert to a user-specified location @@ -1144,21 +1136,14 @@ bool idle_startup() { // a startup URL was specified agent_location_id = START_LOCATION_ID_URL; - - // doesn't really matter what location_which is, since - // agent_start_look_at will be overwritten when the - // UserLoginLocationReply arrives - location_which = START_LOCATION_ID_LAST; } else if (gSavedSettings.getBOOL("LoginLastLocation")) { agent_location_id = START_LOCATION_ID_LAST; // last location - location_which = START_LOCATION_ID_LAST; } else { agent_location_id = START_LOCATION_ID_HOME; // home - location_which = START_LOCATION_ID_HOME; } gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT); diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index bd1b99911..ca4c37eff 100644 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -1248,8 +1248,6 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y, y_end = tex_width; } - LLVector3d origin_global = from_region_handle(getRegion()->getHandle()); - // OK, for now, just have the composition value equal the height at the point. LLVector3 location; LLColor4U coloru; diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp index 5f17aef78..876ce02d4 100644 --- a/indra/newview/llurlhistory.cpp +++ b/indra/newview/llurlhistory.cpp @@ -151,8 +151,6 @@ void LLURLHistory::addURL(const std::string& collection, const std::string& url) // static void LLURLHistory::removeURL(const std::string& collection, const std::string& url) { - LLSD::array_iterator iter = sHistorySD[collection].beginArray(); - LLSD::array_iterator end = sHistorySD[collection].endArray(); for(int index = 0; index < sHistorySD[collection].size(); index++) { if(sHistorySD[collection].get(index).asString() == url) diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 1a8129bb3..232c4d8fa 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1159,7 +1159,6 @@ void render_hud_attachments() if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices()) { LLCamera hud_cam = *LLViewerCamera::getInstance(); - LLVector3 origin = hud_cam.getOrigin(); hud_cam.setOrigin(-1.f,0,0); hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1)); LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE); diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 3e8b49b98..e6abe3676 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -84,7 +84,7 @@ public: /*virtual*/ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers) { - if (200 <= status && status < 300 || status == 405) // Using HEAD may result in a 405 METHOD NOT ALLOWED, but still have the right Content-TYpe header. + if ((200 <= status && status < 300) || status == 405) // Using HEAD may result in a 405 METHOD NOT ALLOWED, but still have the right Content-Type header. { std::string media_type; if (headers.getFirstValue("content-type", media_type)) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 89d0db41d..7cec043dd 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -165,7 +165,6 @@ #include "llframestats.h" #include "llframestatview.h" #include "llfasttimerview.h" -#include "llmemoryview.h" #include "llgivemoney.h" #include "llgroupmgr.h" #include "llhoverview.h" @@ -251,9 +250,6 @@ #include "lltexlayer.h" // -#include "hgfloatertexteditor.h" -#include "llfloatervfs.h" -#include "llfloatervfsexplorer.h" #include "llfloatermessagelog.h" #include "shfloatermediaticker.h" #include "llpacketring.h" @@ -503,8 +499,6 @@ void handle_hide_typing_notification(void*); void handle_close_all_notifications(void*); void handle_open_message_log(void*); void handle_edit_ao(void*); -void handle_local_assets(void*); -void handle_vfs_explorer(void*); void handle_sounds_explorer(void*); void handle_blacklist(void*); // @@ -970,14 +964,6 @@ void init_client_menu(LLMenuGL* menu) &get_visibility, (void*)gDebugView->mFastTimerView, '9', MASK_CONTROL|MASK_SHIFT ) ); -//#if MEM_TRACK_MEM - sub->addChild(new LLMenuItemCheckGL("Memory", - &toggle_visibility, - NULL, - &get_visibility, - (void*)gDebugView->mMemoryView, - '0', MASK_CONTROL|MASK_SHIFT ) ); -//#endif sub->addSeparator(); @@ -3808,16 +3794,6 @@ void handle_edit_ao(void*) LLFloaterAO::show(NULL); } -void handle_local_assets(void*) -{ - -} - -void handle_vfs_explorer(void*) -{ - -} - void handle_sounds_explorer(void*) { LLFloaterExploreSounds::toggle(); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index a721f1b45..00f6c939c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1477,9 +1477,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& bool busy=FALSE; -// [RLVa:KB] - Checked: 2010-09-23 (RLVa-1.2.1e) | Added: RLVa-1.2.1e - bool fRlvNotifyAccepted = false; -// [/RLVa:KB] switch(button) { case IOR_ACCEPT: @@ -1495,13 +1492,11 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& if ( (rlv_handler_t::isEnabled()) && (IM_TASK_INVENTORY_OFFERED == mIM) && (LLAssetType::AT_CATEGORY == mType) && (mDesc.find(RLV_PUTINV_PREFIX) == 1) ) { - fRlvNotifyAccepted = true; if (!RlvSettings::getForbidGiveToRLV()) { const LLViewerInventoryCategory* pRlvRoot = RlvInventory::instance().getSharedRoot(); if (pRlvRoot) { - fRlvNotifyAccepted = false; // "accepted_in_rlv" is sent from RlvGiveToRLVTaskOffer *after* we have the folder mFolderID = pRlvRoot->getUUID(); RlvGiveToRLVTaskOffer* pOfferObserver = new RlvGiveToRLVTaskOffer(mTransactionID); @@ -4678,7 +4673,6 @@ extern U32 gObjectBits; void process_object_update(LLMessageSystem *mesgsys, void **user_data) { - LLMemType mt(LLMemType::MTYPE_OBJECT); // Update the data counters if (mesgsys->getReceiveCompressedSize()) { @@ -4695,7 +4689,6 @@ void process_object_update(LLMessageSystem *mesgsys, void **user_data) void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data) { - LLMemType mt(LLMemType::MTYPE_OBJECT); // Update the data counters if (mesgsys->getReceiveCompressedSize()) { @@ -4712,7 +4705,6 @@ void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data) { - LLMemType mt(LLMemType::MTYPE_OBJECT); // Update the data counters if (mesgsys->getReceiveCompressedSize()) { @@ -4730,7 +4722,6 @@ void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data) void process_terse_object_update_improved(LLMessageSystem *mesgsys, void **user_data) { - LLMemType mt(LLMemType::MTYPE_OBJECT); if (mesgsys->getReceiveCompressedSize()) { gObjectBits += mesgsys->getReceiveCompressedSize() * 8; diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index aee6936a0..48f4481ba 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -907,7 +907,6 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, const EObjectUpdateType update_type, LLDataPacker *dp) { - LLMemType mt(LLMemType::MTYPE_OBJECT); U32 retval = 0x0; // If region is removed from the list it is also deleted. @@ -2449,8 +2448,6 @@ void LLViewerObject::interpolateLinearMotion(const F64 & time, const F32 & dt) BOOL LLViewerObject::setData(const U8 *datap, const U32 data_size) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - delete [] mData; if (datap) @@ -2492,8 +2489,6 @@ void LLViewerObject::doUpdateInventory( U8 key, bool is_new) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - LLViewerInventoryItem* old_item = NULL; if(TASK_INVENTORY_ITEM_KEY == key) { @@ -2577,8 +2572,6 @@ void LLViewerObject::saveScript( BOOL active, bool is_new) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - /* * XXXPAM Investigate not making this copy. Seems unecessary, but I'm unsure about the * interaction with doUpdateInventory() called below. @@ -2654,8 +2647,6 @@ void LLViewerObject::dirtyInventory() void LLViewerObject::registerInventoryListener(LLVOInventoryListener* listener, void* user_data) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - LLInventoryCallbackInfo* info = new LLInventoryCallbackInfo; info->mListener = listener; info->mInventoryData = user_data; @@ -2753,8 +2744,6 @@ S32 LLFilenameAndTask::sCount = 0; // static void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - LLUUID task_id; msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_TaskID, task_id); LLViewerObject* object = gObjectList.findObject(task_id); @@ -2841,8 +2830,6 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS void LLViewerObject::loadTaskInvFile(const std::string& filename) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename); llifstream ifs(filename_and_local_path); if(ifs.good()) @@ -2970,8 +2957,6 @@ void LLViewerObject::updateInventory( U8 key, bool is_new) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - // This slices the object into what we're concerned about on the // viewer. The simulator will take the permissions and transfer // ownership. @@ -3982,8 +3967,6 @@ std::string LLViewerObject::getMediaURL() const void LLViewerObject::setMediaURL(const std::string& media_url) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - if (!mMedia) { mMedia = new LLViewerObjectMedia; @@ -4033,8 +4016,6 @@ BOOL LLViewerObject::setMaterial(const U8 material) void LLViewerObject::setNumTEs(const U8 num_tes) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - U32 i; if (num_tes != getNumTEs()) { diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 8b4693c79..b5522be92 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -40,7 +40,6 @@ #include "llhudicon.h" #include "llinventory.h" #include "llrefcount.h" -#include "llmemtype.h" #include "llprimitive.h" #include "lluuid.h" #include "llvoinventorylistener.h" diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index ddcb84554..c4aa02be9 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -323,7 +323,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, { LLFastTimer t(FTM_PROCESS_OBJECTS); - LLVector3d camera_global = gAgentCamera.getCameraPositionGlobal(); LLViewerObject *objectp; S32 num_objects; U32 local_id; @@ -908,8 +907,6 @@ private: void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) { - LLMemType mt(LLMemType::MTYPE_OBJECT); - // Update globals static const LLCachedControl VelocityInterpolate("VelocityInterpolate"); static const LLCachedControl PingInterpolate("PingInterpolate"); @@ -1235,7 +1232,6 @@ void LLViewerObjectList::clearDebugText() void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp) { - LLMemType mt(LLMemType::MTYPE_OBJECT); if (mDeadObjects.find(objectp->mID) != mDeadObjects.end()) { llinfos << "Object " << objectp->mID << " already on dead list!" << llendl; @@ -1477,7 +1473,6 @@ void LLViewerObjectList::removeFromActiveList(LLViewerObject* objectp) void LLViewerObjectList::updateActive(LLViewerObject *objectp) { - LLMemType mt(LLMemType::MTYPE_OBJECT); if (objectp->isDead()) { return; // We don't update dead objects! @@ -1958,7 +1953,6 @@ void LLViewerObjectList::resetObjectBeacons() LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp) { - LLMemType mt(LLMemType::MTYPE_OBJECT); LLUUID fullid; fullid.generate(); @@ -1990,7 +1984,6 @@ static LLFastTimer::DeclareTimer FTM_CREATE_OBJECT("Create Object"); LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRegion *regionp, const LLUUID &uuid, const U32 local_id, const LLHost &sender) { - LLMemType mt(LLMemType::MTYPE_OBJECT); LLFastTimer t(FTM_CREATE_OBJECT); LLUUID fullid; @@ -2061,7 +2054,6 @@ S32 LLViewerObjectList::findReferences(LLDrawable *drawablep) const void LLViewerObjectList::orphanize(LLViewerObject *childp, U32 parent_id, U32 ip, U32 port) { - LLMemType mt(LLMemType::MTYPE_OBJECT); #ifdef ORPHAN_SPAM llinfos << "Orphaning object " << childp->getID() << " with parent " << parent_id << llendl; #endif diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 6a8de2595..92abe4bf2 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -85,7 +85,6 @@ LLViewerPart::LLViewerPart() : mVPCallback(NULL), mImagep(NULL) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mPartSourcep = NULL; ++LLViewerPartSim::sParticleCount2 ; @@ -93,7 +92,6 @@ LLViewerPart::LLViewerPart() : LLViewerPart::~LLViewerPart() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mPartSourcep = NULL; --LLViewerPartSim::sParticleCount2 ; @@ -101,7 +99,6 @@ LLViewerPart::~LLViewerPart() void LLViewerPart::init(LLPointer sourcep, LLViewerTexture *imagep, LLVPCallback cb) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mPartID = LLViewerPart::sNextPartID; LLViewerPart::sNextPartID++; mFlags = 0x00f; @@ -126,7 +123,6 @@ void LLViewerPart::init(LLPointer sourcep, LLViewerTexture * LLViewerPartGroup::LLViewerPartGroup(const LLVector3 ¢er_agent, const F32 box_side, bool hud) : mHud(hud) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mVOPartGroupp = NULL; mUniformParticles = TRUE; @@ -183,7 +179,6 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 ¢er_agent, const F32 bo LLViewerPartGroup::~LLViewerPartGroup() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); cleanup(); S32 count = (S32) mParticles.size(); @@ -198,7 +193,6 @@ LLViewerPartGroup::~LLViewerPartGroup() void LLViewerPartGroup::cleanup() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (mVOPartGroupp) { if (!mVOPartGroupp->isDead()) @@ -211,7 +205,6 @@ void LLViewerPartGroup::cleanup() BOOL LLViewerPartGroup::posInGroup(const LLVector3 &pos, const F32 desired_size) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if ((pos.mV[VX] < mMinObjPos.mV[VX]) || (pos.mV[VY] < mMinObjPos.mV[VY]) || (pos.mV[VZ] < mMinObjPos.mV[VZ])) @@ -239,8 +232,6 @@ BOOL LLViewerPartGroup::posInGroup(const LLVector3 &pos, const F32 desired_size) BOOL LLViewerPartGroup::addPart(LLViewerPart* part, F32 desired_size) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); - if (part->mFlags & LLPartData::LL_PART_HUD && !mHud) { return FALSE; @@ -267,7 +258,6 @@ BOOL LLViewerPartGroup::addPart(LLViewerPart* part, F32 desired_size) void LLViewerPartGroup::updateParticles(const F32 lastdt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); F32 dt; LLVector3 gravity(0.f, 0.f, GRAVITY); @@ -435,7 +425,6 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt) void LLViewerPartGroup::shift(const LLVector3 &offset) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mCenterAgent += offset; mMinObjPos += offset; mMaxObjPos += offset; @@ -448,8 +437,6 @@ void LLViewerPartGroup::shift(const LLVector3 &offset) void LLViewerPartGroup::removeParticlesByID(const U32 source_id) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); - for (S32 i = 0; i < (S32)mParticles.size(); i++) { if(mParticles[i]->mPartSourcep->getID() == source_id) @@ -481,7 +468,6 @@ void LLViewerPartSim::checkParticleCount(U32 size) LLViewerPartSim::LLViewerPartSim() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); sMaxParticleCount = llmin(gSavedSettings.getS32("RenderMaxPartCount"), LL_MAX_PARTICLE_COUNT); static U32 id_seed = 0; mID = ++id_seed; @@ -490,7 +476,6 @@ LLViewerPartSim::LLViewerPartSim() void LLViewerPartSim::destroyClass() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); S32 i; S32 count; @@ -508,7 +493,6 @@ void LLViewerPartSim::destroyClass() BOOL LLViewerPartSim::shouldAddPart() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (sParticleCount > PART_THROTTLE_THRESHOLD*sMaxParticleCount) { @@ -531,7 +515,6 @@ BOOL LLViewerPartSim::shouldAddPart() void LLViewerPartSim::addPart(LLViewerPart* part) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (sParticleCount < MAX_PART_COUNT) { put(part); @@ -547,7 +530,6 @@ void LLViewerPartSim::addPart(LLViewerPart* part) LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); const F32 MAX_MAG = 1000000.f*1000000.f; // 1 million LLViewerPartGroup *return_group = NULL ; if (part->mPosAgent.magVecSquared() > MAX_MAG || !part->mPosAgent.isFinite()) @@ -605,7 +587,6 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part) LLViewerPartGroup *LLViewerPartSim::createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size, bool hud) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); //find a box that has a center position divisible by PART_SIM_BOX_SIDE that encompasses //pos_agent LLViewerPartGroup *groupp = new LLViewerPartGroup(pos_agent, desired_size, hud); @@ -638,8 +619,6 @@ static LLFastTimer::DeclareTimer FTM_SIMULATE_PARTICLES("Simulate Particles"); void LLViewerPartSim::updateSimulation() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); - static LLFrameTimer update_timer; const F32 dt = llmin(update_timer.getElapsedTimeAndResetF32(), 0.1f); @@ -817,7 +796,6 @@ void LLViewerPartSim::updatePartBurstRate() void LLViewerPartSim::addPartSource(LLPointer sourcep) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (!sourcep) { llwarns << "Null part source!" << llendl; @@ -834,8 +812,6 @@ void LLViewerPartSim::removeLastCreatedSource() void LLViewerPartSim::cleanupRegion(LLViewerRegion *regionp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); - group_list_t& vec = mViewerPartGroups; for (group_list_t::size_type i = 0;iremoveParticlesByID(system_id); @@ -869,7 +844,6 @@ void LLViewerPartSim::clearParticlesByID(const U32 system_id) void LLViewerPartSim::clearParticlesByOwnerID(const LLUUID& task_id) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); for (source_list_t::iterator iter = mViewerPartSources.begin(); iter != mViewerPartSources.end(); ++iter) { if ((*iter)->getOwnerUUID() == task_id) diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp index 4752bf1a8..d712138fd 100644 --- a/indra/newview/llviewerpartsource.cpp +++ b/indra/newview/llviewerpartsource.cpp @@ -96,7 +96,6 @@ void LLViewerPartSource::setStart() LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) : LLViewerPartSource(LL_PART_SOURCE_SCRIPT) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); llassert(source_objp); mSourceObjectp = source_objp; mPosAgent = mSourceObjectp->getPositionAgent(); @@ -108,7 +107,6 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) void LLViewerPartSourceScript::setDead() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mIsDead = TRUE; mSourceObjectp = NULL; mTargetObjectp = NULL; @@ -119,7 +117,6 @@ void LLViewerPartSourceScript::update(const F32 dt) if( mIsSuspended ) return; - LLMemType mt(LLMemType::MTYPE_PARTICLES); F32 old_update_time = mLastUpdateTime; mLastUpdateTime += dt; @@ -400,7 +397,6 @@ void LLViewerPartSourceScript::update(const F32 dt) // static LLPointer LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLPointer pssp, const S32 block_num) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (!pssp) { if (LLPartSysData::isNullPS(block_num)) @@ -442,7 +438,6 @@ LLPointer LLViewerPartSourceScript::unpackPSS(LLViewer LLPointer LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLPointer pssp, LLDataPacker &dp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (!pssp) { LLPointer new_pssp = new LLViewerPartSourceScript(source_objp); @@ -476,8 +471,6 @@ LLPointer LLViewerPartSourceScript::unpackPSS(LLViewer /* static */ LLPointer LLViewerPartSourceScript::createPSS(LLViewerObject *source_objp, const LLPartSysData& particle_parameters) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); - LLPointer new_pssp = new LLViewerPartSourceScript(source_objp); new_pssp->mPartSysData = particle_parameters; @@ -493,13 +486,11 @@ LLPointer LLViewerPartSourceScript::createPSS(LLViewer void LLViewerPartSourceScript::setImage(LLViewerTexture *imagep) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mImagep = imagep; } void LLViewerPartSourceScript::setTargetObject(LLViewerObject *objp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mTargetObjectp = objp; } @@ -515,7 +506,6 @@ LLViewerPartSourceSpiral::LLViewerPartSourceSpiral(const LLVector3 &pos) : void LLViewerPartSourceSpiral::setDead() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mIsDead = TRUE; mSourceObjectp = NULL; } @@ -523,7 +513,6 @@ void LLViewerPartSourceSpiral::setDead() void LLViewerPartSourceSpiral::updatePart(LLViewerPart &part, const F32 dt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); F32 frac = part.mLastUpdateTime/part.mMaxAge; LLVector3 center_pos; @@ -548,7 +537,6 @@ void LLViewerPartSourceSpiral::updatePart(LLViewerPart &part, const F32 dt) void LLViewerPartSourceSpiral::update(const F32 dt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (!mImagep) { mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); @@ -594,7 +582,6 @@ void LLViewerPartSourceSpiral::update(const F32 dt) void LLViewerPartSourceSpiral::setSourceObject(LLViewerObject *objp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mSourceObjectp = objp; } @@ -618,7 +605,6 @@ LLViewerPartSourceBeam::~LLViewerPartSourceBeam() void LLViewerPartSourceBeam::setDead() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mIsDead = TRUE; mSourceObjectp = NULL; mTargetObjectp = NULL; @@ -632,7 +618,6 @@ void LLViewerPartSourceBeam::setColor(const LLColor4 &color) void LLViewerPartSourceBeam::updatePart(LLViewerPart &part, const F32 dt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); F32 frac = part.mLastUpdateTime/part.mMaxAge; LLViewerPartSource *ps = (LLViewerPartSource*)part.mPartSourcep; @@ -677,7 +662,6 @@ void LLViewerPartSourceBeam::updatePart(LLViewerPart &part, const F32 dt) void LLViewerPartSourceBeam::update(const F32 dt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); const F32 RATE = 0.025f; mLastUpdateTime += dt; @@ -749,13 +733,11 @@ void LLViewerPartSourceBeam::update(const F32 dt) void LLViewerPartSourceBeam::setSourceObject(LLViewerObject* objp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mSourceObjectp = objp; } void LLViewerPartSourceBeam::setTargetObject(LLViewerObject* objp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mTargetObjectp = objp; } @@ -770,7 +752,6 @@ LLViewerPartSourceChat::LLViewerPartSourceChat(const LLVector3 &pos) : void LLViewerPartSourceChat::setDead() { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mIsDead = TRUE; mSourceObjectp = NULL; } @@ -778,7 +759,6 @@ void LLViewerPartSourceChat::setDead() void LLViewerPartSourceChat::updatePart(LLViewerPart &part, const F32 dt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); F32 frac = part.mLastUpdateTime/part.mMaxAge; LLVector3 center_pos; @@ -803,7 +783,6 @@ void LLViewerPartSourceChat::updatePart(LLViewerPart &part, const F32 dt) void LLViewerPartSourceChat::update(const F32 dt) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); if (!mImagep) { mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); @@ -859,7 +838,6 @@ void LLViewerPartSourceChat::update(const F32 dt) void LLViewerPartSourceChat::setSourceObject(LLViewerObject *objp) { - LLMemType mt(LLMemType::MTYPE_PARTICLES); mSourceObjectp = objp; } diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 84504a118..f000bc39c 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -780,7 +780,6 @@ void LLViewerRegion::dirtyHeights() BOOL LLViewerRegion::idleUpdate(F32 max_update_time) { - LLMemType mt_ivr(LLMemType::MTYPE_IDLE_UPDATE_VIEWER_REGION); // did_update returns TRUE if we did at least one significant update BOOL did_update = mImpl->mLandp->idleUpdate(max_update_time); diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 0f305c087..a1de57f87 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -39,7 +39,6 @@ #include "llimagebmp.h" #include "llimagej2c.h" #include "llimagetga.h" -#include "llmemtype.h" #include "llstl.h" #include "llvfile.h" #include "llvfs.h" diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 06bca2c16..7a7b70f9b 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1393,7 +1393,6 @@ void LLViewerTextureList::receiveImagePacket(LLMessageSystem *msg, void **user_d { static LLCachedControl log_texture_traffic(gSavedSettings,"LogTextureNetworkTraffic") ; - LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE); LLFastTimer t(FTM_PROCESS_IMAGES); // Receives image packet, copy into image object, diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9b87e221e..f90c82fa7 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1018,7 +1018,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, static LLCachedControl const freeze_time("FreezeTime", false); mFreezeTimeLangolier = freeze_time; - LLMemType mt(LLMemType::MTYPE_AVATAR); //VTResume(); // VTune // mVoiceVisualizer is created by the hud effects manager and uses the HUD Effects pipeline @@ -1965,8 +1964,6 @@ void LLVOAvatar::buildCharacter() //----------------------------------------------------------------------------- void LLVOAvatar::releaseMeshData() { - LLMemType mt(LLMemType::MTYPE_AVATAR); - if (sInstances.size() < AVATAR_RELEASE_THRESHOLD || mIsDummy) { return; @@ -2021,7 +2018,6 @@ void LLVOAvatar::releaseMeshData() void LLVOAvatar::restoreMeshData() { llassert(!isSelf()); - LLMemType mt(LLMemType::MTYPE_AVATAR); //llinfos << "Restoring" << llendl; mMeshValid = TRUE; @@ -2179,8 +2175,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys, U32 block_num, const EObjectUpdateType update_type, LLDataPacker *dp) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - const BOOL has_name = !getNVPair("FirstName"); // Do base class updates... @@ -2286,7 +2280,6 @@ void LLVOAvatar::dumpAnimationState() //------------------------------------------------------------------------ void LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { - LLMemType mt(LLMemType::MTYPE_AVATAR); LLFastTimer t(FTM_AVATAR_UPDATE); if (isDead()) @@ -3350,8 +3343,6 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) mNameText->setTextAlignment(LLHUDNameTag::ALIGN_TEXT_LEFT); mNameText->setFadeDistance(CHAT_NORMAL_RADIUS * 2.f, 5.f); - char line[MAX_STRING]; /* Flawfinder: ignore */ - line[0] = '\0'; std::deque::iterator chat_iter = mChats.begin(); mNameText->clearString(); @@ -3596,8 +3587,6 @@ void LLVOAvatar::resetFreezeTime() //------------------------------------------------------------------------ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - // Frozen! if (areAnimationsPaused()) { @@ -4614,8 +4603,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass) } // Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair) // TODO: 1.25 will be able to switch this logic back to calling isTextureVisible(); - if ( getImage(TEX_HAIR_BAKED, 0) && - getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE || LLDrawPoolAlpha::sShowDebugAlpha) + if ((getImage(TEX_HAIR_BAKED, 0) && + getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE) || LLDrawPoolAlpha::sShowDebugAlpha) { LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR); if (hair_mesh) @@ -5306,8 +5295,6 @@ const LLUUID& LLVOAvatar::getStepSound() const //----------------------------------------------------------------------------- void LLVOAvatar::processAnimationStateChanges() { - LLMemType mt(LLMemType::MTYPE_AVATAR); - if ((gNoRender)||(gAgent.isTPosed())) //isTPosed is meant to stop animation updates while force-TPosed. { return; @@ -5423,8 +5410,6 @@ void LLVOAvatar::processAnimationStateChanges() //----------------------------------------------------------------------------- BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL start ) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - BOOL result = FALSE; if ( start ) // start animation @@ -5612,8 +5597,6 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset) return TRUE; } - LLMemType mt(LLMemType::MTYPE_AVATAR); - lldebugs << "motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << llendl; LLUUID remap_id = remapMotionID(id); @@ -5992,8 +5975,6 @@ BOOL LLVOAvatar::isActive() const //----------------------------------------------------------------------------- void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - if (mDrawable.isNull()) { return; @@ -8200,7 +8181,6 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerFetchedTexture if (!userdata) return; //llinfos << "onBakedTextureMasksLoaded: " << src_vi->getID() << llendl; - const LLMemType mt(LLMemType::MTYPE_AVATAR); const LLUUID id = src_vi->getID(); LLTextureMaskData* maskData = (LLTextureMaskData*) userdata; diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index eb8cec7dc..8c54a558b 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -299,8 +299,6 @@ BOOL LLVOAvatarSelf::loadAvatarSelf() BOOL LLVOAvatarSelf::buildSkeletonSelf(const LLAvatarSkeletonInfo *info) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - // add special-purpose "screen" joint mScreenp = new LLViewerJoint("mScreen", NULL); // for now, put screen at origin, as it is only used during special @@ -555,8 +553,6 @@ LLVOAvatarSelf::~LLVOAvatarSelf() // virtual BOOL LLVOAvatarSelf::updateCharacter(LLAgent &agent) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - // update screen joint size if (mScreenp) { @@ -962,8 +958,6 @@ void LLVOAvatarSelf::idleUpdateTractorBeam() // virtual void LLVOAvatarSelf::restoreMeshData() { - LLMemType mt(LLMemType::MTYPE_AVATAR); - //llinfos << "Restoring" << llendl; mMeshValid = TRUE; updateJointLODs(); diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index 4c40dd76a..f1ca2c6a3 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -700,7 +700,6 @@ static LLFastTimer::DeclareTimer FTM_REBUILD_GRASS_VB("Grass VB"); void LLGrassPartition::getGeometry(LLSpatialGroup* group) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); LLFastTimer ftm(FTM_REBUILD_GRASS_VB); std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater()); diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 43a12d5c9..888d77d8e 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -3079,7 +3079,8 @@ void LLVoiceClient::giveUp() static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel) { - F32 nat[3], nup[3], nl[3], nvel[3]; // the new at, up, left vectors and the new position and velocity + F32 nat[3], nup[3], nl[3]; // the new at, up, left vectors and the new position and velocity +// F32 nvel[3]; F64 npos[3]; // The original XML command was sent like this: @@ -3129,9 +3130,9 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe npos[1] = pos.mdV[VZ]; npos[2] = pos.mdV[VY]; - nvel[0] = vel.mV[VX]; - nvel[1] = vel.mV[VZ]; - nvel[2] = vel.mV[VY]; +// nvel[0] = vel.mV[VX]; +// nvel[1] = vel.mV[VZ]; +// nvel[2] = vel.mV[VY]; for(int i=0;i<3;++i) { at.mV[i] = nat[i]; diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 9f4c1c22d..b3faa57ac 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -600,7 +600,6 @@ static LLFastTimer::DeclareTimer FTM_REBUILD_PARTICLE_GEOM("Particle Geom"); void LLParticlePartition::getGeometry(LLSpatialGroup* group) { - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); LLFastTimer ftm(FTM_REBUILD_PARTICLE_GEOM); std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater()); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index d1cee520d..535f0879c 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3044,10 +3044,13 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons } //build matrix palette - LLMatrix4a mp[64]; + static const size_t kMaxJoints = 64; + + LLMatrix4a mp[kMaxJoints]; LLMatrix4* mat = (LLMatrix4*) mp; - for (U32 j = 0; j < skin->mJointNames.size(); ++j) + U32 maxJoints = llmin(skin->mJointNames.size(), kMaxJoints); + for (U32 j = 0; j < maxJoints; ++j) { LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); if (joint) @@ -3105,8 +3108,10 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons F32 w = wght[k]; LLMatrix4a src; - src.setMul(mp[idx[k]], w); - + // Insure ref'd bone is in our clamped array of mats + llassert(idx[k] < kMaxJoints); + // clamp k to kMaxJoints to avoid reading garbage off stack in release + src.setMul(mp[idx[(k < kMaxJoints) ? k : 0]], w); final_mat.add(src); } @@ -3210,7 +3215,6 @@ static LLFastTimer::DeclareTimer FTM_REGISTER_FACE("Register Face"); void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, U32 type) { LLFastTimer t(FTM_REGISTER_FACE); - LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); // if (facep->getViewerObject()->isSelected() && gHideSelectedObjects) // [RLVa:KB] - Checked: 2010-11-29 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp index 39d366b02..9cc91d224 100644 --- a/indra/newview/llwaterparamset.cpp +++ b/indra/newview/llwaterparamset.cpp @@ -185,8 +185,6 @@ LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error) LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) { // test to see if right type - int ttest; - ttest = mParamValues.size(); LLSD cur_val = mParamValues.get(paramName); if (!cur_val.isArray() || cur_val.size() != 2) { diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 487a28905..3bdb3ed59 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -149,7 +149,6 @@ void LLWorld::destroyClass() LLViewerRegion* LLWorld::addRegion(const U64 ®ion_handle, const LLHost &host) { - LLMemType mt(LLMemType::MTYPE_REGIONS); llinfos << "Add region with handle: " << region_handle << " on host " << host << llendl; LLViewerRegion *regionp = getRegionFromHandle(region_handle); if (regionp) diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 01d9ca29f..9f06fbbcc 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -1311,8 +1311,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4& S32 text_x = x; S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight()); - BOOL is_in_window = true; - if( x < 0 || y < 0 || x >= getRect().getWidth() @@ -1325,7 +1323,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4& text_x = sTrackingArrowX; text_y = sTrackingArrowY; } - is_in_window = false; } else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION && LLTracker::getTrackedLocationType() != LLTracker::LOCATION_NOTHING) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 55ad60a5c..48afdb169 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -42,7 +42,6 @@ #include "llfasttimer.h" #include "llfontgl.h" #include "llmemory.h" -#include "llmemtype.h" #include "llnamevalue.h" #include "llpointer.h" #include "llprimitive.h" @@ -401,8 +400,6 @@ LLPipeline::LLPipeline() : void LLPipeline::init() { - LLMemType mt(LLMemType::MTYPE_PIPELINE_INIT); - refreshCachedSettings(); gOctreeMaxCapacity = gSavedSettings.getU32("OctreeMaxNodeCapacity"); @@ -985,7 +982,6 @@ void LLPipeline::releaseScreenBuffers() void LLPipeline::createGLBuffers() { stop_glerror(); - LLMemType mt_cb(LLMemType::MTYPE_PIPELINE_CREATE_BUFFERS); assertInitialized(); updateRenderDeferred(); @@ -1130,7 +1126,6 @@ void LLPipeline::createLUTBuffers() void LLPipeline::restoreGL() { - LLMemType mt_cb(LLMemType::MTYPE_PIPELINE_RESTORE_GL); assertInitialized(); if (mVertexShadersEnabled) @@ -1194,7 +1189,6 @@ BOOL LLPipeline::canUseAntiAliasing() const void LLPipeline::unloadShaders() { - LLMemType mt_us(LLMemType::MTYPE_PIPELINE_UNLOAD_SHADERS); LLViewerShaderMgr::instance()->unloadShaders(); mVertexShadersLoaded = 0; @@ -1226,7 +1220,6 @@ S32 LLPipeline::getMaxLightingDetail() const S32 LLPipeline::setLightingDetail(S32 level) { - LLMemType mt_ld(LLMemType::MTYPE_PIPELINE_LIGHTING_DETAIL); refreshCachedSettings(); if (level < 0) @@ -1392,7 +1385,6 @@ LLDrawPool *LLPipeline::findPool(const U32 type, LLViewerTexture *tex0) LLDrawPool *LLPipeline::getPool(const U32 type, LLViewerTexture *tex0) { - LLMemType mt(LLMemType::MTYPE_PIPELINE); LLDrawPool *poolp = findPool(type, tex0); if (poolp) { @@ -1409,7 +1401,6 @@ LLDrawPool *LLPipeline::getPool(const U32 type, LLViewerTexture *tex0) // static LLDrawPool* LLPipeline::getPoolFromTE(const LLTextureEntry* te, LLViewerTexture* imagep) { - LLMemType mt(LLMemType::MTYPE_PIPELINE); U32 type = getPoolTypeFromTE(te, imagep); return gPipeline.getPool(type, imagep); } @@ -1417,8 +1408,6 @@ LLDrawPool* LLPipeline::getPoolFromTE(const LLTextureEntry* te, LLViewerTexture* //static U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* imagep) { - LLMemType mt_gpt(LLMemType::MTYPE_PIPELINE_GET_POOL_TYPE); - if (!te || !imagep) { return 0; @@ -1447,7 +1436,6 @@ U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* ima void LLPipeline::addPool(LLDrawPool *new_poolp) { - LLMemType mt_a(LLMemType::MTYPE_PIPELINE_ADD_POOL); assertInitialized(); mPools.insert(new_poolp); addToQuickLookup( new_poolp ); @@ -1459,7 +1447,7 @@ void LLPipeline::allocDrawable(LLViewerObject *vobj) { llerrs << "Null object passed to allocDrawable!" << llendl; } - LLMemType mt_ad(LLMemType::MTYPE_PIPELINE_ALLOCATE_DRAWABLE); + LLDrawable *drawable = new LLDrawable(); vobj->mDrawable = drawable; @@ -1568,7 +1556,7 @@ U32 LLPipeline::addObject(LLViewerObject *vobj) { return 0; } - LLMemType mt_ao(LLMemType::MTYPE_PIPELINE_ADD_OBJECT); + static const LLCachedControl render_delay_creation("RenderDelayCreation",false); if (!vobj->isAvatar() && render_delay_creation) { @@ -1585,7 +1573,6 @@ U32 LLPipeline::addObject(LLViewerObject *vobj) void LLPipeline::createObjects(F32 max_dtime) { LLFastTimer ftm(FTM_PIPELINE_CREATE); - LLMemType mt(LLMemType::MTYPE_PIPELINE_CREATE_OBJECTS); LLTimer update_timer; @@ -1774,7 +1761,6 @@ static LLFastTimer::DeclareTimer FTM_UPDATE_MOVE("Update Move"); void LLPipeline::updateMove() { LLFastTimer t(FTM_UPDATE_MOVE); - LLMemType mt_um(LLMemType::MTYPE_PIPELINE_UPDATE_MOVE); static const LLCachedControl freeze_time("FreezeTime",false); if (freeze_time) @@ -2129,7 +2115,6 @@ static LLFastTimer::DeclareTimer FTM_CULL("Object Culling"); void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip, LLPlane* planep) { LLFastTimer t(FTM_CULL); - LLMemType mt_uc(LLMemType::MTYPE_PIPELINE_UPDATE_CULL); grabReferences(result); @@ -2512,7 +2497,6 @@ void LLPipeline::rebuildPriorityGroups() { LLFastTimer t(FTM_REBUILD_PRIORITY_GROUPS); LLTimer update_timer; - LLMemType mt(LLMemType::MTYPE_PIPELINE); assertInitialized(); @@ -2585,7 +2569,6 @@ void LLPipeline::rebuildGroups() void LLPipeline::updateGeom(F32 max_dtime) { LLTimer update_timer; - LLMemType mt(LLMemType::MTYPE_PIPELINE_UPDATE_GEOM); LLPointer drawablep; LLFastTimer t(FTM_GEO_UPDATE); @@ -2688,8 +2671,6 @@ void LLPipeline::updateGeom(F32 max_dtime) void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_VISIBLE); - if(drawablep && !drawablep->isDead()) { if (drawablep->isSpatialBridge()) @@ -2733,8 +2714,6 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) void LLPipeline::markMoved(LLDrawable *drawablep, BOOL damped_motion) { - LLMemType mt_mm(LLMemType::MTYPE_PIPELINE_MARK_MOVED); - if (!drawablep) { //llerrs << "Sending null drawable to moved list!" << llendl; @@ -2779,8 +2758,6 @@ void LLPipeline::markMoved(LLDrawable *drawablep, BOOL damped_motion) void LLPipeline::markShift(LLDrawable *drawablep) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_SHIFT); - if (!drawablep || drawablep->isDead()) { return; @@ -2806,8 +2783,6 @@ static LLFastTimer::DeclareTimer FTM_SHIFT_HUD("Shift HUD"); void LLPipeline::shiftObjects(const LLVector3 &offset) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_SHIFT_OBJECTS); - assertInitialized(); glClear(GL_DEPTH_BUFFER_BIT); @@ -2859,8 +2834,6 @@ void LLPipeline::shiftObjects(const LLVector3 &offset) void LLPipeline::markTextured(LLDrawable *drawablep) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_TEXTURED); - if (drawablep && !drawablep->isDead() && assertInitialized()) { mRetexturedList.insert(drawablep); @@ -2911,8 +2884,6 @@ void LLPipeline::markMeshDirty(LLSpatialGroup* group) void LLPipeline::markRebuild(LLSpatialGroup* group, BOOL priority) { - LLMemType mt(LLMemType::MTYPE_PIPELINE); - if (group && !group->isDead() && group->mSpatialPartition) { if (group->mSpatialPartition->mPartitionType == LLViewerRegion::PARTITION_HUD) @@ -2957,8 +2928,6 @@ void LLPipeline::markRebuild(LLSpatialGroup* group, BOOL priority) void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags flag, BOOL priority) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_REBUILD); - if (drawablep && !drawablep->isDead() && assertInitialized()) { if (!drawablep->isState(LLDrawable::BUILT)) @@ -3005,7 +2974,6 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) } LLFastTimer ftm(FTM_STATESORT); - LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT); //LLVertexBuffer::unbind(); @@ -3107,7 +3075,6 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result) void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT); if (!sSkipUpdate && group->changeLOD()) { OctreeGuard guard(group->mOctreeNode); @@ -3127,7 +3094,6 @@ void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera) void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT); if (/*!sShadowRender && */!sSkipUpdate && bridge->getSpatialGroup()->changeLOD()) { bool force_update = false; @@ -3137,8 +3103,6 @@ void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera) void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT); - if (!drawablep || drawablep->isDead() || !hasRenderType(drawablep->getRenderType())) @@ -3409,7 +3373,6 @@ void updateParticleActivity(LLDrawable *drawablep); void LLPipeline::postSort(LLCamera& camera) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_POST_SORT); LLFastTimer ftm(FTM_STATESORT_POSTSORT); assertInitialized(); @@ -3661,7 +3624,6 @@ void LLPipeline::postSort(LLCamera& camera) void render_hud_elements() { - LLMemType mt_rhe(LLMemType::MTYPE_PIPELINE_RENDER_HUD_ELS); LLFastTimer t(FTM_RENDER_UI); gPipeline.disableLights(); @@ -3717,8 +3679,6 @@ void render_hud_elements() void LLPipeline::renderHighlights() { - LLMemType mt(LLMemType::MTYPE_PIPELINE_RENDER_HL); - assertInitialized(); // Draw 3D UI elements here (before we clear the Z buffer in POOL_HUD) @@ -3785,7 +3745,6 @@ U32 LLPipeline::sCurRenderPoolType = 0 ; void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_RENDER_GEOM); LLFastTimer t(FTM_RENDER_GEOMETRY); assertInitialized(); @@ -4050,7 +4009,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) void LLPipeline::renderGeomDeferred(LLCamera& camera) { LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomDeferred"); - LLMemType mt_rgd(LLMemType::MTYPE_PIPELINE_RENDER_GEOM_DEFFERRED); LLFastTimer t(FTM_RENDER_GEOMETRY); LLFastTimer t2(FTM_DEFERRED_POOLS); @@ -4150,7 +4108,6 @@ void LLPipeline::renderGeomDeferred(LLCamera& camera) void LLPipeline::renderGeomPostDeferred(LLCamera& camera) { - LLMemType mt_rgpd(LLMemType::MTYPE_PIPELINE_RENDER_GEOM_POST_DEF); LLFastTimer t(FTM_POST_DEFERRED_POOLS); U32 cur_type = 0; @@ -4247,7 +4204,6 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera) void LLPipeline::renderGeomShadow(LLCamera& camera) { - LLMemType mt_rgs(LLMemType::MTYPE_PIPELINE_RENDER_GEOM_SHADOW); U32 cur_type = 0; LLGLEnable cull(GL_CULL_FACE); @@ -4401,8 +4357,6 @@ void LLPipeline::renderPhysicsDisplay() void LLPipeline::renderDebug() { - LLMemType mt(LLMemType::MTYPE_PIPELINE); - assertInitialized(); gGL.color4f(1,1,1,1); @@ -4735,7 +4689,6 @@ static LLFastTimer::DeclareTimer FTM_REBUILD_POOLS("Rebuild Pools"); void LLPipeline::rebuildPools() { LLFastTimer t(FTM_REBUILD_POOLS); - LLMemType mt(LLMemType::MTYPE_PIPELINE_REBUILD_POOLS); assertInitialized(); @@ -4775,8 +4728,6 @@ void LLPipeline::rebuildPools() void LLPipeline::addToQuickLookup( LLDrawPool* new_poolp ) { - LLMemType mt(LLMemType::MTYPE_PIPELINE_QUICK_LOOKUP); - assertInitialized(); switch( new_poolp->getType() ) @@ -4942,7 +4893,6 @@ void LLPipeline::removePool( LLDrawPool* poolp ) void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp ) { assertInitialized(); - LLMemType mt(LLMemType::MTYPE_PIPELINE); switch( poolp->getType() ) { case LLDrawPool::POOL_SIMPLE: @@ -6425,7 +6375,6 @@ void LLPipeline::doResetVertexBuffers() void LLPipeline::renderObjects(U32 type, U32 mask, BOOL texture, BOOL batch_texture) { - LLMemType mt_ro(LLMemType::MTYPE_PIPELINE_RENDER_OBJECTS); assertInitialized(); gGL.loadMatrix(gGLModelView); gGLLastMatrix = NULL; @@ -6501,7 +6450,6 @@ void LLPipeline::bindScreenToTexture() static LLFastTimer::DeclareTimer FTM_RENDER_BLOOM("Bloom"); void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, bool tiling) { - LLMemType mt_ru(LLMemType::MTYPE_PIPELINE_RENDER_BLOOM); if (!(gPipeline.canUseVertexShaders() && sRenderGlow)) { @@ -9599,7 +9547,6 @@ static LLFastTimer::DeclareTimer FTM_IMPOSTOR_RESIZE("Impostor Resize"); void LLPipeline::generateImpostor(LLVOAvatar* avatar) { - LLMemType mt_gi(LLMemType::MTYPE_PIPELINE_GENERATE_IMPOSTOR); LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); diff --git a/indra/newview/skins/Pony-Aquablue.xml b/indra/newview/skins/Pony-Aquablue.xml index 19e0c2e3a..28390db10 100644 --- a/indra/newview/skins/Pony-Aquablue.xml +++ b/indra/newview/skins/Pony-Aquablue.xml @@ -10,6 +10,6 @@ Game-style interface. Make your Second Life Viewer more like online games If you like it, there are still many other colors for you to choose. folder_name - Pony-Aquablue + ponyaquablue diff --git a/indra/newview/skins/Pony-Purple.xml b/indra/newview/skins/Pony-Purple.xml index 8e9e0eca0..2102573fe 100644 --- a/indra/newview/skins/Pony-Purple.xml +++ b/indra/newview/skins/Pony-Purple.xml @@ -10,6 +10,6 @@ Game-style interface. Make your Second Life Viewer more like online games If you like it, there are still many other colors for you to choose. folder_name - Pony-Purple + ponypurple diff --git a/indra/newview/skins/blackdark.xml b/indra/newview/skins/blackdark.xml index 8f83e11f1..f00a3fea0 100644 --- a/indra/newview/skins/blackdark.xml +++ b/indra/newview/skins/blackdark.xml @@ -9,6 +9,6 @@ skin_info folder_name - Blackdark + blackdark diff --git a/indra/newview/skins/Blackdark/colors.xml b/indra/newview/skins/blackdark/colors.xml similarity index 100% rename from indra/newview/skins/Blackdark/colors.xml rename to indra/newview/skins/blackdark/colors.xml diff --git a/indra/newview/skins/Blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/indra/newview/skins/blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga rename to indra/newview/skins/blackdark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga diff --git a/indra/newview/skins/Blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/indra/newview/skins/blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga rename to indra/newview/skins/blackdark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga diff --git a/indra/newview/skins/Blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga b/indra/newview/skins/blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga rename to indra/newview/skins/blackdark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga diff --git a/indra/newview/skins/Blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/indra/newview/skins/blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga rename to indra/newview/skins/blackdark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga diff --git a/indra/newview/skins/Blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/indra/newview/skins/blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga rename to indra/newview/skins/blackdark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga diff --git a/indra/newview/skins/Blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/indra/newview/skins/blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga rename to indra/newview/skins/blackdark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga diff --git a/indra/newview/skins/Blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/indra/newview/skins/blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga rename to indra/newview/skins/blackdark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga diff --git a/indra/newview/skins/Blackdark/textures/active_speakers.tga b/indra/newview/skins/blackdark/textures/active_speakers.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/active_speakers.tga rename to indra/newview/skins/blackdark/textures/active_speakers.tga diff --git a/indra/newview/skins/Blackdark/textures/active_voice_tab.tga b/indra/newview/skins/blackdark/textures/active_voice_tab.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/active_voice_tab.tga rename to indra/newview/skins/blackdark/textures/active_voice_tab.tga diff --git a/indra/newview/skins/Blackdark/textures/arrow_down.tga b/indra/newview/skins/blackdark/textures/arrow_down.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/arrow_down.tga rename to indra/newview/skins/blackdark/textures/arrow_down.tga diff --git a/indra/newview/skins/Blackdark/textures/arrow_up.tga b/indra/newview/skins/blackdark/textures/arrow_up.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/arrow_up.tga rename to indra/newview/skins/blackdark/textures/arrow_up.tga diff --git a/indra/newview/skins/Blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/indra/newview/skins/blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga rename to indra/newview/skins/blackdark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga diff --git a/indra/newview/skins/Blackdark/textures/badge_error.j2c b/indra/newview/skins/blackdark/textures/badge_error.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/badge_error.j2c rename to indra/newview/skins/blackdark/textures/badge_error.j2c diff --git a/indra/newview/skins/Blackdark/textures/badge_note.j2c b/indra/newview/skins/blackdark/textures/badge_note.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/badge_note.j2c rename to indra/newview/skins/blackdark/textures/badge_note.j2c diff --git a/indra/newview/skins/Blackdark/textures/badge_ok.j2c b/indra/newview/skins/blackdark/textures/badge_ok.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/badge_ok.j2c rename to indra/newview/skins/blackdark/textures/badge_ok.j2c diff --git a/indra/newview/skins/Blackdark/textures/badge_warn.j2c b/indra/newview/skins/blackdark/textures/badge_warn.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/badge_warn.j2c rename to indra/newview/skins/blackdark/textures/badge_warn.j2c diff --git a/indra/newview/skins/Blackdark/textures/black.tga b/indra/newview/skins/blackdark/textures/black.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/black.tga rename to indra/newview/skins/blackdark/textures/black.tga diff --git a/indra/newview/skins/Blackdark/textures/btn_chatbar.tga b/indra/newview/skins/blackdark/textures/btn_chatbar.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/btn_chatbar.tga rename to indra/newview/skins/blackdark/textures/btn_chatbar.tga diff --git a/indra/newview/skins/Blackdark/textures/btn_chatbar_selected.tga b/indra/newview/skins/blackdark/textures/btn_chatbar_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/btn_chatbar_selected.tga rename to indra/newview/skins/blackdark/textures/btn_chatbar_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/button_anim_pause.tga b/indra/newview/skins/blackdark/textures/button_anim_pause.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_anim_pause.tga rename to indra/newview/skins/blackdark/textures/button_anim_pause.tga diff --git a/indra/newview/skins/Blackdark/textures/button_anim_pause_selected.tga b/indra/newview/skins/blackdark/textures/button_anim_pause_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_anim_pause_selected.tga rename to indra/newview/skins/blackdark/textures/button_anim_pause_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/button_anim_play.tga b/indra/newview/skins/blackdark/textures/button_anim_play.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_anim_play.tga rename to indra/newview/skins/blackdark/textures/button_anim_play.tga diff --git a/indra/newview/skins/Blackdark/textures/button_anim_play_selected.tga b/indra/newview/skins/blackdark/textures/button_anim_play_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_anim_play_selected.tga rename to indra/newview/skins/blackdark/textures/button_anim_play_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/button_anim_stop.tga b/indra/newview/skins/blackdark/textures/button_anim_stop.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_anim_stop.tga rename to indra/newview/skins/blackdark/textures/button_anim_stop.tga diff --git a/indra/newview/skins/Blackdark/textures/button_anim_stop_selected.tga b/indra/newview/skins/blackdark/textures/button_anim_stop_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_anim_stop_selected.tga rename to indra/newview/skins/blackdark/textures/button_anim_stop_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/button_disabled_32x128.tga b/indra/newview/skins/blackdark/textures/button_disabled_32x128.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_disabled_32x128.tga rename to indra/newview/skins/blackdark/textures/button_disabled_32x128.tga diff --git a/indra/newview/skins/Blackdark/textures/button_enabled_32x128.tga b/indra/newview/skins/blackdark/textures/button_enabled_32x128.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_enabled_32x128.tga rename to indra/newview/skins/blackdark/textures/button_enabled_32x128.tga diff --git a/indra/newview/skins/Blackdark/textures/button_enabled_selected_32x128.tga b/indra/newview/skins/blackdark/textures/button_enabled_selected_32x128.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/button_enabled_selected_32x128.tga rename to indra/newview/skins/blackdark/textures/button_enabled_selected_32x128.tga diff --git a/indra/newview/skins/Blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/indra/newview/skins/blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga rename to indra/newview/skins/blackdark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga diff --git a/indra/newview/skins/Blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/indra/newview/skins/blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga rename to indra/newview/skins/blackdark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_rotate_in.tga b/indra/newview/skins/blackdark/textures/cam_rotate_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_rotate_in.tga rename to indra/newview/skins/blackdark/textures/cam_rotate_in.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_rotate_out.tga b/indra/newview/skins/blackdark/textures/cam_rotate_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_rotate_out.tga rename to indra/newview/skins/blackdark/textures/cam_rotate_out.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_tracking_in.tga b/indra/newview/skins/blackdark/textures/cam_tracking_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_tracking_in.tga rename to indra/newview/skins/blackdark/textures/cam_tracking_in.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_tracking_out.tga b/indra/newview/skins/blackdark/textures/cam_tracking_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_tracking_out.tga rename to indra/newview/skins/blackdark/textures/cam_tracking_out.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_zoom_minus_in.tga b/indra/newview/skins/blackdark/textures/cam_zoom_minus_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_zoom_minus_in.tga rename to indra/newview/skins/blackdark/textures/cam_zoom_minus_in.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_zoom_out.tga b/indra/newview/skins/blackdark/textures/cam_zoom_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_zoom_out.tga rename to indra/newview/skins/blackdark/textures/cam_zoom_out.tga diff --git a/indra/newview/skins/Blackdark/textures/cam_zoom_plus_in.tga b/indra/newview/skins/blackdark/textures/cam_zoom_plus_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/cam_zoom_plus_in.tga rename to indra/newview/skins/blackdark/textures/cam_zoom_plus_in.tga diff --git a/indra/newview/skins/Blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/indra/newview/skins/blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga rename to indra/newview/skins/blackdark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga diff --git a/indra/newview/skins/Blackdark/textures/checkbox_disabled_false.tga b/indra/newview/skins/blackdark/textures/checkbox_disabled_false.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/checkbox_disabled_false.tga rename to indra/newview/skins/blackdark/textures/checkbox_disabled_false.tga diff --git a/indra/newview/skins/Blackdark/textures/checkbox_disabled_true.tga b/indra/newview/skins/blackdark/textures/checkbox_disabled_true.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/checkbox_disabled_true.tga rename to indra/newview/skins/blackdark/textures/checkbox_disabled_true.tga diff --git a/indra/newview/skins/Blackdark/textures/checkbox_enabled_false.tga b/indra/newview/skins/blackdark/textures/checkbox_enabled_false.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/checkbox_enabled_false.tga rename to indra/newview/skins/blackdark/textures/checkbox_enabled_false.tga diff --git a/indra/newview/skins/Blackdark/textures/checkbox_enabled_true.tga b/indra/newview/skins/blackdark/textures/checkbox_enabled_true.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/checkbox_enabled_true.tga rename to indra/newview/skins/blackdark/textures/checkbox_enabled_true.tga diff --git a/indra/newview/skins/Blackdark/textures/circle.tga b/indra/newview/skins/blackdark/textures/circle.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/circle.tga rename to indra/newview/skins/blackdark/textures/circle.tga diff --git a/indra/newview/skins/Blackdark/textures/close_in_blue.tga b/indra/newview/skins/blackdark/textures/close_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/close_in_blue.tga rename to indra/newview/skins/blackdark/textures/close_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/close_inactive.tga b/indra/newview/skins/blackdark/textures/close_inactive.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/close_inactive.tga rename to indra/newview/skins/blackdark/textures/close_inactive.tga diff --git a/indra/newview/skins/Blackdark/textures/close_inactive_blue.tga b/indra/newview/skins/blackdark/textures/close_inactive_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/close_inactive_blue.tga rename to indra/newview/skins/blackdark/textures/close_inactive_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/closebox.tga b/indra/newview/skins/blackdark/textures/closebox.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/closebox.tga rename to indra/newview/skins/blackdark/textures/closebox.tga diff --git a/indra/newview/skins/Blackdark/textures/combobox_arrow.tga b/indra/newview/skins/blackdark/textures/combobox_arrow.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/combobox_arrow.tga rename to indra/newview/skins/blackdark/textures/combobox_arrow.tga diff --git a/indra/newview/skins/Blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/skins/blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c rename to indra/newview/skins/blackdark/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c diff --git a/indra/newview/skins/Blackdark/textures/darkgray.tga b/indra/newview/skins/blackdark/textures/darkgray.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/darkgray.tga rename to indra/newview/skins/blackdark/textures/darkgray.tga diff --git a/indra/newview/skins/Blackdark/textures/default_land_picture.j2c b/indra/newview/skins/blackdark/textures/default_land_picture.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/default_land_picture.j2c rename to indra/newview/skins/blackdark/textures/default_land_picture.j2c diff --git a/indra/newview/skins/Blackdark/textures/default_profile_picture.j2c b/indra/newview/skins/blackdark/textures/default_profile_picture.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/default_profile_picture.j2c rename to indra/newview/skins/blackdark/textures/default_profile_picture.j2c diff --git a/indra/newview/skins/Blackdark/textures/direction_arrow.tga b/indra/newview/skins/blackdark/textures/direction_arrow.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/direction_arrow.tga rename to indra/newview/skins/blackdark/textures/direction_arrow.tga diff --git a/indra/newview/skins/Blackdark/textures/down_arrow.png b/indra/newview/skins/blackdark/textures/down_arrow.png similarity index 100% rename from indra/newview/skins/Blackdark/textures/down_arrow.png rename to indra/newview/skins/blackdark/textures/down_arrow.png diff --git a/indra/newview/skins/Blackdark/textures/eye_button_active.tga b/indra/newview/skins/blackdark/textures/eye_button_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/eye_button_active.tga rename to indra/newview/skins/blackdark/textures/eye_button_active.tga diff --git a/indra/newview/skins/Blackdark/textures/eye_button_inactive.tga b/indra/newview/skins/blackdark/textures/eye_button_inactive.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/eye_button_inactive.tga rename to indra/newview/skins/blackdark/textures/eye_button_inactive.tga diff --git a/indra/newview/skins/Blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/indra/newview/skins/blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga rename to indra/newview/skins/blackdark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga diff --git a/indra/newview/skins/Blackdark/textures/ff_edit_mine_button.tga b/indra/newview/skins/blackdark/textures/ff_edit_mine_button.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ff_edit_mine_button.tga rename to indra/newview/skins/blackdark/textures/ff_edit_mine_button.tga diff --git a/indra/newview/skins/Blackdark/textures/ff_edit_theirs_button.tga b/indra/newview/skins/blackdark/textures/ff_edit_theirs_button.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ff_edit_theirs_button.tga rename to indra/newview/skins/blackdark/textures/ff_edit_theirs_button.tga diff --git a/indra/newview/skins/Blackdark/textures/ff_online_status_button.tga b/indra/newview/skins/blackdark/textures/ff_online_status_button.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ff_online_status_button.tga rename to indra/newview/skins/blackdark/textures/ff_online_status_button.tga diff --git a/indra/newview/skins/Blackdark/textures/ff_visible_map_button.tga b/indra/newview/skins/blackdark/textures/ff_visible_map_button.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ff_visible_map_button.tga rename to indra/newview/skins/blackdark/textures/ff_visible_map_button.tga diff --git a/indra/newview/skins/Blackdark/textures/ff_visible_online_button.tga b/indra/newview/skins/blackdark/textures/ff_visible_online_button.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ff_visible_online_button.tga rename to indra/newview/skins/blackdark/textures/ff_visible_online_button.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_left.tga b/indra/newview/skins/blackdark/textures/flyout_btn_left.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_btn_left.tga rename to indra/newview/skins/blackdark/textures/flyout_btn_left.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_left_disabled.tga b/indra/newview/skins/blackdark/textures/flyout_btn_left_disabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_btn_left_disabled.tga rename to indra/newview/skins/blackdark/textures/flyout_btn_left_disabled.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_left_selected.tga b/indra/newview/skins/blackdark/textures/flyout_btn_left_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_btn_left_selected.tga rename to indra/newview/skins/blackdark/textures/flyout_btn_left_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_right.tga b/indra/newview/skins/blackdark/textures/flyout_btn_right.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_btn_right.tga rename to indra/newview/skins/blackdark/textures/flyout_btn_right.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_right_disabled.tga b/indra/newview/skins/blackdark/textures/flyout_btn_right_disabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_btn_right_disabled.tga rename to indra/newview/skins/blackdark/textures/flyout_btn_right_disabled.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_btn_right_selected.tga b/indra/newview/skins/blackdark/textures/flyout_btn_right_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_btn_right_selected.tga rename to indra/newview/skins/blackdark/textures/flyout_btn_right_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_left.tga b/indra/newview/skins/blackdark/textures/flyout_left.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_left.tga rename to indra/newview/skins/blackdark/textures/flyout_left.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_left_disabled.tga b/indra/newview/skins/blackdark/textures/flyout_left_disabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_left_disabled.tga rename to indra/newview/skins/blackdark/textures/flyout_left_disabled.tga diff --git a/indra/newview/skins/Blackdark/textures/flyout_left_selected.tga b/indra/newview/skins/blackdark/textures/flyout_left_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/flyout_left_selected.tga rename to indra/newview/skins/blackdark/textures/flyout_left_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/folder_arrow.tga b/indra/newview/skins/blackdark/textures/folder_arrow.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/folder_arrow.tga rename to indra/newview/skins/blackdark/textures/folder_arrow.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl0.tga b/indra/newview/skins/blackdark/textures/icn_active-speakers-dot-lvl0.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl0.tga rename to indra/newview/skins/blackdark/textures/icn_active-speakers-dot-lvl0.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl1.tga b/indra/newview/skins/blackdark/textures/icn_active-speakers-dot-lvl1.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl1.tga rename to indra/newview/skins/blackdark/textures/icn_active-speakers-dot-lvl1.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl2.tga b/indra/newview/skins/blackdark/textures/icn_active-speakers-dot-lvl2.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_active-speakers-dot-lvl2.tga rename to indra/newview/skins/blackdark/textures/icn_active-speakers-dot-lvl2.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing1.tga b/indra/newview/skins/blackdark/textures/icn_active-speakers-typing1.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_active-speakers-typing1.tga rename to indra/newview/skins/blackdark/textures/icn_active-speakers-typing1.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing2.tga b/indra/newview/skins/blackdark/textures/icn_active-speakers-typing2.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_active-speakers-typing2.tga rename to indra/newview/skins/blackdark/textures/icn_active-speakers-typing2.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_active-speakers-typing3.tga b/indra/newview/skins/blackdark/textures/icn_active-speakers-typing3.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_active-speakers-typing3.tga rename to indra/newview/skins/blackdark/textures/icn_active-speakers-typing3.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_chatbar.tga b/indra/newview/skins/blackdark/textures/icn_chatbar.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_chatbar.tga rename to indra/newview/skins/blackdark/textures/icn_chatbar.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_clear_lineeditor.tga b/indra/newview/skins/blackdark/textures/icn_clear_lineeditor.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_clear_lineeditor.tga rename to indra/newview/skins/blackdark/textures/icn_clear_lineeditor.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_label_media.tga b/indra/newview/skins/blackdark/textures/icn_label_media.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_label_media.tga rename to indra/newview/skins/blackdark/textures/icn_label_media.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_label_music.tga b/indra/newview/skins/blackdark/textures/icn_label_music.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_label_music.tga rename to indra/newview/skins/blackdark/textures/icn_label_music.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_label_web.tga b/indra/newview/skins/blackdark/textures/icn_label_web.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_label_web.tga rename to indra/newview/skins/blackdark/textures/icn_label_web.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media-pause_active.tga b/indra/newview/skins/blackdark/textures/icn_media-pause_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media-pause_active.tga rename to indra/newview/skins/blackdark/textures/icn_media-pause_active.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media-pause_disabled.tga b/indra/newview/skins/blackdark/textures/icn_media-pause_disabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media-pause_disabled.tga rename to indra/newview/skins/blackdark/textures/icn_media-pause_disabled.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media-pause_enabled.tga b/indra/newview/skins/blackdark/textures/icn_media-pause_enabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media-pause_enabled.tga rename to indra/newview/skins/blackdark/textures/icn_media-pause_enabled.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media-play_enabled.tga b/indra/newview/skins/blackdark/textures/icn_media-play_enabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media-play_enabled.tga rename to indra/newview/skins/blackdark/textures/icn_media-play_enabled.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media-stop_enabled.tga b/indra/newview/skins/blackdark/textures/icn_media-stop_enabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media-stop_enabled.tga rename to indra/newview/skins/blackdark/textures/icn_media-stop_enabled.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media.tga b/indra/newview/skins/blackdark/textures/icn_media.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media.tga rename to indra/newview/skins/blackdark/textures/icn_media.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media_movie.tga b/indra/newview/skins/blackdark/textures/icn_media_movie.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media_movie.tga rename to indra/newview/skins/blackdark/textures/icn_media_movie.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_media_web.tga b/indra/newview/skins/blackdark/textures/icn_media_web.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_media_web.tga rename to indra/newview/skins/blackdark/textures/icn_media_web.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_music.tga b/indra/newview/skins/blackdark/textures/icn_music.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_music.tga rename to indra/newview/skins/blackdark/textures/icn_music.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_pause.tga b/indra/newview/skins/blackdark/textures/icn_pause.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_pause.tga rename to indra/newview/skins/blackdark/textures/icn_pause.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_play.tga b/indra/newview/skins/blackdark/textures/icn_play.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_play.tga rename to indra/newview/skins/blackdark/textures/icn_play.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_rounded-text-field.tga b/indra/newview/skins/blackdark/textures/icn_rounded-text-field.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_rounded-text-field.tga rename to indra/newview/skins/blackdark/textures/icn_rounded-text-field.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_scrollbar.tga b/indra/newview/skins/blackdark/textures/icn_scrollbar.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_scrollbar.tga rename to indra/newview/skins/blackdark/textures/icn_scrollbar.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_scrollbar_bg.tga b/indra/newview/skins/blackdark/textures/icn_scrollbar_bg.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_scrollbar_bg.tga rename to indra/newview/skins/blackdark/textures/icn_scrollbar_bg.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_scrollbar_thumb.tga b/indra/newview/skins/blackdark/textures/icn_scrollbar_thumb.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_scrollbar_thumb.tga rename to indra/newview/skins/blackdark/textures/icn_scrollbar_thumb.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_slide-groove_dark.tga b/indra/newview/skins/blackdark/textures/icn_slide-groove_dark.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_slide-groove_dark.tga rename to indra/newview/skins/blackdark/textures/icn_slide-groove_dark.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_slide-highlight.tga b/indra/newview/skins/blackdark/textures/icn_slide-highlight.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_slide-highlight.tga rename to indra/newview/skins/blackdark/textures/icn_slide-highlight.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_slide-thumb_dark.tga b/indra/newview/skins/blackdark/textures/icn_slide-thumb_dark.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_slide-thumb_dark.tga rename to indra/newview/skins/blackdark/textures/icn_slide-thumb_dark.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_speaker-muted_dark.tga b/indra/newview/skins/blackdark/textures/icn_speaker-muted_dark.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_speaker-muted_dark.tga rename to indra/newview/skins/blackdark/textures/icn_speaker-muted_dark.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_speaker_dark.tga b/indra/newview/skins/blackdark/textures/icn_speaker_dark.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_speaker_dark.tga rename to indra/newview/skins/blackdark/textures/icn_speaker_dark.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_stop.tga b/indra/newview/skins/blackdark/textures/icn_stop.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_stop.tga rename to indra/newview/skins/blackdark/textures/icn_stop.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_build.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_build.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_build.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_build.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_fly.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_fly.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_fly.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_fly.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_inventory.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_inventory.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_inventory.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_inventory.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_map.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_map.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_map.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_map.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_minimap.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_minimap.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_minimap.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_minimap.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_radar.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_radar.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_radar.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_radar.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_search.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_search.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_search.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_search.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_toolbar_snapshot.tga b/indra/newview/skins/blackdark/textures/icn_toolbar_snapshot.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_toolbar_snapshot.tga rename to indra/newview/skins/blackdark/textures/icn_toolbar_snapshot.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-call-end.tga b/indra/newview/skins/blackdark/textures/icn_voice-call-end.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice-call-end.tga rename to indra/newview/skins/blackdark/textures/icn_voice-call-end.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-call-start.tga b/indra/newview/skins/blackdark/textures/icn_voice-call-start.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice-call-start.tga rename to indra/newview/skins/blackdark/textures/icn_voice-call-start.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-groupfocus.tga b/indra/newview/skins/blackdark/textures/icn_voice-groupfocus.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice-groupfocus.tga rename to indra/newview/skins/blackdark/textures/icn_voice-groupfocus.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-localchat.tga b/indra/newview/skins/blackdark/textures/icn_voice-localchat.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice-localchat.tga rename to indra/newview/skins/blackdark/textures/icn_voice-localchat.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/blackdark/textures/icn_voice-pvtfocus.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice-pvtfocus.tga rename to indra/newview/skins/blackdark/textures/icn_voice-pvtfocus.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-off.tga b/indra/newview/skins/blackdark/textures/icn_voice_ptt-off.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice_ptt-off.tga rename to indra/newview/skins/blackdark/textures/icn_voice_ptt-off.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl1.tga b/indra/newview/skins/blackdark/textures/icn_voice_ptt-on-lvl1.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl1.tga rename to indra/newview/skins/blackdark/textures/icn_voice_ptt-on-lvl1.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl2.tga b/indra/newview/skins/blackdark/textures/icn_voice_ptt-on-lvl2.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl2.tga rename to indra/newview/skins/blackdark/textures/icn_voice_ptt-on-lvl2.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl3.tga b/indra/newview/skins/blackdark/textures/icn_voice_ptt-on-lvl3.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice_ptt-on-lvl3.tga rename to indra/newview/skins/blackdark/textures/icn_voice_ptt-on-lvl3.tga diff --git a/indra/newview/skins/Blackdark/textures/icn_voice_ptt-on.tga b/indra/newview/skins/blackdark/textures/icn_voice_ptt-on.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icn_voice_ptt-on.tga rename to indra/newview/skins/blackdark/textures/icn_voice_ptt-on.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_auction.tga b/indra/newview/skins/blackdark/textures/icon_auction.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_auction.tga rename to indra/newview/skins/blackdark/textures/icon_auction.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_avatar_offline.tga b/indra/newview/skins/blackdark/textures/icon_avatar_offline.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_avatar_offline.tga rename to indra/newview/skins/blackdark/textures/icon_avatar_offline.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_avatar_online.tga b/indra/newview/skins/blackdark/textures/icon_avatar_online.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_avatar_online.tga rename to indra/newview/skins/blackdark/textures/icon_avatar_online.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_event.tga b/indra/newview/skins/blackdark/textures/icon_event.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_event.tga rename to indra/newview/skins/blackdark/textures/icon_event.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_event_adult.tga b/indra/newview/skins/blackdark/textures/icon_event_adult.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_event_adult.tga rename to indra/newview/skins/blackdark/textures/icon_event_adult.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_event_mature.tga b/indra/newview/skins/blackdark/textures/icon_event_mature.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_event_mature.tga rename to indra/newview/skins/blackdark/textures/icon_event_mature.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_for_sale.tga b/indra/newview/skins/blackdark/textures/icon_for_sale.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_for_sale.tga rename to indra/newview/skins/blackdark/textures/icon_for_sale.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_for_sale_adult.tga b/indra/newview/skins/blackdark/textures/icon_for_sale_adult.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_for_sale_adult.tga rename to indra/newview/skins/blackdark/textures/icon_for_sale_adult.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_group.tga b/indra/newview/skins/blackdark/textures/icon_group.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_group.tga rename to indra/newview/skins/blackdark/textures/icon_group.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_groupnotice.tga b/indra/newview/skins/blackdark/textures/icon_groupnotice.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_groupnotice.tga rename to indra/newview/skins/blackdark/textures/icon_groupnotice.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_groupnoticeinventory.tga b/indra/newview/skins/blackdark/textures/icon_groupnoticeinventory.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_groupnoticeinventory.tga rename to indra/newview/skins/blackdark/textures/icon_groupnoticeinventory.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_lock.tga b/indra/newview/skins/blackdark/textures/icon_lock.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_lock.tga rename to indra/newview/skins/blackdark/textures/icon_lock.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_place.tga b/indra/newview/skins/blackdark/textures/icon_place.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_place.tga rename to indra/newview/skins/blackdark/textures/icon_place.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_popular.tga b/indra/newview/skins/blackdark/textures/icon_popular.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_popular.tga rename to indra/newview/skins/blackdark/textures/icon_popular.tga diff --git a/indra/newview/skins/Blackdark/textures/icon_top_pick.tga b/indra/newview/skins/blackdark/textures/icon_top_pick.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/icon_top_pick.tga rename to indra/newview/skins/blackdark/textures/icon_top_pick.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_animation.tga b/indra/newview/skins/blackdark/textures/inv_folder_animation.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_animation.tga rename to indra/newview/skins/blackdark/textures/inv_folder_animation.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_bodypart.tga b/indra/newview/skins/blackdark/textures/inv_folder_bodypart.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_bodypart.tga rename to indra/newview/skins/blackdark/textures/inv_folder_bodypart.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_callingcard.tga b/indra/newview/skins/blackdark/textures/inv_folder_callingcard.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_callingcard.tga rename to indra/newview/skins/blackdark/textures/inv_folder_callingcard.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_clothing.tga b/indra/newview/skins/blackdark/textures/inv_folder_clothing.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_clothing.tga rename to indra/newview/skins/blackdark/textures/inv_folder_clothing.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_gesture.tga b/indra/newview/skins/blackdark/textures/inv_folder_gesture.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_gesture.tga rename to indra/newview/skins/blackdark/textures/inv_folder_gesture.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_landmark.tga b/indra/newview/skins/blackdark/textures/inv_folder_landmark.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_landmark.tga rename to indra/newview/skins/blackdark/textures/inv_folder_landmark.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_lostandfound.tga b/indra/newview/skins/blackdark/textures/inv_folder_lostandfound.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_lostandfound.tga rename to indra/newview/skins/blackdark/textures/inv_folder_lostandfound.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_notecard.tga b/indra/newview/skins/blackdark/textures/inv_folder_notecard.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_notecard.tga rename to indra/newview/skins/blackdark/textures/inv_folder_notecard.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_object.tga b/indra/newview/skins/blackdark/textures/inv_folder_object.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_object.tga rename to indra/newview/skins/blackdark/textures/inv_folder_object.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_plain_closed.tga b/indra/newview/skins/blackdark/textures/inv_folder_plain_closed.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_plain_closed.tga rename to indra/newview/skins/blackdark/textures/inv_folder_plain_closed.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_plain_open.tga b/indra/newview/skins/blackdark/textures/inv_folder_plain_open.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_plain_open.tga rename to indra/newview/skins/blackdark/textures/inv_folder_plain_open.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_script.tga b/indra/newview/skins/blackdark/textures/inv_folder_script.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_script.tga rename to indra/newview/skins/blackdark/textures/inv_folder_script.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_snapshot.tga b/indra/newview/skins/blackdark/textures/inv_folder_snapshot.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_snapshot.tga rename to indra/newview/skins/blackdark/textures/inv_folder_snapshot.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_sound.tga b/indra/newview/skins/blackdark/textures/inv_folder_sound.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_sound.tga rename to indra/newview/skins/blackdark/textures/inv_folder_sound.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_texture.tga b/indra/newview/skins/blackdark/textures/inv_folder_texture.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_texture.tga rename to indra/newview/skins/blackdark/textures/inv_folder_texture.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_folder_trash.tga b/indra/newview/skins/blackdark/textures/inv_folder_trash.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_folder_trash.tga rename to indra/newview/skins/blackdark/textures/inv_folder_trash.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_animation.tga b/indra/newview/skins/blackdark/textures/inv_item_animation.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_animation.tga rename to indra/newview/skins/blackdark/textures/inv_item_animation.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_attach.tga b/indra/newview/skins/blackdark/textures/inv_item_attach.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_attach.tga rename to indra/newview/skins/blackdark/textures/inv_item_attach.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_callingcard_offline.tga b/indra/newview/skins/blackdark/textures/inv_item_callingcard_offline.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_callingcard_offline.tga rename to indra/newview/skins/blackdark/textures/inv_item_callingcard_offline.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_callingcard_online.tga b/indra/newview/skins/blackdark/textures/inv_item_callingcard_online.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_callingcard_online.tga rename to indra/newview/skins/blackdark/textures/inv_item_callingcard_online.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_clothing.tga b/indra/newview/skins/blackdark/textures/inv_item_clothing.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_clothing.tga rename to indra/newview/skins/blackdark/textures/inv_item_clothing.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_eyes.tga b/indra/newview/skins/blackdark/textures/inv_item_eyes.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_eyes.tga rename to indra/newview/skins/blackdark/textures/inv_item_eyes.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_gesture.tga b/indra/newview/skins/blackdark/textures/inv_item_gesture.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_gesture.tga rename to indra/newview/skins/blackdark/textures/inv_item_gesture.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_gloves.tga b/indra/newview/skins/blackdark/textures/inv_item_gloves.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_gloves.tga rename to indra/newview/skins/blackdark/textures/inv_item_gloves.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_hair.tga b/indra/newview/skins/blackdark/textures/inv_item_hair.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_hair.tga rename to indra/newview/skins/blackdark/textures/inv_item_hair.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_jacket.tga b/indra/newview/skins/blackdark/textures/inv_item_jacket.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_jacket.tga rename to indra/newview/skins/blackdark/textures/inv_item_jacket.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_landmark.tga b/indra/newview/skins/blackdark/textures/inv_item_landmark.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_landmark.tga rename to indra/newview/skins/blackdark/textures/inv_item_landmark.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_landmark_visited.tga b/indra/newview/skins/blackdark/textures/inv_item_landmark_visited.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_landmark_visited.tga rename to indra/newview/skins/blackdark/textures/inv_item_landmark_visited.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_notecard.tga b/indra/newview/skins/blackdark/textures/inv_item_notecard.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_notecard.tga rename to indra/newview/skins/blackdark/textures/inv_item_notecard.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_object.tga b/indra/newview/skins/blackdark/textures/inv_item_object.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_object.tga rename to indra/newview/skins/blackdark/textures/inv_item_object.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_object_multi.tga b/indra/newview/skins/blackdark/textures/inv_item_object_multi.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_object_multi.tga rename to indra/newview/skins/blackdark/textures/inv_item_object_multi.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_pants.tga b/indra/newview/skins/blackdark/textures/inv_item_pants.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_pants.tga rename to indra/newview/skins/blackdark/textures/inv_item_pants.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_script.tga b/indra/newview/skins/blackdark/textures/inv_item_script.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_script.tga rename to indra/newview/skins/blackdark/textures/inv_item_script.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_script_dangerous.tga b/indra/newview/skins/blackdark/textures/inv_item_script_dangerous.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_script_dangerous.tga rename to indra/newview/skins/blackdark/textures/inv_item_script_dangerous.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_shape.tga b/indra/newview/skins/blackdark/textures/inv_item_shape.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_shape.tga rename to indra/newview/skins/blackdark/textures/inv_item_shape.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_shirt.tga b/indra/newview/skins/blackdark/textures/inv_item_shirt.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_shirt.tga rename to indra/newview/skins/blackdark/textures/inv_item_shirt.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_shoes.tga b/indra/newview/skins/blackdark/textures/inv_item_shoes.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_shoes.tga rename to indra/newview/skins/blackdark/textures/inv_item_shoes.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_skin.tga b/indra/newview/skins/blackdark/textures/inv_item_skin.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_skin.tga rename to indra/newview/skins/blackdark/textures/inv_item_skin.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_skirt.tga b/indra/newview/skins/blackdark/textures/inv_item_skirt.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_skirt.tga rename to indra/newview/skins/blackdark/textures/inv_item_skirt.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_snapshot.tga b/indra/newview/skins/blackdark/textures/inv_item_snapshot.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_snapshot.tga rename to indra/newview/skins/blackdark/textures/inv_item_snapshot.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_socks.tga b/indra/newview/skins/blackdark/textures/inv_item_socks.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_socks.tga rename to indra/newview/skins/blackdark/textures/inv_item_socks.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_sound.tga b/indra/newview/skins/blackdark/textures/inv_item_sound.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_sound.tga rename to indra/newview/skins/blackdark/textures/inv_item_sound.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_texture.tga b/indra/newview/skins/blackdark/textures/inv_item_texture.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_texture.tga rename to indra/newview/skins/blackdark/textures/inv_item_texture.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_underpants.tga b/indra/newview/skins/blackdark/textures/inv_item_underpants.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_underpants.tga rename to indra/newview/skins/blackdark/textures/inv_item_underpants.tga diff --git a/indra/newview/skins/Blackdark/textures/inv_item_undershirt.tga b/indra/newview/skins/blackdark/textures/inv_item_undershirt.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/inv_item_undershirt.tga rename to indra/newview/skins/blackdark/textures/inv_item_undershirt.tga diff --git a/indra/newview/skins/Blackdark/textures/lightgray.tga b/indra/newview/skins/blackdark/textures/lightgray.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/lightgray.tga rename to indra/newview/skins/blackdark/textures/lightgray.tga diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_16.tga b/indra/newview/skins/blackdark/textures/map_avatar_16.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_avatar_16.tga rename to indra/newview/skins/blackdark/textures/map_avatar_16.tga diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_8.tga b/indra/newview/skins/blackdark/textures/map_avatar_8.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_avatar_8.tga rename to indra/newview/skins/blackdark/textures/map_avatar_8.tga diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_above_8.tga b/indra/newview/skins/blackdark/textures/map_avatar_above_8.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_avatar_above_8.tga rename to indra/newview/skins/blackdark/textures/map_avatar_above_8.tga diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_below_8.tga b/indra/newview/skins/blackdark/textures/map_avatar_below_8.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_avatar_below_8.tga rename to indra/newview/skins/blackdark/textures/map_avatar_below_8.tga diff --git a/indra/newview/skins/Blackdark/textures/map_avatar_you_8.tga b/indra/newview/skins/blackdark/textures/map_avatar_you_8.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_avatar_you_8.tga rename to indra/newview/skins/blackdark/textures/map_avatar_you_8.tga diff --git a/indra/newview/skins/Blackdark/textures/map_event.tga b/indra/newview/skins/blackdark/textures/map_event.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_event.tga rename to indra/newview/skins/blackdark/textures/map_event.tga diff --git a/indra/newview/skins/Blackdark/textures/map_event_adult.tga b/indra/newview/skins/blackdark/textures/map_event_adult.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_event_adult.tga rename to indra/newview/skins/blackdark/textures/map_event_adult.tga diff --git a/indra/newview/skins/Blackdark/textures/map_event_mature.tga b/indra/newview/skins/blackdark/textures/map_event_mature.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_event_mature.tga rename to indra/newview/skins/blackdark/textures/map_event_mature.tga diff --git a/indra/newview/skins/Blackdark/textures/map_home.tga b/indra/newview/skins/blackdark/textures/map_home.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_home.tga rename to indra/newview/skins/blackdark/textures/map_home.tga diff --git a/indra/newview/skins/Blackdark/textures/map_infohub.tga b/indra/newview/skins/blackdark/textures/map_infohub.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_infohub.tga rename to indra/newview/skins/blackdark/textures/map_infohub.tga diff --git a/indra/newview/skins/Blackdark/textures/map_telehub.tga b/indra/newview/skins/blackdark/textures/map_telehub.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_telehub.tga rename to indra/newview/skins/blackdark/textures/map_telehub.tga diff --git a/indra/newview/skins/Blackdark/textures/map_track_16.tga b/indra/newview/skins/blackdark/textures/map_track_16.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_track_16.tga rename to indra/newview/skins/blackdark/textures/map_track_16.tga diff --git a/indra/newview/skins/Blackdark/textures/map_track_8.tga b/indra/newview/skins/blackdark/textures/map_track_8.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/map_track_8.tga rename to indra/newview/skins/blackdark/textures/map_track_8.tga diff --git a/indra/newview/skins/Blackdark/textures/minimize.tga b/indra/newview/skins/blackdark/textures/minimize.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/minimize.tga rename to indra/newview/skins/blackdark/textures/minimize.tga diff --git a/indra/newview/skins/Blackdark/textures/minimize_inactive.tga b/indra/newview/skins/blackdark/textures/minimize_inactive.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/minimize_inactive.tga rename to indra/newview/skins/blackdark/textures/minimize_inactive.tga diff --git a/indra/newview/skins/Blackdark/textures/minimize_pressed.tga b/indra/newview/skins/blackdark/textures/minimize_pressed.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/minimize_pressed.tga rename to indra/newview/skins/blackdark/textures/minimize_pressed.tga diff --git a/indra/newview/skins/Blackdark/textures/move_backward_in.tga b/indra/newview/skins/blackdark/textures/move_backward_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_backward_in.tga rename to indra/newview/skins/blackdark/textures/move_backward_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_backward_out.tga b/indra/newview/skins/blackdark/textures/move_backward_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_backward_out.tga rename to indra/newview/skins/blackdark/textures/move_backward_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_down_in.tga b/indra/newview/skins/blackdark/textures/move_down_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_down_in.tga rename to indra/newview/skins/blackdark/textures/move_down_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_down_out.tga b/indra/newview/skins/blackdark/textures/move_down_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_down_out.tga rename to indra/newview/skins/blackdark/textures/move_down_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_forward_in.tga b/indra/newview/skins/blackdark/textures/move_forward_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_forward_in.tga rename to indra/newview/skins/blackdark/textures/move_forward_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_forward_out.tga b/indra/newview/skins/blackdark/textures/move_forward_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_forward_out.tga rename to indra/newview/skins/blackdark/textures/move_forward_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_left_in.tga b/indra/newview/skins/blackdark/textures/move_left_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_left_in.tga rename to indra/newview/skins/blackdark/textures/move_left_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_left_out.tga b/indra/newview/skins/blackdark/textures/move_left_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_left_out.tga rename to indra/newview/skins/blackdark/textures/move_left_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_right_in.tga b/indra/newview/skins/blackdark/textures/move_right_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_right_in.tga rename to indra/newview/skins/blackdark/textures/move_right_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_right_out.tga b/indra/newview/skins/blackdark/textures/move_right_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_right_out.tga rename to indra/newview/skins/blackdark/textures/move_right_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_turn_left_in.tga b/indra/newview/skins/blackdark/textures/move_turn_left_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_turn_left_in.tga rename to indra/newview/skins/blackdark/textures/move_turn_left_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_turn_left_out.tga b/indra/newview/skins/blackdark/textures/move_turn_left_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_turn_left_out.tga rename to indra/newview/skins/blackdark/textures/move_turn_left_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_turn_right_in.tga b/indra/newview/skins/blackdark/textures/move_turn_right_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_turn_right_in.tga rename to indra/newview/skins/blackdark/textures/move_turn_right_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_turn_right_out.tga b/indra/newview/skins/blackdark/textures/move_turn_right_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_turn_right_out.tga rename to indra/newview/skins/blackdark/textures/move_turn_right_out.tga diff --git a/indra/newview/skins/Blackdark/textures/move_up_in.tga b/indra/newview/skins/blackdark/textures/move_up_in.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_up_in.tga rename to indra/newview/skins/blackdark/textures/move_up_in.tga diff --git a/indra/newview/skins/Blackdark/textures/move_up_out.tga b/indra/newview/skins/blackdark/textures/move_up_out.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/move_up_out.tga rename to indra/newview/skins/blackdark/textures/move_up_out.tga diff --git a/indra/newview/skins/Blackdark/textures/mute_icon.tga b/indra/newview/skins/blackdark/textures/mute_icon.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/mute_icon.tga rename to indra/newview/skins/blackdark/textures/mute_icon.tga diff --git a/indra/newview/skins/Blackdark/textures/notify_box_icon.tga b/indra/newview/skins/blackdark/textures/notify_box_icon.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/notify_box_icon.tga rename to indra/newview/skins/blackdark/textures/notify_box_icon.tga diff --git a/indra/newview/skins/Blackdark/textures/notify_caution_icon.tga b/indra/newview/skins/blackdark/textures/notify_caution_icon.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/notify_caution_icon.tga rename to indra/newview/skins/blackdark/textures/notify_caution_icon.tga diff --git a/indra/newview/skins/Blackdark/textures/notify_next.png b/indra/newview/skins/blackdark/textures/notify_next.png similarity index 100% rename from indra/newview/skins/Blackdark/textures/notify_next.png rename to indra/newview/skins/blackdark/textures/notify_next.png diff --git a/indra/newview/skins/Blackdark/textures/notify_tip_icon.tga b/indra/newview/skins/blackdark/textures/notify_tip_icon.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/notify_tip_icon.tga rename to indra/newview/skins/blackdark/textures/notify_tip_icon.tga diff --git a/indra/newview/skins/Blackdark/textures/object_cone.tga b/indra/newview/skins/blackdark/textures/object_cone.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_cone.tga rename to indra/newview/skins/blackdark/textures/object_cone.tga diff --git a/indra/newview/skins/Blackdark/textures/object_cone_active.tga b/indra/newview/skins/blackdark/textures/object_cone_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_cone_active.tga rename to indra/newview/skins/blackdark/textures/object_cone_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_cube.tga b/indra/newview/skins/blackdark/textures/object_cube.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_cube.tga rename to indra/newview/skins/blackdark/textures/object_cube.tga diff --git a/indra/newview/skins/Blackdark/textures/object_cube_active.tga b/indra/newview/skins/blackdark/textures/object_cube_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_cube_active.tga rename to indra/newview/skins/blackdark/textures/object_cube_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_cylinder.tga b/indra/newview/skins/blackdark/textures/object_cylinder.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_cylinder.tga rename to indra/newview/skins/blackdark/textures/object_cylinder.tga diff --git a/indra/newview/skins/Blackdark/textures/object_cylinder_active.tga b/indra/newview/skins/blackdark/textures/object_cylinder_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_cylinder_active.tga rename to indra/newview/skins/blackdark/textures/object_cylinder_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_grass.tga b/indra/newview/skins/blackdark/textures/object_grass.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_grass.tga rename to indra/newview/skins/blackdark/textures/object_grass.tga diff --git a/indra/newview/skins/Blackdark/textures/object_grass_active.tga b/indra/newview/skins/blackdark/textures/object_grass_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_grass_active.tga rename to indra/newview/skins/blackdark/textures/object_grass_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cone.tga b/indra/newview/skins/blackdark/textures/object_hemi_cone.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_hemi_cone.tga rename to indra/newview/skins/blackdark/textures/object_hemi_cone.tga diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cone_active.tga b/indra/newview/skins/blackdark/textures/object_hemi_cone_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_hemi_cone_active.tga rename to indra/newview/skins/blackdark/textures/object_hemi_cone_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cylinder.tga b/indra/newview/skins/blackdark/textures/object_hemi_cylinder.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_hemi_cylinder.tga rename to indra/newview/skins/blackdark/textures/object_hemi_cylinder.tga diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_cylinder_active.tga b/indra/newview/skins/blackdark/textures/object_hemi_cylinder_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_hemi_cylinder_active.tga rename to indra/newview/skins/blackdark/textures/object_hemi_cylinder_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_sphere.tga b/indra/newview/skins/blackdark/textures/object_hemi_sphere.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_hemi_sphere.tga rename to indra/newview/skins/blackdark/textures/object_hemi_sphere.tga diff --git a/indra/newview/skins/Blackdark/textures/object_hemi_sphere_active.tga b/indra/newview/skins/blackdark/textures/object_hemi_sphere_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_hemi_sphere_active.tga rename to indra/newview/skins/blackdark/textures/object_hemi_sphere_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_prism.tga b/indra/newview/skins/blackdark/textures/object_prism.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_prism.tga rename to indra/newview/skins/blackdark/textures/object_prism.tga diff --git a/indra/newview/skins/Blackdark/textures/object_prism_active.tga b/indra/newview/skins/blackdark/textures/object_prism_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_prism_active.tga rename to indra/newview/skins/blackdark/textures/object_prism_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_pyramid.tga b/indra/newview/skins/blackdark/textures/object_pyramid.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_pyramid.tga rename to indra/newview/skins/blackdark/textures/object_pyramid.tga diff --git a/indra/newview/skins/Blackdark/textures/object_pyramid_active.tga b/indra/newview/skins/blackdark/textures/object_pyramid_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_pyramid_active.tga rename to indra/newview/skins/blackdark/textures/object_pyramid_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_ring.tga b/indra/newview/skins/blackdark/textures/object_ring.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_ring.tga rename to indra/newview/skins/blackdark/textures/object_ring.tga diff --git a/indra/newview/skins/Blackdark/textures/object_ring_active.tga b/indra/newview/skins/blackdark/textures/object_ring_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_ring_active.tga rename to indra/newview/skins/blackdark/textures/object_ring_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_sphere.tga b/indra/newview/skins/blackdark/textures/object_sphere.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_sphere.tga rename to indra/newview/skins/blackdark/textures/object_sphere.tga diff --git a/indra/newview/skins/Blackdark/textures/object_sphere_active.tga b/indra/newview/skins/blackdark/textures/object_sphere_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_sphere_active.tga rename to indra/newview/skins/blackdark/textures/object_sphere_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_tetrahedron.tga b/indra/newview/skins/blackdark/textures/object_tetrahedron.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_tetrahedron.tga rename to indra/newview/skins/blackdark/textures/object_tetrahedron.tga diff --git a/indra/newview/skins/Blackdark/textures/object_tetrahedron_active.tga b/indra/newview/skins/blackdark/textures/object_tetrahedron_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_tetrahedron_active.tga rename to indra/newview/skins/blackdark/textures/object_tetrahedron_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_torus.tga b/indra/newview/skins/blackdark/textures/object_torus.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_torus.tga rename to indra/newview/skins/blackdark/textures/object_torus.tga diff --git a/indra/newview/skins/Blackdark/textures/object_torus_active.tga b/indra/newview/skins/blackdark/textures/object_torus_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_torus_active.tga rename to indra/newview/skins/blackdark/textures/object_torus_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_tree.tga b/indra/newview/skins/blackdark/textures/object_tree.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_tree.tga rename to indra/newview/skins/blackdark/textures/object_tree.tga diff --git a/indra/newview/skins/Blackdark/textures/object_tree_active.tga b/indra/newview/skins/blackdark/textures/object_tree_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_tree_active.tga rename to indra/newview/skins/blackdark/textures/object_tree_active.tga diff --git a/indra/newview/skins/Blackdark/textures/object_tube.tga b/indra/newview/skins/blackdark/textures/object_tube.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_tube.tga rename to indra/newview/skins/blackdark/textures/object_tube.tga diff --git a/indra/newview/skins/Blackdark/textures/object_tube_active.tga b/indra/newview/skins/blackdark/textures/object_tube_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/object_tube_active.tga rename to indra/newview/skins/blackdark/textures/object_tube_active.tga diff --git a/indra/newview/skins/Blackdark/textures/preview.png b/indra/newview/skins/blackdark/textures/preview.png similarity index 100% rename from indra/newview/skins/Blackdark/textures/preview.png rename to indra/newview/skins/blackdark/textures/preview.png diff --git a/indra/newview/skins/Blackdark/textures/progress_fill.tga b/indra/newview/skins/blackdark/textures/progress_fill.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/progress_fill.tga rename to indra/newview/skins/blackdark/textures/progress_fill.tga diff --git a/indra/newview/skins/Blackdark/textures/progressbar_fill.tga b/indra/newview/skins/blackdark/textures/progressbar_fill.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/progressbar_fill.tga rename to indra/newview/skins/blackdark/textures/progressbar_fill.tga diff --git a/indra/newview/skins/Blackdark/textures/progressbar_track.tga b/indra/newview/skins/blackdark/textures/progressbar_track.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/progressbar_track.tga rename to indra/newview/skins/blackdark/textures/progressbar_track.tga diff --git a/indra/newview/skins/Blackdark/textures/ptt_lock_off.tga b/indra/newview/skins/blackdark/textures/ptt_lock_off.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ptt_lock_off.tga rename to indra/newview/skins/blackdark/textures/ptt_lock_off.tga diff --git a/indra/newview/skins/Blackdark/textures/ptt_lock_on.tga b/indra/newview/skins/blackdark/textures/ptt_lock_on.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/ptt_lock_on.tga rename to indra/newview/skins/blackdark/textures/ptt_lock_on.tga diff --git a/indra/newview/skins/Blackdark/textures/radio_active_false.tga b/indra/newview/skins/blackdark/textures/radio_active_false.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/radio_active_false.tga rename to indra/newview/skins/blackdark/textures/radio_active_false.tga diff --git a/indra/newview/skins/Blackdark/textures/radio_active_true.tga b/indra/newview/skins/blackdark/textures/radio_active_true.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/radio_active_true.tga rename to indra/newview/skins/blackdark/textures/radio_active_true.tga diff --git a/indra/newview/skins/Blackdark/textures/radio_inactive_false.tga b/indra/newview/skins/blackdark/textures/radio_inactive_false.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/radio_inactive_false.tga rename to indra/newview/skins/blackdark/textures/radio_inactive_false.tga diff --git a/indra/newview/skins/Blackdark/textures/radio_inactive_true.tga b/indra/newview/skins/blackdark/textures/radio_inactive_true.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/radio_inactive_true.tga rename to indra/newview/skins/blackdark/textures/radio_inactive_true.tga diff --git a/indra/newview/skins/Blackdark/textures/resize_handle_bottom_right_blue.tga b/indra/newview/skins/blackdark/textures/resize_handle_bottom_right_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/resize_handle_bottom_right_blue.tga rename to indra/newview/skins/blackdark/textures/resize_handle_bottom_right_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/restore.tga b/indra/newview/skins/blackdark/textures/restore.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/restore.tga rename to indra/newview/skins/blackdark/textures/restore.tga diff --git a/indra/newview/skins/Blackdark/textures/restore_inactive.tga b/indra/newview/skins/blackdark/textures/restore_inactive.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/restore_inactive.tga rename to indra/newview/skins/blackdark/textures/restore_inactive.tga diff --git a/indra/newview/skins/Blackdark/textures/restore_pressed.tga b/indra/newview/skins/blackdark/textures/restore_pressed.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/restore_pressed.tga rename to indra/newview/skins/blackdark/textures/restore_pressed.tga diff --git a/indra/newview/skins/Blackdark/textures/rounded_square.j2c b/indra/newview/skins/blackdark/textures/rounded_square.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/rounded_square.j2c rename to indra/newview/skins/blackdark/textures/rounded_square.j2c diff --git a/indra/newview/skins/Blackdark/textures/rounded_square.tga b/indra/newview/skins/blackdark/textures/rounded_square.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/rounded_square.tga rename to indra/newview/skins/blackdark/textures/rounded_square.tga diff --git a/indra/newview/skins/Blackdark/textures/rounded_square_soft.tga b/indra/newview/skins/blackdark/textures/rounded_square_soft.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/rounded_square_soft.tga rename to indra/newview/skins/blackdark/textures/rounded_square_soft.tga diff --git a/indra/newview/skins/Blackdark/textures/script_error.j2c b/indra/newview/skins/blackdark/textures/script_error.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/script_error.j2c rename to indra/newview/skins/blackdark/textures/script_error.j2c diff --git a/indra/newview/skins/Blackdark/textures/script_error.tga b/indra/newview/skins/blackdark/textures/script_error.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/script_error.tga rename to indra/newview/skins/blackdark/textures/script_error.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_down_in_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_down_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_down_in_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_down_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_down_out_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_down_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_down_out_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_down_out_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_left_in_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_left_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_left_in_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_left_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_left_out_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_left_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_left_out_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_left_out_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_right_in_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_right_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_right_in_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_right_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_right_out_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_right_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_right_out_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_right_out_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_up_in_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_up_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_up_in_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_up_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/scrollbutton_up_out_blue.tga b/indra/newview/skins/blackdark/textures/scrollbutton_up_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/scrollbutton_up_out_blue.tga rename to indra/newview/skins/blackdark/textures/scrollbutton_up_out_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/sm_rounded_corners_simple.tga b/indra/newview/skins/blackdark/textures/sm_rounded_corners_simple.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/sm_rounded_corners_simple.tga rename to indra/newview/skins/blackdark/textures/sm_rounded_corners_simple.tga diff --git a/indra/newview/skins/Blackdark/textures/spacer24.tga b/indra/newview/skins/blackdark/textures/spacer24.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/spacer24.tga rename to indra/newview/skins/blackdark/textures/spacer24.tga diff --git a/indra/newview/skins/Blackdark/textures/spacer35.tga b/indra/newview/skins/blackdark/textures/spacer35.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/spacer35.tga rename to indra/newview/skins/blackdark/textures/spacer35.tga diff --git a/indra/newview/skins/Blackdark/textures/spin_down_in_blue.tga b/indra/newview/skins/blackdark/textures/spin_down_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/spin_down_in_blue.tga rename to indra/newview/skins/blackdark/textures/spin_down_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/spin_down_out_blue.tga b/indra/newview/skins/blackdark/textures/spin_down_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/spin_down_out_blue.tga rename to indra/newview/skins/blackdark/textures/spin_down_out_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/spin_up_in_blue.tga b/indra/newview/skins/blackdark/textures/spin_up_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/spin_up_in_blue.tga rename to indra/newview/skins/blackdark/textures/spin_up_in_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/spin_up_out_blue.tga b/indra/newview/skins/blackdark/textures/spin_up_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/spin_up_out_blue.tga rename to indra/newview/skins/blackdark/textures/spin_up_out_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/square_btn_32x128.tga b/indra/newview/skins/blackdark/textures/square_btn_32x128.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/square_btn_32x128.tga rename to indra/newview/skins/blackdark/textures/square_btn_32x128.tga diff --git a/indra/newview/skins/Blackdark/textures/square_btn_selected_32x128.tga b/indra/newview/skins/blackdark/textures/square_btn_selected_32x128.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/square_btn_selected_32x128.tga rename to indra/newview/skins/blackdark/textures/square_btn_selected_32x128.tga diff --git a/indra/newview/skins/Blackdark/textures/startup_logo.j2c b/indra/newview/skins/blackdark/textures/startup_logo.j2c similarity index 100% rename from indra/newview/skins/Blackdark/textures/startup_logo.j2c rename to indra/newview/skins/blackdark/textures/startup_logo.j2c diff --git a/indra/newview/skins/Blackdark/textures/status_buy_currency.tga b/indra/newview/skins/blackdark/textures/status_buy_currency.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_buy_currency.tga rename to indra/newview/skins/blackdark/textures/status_buy_currency.tga diff --git a/indra/newview/skins/Blackdark/textures/status_buy_currency_pressed.tga b/indra/newview/skins/blackdark/textures/status_buy_currency_pressed.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_buy_currency_pressed.tga rename to indra/newview/skins/blackdark/textures/status_buy_currency_pressed.tga diff --git a/indra/newview/skins/Blackdark/textures/status_buy_land.tga b/indra/newview/skins/blackdark/textures/status_buy_land.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_buy_land.tga rename to indra/newview/skins/blackdark/textures/status_buy_land.tga diff --git a/indra/newview/skins/Blackdark/textures/status_buy_land_pressed.tga b/indra/newview/skins/blackdark/textures/status_buy_land_pressed.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_buy_land_pressed.tga rename to indra/newview/skins/blackdark/textures/status_buy_land_pressed.tga diff --git a/indra/newview/skins/Blackdark/textures/status_health.tga b/indra/newview/skins/blackdark/textures/status_health.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_health.tga rename to indra/newview/skins/blackdark/textures/status_health.tga diff --git a/indra/newview/skins/Blackdark/textures/status_no_build.tga b/indra/newview/skins/blackdark/textures/status_no_build.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_no_build.tga rename to indra/newview/skins/blackdark/textures/status_no_build.tga diff --git a/indra/newview/skins/Blackdark/textures/status_no_fly.tga b/indra/newview/skins/blackdark/textures/status_no_fly.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_no_fly.tga rename to indra/newview/skins/blackdark/textures/status_no_fly.tga diff --git a/indra/newview/skins/Blackdark/textures/status_no_push.tga b/indra/newview/skins/blackdark/textures/status_no_push.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_no_push.tga rename to indra/newview/skins/blackdark/textures/status_no_push.tga diff --git a/indra/newview/skins/Blackdark/textures/status_no_scripts.tga b/indra/newview/skins/blackdark/textures/status_no_scripts.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_no_scripts.tga rename to indra/newview/skins/blackdark/textures/status_no_scripts.tga diff --git a/indra/newview/skins/Blackdark/textures/status_no_voice.tga b/indra/newview/skins/blackdark/textures/status_no_voice.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_no_voice.tga rename to indra/newview/skins/blackdark/textures/status_no_voice.tga diff --git a/indra/newview/skins/Blackdark/textures/status_script_debug.tga b/indra/newview/skins/blackdark/textures/status_script_debug.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_script_debug.tga rename to indra/newview/skins/blackdark/textures/status_script_debug.tga diff --git a/indra/newview/skins/Blackdark/textures/status_search_btn.png b/indra/newview/skins/blackdark/textures/status_search_btn.png similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_search_btn.png rename to indra/newview/skins/blackdark/textures/status_search_btn.png diff --git a/indra/newview/skins/Blackdark/textures/status_search_btn_pressed.png b/indra/newview/skins/blackdark/textures/status_search_btn_pressed.png similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_search_btn_pressed.png rename to indra/newview/skins/blackdark/textures/status_search_btn_pressed.png diff --git a/indra/newview/skins/Blackdark/textures/status_voice.tga b/indra/newview/skins/blackdark/textures/status_voice.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/status_voice.tga rename to indra/newview/skins/blackdark/textures/status_voice.tga diff --git a/indra/newview/skins/Blackdark/textures/tab_bottom_blue.tga b/indra/newview/skins/blackdark/textures/tab_bottom_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tab_bottom_blue.tga rename to indra/newview/skins/blackdark/textures/tab_bottom_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/tab_bottom_selected_blue.tga b/indra/newview/skins/blackdark/textures/tab_bottom_selected_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tab_bottom_selected_blue.tga rename to indra/newview/skins/blackdark/textures/tab_bottom_selected_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/tab_left.tga b/indra/newview/skins/blackdark/textures/tab_left.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tab_left.tga rename to indra/newview/skins/blackdark/textures/tab_left.tga diff --git a/indra/newview/skins/Blackdark/textures/tab_left_selected.tga b/indra/newview/skins/blackdark/textures/tab_left_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tab_left_selected.tga rename to indra/newview/skins/blackdark/textures/tab_left_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/tab_top_blue.tga b/indra/newview/skins/blackdark/textures/tab_top_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tab_top_blue.tga rename to indra/newview/skins/blackdark/textures/tab_top_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/tab_top_selected_blue.tga b/indra/newview/skins/blackdark/textures/tab_top_selected_blue.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tab_top_selected_blue.tga rename to indra/newview/skins/blackdark/textures/tab_top_selected_blue.tga diff --git a/indra/newview/skins/Blackdark/textures/tabarea.tga b/indra/newview/skins/blackdark/textures/tabarea.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tabarea.tga rename to indra/newview/skins/blackdark/textures/tabarea.tga diff --git a/indra/newview/skins/Blackdark/textures/tearoff_pressed.tga b/indra/newview/skins/blackdark/textures/tearoff_pressed.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tearoff_pressed.tga rename to indra/newview/skins/blackdark/textures/tearoff_pressed.tga diff --git a/indra/newview/skins/Blackdark/textures/tearoffbox.tga b/indra/newview/skins/blackdark/textures/tearoffbox.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tearoffbox.tga rename to indra/newview/skins/blackdark/textures/tearoffbox.tga diff --git a/indra/newview/skins/Blackdark/textures/textures.xml b/indra/newview/skins/blackdark/textures/textures.xml similarity index 100% rename from indra/newview/skins/Blackdark/textures/textures.xml rename to indra/newview/skins/blackdark/textures/textures.xml diff --git a/indra/newview/skins/Blackdark/textures/tool_dozer.tga b/indra/newview/skins/blackdark/textures/tool_dozer.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tool_dozer.tga rename to indra/newview/skins/blackdark/textures/tool_dozer.tga diff --git a/indra/newview/skins/Blackdark/textures/tool_dozer_active.tga b/indra/newview/skins/blackdark/textures/tool_dozer_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tool_dozer_active.tga rename to indra/newview/skins/blackdark/textures/tool_dozer_active.tga diff --git a/indra/newview/skins/Blackdark/textures/tool_zoom.tga b/indra/newview/skins/blackdark/textures/tool_zoom.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tool_zoom.tga rename to indra/newview/skins/blackdark/textures/tool_zoom.tga diff --git a/indra/newview/skins/Blackdark/textures/tool_zoom_active.tga b/indra/newview/skins/blackdark/textures/tool_zoom_active.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/tool_zoom_active.tga rename to indra/newview/skins/blackdark/textures/tool_zoom_active.tga diff --git a/indra/newview/skins/Blackdark/textures/toolbar_bg.tga b/indra/newview/skins/blackdark/textures/toolbar_bg.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/toolbar_bg.tga rename to indra/newview/skins/blackdark/textures/toolbar_bg.tga diff --git a/indra/newview/skins/Blackdark/textures/toolbar_btn_disabled.tga b/indra/newview/skins/blackdark/textures/toolbar_btn_disabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/toolbar_btn_disabled.tga rename to indra/newview/skins/blackdark/textures/toolbar_btn_disabled.tga diff --git a/indra/newview/skins/Blackdark/textures/toolbar_btn_enabled.tga b/indra/newview/skins/blackdark/textures/toolbar_btn_enabled.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/toolbar_btn_enabled.tga rename to indra/newview/skins/blackdark/textures/toolbar_btn_enabled.tga diff --git a/indra/newview/skins/Blackdark/textures/toolbar_btn_selected.tga b/indra/newview/skins/blackdark/textures/toolbar_btn_selected.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/toolbar_btn_selected.tga rename to indra/newview/skins/blackdark/textures/toolbar_btn_selected.tga diff --git a/indra/newview/skins/Blackdark/textures/toolbar_tab.tga b/indra/newview/skins/blackdark/textures/toolbar_tab.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/toolbar_tab.tga rename to indra/newview/skins/blackdark/textures/toolbar_tab.tga diff --git a/indra/newview/skins/Blackdark/textures/up_arrow.png b/indra/newview/skins/blackdark/textures/up_arrow.png similarity index 100% rename from indra/newview/skins/Blackdark/textures/up_arrow.png rename to indra/newview/skins/blackdark/textures/up_arrow.png diff --git a/indra/newview/skins/Blackdark/textures/white.tga b/indra/newview/skins/blackdark/textures/white.tga similarity index 100% rename from indra/newview/skins/Blackdark/textures/white.tga rename to indra/newview/skins/blackdark/textures/white.tga diff --git a/indra/newview/skins/blacklightblue.xml b/indra/newview/skins/blacklightblue.xml index 8ade2a477..984357360 100644 --- a/indra/newview/skins/blacklightblue.xml +++ b/indra/newview/skins/blacklightblue.xml @@ -9,6 +9,6 @@ skin_info folder_name - Blacklightblue + blacklightblue diff --git a/indra/newview/skins/Blacklightblue/License and Credit.txt b/indra/newview/skins/blacklightblue/License and Credit.txt similarity index 100% rename from indra/newview/skins/Blacklightblue/License and Credit.txt rename to indra/newview/skins/blacklightblue/License and Credit.txt diff --git a/indra/newview/skins/Blacklightblue/colors.xml b/indra/newview/skins/blacklightblue/colors.xml similarity index 100% rename from indra/newview/skins/Blacklightblue/colors.xml rename to indra/newview/skins/blacklightblue/colors.xml diff --git a/indra/newview/skins/Blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/indra/newview/skins/blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga rename to indra/newview/skins/blacklightblue/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga diff --git a/indra/newview/skins/Blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/indra/newview/skins/blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga rename to indra/newview/skins/blacklightblue/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga diff --git a/indra/newview/skins/Blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/indra/newview/skins/blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga rename to indra/newview/skins/blacklightblue/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga diff --git a/indra/newview/skins/Blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/indra/newview/skins/blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga rename to indra/newview/skins/blacklightblue/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga diff --git a/indra/newview/skins/Blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/indra/newview/skins/blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga rename to indra/newview/skins/blacklightblue/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga diff --git a/indra/newview/skins/Blacklightblue/textures/active_speakers.tga b/indra/newview/skins/blacklightblue/textures/active_speakers.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/active_speakers.tga rename to indra/newview/skins/blacklightblue/textures/active_speakers.tga diff --git a/indra/newview/skins/Blacklightblue/textures/active_voice_tab.tga b/indra/newview/skins/blacklightblue/textures/active_voice_tab.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/active_voice_tab.tga rename to indra/newview/skins/blacklightblue/textures/active_voice_tab.tga diff --git a/indra/newview/skins/Blacklightblue/textures/arrow_down.tga b/indra/newview/skins/blacklightblue/textures/arrow_down.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/arrow_down.tga rename to indra/newview/skins/blacklightblue/textures/arrow_down.tga diff --git a/indra/newview/skins/Blacklightblue/textures/arrow_up.tga b/indra/newview/skins/blacklightblue/textures/arrow_up.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/arrow_up.tga rename to indra/newview/skins/blacklightblue/textures/arrow_up.tga diff --git a/indra/newview/skins/Blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/indra/newview/skins/blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga rename to indra/newview/skins/blacklightblue/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga diff --git a/indra/newview/skins/Blacklightblue/textures/badge_error.j2c b/indra/newview/skins/blacklightblue/textures/badge_error.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/badge_error.j2c rename to indra/newview/skins/blacklightblue/textures/badge_error.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/badge_note.j2c b/indra/newview/skins/blacklightblue/textures/badge_note.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/badge_note.j2c rename to indra/newview/skins/blacklightblue/textures/badge_note.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/badge_ok.j2c b/indra/newview/skins/blacklightblue/textures/badge_ok.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/badge_ok.j2c rename to indra/newview/skins/blacklightblue/textures/badge_ok.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/badge_warn.j2c b/indra/newview/skins/blacklightblue/textures/badge_warn.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/badge_warn.j2c rename to indra/newview/skins/blacklightblue/textures/badge_warn.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/btn_chatbar.tga b/indra/newview/skins/blacklightblue/textures/btn_chatbar.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/btn_chatbar.tga rename to indra/newview/skins/blacklightblue/textures/btn_chatbar.tga diff --git a/indra/newview/skins/Blacklightblue/textures/btn_chatbar_selected.tga b/indra/newview/skins/blacklightblue/textures/btn_chatbar_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/btn_chatbar_selected.tga rename to indra/newview/skins/blacklightblue/textures/btn_chatbar_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_pause.tga b/indra/newview/skins/blacklightblue/textures/button_anim_pause.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_anim_pause.tga rename to indra/newview/skins/blacklightblue/textures/button_anim_pause.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_pause_selected.tga b/indra/newview/skins/blacklightblue/textures/button_anim_pause_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_anim_pause_selected.tga rename to indra/newview/skins/blacklightblue/textures/button_anim_pause_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_play.tga b/indra/newview/skins/blacklightblue/textures/button_anim_play.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_anim_play.tga rename to indra/newview/skins/blacklightblue/textures/button_anim_play.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_play_selected.tga b/indra/newview/skins/blacklightblue/textures/button_anim_play_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_anim_play_selected.tga rename to indra/newview/skins/blacklightblue/textures/button_anim_play_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_stop.tga b/indra/newview/skins/blacklightblue/textures/button_anim_stop.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_anim_stop.tga rename to indra/newview/skins/blacklightblue/textures/button_anim_stop.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_anim_stop_selected.tga b/indra/newview/skins/blacklightblue/textures/button_anim_stop_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_anim_stop_selected.tga rename to indra/newview/skins/blacklightblue/textures/button_anim_stop_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_disabled_32x128.tga b/indra/newview/skins/blacklightblue/textures/button_disabled_32x128.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_disabled_32x128.tga rename to indra/newview/skins/blacklightblue/textures/button_disabled_32x128.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_enabled_32x128.tga b/indra/newview/skins/blacklightblue/textures/button_enabled_32x128.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_enabled_32x128.tga rename to indra/newview/skins/blacklightblue/textures/button_enabled_32x128.tga diff --git a/indra/newview/skins/Blacklightblue/textures/button_enabled_selected_32x128.tga b/indra/newview/skins/blacklightblue/textures/button_enabled_selected_32x128.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/button_enabled_selected_32x128.tga rename to indra/newview/skins/blacklightblue/textures/button_enabled_selected_32x128.tga diff --git a/indra/newview/skins/Blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/indra/newview/skins/blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga rename to indra/newview/skins/blacklightblue/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga diff --git a/indra/newview/skins/Blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/indra/newview/skins/blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga rename to indra/newview/skins/blacklightblue/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_rotate_in.tga b/indra/newview/skins/blacklightblue/textures/cam_rotate_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_rotate_in.tga rename to indra/newview/skins/blacklightblue/textures/cam_rotate_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_rotate_out.tga b/indra/newview/skins/blacklightblue/textures/cam_rotate_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_rotate_out.tga rename to indra/newview/skins/blacklightblue/textures/cam_rotate_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_tracking_in.tga b/indra/newview/skins/blacklightblue/textures/cam_tracking_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_tracking_in.tga rename to indra/newview/skins/blacklightblue/textures/cam_tracking_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_tracking_out.tga b/indra/newview/skins/blacklightblue/textures/cam_tracking_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_tracking_out.tga rename to indra/newview/skins/blacklightblue/textures/cam_tracking_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_zoom_minus_in.tga b/indra/newview/skins/blacklightblue/textures/cam_zoom_minus_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_zoom_minus_in.tga rename to indra/newview/skins/blacklightblue/textures/cam_zoom_minus_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_zoom_out.tga b/indra/newview/skins/blacklightblue/textures/cam_zoom_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_zoom_out.tga rename to indra/newview/skins/blacklightblue/textures/cam_zoom_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/cam_zoom_plus_in.tga b/indra/newview/skins/blacklightblue/textures/cam_zoom_plus_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/cam_zoom_plus_in.tga rename to indra/newview/skins/blacklightblue/textures/cam_zoom_plus_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/indra/newview/skins/blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga rename to indra/newview/skins/blacklightblue/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_false.tga b/indra/newview/skins/blacklightblue/textures/checkbox_disabled_false.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/checkbox_disabled_false.tga rename to indra/newview/skins/blacklightblue/textures/checkbox_disabled_false.tga diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_disabled_true.tga b/indra/newview/skins/blacklightblue/textures/checkbox_disabled_true.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/checkbox_disabled_true.tga rename to indra/newview/skins/blacklightblue/textures/checkbox_disabled_true.tga diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_false.tga b/indra/newview/skins/blacklightblue/textures/checkbox_enabled_false.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/checkbox_enabled_false.tga rename to indra/newview/skins/blacklightblue/textures/checkbox_enabled_false.tga diff --git a/indra/newview/skins/Blacklightblue/textures/checkbox_enabled_true.tga b/indra/newview/skins/blacklightblue/textures/checkbox_enabled_true.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/checkbox_enabled_true.tga rename to indra/newview/skins/blacklightblue/textures/checkbox_enabled_true.tga diff --git a/indra/newview/skins/Blacklightblue/textures/close_in_blue.tga b/indra/newview/skins/blacklightblue/textures/close_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/close_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/close_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/close_inactive_blue.tga b/indra/newview/skins/blacklightblue/textures/close_inactive_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/close_inactive_blue.tga rename to indra/newview/skins/blacklightblue/textures/close_inactive_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/closebox.tga b/indra/newview/skins/blacklightblue/textures/closebox.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/closebox.tga rename to indra/newview/skins/blacklightblue/textures/closebox.tga diff --git a/indra/newview/skins/Blacklightblue/textures/combobox_arrow.tga b/indra/newview/skins/blacklightblue/textures/combobox_arrow.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/combobox_arrow.tga rename to indra/newview/skins/blacklightblue/textures/combobox_arrow.tga diff --git a/indra/newview/skins/Blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/skins/blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c rename to indra/newview/skins/blacklightblue/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/default_land_picture.j2c b/indra/newview/skins/blacklightblue/textures/default_land_picture.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/default_land_picture.j2c rename to indra/newview/skins/blacklightblue/textures/default_land_picture.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/default_profile_picture.j2c b/indra/newview/skins/blacklightblue/textures/default_profile_picture.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/default_profile_picture.j2c rename to indra/newview/skins/blacklightblue/textures/default_profile_picture.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/direction_arrow.tga b/indra/newview/skins/blacklightblue/textures/direction_arrow.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/direction_arrow.tga rename to indra/newview/skins/blacklightblue/textures/direction_arrow.tga diff --git a/indra/newview/skins/Blacklightblue/textures/down_arrow.png b/indra/newview/skins/blacklightblue/textures/down_arrow.png similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/down_arrow.png rename to indra/newview/skins/blacklightblue/textures/down_arrow.png diff --git a/indra/newview/skins/Blacklightblue/textures/eye_button_active.tga b/indra/newview/skins/blacklightblue/textures/eye_button_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/eye_button_active.tga rename to indra/newview/skins/blacklightblue/textures/eye_button_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/eye_button_inactive.tga b/indra/newview/skins/blacklightblue/textures/eye_button_inactive.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/eye_button_inactive.tga rename to indra/newview/skins/blacklightblue/textures/eye_button_inactive.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/indra/newview/skins/blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga rename to indra/newview/skins/blacklightblue/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_edit_mine_button.tga b/indra/newview/skins/blacklightblue/textures/ff_edit_mine_button.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_edit_mine_button.tga rename to indra/newview/skins/blacklightblue/textures/ff_edit_mine_button.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_edit_theirs_button.tga b/indra/newview/skins/blacklightblue/textures/ff_edit_theirs_button.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_edit_theirs_button.tga rename to indra/newview/skins/blacklightblue/textures/ff_edit_theirs_button.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_online_status_button.tga b/indra/newview/skins/blacklightblue/textures/ff_online_status_button.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_online_status_button.tga rename to indra/newview/skins/blacklightblue/textures/ff_online_status_button.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_map.tga b/indra/newview/skins/blacklightblue/textures/ff_visible_map.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_visible_map.tga rename to indra/newview/skins/blacklightblue/textures/ff_visible_map.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_map_button.tga b/indra/newview/skins/blacklightblue/textures/ff_visible_map_button.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_visible_map_button.tga rename to indra/newview/skins/blacklightblue/textures/ff_visible_map_button.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_online.tga b/indra/newview/skins/blacklightblue/textures/ff_visible_online.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_visible_online.tga rename to indra/newview/skins/blacklightblue/textures/ff_visible_online.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ff_visible_online_button.tga b/indra/newview/skins/blacklightblue/textures/ff_visible_online_button.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ff_visible_online_button.tga rename to indra/newview/skins/blacklightblue/textures/ff_visible_online_button.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_left.tga b/indra/newview/skins/blacklightblue/textures/flyout_btn_left.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_btn_left.tga rename to indra/newview/skins/blacklightblue/textures/flyout_btn_left.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_disabled.tga b/indra/newview/skins/blacklightblue/textures/flyout_btn_left_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_btn_left_disabled.tga rename to indra/newview/skins/blacklightblue/textures/flyout_btn_left_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_left_selected.tga b/indra/newview/skins/blacklightblue/textures/flyout_btn_left_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_btn_left_selected.tga rename to indra/newview/skins/blacklightblue/textures/flyout_btn_left_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_right.tga b/indra/newview/skins/blacklightblue/textures/flyout_btn_right.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_btn_right.tga rename to indra/newview/skins/blacklightblue/textures/flyout_btn_right.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_disabled.tga b/indra/newview/skins/blacklightblue/textures/flyout_btn_right_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_btn_right_disabled.tga rename to indra/newview/skins/blacklightblue/textures/flyout_btn_right_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_btn_right_selected.tga b/indra/newview/skins/blacklightblue/textures/flyout_btn_right_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_btn_right_selected.tga rename to indra/newview/skins/blacklightblue/textures/flyout_btn_right_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_left.tga b/indra/newview/skins/blacklightblue/textures/flyout_left.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_left.tga rename to indra/newview/skins/blacklightblue/textures/flyout_left.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_left_disabled.tga b/indra/newview/skins/blacklightblue/textures/flyout_left_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_left_disabled.tga rename to indra/newview/skins/blacklightblue/textures/flyout_left_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/flyout_left_selected.tga b/indra/newview/skins/blacklightblue/textures/flyout_left_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/flyout_left_selected.tga rename to indra/newview/skins/blacklightblue/textures/flyout_left_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/folder_arrow.tga b/indra/newview/skins/blacklightblue/textures/folder_arrow.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/folder_arrow.tga rename to indra/newview/skins/blacklightblue/textures/folder_arrow.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_chatbar.tga b/indra/newview/skins/blacklightblue/textures/icn_chatbar.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_chatbar.tga rename to indra/newview/skins/blacklightblue/textures/icn_chatbar.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_label_media.tga b/indra/newview/skins/blacklightblue/textures/icn_label_media.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_label_media.tga rename to indra/newview/skins/blacklightblue/textures/icn_label_media.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_label_music.tga b/indra/newview/skins/blacklightblue/textures/icn_label_music.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_label_music.tga rename to indra/newview/skins/blacklightblue/textures/icn_label_music.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_label_web.tga b/indra/newview/skins/blacklightblue/textures/icn_label_web.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_label_web.tga rename to indra/newview/skins/blacklightblue/textures/icn_label_web.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-pause_active.tga b/indra/newview/skins/blacklightblue/textures/icn_media-pause_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-pause_active.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-pause_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-pause_disabled.tga b/indra/newview/skins/blacklightblue/textures/icn_media-pause_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-pause_disabled.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-pause_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-pause_enabled.tga b/indra/newview/skins/blacklightblue/textures/icn_media-pause_enabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-pause_enabled.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-pause_enabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-play_active.tga b/indra/newview/skins/blacklightblue/textures/icn_media-play_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-play_active.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-play_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-play_disabled.tga b/indra/newview/skins/blacklightblue/textures/icn_media-play_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-play_disabled.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-play_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-play_enabled.tga b/indra/newview/skins/blacklightblue/textures/icn_media-play_enabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-play_enabled.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-play_enabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-stop_active.tga b/indra/newview/skins/blacklightblue/textures/icn_media-stop_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-stop_active.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-stop_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-stop_disabled.tga b/indra/newview/skins/blacklightblue/textures/icn_media-stop_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-stop_disabled.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-stop_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media-stop_enabled.tga b/indra/newview/skins/blacklightblue/textures/icn_media-stop_enabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media-stop_enabled.tga rename to indra/newview/skins/blacklightblue/textures/icn_media-stop_enabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media.tga b/indra/newview/skins/blacklightblue/textures/icn_media.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media.tga rename to indra/newview/skins/blacklightblue/textures/icn_media.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media_movie.tga b/indra/newview/skins/blacklightblue/textures/icn_media_movie.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media_movie.tga rename to indra/newview/skins/blacklightblue/textures/icn_media_movie.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_media_web.tga b/indra/newview/skins/blacklightblue/textures/icn_media_web.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_media_web.tga rename to indra/newview/skins/blacklightblue/textures/icn_media_web.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_music-play.tga b/indra/newview/skins/blacklightblue/textures/icn_music-play.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_music-play.tga rename to indra/newview/skins/blacklightblue/textures/icn_music-play.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_music.tga b/indra/newview/skins/blacklightblue/textures/icn_music.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_music.tga rename to indra/newview/skins/blacklightblue/textures/icn_music.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_pause.tga b/indra/newview/skins/blacklightblue/textures/icn_pause.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_pause.tga rename to indra/newview/skins/blacklightblue/textures/icn_pause.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_play.tga b/indra/newview/skins/blacklightblue/textures/icn_play.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_play.tga rename to indra/newview/skins/blacklightblue/textures/icn_play.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_rounded-text-field.tga b/indra/newview/skins/blacklightblue/textures/icn_rounded-text-field.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_rounded-text-field.tga rename to indra/newview/skins/blacklightblue/textures/icn_rounded-text-field.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_slide-groove_dark.tga b/indra/newview/skins/blacklightblue/textures/icn_slide-groove_dark.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_slide-groove_dark.tga rename to indra/newview/skins/blacklightblue/textures/icn_slide-groove_dark.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_slide-highlight.tga b/indra/newview/skins/blacklightblue/textures/icn_slide-highlight.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_slide-highlight.tga rename to indra/newview/skins/blacklightblue/textures/icn_slide-highlight.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_slide-thumb_dark.tga b/indra/newview/skins/blacklightblue/textures/icn_slide-thumb_dark.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_slide-thumb_dark.tga rename to indra/newview/skins/blacklightblue/textures/icn_slide-thumb_dark.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_speaker-muted_dark.tga b/indra/newview/skins/blacklightblue/textures/icn_speaker-muted_dark.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_speaker-muted_dark.tga rename to indra/newview/skins/blacklightblue/textures/icn_speaker-muted_dark.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_speaker_dark.tga b/indra/newview/skins/blacklightblue/textures/icn_speaker_dark.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_speaker_dark.tga rename to indra/newview/skins/blacklightblue/textures/icn_speaker_dark.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_stop.tga b/indra/newview/skins/blacklightblue/textures/icn_stop.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_stop.tga rename to indra/newview/skins/blacklightblue/textures/icn_stop.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_toolbar_radar.tga b/indra/newview/skins/blacklightblue/textures/icn_toolbar_radar.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_toolbar_radar.tga rename to indra/newview/skins/blacklightblue/textures/icn_toolbar_radar.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice-groupfocus.tga b/indra/newview/skins/blacklightblue/textures/icn_voice-groupfocus.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice-groupfocus.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice-groupfocus.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice-localchat.tga b/indra/newview/skins/blacklightblue/textures/icn_voice-localchat.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice-localchat.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice-localchat.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/blacklightblue/textures/icn_voice-pvtfocus.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice-pvtfocus.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice-pvtfocus.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-off.tga b/indra/newview/skins/blacklightblue/textures/icn_voice_ptt-off.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-off.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice_ptt-off.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl1.tga b/indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on-lvl1.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl1.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on-lvl1.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl2.tga b/indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on-lvl2.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl2.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on-lvl2.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl3.tga b/indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on-lvl3.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on-lvl3.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on-lvl3.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on.tga b/indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icn_voice_ptt-on.tga rename to indra/newview/skins/blacklightblue/textures/icn_voice_ptt-on.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_auction.tga b/indra/newview/skins/blacklightblue/textures/icon_auction.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_auction.tga rename to indra/newview/skins/blacklightblue/textures/icon_auction.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_avatar_offline.tga b/indra/newview/skins/blacklightblue/textures/icon_avatar_offline.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_avatar_offline.tga rename to indra/newview/skins/blacklightblue/textures/icon_avatar_offline.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_avatar_online.tga b/indra/newview/skins/blacklightblue/textures/icon_avatar_online.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_avatar_online.tga rename to indra/newview/skins/blacklightblue/textures/icon_avatar_online.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_diurnal.tga b/indra/newview/skins/blacklightblue/textures/icon_diurnal.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_diurnal.tga rename to indra/newview/skins/blacklightblue/textures/icon_diurnal.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_event.tga b/indra/newview/skins/blacklightblue/textures/icon_event.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_event.tga rename to indra/newview/skins/blacklightblue/textures/icon_event.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_event_adult.tga b/indra/newview/skins/blacklightblue/textures/icon_event_adult.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_event_adult.tga rename to indra/newview/skins/blacklightblue/textures/icon_event_adult.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_event_mature.tga b/indra/newview/skins/blacklightblue/textures/icon_event_mature.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_event_mature.tga rename to indra/newview/skins/blacklightblue/textures/icon_event_mature.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_for_sale.tga b/indra/newview/skins/blacklightblue/textures/icon_for_sale.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_for_sale.tga rename to indra/newview/skins/blacklightblue/textures/icon_for_sale.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_for_sale_adult.tga b/indra/newview/skins/blacklightblue/textures/icon_for_sale_adult.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_for_sale_adult.tga rename to indra/newview/skins/blacklightblue/textures/icon_for_sale_adult.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_group.tga b/indra/newview/skins/blacklightblue/textures/icon_group.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_group.tga rename to indra/newview/skins/blacklightblue/textures/icon_group.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_groupnotice.tga b/indra/newview/skins/blacklightblue/textures/icon_groupnotice.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_groupnotice.tga rename to indra/newview/skins/blacklightblue/textures/icon_groupnotice.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_groupnoticeinventory.tga b/indra/newview/skins/blacklightblue/textures/icon_groupnoticeinventory.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_groupnoticeinventory.tga rename to indra/newview/skins/blacklightblue/textures/icon_groupnoticeinventory.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_lock.tga b/indra/newview/skins/blacklightblue/textures/icon_lock.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_lock.tga rename to indra/newview/skins/blacklightblue/textures/icon_lock.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_place.tga b/indra/newview/skins/blacklightblue/textures/icon_place.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_place.tga rename to indra/newview/skins/blacklightblue/textures/icon_place.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_popular.tga b/indra/newview/skins/blacklightblue/textures/icon_popular.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_popular.tga rename to indra/newview/skins/blacklightblue/textures/icon_popular.tga diff --git a/indra/newview/skins/Blacklightblue/textures/icon_top_pick.tga b/indra/newview/skins/blacklightblue/textures/icon_top_pick.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/icon_top_pick.tga rename to indra/newview/skins/blacklightblue/textures/icon_top_pick.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_animation.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_animation.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_animation.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_animation.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_bodypart.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_bodypart.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_bodypart.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_bodypart.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_callingcard.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_callingcard.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_callingcard.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_callingcard.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_clothing.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_clothing.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_clothing.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_clothing.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_gesture.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_gesture.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_gesture.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_gesture.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_landmark.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_landmark.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_landmark.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_landmark.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_lostandfound.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_lostandfound.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_lostandfound.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_lostandfound.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_notecard.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_notecard.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_notecard.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_notecard.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_object.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_object.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_object.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_object.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_closed.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_plain_closed.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_plain_closed.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_plain_closed.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_plain_open.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_plain_open.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_plain_open.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_plain_open.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_script.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_script.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_script.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_script.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_snapshot.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_snapshot.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_snapshot.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_snapshot.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_sound.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_sound.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_sound.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_sound.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_texture.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_texture.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_texture.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_texture.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_folder_trash.tga b/indra/newview/skins/blacklightblue/textures/inv_folder_trash.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_folder_trash.tga rename to indra/newview/skins/blacklightblue/textures/inv_folder_trash.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_animation.tga b/indra/newview/skins/blacklightblue/textures/inv_item_animation.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_animation.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_animation.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_attach.tga b/indra/newview/skins/blacklightblue/textures/inv_item_attach.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_attach.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_attach.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_offline.tga b/indra/newview/skins/blacklightblue/textures/inv_item_callingcard_offline.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_offline.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_callingcard_offline.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_online.tga b/indra/newview/skins/blacklightblue/textures/inv_item_callingcard_online.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_callingcard_online.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_callingcard_online.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_clothing.tga b/indra/newview/skins/blacklightblue/textures/inv_item_clothing.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_clothing.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_clothing.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_eyes.tga b/indra/newview/skins/blacklightblue/textures/inv_item_eyes.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_eyes.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_eyes.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_gesture.tga b/indra/newview/skins/blacklightblue/textures/inv_item_gesture.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_gesture.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_gesture.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_gloves.tga b/indra/newview/skins/blacklightblue/textures/inv_item_gloves.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_gloves.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_gloves.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_hair.tga b/indra/newview/skins/blacklightblue/textures/inv_item_hair.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_hair.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_hair.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_jacket.tga b/indra/newview/skins/blacklightblue/textures/inv_item_jacket.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_jacket.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_jacket.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_landmark.tga b/indra/newview/skins/blacklightblue/textures/inv_item_landmark.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_landmark.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_landmark.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_landmark_visited.tga b/indra/newview/skins/blacklightblue/textures/inv_item_landmark_visited.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_landmark_visited.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_landmark_visited.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_notecard.tga b/indra/newview/skins/blacklightblue/textures/inv_item_notecard.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_notecard.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_notecard.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_object.tga b/indra/newview/skins/blacklightblue/textures/inv_item_object.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_object.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_object.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_object_multi.tga b/indra/newview/skins/blacklightblue/textures/inv_item_object_multi.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_object_multi.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_object_multi.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_pants.tga b/indra/newview/skins/blacklightblue/textures/inv_item_pants.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_pants.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_pants.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_script.tga b/indra/newview/skins/blacklightblue/textures/inv_item_script.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_script.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_script.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_script_dangerous.tga b/indra/newview/skins/blacklightblue/textures/inv_item_script_dangerous.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_script_dangerous.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_script_dangerous.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_shape.tga b/indra/newview/skins/blacklightblue/textures/inv_item_shape.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_shape.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_shape.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_shirt.tga b/indra/newview/skins/blacklightblue/textures/inv_item_shirt.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_shirt.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_shirt.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_shoes.tga b/indra/newview/skins/blacklightblue/textures/inv_item_shoes.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_shoes.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_shoes.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_skin.tga b/indra/newview/skins/blacklightblue/textures/inv_item_skin.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_skin.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_skin.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_skirt.tga b/indra/newview/skins/blacklightblue/textures/inv_item_skirt.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_skirt.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_skirt.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_snapshot.tga b/indra/newview/skins/blacklightblue/textures/inv_item_snapshot.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_snapshot.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_snapshot.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_socks.tga b/indra/newview/skins/blacklightblue/textures/inv_item_socks.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_socks.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_socks.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_sound.tga b/indra/newview/skins/blacklightblue/textures/inv_item_sound.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_sound.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_sound.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_texture.tga b/indra/newview/skins/blacklightblue/textures/inv_item_texture.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_texture.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_texture.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_underpants.tga b/indra/newview/skins/blacklightblue/textures/inv_item_underpants.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_underpants.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_underpants.tga diff --git a/indra/newview/skins/Blacklightblue/textures/inv_item_undershirt.tga b/indra/newview/skins/blacklightblue/textures/inv_item_undershirt.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/inv_item_undershirt.tga rename to indra/newview/skins/blacklightblue/textures/inv_item_undershirt.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_16.tga b/indra/newview/skins/blacklightblue/textures/map_avatar_16.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_avatar_16.tga rename to indra/newview/skins/blacklightblue/textures/map_avatar_16.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_8.tga b/indra/newview/skins/blacklightblue/textures/map_avatar_8.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_avatar_8.tga rename to indra/newview/skins/blacklightblue/textures/map_avatar_8.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_above_8.tga b/indra/newview/skins/blacklightblue/textures/map_avatar_above_8.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_avatar_above_8.tga rename to indra/newview/skins/blacklightblue/textures/map_avatar_above_8.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_below_8.tga b/indra/newview/skins/blacklightblue/textures/map_avatar_below_8.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_avatar_below_8.tga rename to indra/newview/skins/blacklightblue/textures/map_avatar_below_8.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_avatar_you_8.tga b/indra/newview/skins/blacklightblue/textures/map_avatar_you_8.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_avatar_you_8.tga rename to indra/newview/skins/blacklightblue/textures/map_avatar_you_8.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_event.tga b/indra/newview/skins/blacklightblue/textures/map_event.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_event.tga rename to indra/newview/skins/blacklightblue/textures/map_event.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_event_adult.tga b/indra/newview/skins/blacklightblue/textures/map_event_adult.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_event_adult.tga rename to indra/newview/skins/blacklightblue/textures/map_event_adult.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_event_mature.tga b/indra/newview/skins/blacklightblue/textures/map_event_mature.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_event_mature.tga rename to indra/newview/skins/blacklightblue/textures/map_event_mature.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_home.tga b/indra/newview/skins/blacklightblue/textures/map_home.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_home.tga rename to indra/newview/skins/blacklightblue/textures/map_home.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_infohub.tga b/indra/newview/skins/blacklightblue/textures/map_infohub.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_infohub.tga rename to indra/newview/skins/blacklightblue/textures/map_infohub.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_telehub.tga b/indra/newview/skins/blacklightblue/textures/map_telehub.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_telehub.tga rename to indra/newview/skins/blacklightblue/textures/map_telehub.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_track_16.tga b/indra/newview/skins/blacklightblue/textures/map_track_16.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_track_16.tga rename to indra/newview/skins/blacklightblue/textures/map_track_16.tga diff --git a/indra/newview/skins/Blacklightblue/textures/map_track_8.tga b/indra/newview/skins/blacklightblue/textures/map_track_8.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/map_track_8.tga rename to indra/newview/skins/blacklightblue/textures/map_track_8.tga diff --git a/indra/newview/skins/Blacklightblue/textures/media_icon.tga b/indra/newview/skins/blacklightblue/textures/media_icon.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/media_icon.tga rename to indra/newview/skins/blacklightblue/textures/media_icon.tga diff --git a/indra/newview/skins/Blacklightblue/textures/minimize.tga b/indra/newview/skins/blacklightblue/textures/minimize.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/minimize.tga rename to indra/newview/skins/blacklightblue/textures/minimize.tga diff --git a/indra/newview/skins/Blacklightblue/textures/minimize_inactive.tga b/indra/newview/skins/blacklightblue/textures/minimize_inactive.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/minimize_inactive.tga rename to indra/newview/skins/blacklightblue/textures/minimize_inactive.tga diff --git a/indra/newview/skins/Blacklightblue/textures/minimize_pressed.tga b/indra/newview/skins/blacklightblue/textures/minimize_pressed.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/minimize_pressed.tga rename to indra/newview/skins/blacklightblue/textures/minimize_pressed.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_backward_in.tga b/indra/newview/skins/blacklightblue/textures/move_backward_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_backward_in.tga rename to indra/newview/skins/blacklightblue/textures/move_backward_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_backward_out.tga b/indra/newview/skins/blacklightblue/textures/move_backward_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_backward_out.tga rename to indra/newview/skins/blacklightblue/textures/move_backward_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_down_in.tga b/indra/newview/skins/blacklightblue/textures/move_down_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_down_in.tga rename to indra/newview/skins/blacklightblue/textures/move_down_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_down_out.tga b/indra/newview/skins/blacklightblue/textures/move_down_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_down_out.tga rename to indra/newview/skins/blacklightblue/textures/move_down_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_forward_in.tga b/indra/newview/skins/blacklightblue/textures/move_forward_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_forward_in.tga rename to indra/newview/skins/blacklightblue/textures/move_forward_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_forward_out.tga b/indra/newview/skins/blacklightblue/textures/move_forward_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_forward_out.tga rename to indra/newview/skins/blacklightblue/textures/move_forward_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_left_in.tga b/indra/newview/skins/blacklightblue/textures/move_left_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_left_in.tga rename to indra/newview/skins/blacklightblue/textures/move_left_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_left_out.tga b/indra/newview/skins/blacklightblue/textures/move_left_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_left_out.tga rename to indra/newview/skins/blacklightblue/textures/move_left_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_right_in.tga b/indra/newview/skins/blacklightblue/textures/move_right_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_right_in.tga rename to indra/newview/skins/blacklightblue/textures/move_right_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_right_out.tga b/indra/newview/skins/blacklightblue/textures/move_right_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_right_out.tga rename to indra/newview/skins/blacklightblue/textures/move_right_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_left_in.tga b/indra/newview/skins/blacklightblue/textures/move_turn_left_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_turn_left_in.tga rename to indra/newview/skins/blacklightblue/textures/move_turn_left_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_left_out.tga b/indra/newview/skins/blacklightblue/textures/move_turn_left_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_turn_left_out.tga rename to indra/newview/skins/blacklightblue/textures/move_turn_left_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_right_in.tga b/indra/newview/skins/blacklightblue/textures/move_turn_right_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_turn_right_in.tga rename to indra/newview/skins/blacklightblue/textures/move_turn_right_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_turn_right_out.tga b/indra/newview/skins/blacklightblue/textures/move_turn_right_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_turn_right_out.tga rename to indra/newview/skins/blacklightblue/textures/move_turn_right_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_up_in.tga b/indra/newview/skins/blacklightblue/textures/move_up_in.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_up_in.tga rename to indra/newview/skins/blacklightblue/textures/move_up_in.tga diff --git a/indra/newview/skins/Blacklightblue/textures/move_up_out.tga b/indra/newview/skins/blacklightblue/textures/move_up_out.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/move_up_out.tga rename to indra/newview/skins/blacklightblue/textures/move_up_out.tga diff --git a/indra/newview/skins/Blacklightblue/textures/mute_icon.tga b/indra/newview/skins/blacklightblue/textures/mute_icon.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/mute_icon.tga rename to indra/newview/skins/blacklightblue/textures/mute_icon.tga diff --git a/indra/newview/skins/Blacklightblue/textures/notify_box_icon.tga b/indra/newview/skins/blacklightblue/textures/notify_box_icon.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/notify_box_icon.tga rename to indra/newview/skins/blacklightblue/textures/notify_box_icon.tga diff --git a/indra/newview/skins/Blacklightblue/textures/notify_caution_icon.tga b/indra/newview/skins/blacklightblue/textures/notify_caution_icon.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/notify_caution_icon.tga rename to indra/newview/skins/blacklightblue/textures/notify_caution_icon.tga diff --git a/indra/newview/skins/Blacklightblue/textures/notify_next.png b/indra/newview/skins/blacklightblue/textures/notify_next.png similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/notify_next.png rename to indra/newview/skins/blacklightblue/textures/notify_next.png diff --git a/indra/newview/skins/Blacklightblue/textures/notify_tip_icon.tga b/indra/newview/skins/blacklightblue/textures/notify_tip_icon.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/notify_tip_icon.tga rename to indra/newview/skins/blacklightblue/textures/notify_tip_icon.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_cone.tga b/indra/newview/skins/blacklightblue/textures/object_cone.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_cone.tga rename to indra/newview/skins/blacklightblue/textures/object_cone.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_cone_active.tga b/indra/newview/skins/blacklightblue/textures/object_cone_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_cone_active.tga rename to indra/newview/skins/blacklightblue/textures/object_cone_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_cube.tga b/indra/newview/skins/blacklightblue/textures/object_cube.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_cube.tga rename to indra/newview/skins/blacklightblue/textures/object_cube.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_cube_active.tga b/indra/newview/skins/blacklightblue/textures/object_cube_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_cube_active.tga rename to indra/newview/skins/blacklightblue/textures/object_cube_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_cylinder.tga b/indra/newview/skins/blacklightblue/textures/object_cylinder.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_cylinder.tga rename to indra/newview/skins/blacklightblue/textures/object_cylinder.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_cylinder_active.tga b/indra/newview/skins/blacklightblue/textures/object_cylinder_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_cylinder_active.tga rename to indra/newview/skins/blacklightblue/textures/object_cylinder_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_grass.tga b/indra/newview/skins/blacklightblue/textures/object_grass.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_grass.tga rename to indra/newview/skins/blacklightblue/textures/object_grass.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_grass_active.tga b/indra/newview/skins/blacklightblue/textures/object_grass_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_grass_active.tga rename to indra/newview/skins/blacklightblue/textures/object_grass_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cone.tga b/indra/newview/skins/blacklightblue/textures/object_hemi_cone.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_hemi_cone.tga rename to indra/newview/skins/blacklightblue/textures/object_hemi_cone.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cone_active.tga b/indra/newview/skins/blacklightblue/textures/object_hemi_cone_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_hemi_cone_active.tga rename to indra/newview/skins/blacklightblue/textures/object_hemi_cone_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder.tga b/indra/newview/skins/blacklightblue/textures/object_hemi_cylinder.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder.tga rename to indra/newview/skins/blacklightblue/textures/object_hemi_cylinder.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder_active.tga b/indra/newview/skins/blacklightblue/textures/object_hemi_cylinder_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_hemi_cylinder_active.tga rename to indra/newview/skins/blacklightblue/textures/object_hemi_cylinder_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere.tga b/indra/newview/skins/blacklightblue/textures/object_hemi_sphere.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_hemi_sphere.tga rename to indra/newview/skins/blacklightblue/textures/object_hemi_sphere.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_hemi_sphere_active.tga b/indra/newview/skins/blacklightblue/textures/object_hemi_sphere_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_hemi_sphere_active.tga rename to indra/newview/skins/blacklightblue/textures/object_hemi_sphere_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_prism.tga b/indra/newview/skins/blacklightblue/textures/object_prism.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_prism.tga rename to indra/newview/skins/blacklightblue/textures/object_prism.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_prism_active.tga b/indra/newview/skins/blacklightblue/textures/object_prism_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_prism_active.tga rename to indra/newview/skins/blacklightblue/textures/object_prism_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_pyramid.tga b/indra/newview/skins/blacklightblue/textures/object_pyramid.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_pyramid.tga rename to indra/newview/skins/blacklightblue/textures/object_pyramid.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_pyramid_active.tga b/indra/newview/skins/blacklightblue/textures/object_pyramid_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_pyramid_active.tga rename to indra/newview/skins/blacklightblue/textures/object_pyramid_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_ring.tga b/indra/newview/skins/blacklightblue/textures/object_ring.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_ring.tga rename to indra/newview/skins/blacklightblue/textures/object_ring.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_ring_active.tga b/indra/newview/skins/blacklightblue/textures/object_ring_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_ring_active.tga rename to indra/newview/skins/blacklightblue/textures/object_ring_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_sphere.tga b/indra/newview/skins/blacklightblue/textures/object_sphere.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_sphere.tga rename to indra/newview/skins/blacklightblue/textures/object_sphere.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_sphere_active.tga b/indra/newview/skins/blacklightblue/textures/object_sphere_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_sphere_active.tga rename to indra/newview/skins/blacklightblue/textures/object_sphere_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_tetrahedron.tga b/indra/newview/skins/blacklightblue/textures/object_tetrahedron.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_tetrahedron.tga rename to indra/newview/skins/blacklightblue/textures/object_tetrahedron.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_tetrahedron_active.tga b/indra/newview/skins/blacklightblue/textures/object_tetrahedron_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_tetrahedron_active.tga rename to indra/newview/skins/blacklightblue/textures/object_tetrahedron_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_torus.tga b/indra/newview/skins/blacklightblue/textures/object_torus.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_torus.tga rename to indra/newview/skins/blacklightblue/textures/object_torus.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_torus_active.tga b/indra/newview/skins/blacklightblue/textures/object_torus_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_torus_active.tga rename to indra/newview/skins/blacklightblue/textures/object_torus_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_tree.tga b/indra/newview/skins/blacklightblue/textures/object_tree.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_tree.tga rename to indra/newview/skins/blacklightblue/textures/object_tree.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_tree_active.tga b/indra/newview/skins/blacklightblue/textures/object_tree_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_tree_active.tga rename to indra/newview/skins/blacklightblue/textures/object_tree_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_tube.tga b/indra/newview/skins/blacklightblue/textures/object_tube.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_tube.tga rename to indra/newview/skins/blacklightblue/textures/object_tube.tga diff --git a/indra/newview/skins/Blacklightblue/textures/object_tube_active.tga b/indra/newview/skins/blacklightblue/textures/object_tube_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/object_tube_active.tga rename to indra/newview/skins/blacklightblue/textures/object_tube_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/preview.png b/indra/newview/skins/blacklightblue/textures/preview.png similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/preview.png rename to indra/newview/skins/blacklightblue/textures/preview.png diff --git a/indra/newview/skins/Blacklightblue/textures/progress_fill.tga b/indra/newview/skins/blacklightblue/textures/progress_fill.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/progress_fill.tga rename to indra/newview/skins/blacklightblue/textures/progress_fill.tga diff --git a/indra/newview/skins/Blacklightblue/textures/progressbar_fill.tga b/indra/newview/skins/blacklightblue/textures/progressbar_fill.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/progressbar_fill.tga rename to indra/newview/skins/blacklightblue/textures/progressbar_fill.tga diff --git a/indra/newview/skins/Blacklightblue/textures/progressbar_track.tga b/indra/newview/skins/blacklightblue/textures/progressbar_track.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/progressbar_track.tga rename to indra/newview/skins/blacklightblue/textures/progressbar_track.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ptt_lock_off.tga b/indra/newview/skins/blacklightblue/textures/ptt_lock_off.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ptt_lock_off.tga rename to indra/newview/skins/blacklightblue/textures/ptt_lock_off.tga diff --git a/indra/newview/skins/Blacklightblue/textures/ptt_lock_on.tga b/indra/newview/skins/blacklightblue/textures/ptt_lock_on.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/ptt_lock_on.tga rename to indra/newview/skins/blacklightblue/textures/ptt_lock_on.tga diff --git a/indra/newview/skins/Blacklightblue/textures/radio_active_false.tga b/indra/newview/skins/blacklightblue/textures/radio_active_false.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/radio_active_false.tga rename to indra/newview/skins/blacklightblue/textures/radio_active_false.tga diff --git a/indra/newview/skins/Blacklightblue/textures/radio_active_true.tga b/indra/newview/skins/blacklightblue/textures/radio_active_true.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/radio_active_true.tga rename to indra/newview/skins/blacklightblue/textures/radio_active_true.tga diff --git a/indra/newview/skins/Blacklightblue/textures/radio_inactive_false.tga b/indra/newview/skins/blacklightblue/textures/radio_inactive_false.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/radio_inactive_false.tga rename to indra/newview/skins/blacklightblue/textures/radio_inactive_false.tga diff --git a/indra/newview/skins/Blacklightblue/textures/radio_inactive_true.tga b/indra/newview/skins/blacklightblue/textures/radio_inactive_true.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/radio_inactive_true.tga rename to indra/newview/skins/blacklightblue/textures/radio_inactive_true.tga diff --git a/indra/newview/skins/Blacklightblue/textures/resize_handle_bottom_right_blue.tga b/indra/newview/skins/blacklightblue/textures/resize_handle_bottom_right_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/resize_handle_bottom_right_blue.tga rename to indra/newview/skins/blacklightblue/textures/resize_handle_bottom_right_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/restore.tga b/indra/newview/skins/blacklightblue/textures/restore.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/restore.tga rename to indra/newview/skins/blacklightblue/textures/restore.tga diff --git a/indra/newview/skins/Blacklightblue/textures/restore_inactive.tga b/indra/newview/skins/blacklightblue/textures/restore_inactive.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/restore_inactive.tga rename to indra/newview/skins/blacklightblue/textures/restore_inactive.tga diff --git a/indra/newview/skins/Blacklightblue/textures/restore_pressed.tga b/indra/newview/skins/blacklightblue/textures/restore_pressed.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/restore_pressed.tga rename to indra/newview/skins/blacklightblue/textures/restore_pressed.tga diff --git a/indra/newview/skins/Blacklightblue/textures/rounded_square.j2c b/indra/newview/skins/blacklightblue/textures/rounded_square.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/rounded_square.j2c rename to indra/newview/skins/blacklightblue/textures/rounded_square.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/rounded_square.tga b/indra/newview/skins/blacklightblue/textures/rounded_square.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/rounded_square.tga rename to indra/newview/skins/blacklightblue/textures/rounded_square.tga diff --git a/indra/newview/skins/Blacklightblue/textures/rounded_square_soft.tga b/indra/newview/skins/blacklightblue/textures/rounded_square_soft.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/rounded_square_soft.tga rename to indra/newview/skins/blacklightblue/textures/rounded_square_soft.tga diff --git a/indra/newview/skins/Blacklightblue/textures/script_error.j2c b/indra/newview/skins/blacklightblue/textures/script_error.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/script_error.j2c rename to indra/newview/skins/blacklightblue/textures/script_error.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/script_error.tga b/indra/newview/skins/blacklightblue/textures/script_error.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/script_error.tga rename to indra/newview/skins/blacklightblue/textures/script_error.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_in_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_down_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_down_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_down_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_down_out_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_down_out_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_down_out_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_down_out_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_in_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_left_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_left_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_left_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_left_out_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_left_out_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_left_out_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_left_out_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_in_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_right_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_right_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_right_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_right_out_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_right_out_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_right_out_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_right_out_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_in_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_up_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_up_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_up_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/scrollbutton_up_out_blue.tga b/indra/newview/skins/blacklightblue/textures/scrollbutton_up_out_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/scrollbutton_up_out_blue.tga rename to indra/newview/skins/blacklightblue/textures/scrollbutton_up_out_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/sm_rounded_corners_simple.tga b/indra/newview/skins/blacklightblue/textures/sm_rounded_corners_simple.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/sm_rounded_corners_simple.tga rename to indra/newview/skins/blacklightblue/textures/sm_rounded_corners_simple.tga diff --git a/indra/newview/skins/Blacklightblue/textures/smicon_warn.tga b/indra/newview/skins/blacklightblue/textures/smicon_warn.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/smicon_warn.tga rename to indra/newview/skins/blacklightblue/textures/smicon_warn.tga diff --git a/indra/newview/skins/Blacklightblue/textures/spacer24.tga b/indra/newview/skins/blacklightblue/textures/spacer24.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/spacer24.tga rename to indra/newview/skins/blacklightblue/textures/spacer24.tga diff --git a/indra/newview/skins/Blacklightblue/textures/spacer35.tga b/indra/newview/skins/blacklightblue/textures/spacer35.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/spacer35.tga rename to indra/newview/skins/blacklightblue/textures/spacer35.tga diff --git a/indra/newview/skins/Blacklightblue/textures/spin_down_in_blue.tga b/indra/newview/skins/blacklightblue/textures/spin_down_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/spin_down_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/spin_down_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/spin_down_out_blue.tga b/indra/newview/skins/blacklightblue/textures/spin_down_out_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/spin_down_out_blue.tga rename to indra/newview/skins/blacklightblue/textures/spin_down_out_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/spin_up_in_blue.tga b/indra/newview/skins/blacklightblue/textures/spin_up_in_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/spin_up_in_blue.tga rename to indra/newview/skins/blacklightblue/textures/spin_up_in_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/spin_up_out_blue.tga b/indra/newview/skins/blacklightblue/textures/spin_up_out_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/spin_up_out_blue.tga rename to indra/newview/skins/blacklightblue/textures/spin_up_out_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/startup_logo.j2c b/indra/newview/skins/blacklightblue/textures/startup_logo.j2c similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/startup_logo.j2c rename to indra/newview/skins/blacklightblue/textures/startup_logo.j2c diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_currency.tga b/indra/newview/skins/blacklightblue/textures/status_buy_currency.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_buy_currency.tga rename to indra/newview/skins/blacklightblue/textures/status_buy_currency.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_currency_pressed.tga b/indra/newview/skins/blacklightblue/textures/status_buy_currency_pressed.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_buy_currency_pressed.tga rename to indra/newview/skins/blacklightblue/textures/status_buy_currency_pressed.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_land.tga b/indra/newview/skins/blacklightblue/textures/status_buy_land.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_buy_land.tga rename to indra/newview/skins/blacklightblue/textures/status_buy_land.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_buy_land_pressed.tga b/indra/newview/skins/blacklightblue/textures/status_buy_land_pressed.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_buy_land_pressed.tga rename to indra/newview/skins/blacklightblue/textures/status_buy_land_pressed.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_health.tga b/indra/newview/skins/blacklightblue/textures/status_health.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_health.tga rename to indra/newview/skins/blacklightblue/textures/status_health.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_build.tga b/indra/newview/skins/blacklightblue/textures/status_no_build.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_no_build.tga rename to indra/newview/skins/blacklightblue/textures/status_no_build.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_fly.tga b/indra/newview/skins/blacklightblue/textures/status_no_fly.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_no_fly.tga rename to indra/newview/skins/blacklightblue/textures/status_no_fly.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_push.tga b/indra/newview/skins/blacklightblue/textures/status_no_push.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_no_push.tga rename to indra/newview/skins/blacklightblue/textures/status_no_push.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_scripts.tga b/indra/newview/skins/blacklightblue/textures/status_no_scripts.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_no_scripts.tga rename to indra/newview/skins/blacklightblue/textures/status_no_scripts.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_no_voice.tga b/indra/newview/skins/blacklightblue/textures/status_no_voice.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_no_voice.tga rename to indra/newview/skins/blacklightblue/textures/status_no_voice.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_script_debug.tga b/indra/newview/skins/blacklightblue/textures/status_script_debug.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_script_debug.tga rename to indra/newview/skins/blacklightblue/textures/status_script_debug.tga diff --git a/indra/newview/skins/Blacklightblue/textures/status_search_btn.png b/indra/newview/skins/blacklightblue/textures/status_search_btn.png similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_search_btn.png rename to indra/newview/skins/blacklightblue/textures/status_search_btn.png diff --git a/indra/newview/skins/Blacklightblue/textures/status_search_btn_pressed.png b/indra/newview/skins/blacklightblue/textures/status_search_btn_pressed.png similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_search_btn_pressed.png rename to indra/newview/skins/blacklightblue/textures/status_search_btn_pressed.png diff --git a/indra/newview/skins/Blacklightblue/textures/status_voice.tga b/indra/newview/skins/blacklightblue/textures/status_voice.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/status_voice.tga rename to indra/newview/skins/blacklightblue/textures/status_voice.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tab_bottom_blue.tga b/indra/newview/skins/blacklightblue/textures/tab_bottom_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tab_bottom_blue.tga rename to indra/newview/skins/blacklightblue/textures/tab_bottom_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tab_bottom_selected_blue.tga b/indra/newview/skins/blacklightblue/textures/tab_bottom_selected_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tab_bottom_selected_blue.tga rename to indra/newview/skins/blacklightblue/textures/tab_bottom_selected_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tab_left.tga b/indra/newview/skins/blacklightblue/textures/tab_left.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tab_left.tga rename to indra/newview/skins/blacklightblue/textures/tab_left.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tab_left_selected.tga b/indra/newview/skins/blacklightblue/textures/tab_left_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tab_left_selected.tga rename to indra/newview/skins/blacklightblue/textures/tab_left_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tab_top_blue.tga b/indra/newview/skins/blacklightblue/textures/tab_top_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tab_top_blue.tga rename to indra/newview/skins/blacklightblue/textures/tab_top_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tab_top_selected_blue.tga b/indra/newview/skins/blacklightblue/textures/tab_top_selected_blue.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tab_top_selected_blue.tga rename to indra/newview/skins/blacklightblue/textures/tab_top_selected_blue.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tabarea.tga b/indra/newview/skins/blacklightblue/textures/tabarea.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tabarea.tga rename to indra/newview/skins/blacklightblue/textures/tabarea.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tearoff_pressed.tga b/indra/newview/skins/blacklightblue/textures/tearoff_pressed.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tearoff_pressed.tga rename to indra/newview/skins/blacklightblue/textures/tearoff_pressed.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tearoffbox.tga b/indra/newview/skins/blacklightblue/textures/tearoffbox.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tearoffbox.tga rename to indra/newview/skins/blacklightblue/textures/tearoffbox.tga diff --git a/indra/newview/skins/Blacklightblue/textures/textures.xml b/indra/newview/skins/blacklightblue/textures/textures.xml similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/textures.xml rename to indra/newview/skins/blacklightblue/textures/textures.xml diff --git a/indra/newview/skins/Blacklightblue/textures/tool_dozer.tga b/indra/newview/skins/blacklightblue/textures/tool_dozer.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tool_dozer.tga rename to indra/newview/skins/blacklightblue/textures/tool_dozer.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tool_dozer_active.tga b/indra/newview/skins/blacklightblue/textures/tool_dozer_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tool_dozer_active.tga rename to indra/newview/skins/blacklightblue/textures/tool_dozer_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tool_zoom.tga b/indra/newview/skins/blacklightblue/textures/tool_zoom.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tool_zoom.tga rename to indra/newview/skins/blacklightblue/textures/tool_zoom.tga diff --git a/indra/newview/skins/Blacklightblue/textures/tool_zoom_active.tga b/indra/newview/skins/blacklightblue/textures/tool_zoom_active.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/tool_zoom_active.tga rename to indra/newview/skins/blacklightblue/textures/tool_zoom_active.tga diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_bg.tga b/indra/newview/skins/blacklightblue/textures/toolbar_bg.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/toolbar_bg.tga rename to indra/newview/skins/blacklightblue/textures/toolbar_bg.tga diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_btn_disabled.tga b/indra/newview/skins/blacklightblue/textures/toolbar_btn_disabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/toolbar_btn_disabled.tga rename to indra/newview/skins/blacklightblue/textures/toolbar_btn_disabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_btn_enabled.tga b/indra/newview/skins/blacklightblue/textures/toolbar_btn_enabled.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/toolbar_btn_enabled.tga rename to indra/newview/skins/blacklightblue/textures/toolbar_btn_enabled.tga diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_btn_selected.tga b/indra/newview/skins/blacklightblue/textures/toolbar_btn_selected.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/toolbar_btn_selected.tga rename to indra/newview/skins/blacklightblue/textures/toolbar_btn_selected.tga diff --git a/indra/newview/skins/Blacklightblue/textures/toolbar_tab.tga b/indra/newview/skins/blacklightblue/textures/toolbar_tab.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/toolbar_tab.tga rename to indra/newview/skins/blacklightblue/textures/toolbar_tab.tga diff --git a/indra/newview/skins/Blacklightblue/textures/up_arrow.png b/indra/newview/skins/blacklightblue/textures/up_arrow.png similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/up_arrow.png rename to indra/newview/skins/blacklightblue/textures/up_arrow.png diff --git a/indra/newview/skins/Blacklightblue/textures/up_arrow.tga b/indra/newview/skins/blacklightblue/textures/up_arrow.tga similarity index 100% rename from indra/newview/skins/Blacklightblue/textures/up_arrow.tga rename to indra/newview/skins/blacklightblue/textures/up_arrow.tga diff --git a/indra/newview/skins/blackred.xml b/indra/newview/skins/blackred.xml index 93a2ed074..7ffcac46f 100644 --- a/indra/newview/skins/blackred.xml +++ b/indra/newview/skins/blackred.xml @@ -9,6 +9,6 @@ skin_info folder_name - Blackred + blackred diff --git a/indra/newview/skins/Blackred/License and Credit.txt b/indra/newview/skins/blackred/License and Credit.txt similarity index 100% rename from indra/newview/skins/Blackred/License and Credit.txt rename to indra/newview/skins/blackred/License and Credit.txt diff --git a/indra/newview/skins/Blackred/colors.xml b/indra/newview/skins/blackred/colors.xml similarity index 100% rename from indra/newview/skins/Blackred/colors.xml rename to indra/newview/skins/blackred/colors.xml diff --git a/indra/newview/skins/Blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/indra/newview/skins/blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga rename to indra/newview/skins/blackred/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga diff --git a/indra/newview/skins/Blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/indra/newview/skins/blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga rename to indra/newview/skins/blackred/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga diff --git a/indra/newview/skins/Blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/indra/newview/skins/blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga rename to indra/newview/skins/blackred/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga diff --git a/indra/newview/skins/Blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/indra/newview/skins/blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga rename to indra/newview/skins/blackred/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga diff --git a/indra/newview/skins/Blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/indra/newview/skins/blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga rename to indra/newview/skins/blackred/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga diff --git a/indra/newview/skins/Blackred/textures/active_speakers.tga b/indra/newview/skins/blackred/textures/active_speakers.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/active_speakers.tga rename to indra/newview/skins/blackred/textures/active_speakers.tga diff --git a/indra/newview/skins/Blackred/textures/active_voice_tab.tga b/indra/newview/skins/blackred/textures/active_voice_tab.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/active_voice_tab.tga rename to indra/newview/skins/blackred/textures/active_voice_tab.tga diff --git a/indra/newview/skins/Blackred/textures/arrow_down.tga b/indra/newview/skins/blackred/textures/arrow_down.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/arrow_down.tga rename to indra/newview/skins/blackred/textures/arrow_down.tga diff --git a/indra/newview/skins/Blackred/textures/arrow_up.tga b/indra/newview/skins/blackred/textures/arrow_up.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/arrow_up.tga rename to indra/newview/skins/blackred/textures/arrow_up.tga diff --git a/indra/newview/skins/Blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/indra/newview/skins/blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga rename to indra/newview/skins/blackred/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga diff --git a/indra/newview/skins/Blackred/textures/badge_error.j2c b/indra/newview/skins/blackred/textures/badge_error.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/badge_error.j2c rename to indra/newview/skins/blackred/textures/badge_error.j2c diff --git a/indra/newview/skins/Blackred/textures/badge_note.j2c b/indra/newview/skins/blackred/textures/badge_note.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/badge_note.j2c rename to indra/newview/skins/blackred/textures/badge_note.j2c diff --git a/indra/newview/skins/Blackred/textures/badge_ok.j2c b/indra/newview/skins/blackred/textures/badge_ok.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/badge_ok.j2c rename to indra/newview/skins/blackred/textures/badge_ok.j2c diff --git a/indra/newview/skins/Blackred/textures/badge_warn.j2c b/indra/newview/skins/blackred/textures/badge_warn.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/badge_warn.j2c rename to indra/newview/skins/blackred/textures/badge_warn.j2c diff --git a/indra/newview/skins/Blackred/textures/black.tga b/indra/newview/skins/blackred/textures/black.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/black.tga rename to indra/newview/skins/blackred/textures/black.tga diff --git a/indra/newview/skins/Blackred/textures/btn_chatbar.tga b/indra/newview/skins/blackred/textures/btn_chatbar.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/btn_chatbar.tga rename to indra/newview/skins/blackred/textures/btn_chatbar.tga diff --git a/indra/newview/skins/Blackred/textures/btn_chatbar_selected.tga b/indra/newview/skins/blackred/textures/btn_chatbar_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/btn_chatbar_selected.tga rename to indra/newview/skins/blackred/textures/btn_chatbar_selected.tga diff --git a/indra/newview/skins/Blackred/textures/button_anim_pause.tga b/indra/newview/skins/blackred/textures/button_anim_pause.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_anim_pause.tga rename to indra/newview/skins/blackred/textures/button_anim_pause.tga diff --git a/indra/newview/skins/Blackred/textures/button_anim_pause_selected.tga b/indra/newview/skins/blackred/textures/button_anim_pause_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_anim_pause_selected.tga rename to indra/newview/skins/blackred/textures/button_anim_pause_selected.tga diff --git a/indra/newview/skins/Blackred/textures/button_anim_play.tga b/indra/newview/skins/blackred/textures/button_anim_play.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_anim_play.tga rename to indra/newview/skins/blackred/textures/button_anim_play.tga diff --git a/indra/newview/skins/Blackred/textures/button_anim_play_selected.tga b/indra/newview/skins/blackred/textures/button_anim_play_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_anim_play_selected.tga rename to indra/newview/skins/blackred/textures/button_anim_play_selected.tga diff --git a/indra/newview/skins/Blackred/textures/button_anim_stop.tga b/indra/newview/skins/blackred/textures/button_anim_stop.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_anim_stop.tga rename to indra/newview/skins/blackred/textures/button_anim_stop.tga diff --git a/indra/newview/skins/Blackred/textures/button_anim_stop_selected.tga b/indra/newview/skins/blackred/textures/button_anim_stop_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_anim_stop_selected.tga rename to indra/newview/skins/blackred/textures/button_anim_stop_selected.tga diff --git a/indra/newview/skins/Blackred/textures/button_disabled_32x128.tga b/indra/newview/skins/blackred/textures/button_disabled_32x128.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_disabled_32x128.tga rename to indra/newview/skins/blackred/textures/button_disabled_32x128.tga diff --git a/indra/newview/skins/Blackred/textures/button_enabled_32x128.tga b/indra/newview/skins/blackred/textures/button_enabled_32x128.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_enabled_32x128.tga rename to indra/newview/skins/blackred/textures/button_enabled_32x128.tga diff --git a/indra/newview/skins/Blackred/textures/button_enabled_selected_32x128.tga b/indra/newview/skins/blackred/textures/button_enabled_selected_32x128.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/button_enabled_selected_32x128.tga rename to indra/newview/skins/blackred/textures/button_enabled_selected_32x128.tga diff --git a/indra/newview/skins/Blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/indra/newview/skins/blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga rename to indra/newview/skins/blackred/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga diff --git a/indra/newview/skins/Blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/indra/newview/skins/blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga rename to indra/newview/skins/blackred/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga diff --git a/indra/newview/skins/Blackred/textures/cam_rotate_in.tga b/indra/newview/skins/blackred/textures/cam_rotate_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_rotate_in.tga rename to indra/newview/skins/blackred/textures/cam_rotate_in.tga diff --git a/indra/newview/skins/Blackred/textures/cam_rotate_out.tga b/indra/newview/skins/blackred/textures/cam_rotate_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_rotate_out.tga rename to indra/newview/skins/blackred/textures/cam_rotate_out.tga diff --git a/indra/newview/skins/Blackred/textures/cam_tracking_in.tga b/indra/newview/skins/blackred/textures/cam_tracking_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_tracking_in.tga rename to indra/newview/skins/blackred/textures/cam_tracking_in.tga diff --git a/indra/newview/skins/Blackred/textures/cam_tracking_out.tga b/indra/newview/skins/blackred/textures/cam_tracking_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_tracking_out.tga rename to indra/newview/skins/blackred/textures/cam_tracking_out.tga diff --git a/indra/newview/skins/Blackred/textures/cam_zoom_minus_in.tga b/indra/newview/skins/blackred/textures/cam_zoom_minus_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_zoom_minus_in.tga rename to indra/newview/skins/blackred/textures/cam_zoom_minus_in.tga diff --git a/indra/newview/skins/Blackred/textures/cam_zoom_out.tga b/indra/newview/skins/blackred/textures/cam_zoom_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_zoom_out.tga rename to indra/newview/skins/blackred/textures/cam_zoom_out.tga diff --git a/indra/newview/skins/Blackred/textures/cam_zoom_plus_in.tga b/indra/newview/skins/blackred/textures/cam_zoom_plus_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/cam_zoom_plus_in.tga rename to indra/newview/skins/blackred/textures/cam_zoom_plus_in.tga diff --git a/indra/newview/skins/Blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/indra/newview/skins/blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga rename to indra/newview/skins/blackred/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga diff --git a/indra/newview/skins/Blackred/textures/checkbox_disabled_false.tga b/indra/newview/skins/blackred/textures/checkbox_disabled_false.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/checkbox_disabled_false.tga rename to indra/newview/skins/blackred/textures/checkbox_disabled_false.tga diff --git a/indra/newview/skins/Blackred/textures/checkbox_disabled_true.tga b/indra/newview/skins/blackred/textures/checkbox_disabled_true.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/checkbox_disabled_true.tga rename to indra/newview/skins/blackred/textures/checkbox_disabled_true.tga diff --git a/indra/newview/skins/Blackred/textures/checkbox_enabled_false.tga b/indra/newview/skins/blackred/textures/checkbox_enabled_false.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/checkbox_enabled_false.tga rename to indra/newview/skins/blackred/textures/checkbox_enabled_false.tga diff --git a/indra/newview/skins/Blackred/textures/checkbox_enabled_true.tga b/indra/newview/skins/blackred/textures/checkbox_enabled_true.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/checkbox_enabled_true.tga rename to indra/newview/skins/blackred/textures/checkbox_enabled_true.tga diff --git a/indra/newview/skins/Blackred/textures/close_in_blue.tga b/indra/newview/skins/blackred/textures/close_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/close_in_blue.tga rename to indra/newview/skins/blackred/textures/close_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/close_inactive_blue.tga b/indra/newview/skins/blackred/textures/close_inactive_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/close_inactive_blue.tga rename to indra/newview/skins/blackred/textures/close_inactive_blue.tga diff --git a/indra/newview/skins/Blackred/textures/closebox.tga b/indra/newview/skins/blackred/textures/closebox.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/closebox.tga rename to indra/newview/skins/blackred/textures/closebox.tga diff --git a/indra/newview/skins/Blackred/textures/combobox_arrow.tga b/indra/newview/skins/blackred/textures/combobox_arrow.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/combobox_arrow.tga rename to indra/newview/skins/blackred/textures/combobox_arrow.tga diff --git a/indra/newview/skins/Blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/skins/blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c rename to indra/newview/skins/blackred/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c diff --git a/indra/newview/skins/Blackred/textures/darkgray.tga b/indra/newview/skins/blackred/textures/darkgray.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/darkgray.tga rename to indra/newview/skins/blackred/textures/darkgray.tga diff --git a/indra/newview/skins/Blackred/textures/default_land_picture.j2c b/indra/newview/skins/blackred/textures/default_land_picture.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/default_land_picture.j2c rename to indra/newview/skins/blackred/textures/default_land_picture.j2c diff --git a/indra/newview/skins/Blackred/textures/default_profile_picture.j2c b/indra/newview/skins/blackred/textures/default_profile_picture.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/default_profile_picture.j2c rename to indra/newview/skins/blackred/textures/default_profile_picture.j2c diff --git a/indra/newview/skins/Blackred/textures/direction_arrow.tga b/indra/newview/skins/blackred/textures/direction_arrow.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/direction_arrow.tga rename to indra/newview/skins/blackred/textures/direction_arrow.tga diff --git a/indra/newview/skins/Blackred/textures/down_arrow.png b/indra/newview/skins/blackred/textures/down_arrow.png similarity index 100% rename from indra/newview/skins/Blackred/textures/down_arrow.png rename to indra/newview/skins/blackred/textures/down_arrow.png diff --git a/indra/newview/skins/Blackred/textures/eye_button_active.tga b/indra/newview/skins/blackred/textures/eye_button_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/eye_button_active.tga rename to indra/newview/skins/blackred/textures/eye_button_active.tga diff --git a/indra/newview/skins/Blackred/textures/eye_button_inactive.tga b/indra/newview/skins/blackred/textures/eye_button_inactive.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/eye_button_inactive.tga rename to indra/newview/skins/blackred/textures/eye_button_inactive.tga diff --git a/indra/newview/skins/Blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/indra/newview/skins/blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga rename to indra/newview/skins/blackred/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga diff --git a/indra/newview/skins/Blackred/textures/ff_edit_mine_button.tga b/indra/newview/skins/blackred/textures/ff_edit_mine_button.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ff_edit_mine_button.tga rename to indra/newview/skins/blackred/textures/ff_edit_mine_button.tga diff --git a/indra/newview/skins/Blackred/textures/ff_edit_theirs_button.tga b/indra/newview/skins/blackred/textures/ff_edit_theirs_button.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ff_edit_theirs_button.tga rename to indra/newview/skins/blackred/textures/ff_edit_theirs_button.tga diff --git a/indra/newview/skins/Blackred/textures/ff_online_status_button.tga b/indra/newview/skins/blackred/textures/ff_online_status_button.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ff_online_status_button.tga rename to indra/newview/skins/blackred/textures/ff_online_status_button.tga diff --git a/indra/newview/skins/Blackred/textures/ff_visible_map_button.tga b/indra/newview/skins/blackred/textures/ff_visible_map_button.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ff_visible_map_button.tga rename to indra/newview/skins/blackred/textures/ff_visible_map_button.tga diff --git a/indra/newview/skins/Blackred/textures/ff_visible_online_button.tga b/indra/newview/skins/blackred/textures/ff_visible_online_button.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ff_visible_online_button.tga rename to indra/newview/skins/blackred/textures/ff_visible_online_button.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_left.tga b/indra/newview/skins/blackred/textures/flyout_btn_left.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_btn_left.tga rename to indra/newview/skins/blackred/textures/flyout_btn_left.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_left_disabled.tga b/indra/newview/skins/blackred/textures/flyout_btn_left_disabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_btn_left_disabled.tga rename to indra/newview/skins/blackred/textures/flyout_btn_left_disabled.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_left_selected.tga b/indra/newview/skins/blackred/textures/flyout_btn_left_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_btn_left_selected.tga rename to indra/newview/skins/blackred/textures/flyout_btn_left_selected.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_right.tga b/indra/newview/skins/blackred/textures/flyout_btn_right.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_btn_right.tga rename to indra/newview/skins/blackred/textures/flyout_btn_right.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_right_disabled.tga b/indra/newview/skins/blackred/textures/flyout_btn_right_disabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_btn_right_disabled.tga rename to indra/newview/skins/blackred/textures/flyout_btn_right_disabled.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_btn_right_selected.tga b/indra/newview/skins/blackred/textures/flyout_btn_right_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_btn_right_selected.tga rename to indra/newview/skins/blackred/textures/flyout_btn_right_selected.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_left.tga b/indra/newview/skins/blackred/textures/flyout_left.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_left.tga rename to indra/newview/skins/blackred/textures/flyout_left.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_left_disabled.tga b/indra/newview/skins/blackred/textures/flyout_left_disabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_left_disabled.tga rename to indra/newview/skins/blackred/textures/flyout_left_disabled.tga diff --git a/indra/newview/skins/Blackred/textures/flyout_left_selected.tga b/indra/newview/skins/blackred/textures/flyout_left_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/flyout_left_selected.tga rename to indra/newview/skins/blackred/textures/flyout_left_selected.tga diff --git a/indra/newview/skins/Blackred/textures/icn_media-pause_active.tga b/indra/newview/skins/blackred/textures/icn_media-pause_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_media-pause_active.tga rename to indra/newview/skins/blackred/textures/icn_media-pause_active.tga diff --git a/indra/newview/skins/Blackred/textures/icn_media-pause_disabled.tga b/indra/newview/skins/blackred/textures/icn_media-pause_disabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_media-pause_disabled.tga rename to indra/newview/skins/blackred/textures/icn_media-pause_disabled.tga diff --git a/indra/newview/skins/Blackred/textures/icn_media-pause_enabled.tga b/indra/newview/skins/blackred/textures/icn_media-pause_enabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_media-pause_enabled.tga rename to indra/newview/skins/blackred/textures/icn_media-pause_enabled.tga diff --git a/indra/newview/skins/Blackred/textures/icn_media-play_enabled.tga b/indra/newview/skins/blackred/textures/icn_media-play_enabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_media-play_enabled.tga rename to indra/newview/skins/blackred/textures/icn_media-play_enabled.tga diff --git a/indra/newview/skins/Blackred/textures/icn_media-stop_enabled.tga b/indra/newview/skins/blackred/textures/icn_media-stop_enabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_media-stop_enabled.tga rename to indra/newview/skins/blackred/textures/icn_media-stop_enabled.tga diff --git a/indra/newview/skins/Blackred/textures/icn_media.tga b/indra/newview/skins/blackred/textures/icn_media.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_media.tga rename to indra/newview/skins/blackred/textures/icn_media.tga diff --git a/indra/newview/skins/Blackred/textures/icn_music.tga b/indra/newview/skins/blackred/textures/icn_music.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_music.tga rename to indra/newview/skins/blackred/textures/icn_music.tga diff --git a/indra/newview/skins/Blackred/textures/icn_rounded-text-field.tga b/indra/newview/skins/blackred/textures/icn_rounded-text-field.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_rounded-text-field.tga rename to indra/newview/skins/blackred/textures/icn_rounded-text-field.tga diff --git a/indra/newview/skins/Blackred/textures/icn_slide-groove_dark.tga b/indra/newview/skins/blackred/textures/icn_slide-groove_dark.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_slide-groove_dark.tga rename to indra/newview/skins/blackred/textures/icn_slide-groove_dark.tga diff --git a/indra/newview/skins/Blackred/textures/icn_slide-highlight.tga b/indra/newview/skins/blackred/textures/icn_slide-highlight.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_slide-highlight.tga rename to indra/newview/skins/blackred/textures/icn_slide-highlight.tga diff --git a/indra/newview/skins/Blackred/textures/icn_slide-thumb_dark.tga b/indra/newview/skins/blackred/textures/icn_slide-thumb_dark.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_slide-thumb_dark.tga rename to indra/newview/skins/blackred/textures/icn_slide-thumb_dark.tga diff --git a/indra/newview/skins/Blackred/textures/icn_speaker-muted_dark.tga b/indra/newview/skins/blackred/textures/icn_speaker-muted_dark.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_speaker-muted_dark.tga rename to indra/newview/skins/blackred/textures/icn_speaker-muted_dark.tga diff --git a/indra/newview/skins/Blackred/textures/icn_toolbar_radar.tga b/indra/newview/skins/blackred/textures/icn_toolbar_radar.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_toolbar_radar.tga rename to indra/newview/skins/blackred/textures/icn_toolbar_radar.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice-call-end.tga b/indra/newview/skins/blackred/textures/icn_voice-call-end.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice-call-end.tga rename to indra/newview/skins/blackred/textures/icn_voice-call-end.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice-call-start.tga b/indra/newview/skins/blackred/textures/icn_voice-call-start.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice-call-start.tga rename to indra/newview/skins/blackred/textures/icn_voice-call-start.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice-groupfocus.tga b/indra/newview/skins/blackred/textures/icn_voice-groupfocus.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice-groupfocus.tga rename to indra/newview/skins/blackred/textures/icn_voice-groupfocus.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice-localchat.tga b/indra/newview/skins/blackred/textures/icn_voice-localchat.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice-localchat.tga rename to indra/newview/skins/blackred/textures/icn_voice-localchat.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice-pvtfocus.tga b/indra/newview/skins/blackred/textures/icn_voice-pvtfocus.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice-pvtfocus.tga rename to indra/newview/skins/blackred/textures/icn_voice-pvtfocus.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-off.tga b/indra/newview/skins/blackred/textures/icn_voice_ptt-off.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice_ptt-off.tga rename to indra/newview/skins/blackred/textures/icn_voice_ptt-off.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl1.tga b/indra/newview/skins/blackred/textures/icn_voice_ptt-on-lvl1.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl1.tga rename to indra/newview/skins/blackred/textures/icn_voice_ptt-on-lvl1.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl2.tga b/indra/newview/skins/blackred/textures/icn_voice_ptt-on-lvl2.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl2.tga rename to indra/newview/skins/blackred/textures/icn_voice_ptt-on-lvl2.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl3.tga b/indra/newview/skins/blackred/textures/icn_voice_ptt-on-lvl3.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice_ptt-on-lvl3.tga rename to indra/newview/skins/blackred/textures/icn_voice_ptt-on-lvl3.tga diff --git a/indra/newview/skins/Blackred/textures/icn_voice_ptt-on.tga b/indra/newview/skins/blackred/textures/icn_voice_ptt-on.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icn_voice_ptt-on.tga rename to indra/newview/skins/blackred/textures/icn_voice_ptt-on.tga diff --git a/indra/newview/skins/Blackred/textures/icon_auction.tga b/indra/newview/skins/blackred/textures/icon_auction.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_auction.tga rename to indra/newview/skins/blackred/textures/icon_auction.tga diff --git a/indra/newview/skins/Blackred/textures/icon_avatar_offline.tga b/indra/newview/skins/blackred/textures/icon_avatar_offline.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_avatar_offline.tga rename to indra/newview/skins/blackred/textures/icon_avatar_offline.tga diff --git a/indra/newview/skins/Blackred/textures/icon_avatar_online.tga b/indra/newview/skins/blackred/textures/icon_avatar_online.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_avatar_online.tga rename to indra/newview/skins/blackred/textures/icon_avatar_online.tga diff --git a/indra/newview/skins/Blackred/textures/icon_event.tga b/indra/newview/skins/blackred/textures/icon_event.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_event.tga rename to indra/newview/skins/blackred/textures/icon_event.tga diff --git a/indra/newview/skins/Blackred/textures/icon_event_adult.tga b/indra/newview/skins/blackred/textures/icon_event_adult.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_event_adult.tga rename to indra/newview/skins/blackred/textures/icon_event_adult.tga diff --git a/indra/newview/skins/Blackred/textures/icon_event_mature.tga b/indra/newview/skins/blackred/textures/icon_event_mature.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_event_mature.tga rename to indra/newview/skins/blackred/textures/icon_event_mature.tga diff --git a/indra/newview/skins/Blackred/textures/icon_for_sale.tga b/indra/newview/skins/blackred/textures/icon_for_sale.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_for_sale.tga rename to indra/newview/skins/blackred/textures/icon_for_sale.tga diff --git a/indra/newview/skins/Blackred/textures/icon_for_sale_adult.tga b/indra/newview/skins/blackred/textures/icon_for_sale_adult.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_for_sale_adult.tga rename to indra/newview/skins/blackred/textures/icon_for_sale_adult.tga diff --git a/indra/newview/skins/Blackred/textures/icon_group.tga b/indra/newview/skins/blackred/textures/icon_group.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_group.tga rename to indra/newview/skins/blackred/textures/icon_group.tga diff --git a/indra/newview/skins/Blackred/textures/icon_groupnotice.tga b/indra/newview/skins/blackred/textures/icon_groupnotice.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_groupnotice.tga rename to indra/newview/skins/blackred/textures/icon_groupnotice.tga diff --git a/indra/newview/skins/Blackred/textures/icon_groupnoticeinventory.tga b/indra/newview/skins/blackred/textures/icon_groupnoticeinventory.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_groupnoticeinventory.tga rename to indra/newview/skins/blackred/textures/icon_groupnoticeinventory.tga diff --git a/indra/newview/skins/Blackred/textures/icon_lock.tga b/indra/newview/skins/blackred/textures/icon_lock.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_lock.tga rename to indra/newview/skins/blackred/textures/icon_lock.tga diff --git a/indra/newview/skins/Blackred/textures/icon_place.tga b/indra/newview/skins/blackred/textures/icon_place.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_place.tga rename to indra/newview/skins/blackred/textures/icon_place.tga diff --git a/indra/newview/skins/Blackred/textures/icon_popular.tga b/indra/newview/skins/blackred/textures/icon_popular.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_popular.tga rename to indra/newview/skins/blackred/textures/icon_popular.tga diff --git a/indra/newview/skins/Blackred/textures/icon_top_pick.tga b/indra/newview/skins/blackred/textures/icon_top_pick.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/icon_top_pick.tga rename to indra/newview/skins/blackred/textures/icon_top_pick.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_animation.tga b/indra/newview/skins/blackred/textures/inv_folder_animation.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_animation.tga rename to indra/newview/skins/blackred/textures/inv_folder_animation.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_bodypart.tga b/indra/newview/skins/blackred/textures/inv_folder_bodypart.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_bodypart.tga rename to indra/newview/skins/blackred/textures/inv_folder_bodypart.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_callingcard.tga b/indra/newview/skins/blackred/textures/inv_folder_callingcard.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_callingcard.tga rename to indra/newview/skins/blackred/textures/inv_folder_callingcard.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_clothing.tga b/indra/newview/skins/blackred/textures/inv_folder_clothing.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_clothing.tga rename to indra/newview/skins/blackred/textures/inv_folder_clothing.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_gesture.tga b/indra/newview/skins/blackred/textures/inv_folder_gesture.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_gesture.tga rename to indra/newview/skins/blackred/textures/inv_folder_gesture.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_landmark.tga b/indra/newview/skins/blackred/textures/inv_folder_landmark.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_landmark.tga rename to indra/newview/skins/blackred/textures/inv_folder_landmark.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_lostandfound.tga b/indra/newview/skins/blackred/textures/inv_folder_lostandfound.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_lostandfound.tga rename to indra/newview/skins/blackred/textures/inv_folder_lostandfound.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_notecard.tga b/indra/newview/skins/blackred/textures/inv_folder_notecard.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_notecard.tga rename to indra/newview/skins/blackred/textures/inv_folder_notecard.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_object.tga b/indra/newview/skins/blackred/textures/inv_folder_object.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_object.tga rename to indra/newview/skins/blackred/textures/inv_folder_object.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_plain_closed.tga b/indra/newview/skins/blackred/textures/inv_folder_plain_closed.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_plain_closed.tga rename to indra/newview/skins/blackred/textures/inv_folder_plain_closed.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_plain_open.tga b/indra/newview/skins/blackred/textures/inv_folder_plain_open.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_plain_open.tga rename to indra/newview/skins/blackred/textures/inv_folder_plain_open.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_script.tga b/indra/newview/skins/blackred/textures/inv_folder_script.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_script.tga rename to indra/newview/skins/blackred/textures/inv_folder_script.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_snapshot.tga b/indra/newview/skins/blackred/textures/inv_folder_snapshot.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_snapshot.tga rename to indra/newview/skins/blackred/textures/inv_folder_snapshot.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_sound.tga b/indra/newview/skins/blackred/textures/inv_folder_sound.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_sound.tga rename to indra/newview/skins/blackred/textures/inv_folder_sound.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_texture.tga b/indra/newview/skins/blackred/textures/inv_folder_texture.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_texture.tga rename to indra/newview/skins/blackred/textures/inv_folder_texture.tga diff --git a/indra/newview/skins/Blackred/textures/inv_folder_trash.tga b/indra/newview/skins/blackred/textures/inv_folder_trash.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_folder_trash.tga rename to indra/newview/skins/blackred/textures/inv_folder_trash.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_animation.tga b/indra/newview/skins/blackred/textures/inv_item_animation.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_animation.tga rename to indra/newview/skins/blackred/textures/inv_item_animation.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_attach.tga b/indra/newview/skins/blackred/textures/inv_item_attach.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_attach.tga rename to indra/newview/skins/blackred/textures/inv_item_attach.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_callingcard_offline.tga b/indra/newview/skins/blackred/textures/inv_item_callingcard_offline.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_callingcard_offline.tga rename to indra/newview/skins/blackred/textures/inv_item_callingcard_offline.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_callingcard_online.tga b/indra/newview/skins/blackred/textures/inv_item_callingcard_online.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_callingcard_online.tga rename to indra/newview/skins/blackred/textures/inv_item_callingcard_online.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_clothing.tga b/indra/newview/skins/blackred/textures/inv_item_clothing.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_clothing.tga rename to indra/newview/skins/blackred/textures/inv_item_clothing.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_eyes.tga b/indra/newview/skins/blackred/textures/inv_item_eyes.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_eyes.tga rename to indra/newview/skins/blackred/textures/inv_item_eyes.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_gesture.tga b/indra/newview/skins/blackred/textures/inv_item_gesture.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_gesture.tga rename to indra/newview/skins/blackred/textures/inv_item_gesture.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_gloves.tga b/indra/newview/skins/blackred/textures/inv_item_gloves.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_gloves.tga rename to indra/newview/skins/blackred/textures/inv_item_gloves.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_hair.tga b/indra/newview/skins/blackred/textures/inv_item_hair.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_hair.tga rename to indra/newview/skins/blackred/textures/inv_item_hair.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_jacket.tga b/indra/newview/skins/blackred/textures/inv_item_jacket.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_jacket.tga rename to indra/newview/skins/blackred/textures/inv_item_jacket.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_landmark.tga b/indra/newview/skins/blackred/textures/inv_item_landmark.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_landmark.tga rename to indra/newview/skins/blackred/textures/inv_item_landmark.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_landmark_visited.tga b/indra/newview/skins/blackred/textures/inv_item_landmark_visited.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_landmark_visited.tga rename to indra/newview/skins/blackred/textures/inv_item_landmark_visited.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_notecard.tga b/indra/newview/skins/blackred/textures/inv_item_notecard.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_notecard.tga rename to indra/newview/skins/blackred/textures/inv_item_notecard.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_object.tga b/indra/newview/skins/blackred/textures/inv_item_object.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_object.tga rename to indra/newview/skins/blackred/textures/inv_item_object.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_object_multi.tga b/indra/newview/skins/blackred/textures/inv_item_object_multi.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_object_multi.tga rename to indra/newview/skins/blackred/textures/inv_item_object_multi.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_pants.tga b/indra/newview/skins/blackred/textures/inv_item_pants.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_pants.tga rename to indra/newview/skins/blackred/textures/inv_item_pants.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_script.tga b/indra/newview/skins/blackred/textures/inv_item_script.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_script.tga rename to indra/newview/skins/blackred/textures/inv_item_script.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_script_dangerous.tga b/indra/newview/skins/blackred/textures/inv_item_script_dangerous.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_script_dangerous.tga rename to indra/newview/skins/blackred/textures/inv_item_script_dangerous.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_shape.tga b/indra/newview/skins/blackred/textures/inv_item_shape.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_shape.tga rename to indra/newview/skins/blackred/textures/inv_item_shape.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_shirt.tga b/indra/newview/skins/blackred/textures/inv_item_shirt.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_shirt.tga rename to indra/newview/skins/blackred/textures/inv_item_shirt.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_shoes.tga b/indra/newview/skins/blackred/textures/inv_item_shoes.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_shoes.tga rename to indra/newview/skins/blackred/textures/inv_item_shoes.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_skin.tga b/indra/newview/skins/blackred/textures/inv_item_skin.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_skin.tga rename to indra/newview/skins/blackred/textures/inv_item_skin.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_skirt.tga b/indra/newview/skins/blackred/textures/inv_item_skirt.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_skirt.tga rename to indra/newview/skins/blackred/textures/inv_item_skirt.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_snapshot.tga b/indra/newview/skins/blackred/textures/inv_item_snapshot.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_snapshot.tga rename to indra/newview/skins/blackred/textures/inv_item_snapshot.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_socks.tga b/indra/newview/skins/blackred/textures/inv_item_socks.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_socks.tga rename to indra/newview/skins/blackred/textures/inv_item_socks.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_sound.tga b/indra/newview/skins/blackred/textures/inv_item_sound.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_sound.tga rename to indra/newview/skins/blackred/textures/inv_item_sound.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_texture.tga b/indra/newview/skins/blackred/textures/inv_item_texture.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_texture.tga rename to indra/newview/skins/blackred/textures/inv_item_texture.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_underpants.tga b/indra/newview/skins/blackred/textures/inv_item_underpants.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_underpants.tga rename to indra/newview/skins/blackred/textures/inv_item_underpants.tga diff --git a/indra/newview/skins/Blackred/textures/inv_item_undershirt.tga b/indra/newview/skins/blackred/textures/inv_item_undershirt.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/inv_item_undershirt.tga rename to indra/newview/skins/blackred/textures/inv_item_undershirt.tga diff --git a/indra/newview/skins/Blackred/textures/lightgray.tga b/indra/newview/skins/blackred/textures/lightgray.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/lightgray.tga rename to indra/newview/skins/blackred/textures/lightgray.tga diff --git a/indra/newview/skins/Blackred/textures/map_avatar_16.tga b/indra/newview/skins/blackred/textures/map_avatar_16.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_avatar_16.tga rename to indra/newview/skins/blackred/textures/map_avatar_16.tga diff --git a/indra/newview/skins/Blackred/textures/map_avatar_8.tga b/indra/newview/skins/blackred/textures/map_avatar_8.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_avatar_8.tga rename to indra/newview/skins/blackred/textures/map_avatar_8.tga diff --git a/indra/newview/skins/Blackred/textures/map_avatar_above_8.tga b/indra/newview/skins/blackred/textures/map_avatar_above_8.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_avatar_above_8.tga rename to indra/newview/skins/blackred/textures/map_avatar_above_8.tga diff --git a/indra/newview/skins/Blackred/textures/map_avatar_below_8.tga b/indra/newview/skins/blackred/textures/map_avatar_below_8.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_avatar_below_8.tga rename to indra/newview/skins/blackred/textures/map_avatar_below_8.tga diff --git a/indra/newview/skins/Blackred/textures/map_avatar_you_8.tga b/indra/newview/skins/blackred/textures/map_avatar_you_8.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_avatar_you_8.tga rename to indra/newview/skins/blackred/textures/map_avatar_you_8.tga diff --git a/indra/newview/skins/Blackred/textures/map_event.tga b/indra/newview/skins/blackred/textures/map_event.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_event.tga rename to indra/newview/skins/blackred/textures/map_event.tga diff --git a/indra/newview/skins/Blackred/textures/map_event_adult.tga b/indra/newview/skins/blackred/textures/map_event_adult.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_event_adult.tga rename to indra/newview/skins/blackred/textures/map_event_adult.tga diff --git a/indra/newview/skins/Blackred/textures/map_event_mature.tga b/indra/newview/skins/blackred/textures/map_event_mature.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_event_mature.tga rename to indra/newview/skins/blackred/textures/map_event_mature.tga diff --git a/indra/newview/skins/Blackred/textures/map_home.tga b/indra/newview/skins/blackred/textures/map_home.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_home.tga rename to indra/newview/skins/blackred/textures/map_home.tga diff --git a/indra/newview/skins/Blackred/textures/map_infohub.tga b/indra/newview/skins/blackred/textures/map_infohub.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_infohub.tga rename to indra/newview/skins/blackred/textures/map_infohub.tga diff --git a/indra/newview/skins/Blackred/textures/map_telehub.tga b/indra/newview/skins/blackred/textures/map_telehub.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_telehub.tga rename to indra/newview/skins/blackred/textures/map_telehub.tga diff --git a/indra/newview/skins/Blackred/textures/map_track_16.tga b/indra/newview/skins/blackred/textures/map_track_16.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_track_16.tga rename to indra/newview/skins/blackred/textures/map_track_16.tga diff --git a/indra/newview/skins/Blackred/textures/map_track_8.tga b/indra/newview/skins/blackred/textures/map_track_8.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/map_track_8.tga rename to indra/newview/skins/blackred/textures/map_track_8.tga diff --git a/indra/newview/skins/Blackred/textures/minimize.tga b/indra/newview/skins/blackred/textures/minimize.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/minimize.tga rename to indra/newview/skins/blackred/textures/minimize.tga diff --git a/indra/newview/skins/Blackred/textures/minimize_inactive.tga b/indra/newview/skins/blackred/textures/minimize_inactive.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/minimize_inactive.tga rename to indra/newview/skins/blackred/textures/minimize_inactive.tga diff --git a/indra/newview/skins/Blackred/textures/minimize_pressed.tga b/indra/newview/skins/blackred/textures/minimize_pressed.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/minimize_pressed.tga rename to indra/newview/skins/blackred/textures/minimize_pressed.tga diff --git a/indra/newview/skins/Blackred/textures/move_backward_in.tga b/indra/newview/skins/blackred/textures/move_backward_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_backward_in.tga rename to indra/newview/skins/blackred/textures/move_backward_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_backward_out.tga b/indra/newview/skins/blackred/textures/move_backward_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_backward_out.tga rename to indra/newview/skins/blackred/textures/move_backward_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_down_in.tga b/indra/newview/skins/blackred/textures/move_down_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_down_in.tga rename to indra/newview/skins/blackred/textures/move_down_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_down_out.tga b/indra/newview/skins/blackred/textures/move_down_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_down_out.tga rename to indra/newview/skins/blackred/textures/move_down_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_forward_in.tga b/indra/newview/skins/blackred/textures/move_forward_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_forward_in.tga rename to indra/newview/skins/blackred/textures/move_forward_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_forward_out.tga b/indra/newview/skins/blackred/textures/move_forward_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_forward_out.tga rename to indra/newview/skins/blackred/textures/move_forward_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_left_in.tga b/indra/newview/skins/blackred/textures/move_left_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_left_in.tga rename to indra/newview/skins/blackred/textures/move_left_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_left_out.tga b/indra/newview/skins/blackred/textures/move_left_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_left_out.tga rename to indra/newview/skins/blackred/textures/move_left_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_right_in.tga b/indra/newview/skins/blackred/textures/move_right_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_right_in.tga rename to indra/newview/skins/blackred/textures/move_right_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_right_out.tga b/indra/newview/skins/blackred/textures/move_right_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_right_out.tga rename to indra/newview/skins/blackred/textures/move_right_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_turn_left_in.tga b/indra/newview/skins/blackred/textures/move_turn_left_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_turn_left_in.tga rename to indra/newview/skins/blackred/textures/move_turn_left_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_turn_left_out.tga b/indra/newview/skins/blackred/textures/move_turn_left_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_turn_left_out.tga rename to indra/newview/skins/blackred/textures/move_turn_left_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_turn_right_in.tga b/indra/newview/skins/blackred/textures/move_turn_right_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_turn_right_in.tga rename to indra/newview/skins/blackred/textures/move_turn_right_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_turn_right_out.tga b/indra/newview/skins/blackred/textures/move_turn_right_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_turn_right_out.tga rename to indra/newview/skins/blackred/textures/move_turn_right_out.tga diff --git a/indra/newview/skins/Blackred/textures/move_up_in.tga b/indra/newview/skins/blackred/textures/move_up_in.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_up_in.tga rename to indra/newview/skins/blackred/textures/move_up_in.tga diff --git a/indra/newview/skins/Blackred/textures/move_up_out.tga b/indra/newview/skins/blackred/textures/move_up_out.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/move_up_out.tga rename to indra/newview/skins/blackred/textures/move_up_out.tga diff --git a/indra/newview/skins/Blackred/textures/notify_box_icon.tga b/indra/newview/skins/blackred/textures/notify_box_icon.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/notify_box_icon.tga rename to indra/newview/skins/blackred/textures/notify_box_icon.tga diff --git a/indra/newview/skins/Blackred/textures/notify_caution_icon.tga b/indra/newview/skins/blackred/textures/notify_caution_icon.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/notify_caution_icon.tga rename to indra/newview/skins/blackred/textures/notify_caution_icon.tga diff --git a/indra/newview/skins/Blackred/textures/notify_next.png b/indra/newview/skins/blackred/textures/notify_next.png similarity index 100% rename from indra/newview/skins/Blackred/textures/notify_next.png rename to indra/newview/skins/blackred/textures/notify_next.png diff --git a/indra/newview/skins/Blackred/textures/notify_tip_icon.tga b/indra/newview/skins/blackred/textures/notify_tip_icon.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/notify_tip_icon.tga rename to indra/newview/skins/blackred/textures/notify_tip_icon.tga diff --git a/indra/newview/skins/Blackred/textures/object_cone.tga b/indra/newview/skins/blackred/textures/object_cone.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_cone.tga rename to indra/newview/skins/blackred/textures/object_cone.tga diff --git a/indra/newview/skins/Blackred/textures/object_cone_active.tga b/indra/newview/skins/blackred/textures/object_cone_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_cone_active.tga rename to indra/newview/skins/blackred/textures/object_cone_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_cube.tga b/indra/newview/skins/blackred/textures/object_cube.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_cube.tga rename to indra/newview/skins/blackred/textures/object_cube.tga diff --git a/indra/newview/skins/Blackred/textures/object_cube_active.tga b/indra/newview/skins/blackred/textures/object_cube_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_cube_active.tga rename to indra/newview/skins/blackred/textures/object_cube_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_cylinder.tga b/indra/newview/skins/blackred/textures/object_cylinder.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_cylinder.tga rename to indra/newview/skins/blackred/textures/object_cylinder.tga diff --git a/indra/newview/skins/Blackred/textures/object_cylinder_active.tga b/indra/newview/skins/blackred/textures/object_cylinder_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_cylinder_active.tga rename to indra/newview/skins/blackred/textures/object_cylinder_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_grass.tga b/indra/newview/skins/blackred/textures/object_grass.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_grass.tga rename to indra/newview/skins/blackred/textures/object_grass.tga diff --git a/indra/newview/skins/Blackred/textures/object_grass_active.tga b/indra/newview/skins/blackred/textures/object_grass_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_grass_active.tga rename to indra/newview/skins/blackred/textures/object_grass_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cone.tga b/indra/newview/skins/blackred/textures/object_hemi_cone.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_hemi_cone.tga rename to indra/newview/skins/blackred/textures/object_hemi_cone.tga diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cone_active.tga b/indra/newview/skins/blackred/textures/object_hemi_cone_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_hemi_cone_active.tga rename to indra/newview/skins/blackred/textures/object_hemi_cone_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cylinder.tga b/indra/newview/skins/blackred/textures/object_hemi_cylinder.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_hemi_cylinder.tga rename to indra/newview/skins/blackred/textures/object_hemi_cylinder.tga diff --git a/indra/newview/skins/Blackred/textures/object_hemi_cylinder_active.tga b/indra/newview/skins/blackred/textures/object_hemi_cylinder_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_hemi_cylinder_active.tga rename to indra/newview/skins/blackred/textures/object_hemi_cylinder_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_hemi_sphere.tga b/indra/newview/skins/blackred/textures/object_hemi_sphere.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_hemi_sphere.tga rename to indra/newview/skins/blackred/textures/object_hemi_sphere.tga diff --git a/indra/newview/skins/Blackred/textures/object_hemi_sphere_active.tga b/indra/newview/skins/blackred/textures/object_hemi_sphere_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_hemi_sphere_active.tga rename to indra/newview/skins/blackred/textures/object_hemi_sphere_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_prism.tga b/indra/newview/skins/blackred/textures/object_prism.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_prism.tga rename to indra/newview/skins/blackred/textures/object_prism.tga diff --git a/indra/newview/skins/Blackred/textures/object_prism_active.tga b/indra/newview/skins/blackred/textures/object_prism_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_prism_active.tga rename to indra/newview/skins/blackred/textures/object_prism_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_pyramid.tga b/indra/newview/skins/blackred/textures/object_pyramid.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_pyramid.tga rename to indra/newview/skins/blackred/textures/object_pyramid.tga diff --git a/indra/newview/skins/Blackred/textures/object_pyramid_active.tga b/indra/newview/skins/blackred/textures/object_pyramid_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_pyramid_active.tga rename to indra/newview/skins/blackred/textures/object_pyramid_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_ring.tga b/indra/newview/skins/blackred/textures/object_ring.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_ring.tga rename to indra/newview/skins/blackred/textures/object_ring.tga diff --git a/indra/newview/skins/Blackred/textures/object_ring_active.tga b/indra/newview/skins/blackred/textures/object_ring_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_ring_active.tga rename to indra/newview/skins/blackred/textures/object_ring_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_sphere.tga b/indra/newview/skins/blackred/textures/object_sphere.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_sphere.tga rename to indra/newview/skins/blackred/textures/object_sphere.tga diff --git a/indra/newview/skins/Blackred/textures/object_sphere_active.tga b/indra/newview/skins/blackred/textures/object_sphere_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_sphere_active.tga rename to indra/newview/skins/blackred/textures/object_sphere_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_tetrahedron.tga b/indra/newview/skins/blackred/textures/object_tetrahedron.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_tetrahedron.tga rename to indra/newview/skins/blackred/textures/object_tetrahedron.tga diff --git a/indra/newview/skins/Blackred/textures/object_tetrahedron_active.tga b/indra/newview/skins/blackred/textures/object_tetrahedron_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_tetrahedron_active.tga rename to indra/newview/skins/blackred/textures/object_tetrahedron_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_torus.tga b/indra/newview/skins/blackred/textures/object_torus.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_torus.tga rename to indra/newview/skins/blackred/textures/object_torus.tga diff --git a/indra/newview/skins/Blackred/textures/object_torus_active.tga b/indra/newview/skins/blackred/textures/object_torus_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_torus_active.tga rename to indra/newview/skins/blackred/textures/object_torus_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_tree.tga b/indra/newview/skins/blackred/textures/object_tree.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_tree.tga rename to indra/newview/skins/blackred/textures/object_tree.tga diff --git a/indra/newview/skins/Blackred/textures/object_tree_active.tga b/indra/newview/skins/blackred/textures/object_tree_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_tree_active.tga rename to indra/newview/skins/blackred/textures/object_tree_active.tga diff --git a/indra/newview/skins/Blackred/textures/object_tube.tga b/indra/newview/skins/blackred/textures/object_tube.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_tube.tga rename to indra/newview/skins/blackred/textures/object_tube.tga diff --git a/indra/newview/skins/Blackred/textures/object_tube_active.tga b/indra/newview/skins/blackred/textures/object_tube_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/object_tube_active.tga rename to indra/newview/skins/blackred/textures/object_tube_active.tga diff --git a/indra/newview/skins/Blackred/textures/preview.png b/indra/newview/skins/blackred/textures/preview.png similarity index 100% rename from indra/newview/skins/Blackred/textures/preview.png rename to indra/newview/skins/blackred/textures/preview.png diff --git a/indra/newview/skins/Blackred/textures/progress_fill.tga b/indra/newview/skins/blackred/textures/progress_fill.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/progress_fill.tga rename to indra/newview/skins/blackred/textures/progress_fill.tga diff --git a/indra/newview/skins/Blackred/textures/progressbar_fill.tga b/indra/newview/skins/blackred/textures/progressbar_fill.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/progressbar_fill.tga rename to indra/newview/skins/blackred/textures/progressbar_fill.tga diff --git a/indra/newview/skins/Blackred/textures/progressbar_track.tga b/indra/newview/skins/blackred/textures/progressbar_track.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/progressbar_track.tga rename to indra/newview/skins/blackred/textures/progressbar_track.tga diff --git a/indra/newview/skins/Blackred/textures/ptt_lock_off.tga b/indra/newview/skins/blackred/textures/ptt_lock_off.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ptt_lock_off.tga rename to indra/newview/skins/blackred/textures/ptt_lock_off.tga diff --git a/indra/newview/skins/Blackred/textures/ptt_lock_on.tga b/indra/newview/skins/blackred/textures/ptt_lock_on.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/ptt_lock_on.tga rename to indra/newview/skins/blackred/textures/ptt_lock_on.tga diff --git a/indra/newview/skins/Blackred/textures/radio_active_false.tga b/indra/newview/skins/blackred/textures/radio_active_false.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/radio_active_false.tga rename to indra/newview/skins/blackred/textures/radio_active_false.tga diff --git a/indra/newview/skins/Blackred/textures/radio_active_true.tga b/indra/newview/skins/blackred/textures/radio_active_true.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/radio_active_true.tga rename to indra/newview/skins/blackred/textures/radio_active_true.tga diff --git a/indra/newview/skins/Blackred/textures/radio_inactive_false.tga b/indra/newview/skins/blackred/textures/radio_inactive_false.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/radio_inactive_false.tga rename to indra/newview/skins/blackred/textures/radio_inactive_false.tga diff --git a/indra/newview/skins/Blackred/textures/radio_inactive_true.tga b/indra/newview/skins/blackred/textures/radio_inactive_true.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/radio_inactive_true.tga rename to indra/newview/skins/blackred/textures/radio_inactive_true.tga diff --git a/indra/newview/skins/Blackred/textures/resize_handle_bottom_right_blue.tga b/indra/newview/skins/blackred/textures/resize_handle_bottom_right_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/resize_handle_bottom_right_blue.tga rename to indra/newview/skins/blackred/textures/resize_handle_bottom_right_blue.tga diff --git a/indra/newview/skins/Blackred/textures/restore.tga b/indra/newview/skins/blackred/textures/restore.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/restore.tga rename to indra/newview/skins/blackred/textures/restore.tga diff --git a/indra/newview/skins/Blackred/textures/restore_inactive.tga b/indra/newview/skins/blackred/textures/restore_inactive.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/restore_inactive.tga rename to indra/newview/skins/blackred/textures/restore_inactive.tga diff --git a/indra/newview/skins/Blackred/textures/restore_pressed.tga b/indra/newview/skins/blackred/textures/restore_pressed.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/restore_pressed.tga rename to indra/newview/skins/blackred/textures/restore_pressed.tga diff --git a/indra/newview/skins/Blackred/textures/rounded_square.j2c b/indra/newview/skins/blackred/textures/rounded_square.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/rounded_square.j2c rename to indra/newview/skins/blackred/textures/rounded_square.j2c diff --git a/indra/newview/skins/Blackred/textures/rounded_square.tga b/indra/newview/skins/blackred/textures/rounded_square.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/rounded_square.tga rename to indra/newview/skins/blackred/textures/rounded_square.tga diff --git a/indra/newview/skins/Blackred/textures/rounded_square_soft.tga b/indra/newview/skins/blackred/textures/rounded_square_soft.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/rounded_square_soft.tga rename to indra/newview/skins/blackred/textures/rounded_square_soft.tga diff --git a/indra/newview/skins/Blackred/textures/script_error.j2c b/indra/newview/skins/blackred/textures/script_error.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/script_error.j2c rename to indra/newview/skins/blackred/textures/script_error.j2c diff --git a/indra/newview/skins/Blackred/textures/script_error.tga b/indra/newview/skins/blackred/textures/script_error.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/script_error.tga rename to indra/newview/skins/blackred/textures/script_error.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_down_in_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_down_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_down_in_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_down_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_down_out_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_down_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_down_out_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_down_out_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_left_in_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_left_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_left_in_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_left_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_left_out_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_left_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_left_out_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_left_out_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_right_in_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_right_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_right_in_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_right_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_right_out_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_right_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_right_out_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_right_out_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_up_in_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_up_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_up_in_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_up_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/scrollbutton_up_out_blue.tga b/indra/newview/skins/blackred/textures/scrollbutton_up_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/scrollbutton_up_out_blue.tga rename to indra/newview/skins/blackred/textures/scrollbutton_up_out_blue.tga diff --git a/indra/newview/skins/Blackred/textures/sm_rounded_corners_simple.tga b/indra/newview/skins/blackred/textures/sm_rounded_corners_simple.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/sm_rounded_corners_simple.tga rename to indra/newview/skins/blackred/textures/sm_rounded_corners_simple.tga diff --git a/indra/newview/skins/Blackred/textures/spin_down_in_blue.tga b/indra/newview/skins/blackred/textures/spin_down_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/spin_down_in_blue.tga rename to indra/newview/skins/blackred/textures/spin_down_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/spin_down_out_blue.tga b/indra/newview/skins/blackred/textures/spin_down_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/spin_down_out_blue.tga rename to indra/newview/skins/blackred/textures/spin_down_out_blue.tga diff --git a/indra/newview/skins/Blackred/textures/spin_up_in_blue.tga b/indra/newview/skins/blackred/textures/spin_up_in_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/spin_up_in_blue.tga rename to indra/newview/skins/blackred/textures/spin_up_in_blue.tga diff --git a/indra/newview/skins/Blackred/textures/spin_up_out_blue.tga b/indra/newview/skins/blackred/textures/spin_up_out_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/spin_up_out_blue.tga rename to indra/newview/skins/blackred/textures/spin_up_out_blue.tga diff --git a/indra/newview/skins/Blackred/textures/square_btn_32x128.tga b/indra/newview/skins/blackred/textures/square_btn_32x128.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/square_btn_32x128.tga rename to indra/newview/skins/blackred/textures/square_btn_32x128.tga diff --git a/indra/newview/skins/Blackred/textures/square_btn_selected_32x128.tga b/indra/newview/skins/blackred/textures/square_btn_selected_32x128.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/square_btn_selected_32x128.tga rename to indra/newview/skins/blackred/textures/square_btn_selected_32x128.tga diff --git a/indra/newview/skins/Blackred/textures/startup_logo.j2c b/indra/newview/skins/blackred/textures/startup_logo.j2c similarity index 100% rename from indra/newview/skins/Blackred/textures/startup_logo.j2c rename to indra/newview/skins/blackred/textures/startup_logo.j2c diff --git a/indra/newview/skins/Blackred/textures/status_buy_currency.tga b/indra/newview/skins/blackred/textures/status_buy_currency.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_buy_currency.tga rename to indra/newview/skins/blackred/textures/status_buy_currency.tga diff --git a/indra/newview/skins/Blackred/textures/status_buy_currency_pressed.tga b/indra/newview/skins/blackred/textures/status_buy_currency_pressed.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_buy_currency_pressed.tga rename to indra/newview/skins/blackred/textures/status_buy_currency_pressed.tga diff --git a/indra/newview/skins/Blackred/textures/status_buy_land.tga b/indra/newview/skins/blackred/textures/status_buy_land.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_buy_land.tga rename to indra/newview/skins/blackred/textures/status_buy_land.tga diff --git a/indra/newview/skins/Blackred/textures/status_buy_land_pressed.tga b/indra/newview/skins/blackred/textures/status_buy_land_pressed.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_buy_land_pressed.tga rename to indra/newview/skins/blackred/textures/status_buy_land_pressed.tga diff --git a/indra/newview/skins/Blackred/textures/status_health.tga b/indra/newview/skins/blackred/textures/status_health.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_health.tga rename to indra/newview/skins/blackred/textures/status_health.tga diff --git a/indra/newview/skins/Blackred/textures/status_no_build.tga b/indra/newview/skins/blackred/textures/status_no_build.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_no_build.tga rename to indra/newview/skins/blackred/textures/status_no_build.tga diff --git a/indra/newview/skins/Blackred/textures/status_no_fly.tga b/indra/newview/skins/blackred/textures/status_no_fly.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_no_fly.tga rename to indra/newview/skins/blackred/textures/status_no_fly.tga diff --git a/indra/newview/skins/Blackred/textures/status_no_push.tga b/indra/newview/skins/blackred/textures/status_no_push.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_no_push.tga rename to indra/newview/skins/blackred/textures/status_no_push.tga diff --git a/indra/newview/skins/Blackred/textures/status_no_scripts.tga b/indra/newview/skins/blackred/textures/status_no_scripts.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_no_scripts.tga rename to indra/newview/skins/blackred/textures/status_no_scripts.tga diff --git a/indra/newview/skins/Blackred/textures/status_no_voice.tga b/indra/newview/skins/blackred/textures/status_no_voice.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_no_voice.tga rename to indra/newview/skins/blackred/textures/status_no_voice.tga diff --git a/indra/newview/skins/Blackred/textures/status_script_debug.tga b/indra/newview/skins/blackred/textures/status_script_debug.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_script_debug.tga rename to indra/newview/skins/blackred/textures/status_script_debug.tga diff --git a/indra/newview/skins/Blackred/textures/status_search_btn.png b/indra/newview/skins/blackred/textures/status_search_btn.png similarity index 100% rename from indra/newview/skins/Blackred/textures/status_search_btn.png rename to indra/newview/skins/blackred/textures/status_search_btn.png diff --git a/indra/newview/skins/Blackred/textures/status_search_btn_pressed.png b/indra/newview/skins/blackred/textures/status_search_btn_pressed.png similarity index 100% rename from indra/newview/skins/Blackred/textures/status_search_btn_pressed.png rename to indra/newview/skins/blackred/textures/status_search_btn_pressed.png diff --git a/indra/newview/skins/Blackred/textures/status_voice.tga b/indra/newview/skins/blackred/textures/status_voice.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/status_voice.tga rename to indra/newview/skins/blackred/textures/status_voice.tga diff --git a/indra/newview/skins/Blackred/textures/tab_bottom_blue.tga b/indra/newview/skins/blackred/textures/tab_bottom_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tab_bottom_blue.tga rename to indra/newview/skins/blackred/textures/tab_bottom_blue.tga diff --git a/indra/newview/skins/Blackred/textures/tab_bottom_selected_blue.tga b/indra/newview/skins/blackred/textures/tab_bottom_selected_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tab_bottom_selected_blue.tga rename to indra/newview/skins/blackred/textures/tab_bottom_selected_blue.tga diff --git a/indra/newview/skins/Blackred/textures/tab_left.tga b/indra/newview/skins/blackred/textures/tab_left.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tab_left.tga rename to indra/newview/skins/blackred/textures/tab_left.tga diff --git a/indra/newview/skins/Blackred/textures/tab_left_selected.tga b/indra/newview/skins/blackred/textures/tab_left_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tab_left_selected.tga rename to indra/newview/skins/blackred/textures/tab_left_selected.tga diff --git a/indra/newview/skins/Blackred/textures/tab_top_blue.tga b/indra/newview/skins/blackred/textures/tab_top_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tab_top_blue.tga rename to indra/newview/skins/blackred/textures/tab_top_blue.tga diff --git a/indra/newview/skins/Blackred/textures/tab_top_selected_blue.tga b/indra/newview/skins/blackred/textures/tab_top_selected_blue.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tab_top_selected_blue.tga rename to indra/newview/skins/blackred/textures/tab_top_selected_blue.tga diff --git a/indra/newview/skins/Blackred/textures/tearoff_pressed.tga b/indra/newview/skins/blackred/textures/tearoff_pressed.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tearoff_pressed.tga rename to indra/newview/skins/blackred/textures/tearoff_pressed.tga diff --git a/indra/newview/skins/Blackred/textures/tearoffbox.tga b/indra/newview/skins/blackred/textures/tearoffbox.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tearoffbox.tga rename to indra/newview/skins/blackred/textures/tearoffbox.tga diff --git a/indra/newview/skins/Blackred/textures/textures.xml b/indra/newview/skins/blackred/textures/textures.xml similarity index 100% rename from indra/newview/skins/Blackred/textures/textures.xml rename to indra/newview/skins/blackred/textures/textures.xml diff --git a/indra/newview/skins/Blackred/textures/tool_dozer.tga b/indra/newview/skins/blackred/textures/tool_dozer.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tool_dozer.tga rename to indra/newview/skins/blackred/textures/tool_dozer.tga diff --git a/indra/newview/skins/Blackred/textures/tool_dozer_active.tga b/indra/newview/skins/blackred/textures/tool_dozer_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tool_dozer_active.tga rename to indra/newview/skins/blackred/textures/tool_dozer_active.tga diff --git a/indra/newview/skins/Blackred/textures/tool_zoom.tga b/indra/newview/skins/blackred/textures/tool_zoom.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tool_zoom.tga rename to indra/newview/skins/blackred/textures/tool_zoom.tga diff --git a/indra/newview/skins/Blackred/textures/tool_zoom_active.tga b/indra/newview/skins/blackred/textures/tool_zoom_active.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/tool_zoom_active.tga rename to indra/newview/skins/blackred/textures/tool_zoom_active.tga diff --git a/indra/newview/skins/Blackred/textures/toolbar_bg.tga b/indra/newview/skins/blackred/textures/toolbar_bg.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/toolbar_bg.tga rename to indra/newview/skins/blackred/textures/toolbar_bg.tga diff --git a/indra/newview/skins/Blackred/textures/toolbar_btn_disabled.tga b/indra/newview/skins/blackred/textures/toolbar_btn_disabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/toolbar_btn_disabled.tga rename to indra/newview/skins/blackred/textures/toolbar_btn_disabled.tga diff --git a/indra/newview/skins/Blackred/textures/toolbar_btn_enabled.tga b/indra/newview/skins/blackred/textures/toolbar_btn_enabled.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/toolbar_btn_enabled.tga rename to indra/newview/skins/blackred/textures/toolbar_btn_enabled.tga diff --git a/indra/newview/skins/Blackred/textures/toolbar_btn_selected.tga b/indra/newview/skins/blackred/textures/toolbar_btn_selected.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/toolbar_btn_selected.tga rename to indra/newview/skins/blackred/textures/toolbar_btn_selected.tga diff --git a/indra/newview/skins/Blackred/textures/toolbar_tab.tga b/indra/newview/skins/blackred/textures/toolbar_tab.tga similarity index 100% rename from indra/newview/skins/Blackred/textures/toolbar_tab.tga rename to indra/newview/skins/blackred/textures/toolbar_tab.tga diff --git a/indra/newview/skins/Blackred/textures/up_arrow.png b/indra/newview/skins/blackred/textures/up_arrow.png similarity index 100% rename from indra/newview/skins/Blackred/textures/up_arrow.png rename to indra/newview/skins/blackred/textures/up_arrow.png diff --git a/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml b/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml deleted file mode 100644 index 653bb675c..000000000 --- a/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Loading... -