From 128503fd7fc09da60c02970d3a1602ad307d27d6 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 6 Oct 2013 22:54:38 -0400 Subject: [PATCH 01/47] Attempt to fix linking issues --- indra/cmake/Linking.cmake | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 00754ec36..d3ccca416 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -5,22 +5,29 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") include(Variables) if (NOT STANDALONE) - if (WINDOWS) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - elseif (LINUX) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS}) - set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS}) - elseif (DARWIN) - set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) - set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) - set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - endif (WINDOWS) + set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib) + set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) + set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) + + if(WINDOWS OR DARWIN) + # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us + # fortunately both windows and darwin are case insensitive filesystems so this works. + set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") + else(WINDOWS OR DARWIN) + # else block is for linux and any other makefile based generators + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) + set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) + endif(WINDOWS OR DARWIN) + + if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") + # When we're building something other than Release, append the + # packages/lib/release directory to deal with autobuild packages that don't + # provide (e.g.) lib/debug libraries. + list(APPEND ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) + endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") endif (NOT STANDALONE) -link_directories(${ARCH_PREBUILT_DIRS}) +link_directories(${ARCH_PREBUILT_LINK_DIRS}) if (LINUX) set(DL_LIBRARY dl) From 817c01595f0d5a74a22f45a6f95ee6b25c255b33 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 6 Oct 2013 22:55:21 -0400 Subject: [PATCH 02/47] I really really hate you microsoft. More windows sdk cmake poke --- indra/cmake/DirectX.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index a0dc4b2b5..97a0bf910 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -44,10 +44,15 @@ if (WINDOWS) "$ENV{ProgramFiles(x86)}/Windows Kits/8.0" ) - if (WIN_KIT_ROOT_DIR) + find_path (WIN_KIT_LIB_DIR dxguid.lib + "${WIN_KIT_ROOT_DIR}/Lib/winv6.3/um/${DIRECTX_ARCHITECTURE}" + "${WIN_KIT_ROOT_DIR}/Lib/Win8/um/${DIRECTX_ARCHITECTURE}" + ) + + if (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR) set (DIRECTX_INCLUDE_DIR "${WIN_KIT_ROOT_DIR}/Include/um" "${WIN_KIT_ROOT_DIR}/Include/shared") - set (DIRECTX_LIBRARY_DIR "${WIN_KIT_ROOT_DIR}/Lib/Win8/um/${DIRECTX_ARCHITECTURE}") - endif (WIN_KIT_ROOT_DIR) + set (DIRECTX_LIBRARY_DIR "${WIN_KIT_LIB_DIR}") + endif (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR) endif (DIRECTX_ROOT_DIR) if (DIRECTX_INCLUDE_DIR) From a1751dcc1e716c60b21b4f371d9baa6e48cf1c5c Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 6 Oct 2013 22:55:30 -0400 Subject: [PATCH 03/47] Warning fix --- indra/newview/lldrawpoolalpha.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 5fdedc68e..28bc74a47 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -335,7 +335,7 @@ void LLDrawPoolAlpha::render(S32 pass) gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); } - gGL.diffuseColor4f(0.9,0,0,0.4); + gGL.diffuseColor4f(0.9f,0.f,0.f,0.4f); LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f*1024.f); gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ; From 610f7ac5de6463888d8ebd245752c0f3eb1dd5a1 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Mon, 7 Oct 2013 23:23:40 -0400 Subject: [PATCH 04/47] Fix a Clang error --- indra/newview/llviewerwearable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index bdd03c0eb..30483c738 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -698,7 +698,7 @@ std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w) //w.mSaleInfo s << " Params:" << "\n"; - for (LLWearable::visual_param_index_map_t::const_iterator iter = w.mVisualParamIndexMap.begin(); + for (LLViewerWearable::visual_param_index_map_t::const_iterator iter = w.mVisualParamIndexMap.begin(); iter != w.mVisualParamIndexMap.end(); ++iter) { S32 param_id = iter->first; From a4fa66655e4ae7d82932a74550371407eb7b1132 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Mon, 7 Oct 2013 23:23:51 -0400 Subject: [PATCH 05/47] Unbreak OSX Make File builds --- indra/cmake/Linking.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index d3ccca416..9f777827e 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -9,15 +9,15 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - if(WINDOWS OR DARWIN) + if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us # fortunately both windows and darwin are case insensitive filesystems so this works. set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") - else(WINDOWS OR DARWIN) + else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) # else block is for linux and any other makefile based generators string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) - endif(WINDOWS OR DARWIN) + endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") # When we're building something other than Release, append the From 2f80012ccd028c3807720420c29e7f4597f9e821 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sun, 3 Nov 2013 20:51:48 -0500 Subject: [PATCH 06/47] Feature Request: If EditLinkedParts is on, Copy Key should copy keys of any selected prim(s) --- indra/newview/llpanelpermissions.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 42facc56c..f9ad87f55 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -1118,16 +1118,17 @@ void LLPanelPermissions::onClickDeedToGroup(void* data) LLNotificationsUtil::add( "DeedObjectToGroup", LLSD(), LLSD(), callback_deed_to_group); } -void LLPanelPermissions::onClickCopyObjKey() +template +std::string gather_keys(iterator iter, iterator end) { //NAMESHORT - Was requested on the forums, was going to integrate a textbox with the ID, but due to lack of room on the floater, //We now have a copy button :> //Madgeek - Hacked together method to copy more than one key, separated by comma. //At some point the separator was changed to read from the xml settings - I'll probably try to make this openly changable from settings. -HgB + //Lirusaito - Tweaked to copy selected prim(s) when EditLinkedParts, main functionality moved into gather_keys std::string output; std::string separator = gSavedSettings.getString("AscentDataSeparator"); - for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin(); - iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++) + for (; iter != end; ++iter) { LLSelectNode* selectNode = *iter; LLViewerObject* object = selectNode->getObject(); @@ -1137,6 +1138,14 @@ void LLPanelPermissions::onClickCopyObjKey() output.append(object->getID().asString()); } } + return output; +} + +void LLPanelPermissions::onClickCopyObjKey() +{ + bool parts(gSavedSettings.getBOOL("EditLinkedParts")); + LLObjectSelectionHandle selection(LLSelectMgr::getInstance()->getSelection()); + std::string output = parts ? gather_keys(selection->begin(), selection->end()) : gather_keys(selection->root_begin(), selection->root_end()); if (!output.empty()) gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(output)); } From 0cbaa752a6fe4fc5053d6592bf0e062e3dce780f Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Mon, 4 Nov 2013 04:04:39 +0100 Subject: [PATCH 07/47] At the request of LL, append more info to channel string sent to the login server Send versio number bare, without channel name, as V3 does --- indra/newview/lluserauth.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/indra/newview/lluserauth.cpp b/indra/newview/lluserauth.cpp index a0791989e..8c2d359a1 100644 --- a/indra/newview/lluserauth.cpp +++ b/indra/newview/lluserauth.cpp @@ -217,8 +217,21 @@ void LLUserAuth::authenticate( XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0); XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0); XMLRPC_VectorAppendString(params, "start", start.c_str(), 0); - XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name - XMLRPC_VectorAppendString(params, "channel", gVersionChannel, 0); + XMLRPC_VectorAppendString(params, "version", llformat("%d.%d.%d.%d", gVersionMajor, gVersionMinor, gVersionPatch, gVersionBuild).c_str(), 0); + // Singu Note: At the request of Linden Lab we change channel sent to the login server in the following way: + // * If channel is "Singularity" we change it to "Singularity Release", due to their statistics system + // not being able to distinguish just the release version + // * We append "64" to channel name on 64-bit for systems for the LL stats system to be able to produce independent + // crash statistics depending on the architecture + std::string chan(gVersionChannel); + if (chan == "Singularity") + { + chan += " Release"; + } +#if defined(_WIN64) || defined(__x86_64__) + chan += " 64"; +#endif + XMLRPC_VectorAppendString(params, "channel", chan.c_str(), 0); XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0); XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0); From e1356b7aaf7852c60893f4c664b386e20bbeb803 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Sun, 3 Nov 2013 23:00:56 -0500 Subject: [PATCH 08/47] Fix slight breakage in the osx cmake --- indra/cmake/Linking.cmake | 6 +++--- indra/cmake/Variables.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 9f777827e..e7bc897c9 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -9,15 +9,15 @@ if (NOT STANDALONE) set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug) - if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) + if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us # fortunately both windows and darwin are case insensitive filesystems so this works. set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}") - else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) + else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") # else block is for linux and any other makefile based generators string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER}) - endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES Xcode) + endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode") if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") # When we're building something other than Release, append the diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 70d025d85..187412b4a 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -97,7 +97,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - if(${CMAKE_GENERATOR} MATCHES Xcode) + 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) @@ -106,10 +106,10 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) endif (${XCODE_VERSION} VERSION_LESS 4.0.0) - else(${CMAKE_GENERATOR} MATCHES Xcode) + else(${CMAKE_GENERATOR} MATCHES "Xcode") set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - endif(${CMAKE_GENERATOR} MATCHES Xcode) + endif(${CMAKE_GENERATOR} MATCHES "Xcode") set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") From ec55c53b62b3755a38a9f3e4db81ba923bbb7d12 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 4 Nov 2013 17:10:42 -0500 Subject: [PATCH 09/47] French menu gets Motion Resets Camera courtesy of Nomade (more translation on the way) --- indra/newview/skins/default/xui/fr/menu_viewer.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index ab449a3d3..6d4bd005a 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -72,6 +72,7 @@ + From 7129d97ee54015099fa4a231ad7f01ee166eb6f1 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 4 Nov 2013 17:49:29 -0500 Subject: [PATCH 10/47] panel_tools_texture.xml splits off from floater_tools.xml (No real changes here, but this change will make life so nice for me) --- .../skins/default/xui/en-us/floater_tools.xml | 298 +----------------- .../default/xui/en-us/panel_tools_texture.xml | 292 +++++++++++++++++ 2 files changed, 297 insertions(+), 293 deletions(-) create mode 100644 indra/newview/skins/default/xui/en-us/panel_tools_texture.xml diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml index 73d03d0cb..9568791e7 100644 --- a/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml @@ -1355,299 +1355,11 @@ bottom_delta="-20" width="118" /> - - - - - - - - Transparency % - - - - Glow - - - - - Mapping - - - - Default - - - Planar - - - - Shininess - - - - None - - - Low - - - Medium - - - High - - - - Bumpiness - - - - None - - - Brightness - - - Darkness - - - woodgrain - - - bark - - - bricks - - - checker - - - concrete - - - crustytile - - - cutstone - - - discs - - - gravel - - - petridish - - - siding - - - stonetile - - - stucco - - - suction - - - weave - - - - - Repeats per Face - - - - - - - Rotation (degrees) - - - - Repeats Per Meter - - - Repeats Per Face - - - Repeats Per Meter - - - - - - - - + + + + + - - - + + + + + + + + + Glossiness + + + + Environment + + + + Color + + + + + URL of chosen media, if any, goes here + + + +