diff --git a/autobuild.xml b/autobuild.xml
index 274dde845..78e8aa34f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1351,92 +1351,6 @@
version
1.5.3
- jsoncpp
-
libhunspell
+ modernjson
+
nvapi
name
darwin
@@ -2498,11 +2444,11 @@
archive
name
linux64
@@ -2512,11 +2458,11 @@
archive
name
windows
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 59735a520..b480c96b3 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -19,6 +19,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(Variables)
include(BuildVersion)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
"Build type. One of: Debug Release RelWithDebInfo" FORCE)
@@ -58,5 +61,8 @@ add_subdirectory(${LIBS_OPEN_PREFIX}plugins)
add_subdirectory(${VIEWER_PREFIX}newview/statemachine)
add_subdirectory(${VIEWER_PREFIX}newview)
-add_dependencies(viewer singularity-bin)
+add_dependencies(viewer ${VIEWER_BRANDING_ID}-bin)
+if (WINDOWS)
+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VIEWER_BRANDING_ID}-bin)
+endif (WINDOWS)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 4e1e6cb49..e9868cfea 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -7,7 +7,6 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
include(Variables)
-
# Portable compilation flags.
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
@@ -31,14 +30,11 @@ if(NON_RELEASE_CRASH_REPORTING)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLL_SEND_CRASH_REPORTS=1")
endif()
-
# Don't bother with a MinSizeRel build.
-
set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
"Supported build types." FORCE)
# Platform-specific compilation flags.
-
if (WINDOWS)
# Don't build DLLs.
set(BUILD_SHARED_LIBS OFF)
@@ -88,6 +84,7 @@ if (WINDOWS)
/DNOMINMAX
/DUNICODE
/D_UNICODE
+ /DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
/GS
/TP
/W3
@@ -111,7 +108,7 @@ if (WINDOWS)
endif (USE_LTO)
if (WORD_SIZE EQUAL 32)
- add_compile_options(/arch:SSE2)
+ add_compile_options(/arch:SSE3)
endif (WORD_SIZE EQUAL 32)
if (NOT DISABLE_FATAL_WARNINGS)
@@ -128,21 +125,24 @@ set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")
if (LINUX)
set(CMAKE_SKIP_RPATH TRUE)
+ add_compile_options(
+ -fvisibility=hidden
+ -fexceptions
+ -fno-math-errno
+ -fno-strict-aliasing
+ -fsigned-char
+ -g
+ -pthread
+ )
+
add_definitions(
- -DLL_LINUX=1
- -DAPPID=secondlife
- -D_REENTRANT
- -fexceptions
- -fno-math-errno
- -fno-strict-aliasing
- -fsigned-char
- -fvisibility=hidden
- -g
- -pthread
- )
+ -DLL_LINUX=1
+ -DAPPID=secondlife
+ -D_REENTRANT
+ )
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
@@ -213,23 +213,23 @@ if (LINUX)
if (NOT STANDALONE)
set(MARCH_FLAG " -march=pentium4")
endif (NOT STANDALONE)
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
endif (${ARCH} STREQUAL "x86_64")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse3")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse3")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse3")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse3")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
if (NOT STANDALONE)
- set(MARCH_FLAG " -axsse4.1 -msse2")
+ set(MARCH_FLAG " -axsse4.1 -msse3")
endif (NOT STANDALONE)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline-functions")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 7c8e616d6..cacb7fd05 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -36,10 +36,10 @@ set(cmake_SOURCE_FILES
FindGoogleBreakpad.cmake
FindGooglePerfTools.cmake
FindHunSpell.cmake
- FindJsonCpp.cmake
FindNDOF.cmake
FindOpenJPEG.cmake
FindTut.cmake
+ FindURIPARSER.cmake
FindXmlRpcEpi.cmake
FreeType.cmake
GLOD.cmake
@@ -50,7 +50,7 @@ set(cmake_SOURCE_FILES
GooglePerfTools.cmake
Hunspell.cmake
JPEG.cmake
- JsonCpp.cmake
+ Json.cmake
LLAddBuildTest.cmake
LLAppearance.cmake
LLAudio.cmake
@@ -65,7 +65,6 @@ set(cmake_SOURCE_FILES
LLPlugin.cmake
LLPrimitive.cmake
LLPhysicsExtensions.cmake
- LLSharedLibs.cmake
LLRender.cmake
LLSharedLibs.cmake
LLUI.cmake
@@ -93,6 +92,7 @@ set(cmake_SOURCE_FILES
Tut.cmake
UI.cmake
UnixInstall.cmake
+ URIPARSER.cmake
Variables.cmake
ViewerMiscLibs.cmake
WinManifest.cmake
diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake
deleted file mode 100644
index a48c97396..000000000
--- a/indra/cmake/FindJsonCpp.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- cmake -*-
-
-# - Find JSONCpp
-# Find the JSONCpp includes and library
-# This module defines
-# JSONCPP_FOUND, System has libjsoncpp.
-# JSONCPP_INCLUDE_DIRS - The libjsoncpp include directories.
-# JSONCPP_LIBRARIES - The libraries needed to use libjsoncpp.
-# JSONCPP_DEFINITIONS - Compiler switches required for using libjsoncpp.
-
-FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_JSONCPP jsoncpp)
-SET(JSONCPP_DEFINITIONS ${PC_JSONCPP_CFLAGS_OTHER})
-
-FIND_PATH(JSONCPP_INCLUDE_DIR json/reader.h
- HINTS ${PC_JSONCPP_INCLUDE_DIR} ${PC_JSONCPP_INCLUDE_DIRS}
- PATH_SUFFIXES jsoncpp)
-
-# Get the GCC compiler version
-EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE _gcc_COMPILER_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-
-# Try to find a library that was compiled with the same compiler version as we currently use.
-FIND_LIBRARY(JSONCPP_LIBRARY
- NAMES libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so libjsoncpp.so
- HINTS ${PC_JSONCPP_LIBDIR} ${PC_JSONCPP_LIBRARY_DIRS}
- PATHS /usr/lib /usr/local/lib)
-
-SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-SET(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP DEFAULT_MSG
- JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
diff --git a/indra/cmake/FindURIPARSER.cmake b/indra/cmake/FindURIPARSER.cmake
new file mode 100644
index 000000000..05f2d1737
--- /dev/null
+++ b/indra/cmake/FindURIPARSER.cmake
@@ -0,0 +1,46 @@
+# -*- cmake -*-
+
+# - Find uriparser
+# Find the URIPARSER includes and library
+# This module defines
+# URIPARSER_INCLUDE_DIRS, where to find uriparser.h, etc.
+# URIPARSER_LIBRARY, the libraries needed to use uriparser.
+# URIPARSER_FOUND, If false, do not try to use uriparser.
+#
+# This FindURIPARSER is about 43 times as fast the one provided with cmake (2.8.x),
+# because it doesn't look up the version of uriparser, resulting in a dramatic
+# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
+#
+# Note: Since this file is only used for standalone, the windows
+# specific parts were left out.
+
+FIND_PATH(URIPARSER_INCLUDE_DIR uriparser/Uri.h
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+
+FIND_LIBRARY(URIPARSER_LIBRARY uriparser)
+
+if (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+ SET(URIPARSER_INCLUDE_DIRS ${URIPARSER_INCLUDE_DIR})
+ SET(URIPARSER_LIBRARY ${URIPARSER_LIBRARY})
+ SET(URIPARSER_FOUND "YES")
+else (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+ SET(URIPARSER_FOUND "NO")
+endif (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+
+if (URIPARSER_FOUND)
+ if (NOT URIPARSER_FIND_QUIETLY)
+ message(STATUS "Found URIPARSER: ${URIPARSER_LIBRARY}")
+ SET(URIPARSER_FIND_QUIETLY TRUE)
+ endif (NOT URIPARSER_FIND_QUIETLY)
+else (URIPARSER_FOUND)
+ if (URIPARSER_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find URIPARSER library")
+ endif (URIPARSER_FIND_REQUIRED)
+endif (URIPARSER_FOUND)
+
+mark_as_advanced(
+ URIPARSER_LIBRARY
+ URIPARSER_INCLUDE_DIR
+ )
+
diff --git a/indra/cmake/Json.cmake b/indra/cmake/Json.cmake
new file mode 100644
index 000000000..5c9837047
--- /dev/null
+++ b/indra/cmake/Json.cmake
@@ -0,0 +1,6 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+use_prebuilt_binary(modernjson)
+set(JSON_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include")
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
deleted file mode 100644
index 4bde364ce..000000000
--- a/indra/cmake/JsonCpp.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- cmake -*-
-
-include(Prebuilt)
-
-set(JSONCPP_FIND_QUIETLY OFF)
-set(JSONCPP_FIND_REQUIRED ON)
-
-if (STANDALONE)
- include(FindJsonCpp)
-else (STANDALONE)
- use_prebuilt_binary(jsoncpp)
- if (WINDOWS)
- set(JSONCPP_LIBRARIES
- debug jsoncppd.lib
- optimized jsoncpp.lib)
- elseif (DARWIN)
- set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
- elseif (LINUX)
- set(JSONCPP_LIBRARIES jsoncpp)
- endif (WINDOWS)
- set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/)
-endif (STANDALONE)
diff --git a/indra/cmake/URIPARSER.cmake b/indra/cmake/URIPARSER.cmake
new file mode 100644
index 000000000..47c3ccd37
--- /dev/null
+++ b/indra/cmake/URIPARSER.cmake
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+set(URIPARSER_FIND_QUIETLY ON)
+set(URIPARSER_FIND_REQUIRED ON)
+
+include(Prebuilt)
+
+if (USESYSTEMLIBS)
+ include(FindURIPARSER)
+else (USESYSTEMLIBS)
+ use_prebuilt_binary(uriparser)
+ if (WINDOWS)
+ set(URIPARSER_LIBRARY
+ debug uriparserd
+ optimized uriparser)
+ elseif (DARWIN OR LINUX)
+ set(URIPARSER_LIBRARY uriparser)
+ endif (WINDOWS)
+ set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
+endif (USESYSTEMLIBS)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 80eeab0d4..b59485a06 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -10,21 +10,23 @@ include(Linking)
include(Boost)
include(OpenSSL)
include(LLSharedLibs)
+include(Json)
include(GoogleBreakpad)
include(Copy3rdPartyLibs)
include(ZLIB)
+include(URIPARSER)
include_directories(
${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS}
+ ${JSON_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
${BREAKPAD_INCLUDE_DIRECTORIES}
)
set(llcommon_SOURCE_FILES
aialert.cpp
- aifile.cpp
aiframetimer.cpp
aisyncclient.cpp
aithreadid.cpp
@@ -85,6 +87,7 @@ set(llcommon_SOURCE_FILES
llrun.cpp
llscopedvolatileaprpool.h
llsd.cpp
+ llsdjson.cpp
llsdparam.cpp
llsdserialize.cpp
llsdserialize_xml.cpp
@@ -101,6 +104,7 @@ set(llcommon_SOURCE_FILES
llthreadsafequeue.cpp
lltimer.cpp
lluri.cpp
+ lluriparser.cpp
lluuid.cpp
llworkerthread.cpp
metaclass.cpp
@@ -114,7 +118,6 @@ set(llcommon_HEADER_FILES
CMakeLists.txt
aialert.h
- aifile.h
aiframetimer.h
airecursive.h
aisyncclient.h
@@ -210,6 +213,7 @@ set(llcommon_HEADER_FILES
llrun.h
llsafehandle.h
llsd.h
+ llsdjson.h
llsdparam.h
llsdserialize.h
llsdserialize_xml.h
@@ -238,6 +242,7 @@ set(llcommon_HEADER_FILES
llunittype.h
lltypeinfolookup.h
lluri.h
+ lluriparser.h
lluuid.h
llwin32headers.h
llwin32headerslean.h
@@ -296,6 +301,7 @@ target_link_libraries(
${Boost_THREAD_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${CORESERVICES_LIBRARY}
+ ${URIPARSER_LIBRARY}
)
if (DARWIN)
diff --git a/indra/llcommon/aifile.cpp b/indra/llcommon/aifile.cpp
deleted file mode 100644
index cd2ade77a..000000000
--- a/indra/llcommon/aifile.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * @file aifile.cpp
- * @brief POSIX file operations that throw on error.
- *
- * Copyright (c) 2013, Aleric Inglewood.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * 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.
- *
- * CHANGELOG
- * and additional copyright holders.
- *
- * 03/11/2013
- * Initial version, written by Aleric Inglewood @ SL
- */
-
-#include "linden_common.h"
-#include "aifile.h"
-#include "aialert.h"
-
-#if LL_WINDOWS
-#include
-#include // Windows errno
-#else
-#include
-#endif
-
-AIFile::AIFile(std::string const& filename, char const* accessmode)
-{
- mFp = AIFile::fopen(filename, accessmode);
-}
-
-AIFile::~AIFile()
-{
- AIFile::close(mFp);
-}
-
-// Like THROW_MALERTE but appends "LLFile::strerr(errn) << " (" << errn << ')'" as argument to replace [ERROR].
-#define THROW_ERROR(...) \
- do { \
- int errn = errno; \
- std::ostringstream error; \
- error << LLFile::strerr(errn) << " (" << errn << ')'; \
- THROW_MALERT_CLASS(AIAlert::ErrorCode, errn, __VA_ARGS__ ("[ERROR]", error.str())); \
- } while(0)
-
-//static
-void AIFile::mkdir(std::string const& dirname, int perms)
-{
- int rc = LLFile::mkdir_nowarn(dirname, perms);
- if (rc < 0 && errno != EEXIST)
- {
- THROW_ERROR("AIFile_mkdir_Failed_to_create_DIRNAME", AIArgs("[DIRNAME]", dirname));
- }
-}
-
-//static
-void AIFile::rmdir(std::string const& dirname)
-{
- int rc = LLFile::rmdir_nowarn(dirname);
- if (rc < 0 && errno != ENOENT)
- {
- THROW_ERROR("AIFile_rmdir_Failed_to_remove_DIRNAME", AIArgs("[DIRNAME]", dirname));
- }
-}
-
-//static
-LLFILE* AIFile::fopen(std::string const& filename, const char* mode)
-{
- LLFILE* fp = LLFile::fopen(filename, mode);
- if (!fp)
- {
- THROW_ERROR("AIFile_fopen_Failed_to_open_FILENAME", AIArgs("[FILENAME]", filename));
- }
- return fp;
-}
-
-//static
-void AIFile::close(LLFILE* file)
-{
- if (LLFile::close(file) < 0)
- {
- THROW_ERROR("AIFile_close_Failed_to_close_file", AIArgs);
- }
-}
-
-//static
-void AIFile::remove(std::string const& filename)
-{
- int rc = LLFile::remove_nowarn(filename);
- if (rc < 0 && errno != ENOENT)
- {
- THROW_ERROR("AIFile_remove_Failed_to_remove_FILENAME", AIArgs("[FILENAME]", filename));
- }
-}
-
-//static
-void AIFile::rename(std::string const& filename, std::string const& newname)
-{
- if (LLFile::rename_nowarn(filename, newname) < 0)
- {
- THROW_ERROR("AIFile_rename_Failed_to_rename_FILE_to_NEWFILE", AIArgs("[FILE]", filename)("[NEWFILE]", newname));
- }
-}
-
diff --git a/indra/llcommon/aifile.h b/indra/llcommon/aifile.h
deleted file mode 100644
index 1b110496a..000000000
--- a/indra/llcommon/aifile.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @file aifile.h
- * @brief Declaration of AIFile.
- *
- * Copyright (c) 2013, Aleric Inglewood.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * 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.
- *
- * CHANGELOG
- * and additional copyright holders.
- *
- * 02/11/2013
- * Initial version, written by Aleric Inglewood @ SL
- */
-
-#ifndef AIFILE_H
-#define AIFILE_H
-
-#include "llfile.h"
-
-// As LLFile, but throws AIAlert instead of printing a warning.
-class LL_COMMON_API AIFile
-{
- private:
- LLFILE* mFp;
-
- public:
- // Scoped file (exception safe). Throws AIAlertCode with errno on failure.
- AIFile(std::string const& filename, char const* accessmode);
- ~AIFile();
-
- operator LLFILE* () const { return mFp; }
-
- // All these functions take UTF8 path/filenames.
- static LLFILE* fopen(std::string const& filename, char const* accessmode);
- static void close(LLFILE* file);
-
- static void mkdir(std::string const& dirname, int perms = 0700); // Does NOT throw when dirname already exists.
- static void rmdir(std::string const& dirname); // Does NOT throw when dirname does not exist.
- static void remove(std::string const& filename); // Does NOT throw when filename does not exist.
- static void rename(std::string const& filename, std::string const& newname);
-};
-
-#endif // AIFILE_H
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index d600936d8..9936dfd33 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -131,19 +131,6 @@ const U32 DEFAULT_CGI_SERVICES_PORT = 12045;
// on a single host for map tile generation. JC
const U32 DEFAULT_MAPSERVER_PORT = 12124;
-const char LAND_LAYER_CODE = 'L';
-const char WATER_LAYER_CODE = 'W';
-const char WIND_LAYER_CODE = '7';
-const char CLOUD_LAYER_CODE = '8';
-
-// Aurora Sim
-// Extended land layer for Aurora Sim
-const char AURORA_LAND_LAYER_CODE = 'M';
-const char AURORA_WATER_LAYER_CODE = 'X';
-const char AURORA_WIND_LAYER_CODE = '9';
-const char AURORA_CLOUD_LAYER_CODE = ':';
-// Aurora Sim
-
enum ETerrainBrushType
{
// the valid brush numbers cannot be reordered, because they
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 5b22d5bab..66602f4e7 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -101,6 +101,9 @@ LLAssetDictionary::LLAssetDictionary()
addEntry(LLAssetType::AT_OUTFIT, new AssetEntry("OUTFIT", "outfit", "outfit", false, false, false));
addEntry(LLAssetType::AT_MY_OUTFITS, new AssetEntry("MY_OUTFITS", "my_otfts", "my outfits", false, false, false));
addEntry(LLAssetType::AT_MESH, new AssetEntry("MESH", "mesh", "mesh", false, true, true));
+ addEntry(LLAssetType::AT_SETTINGS, new AssetEntry("SETTINGS", "settings", "settings blob", true, true, true));
+
+ addEntry(LLAssetType::AT_UNKNOWN, new AssetEntry("UNKNOWN", "invalid", NULL, false, false, false));
addEntry(LLAssetType::AT_NONE, new AssetEntry("NONE", "-1", NULL, false, false, false));
};
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index e6fee54ca..9435eeb2b 100644
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -122,6 +122,9 @@ public:
AT_LINK_FOLDER = 25,
// Inventory folder link
+
+ AT_MARKETPLACE_FOLDER = 26,
+ // Marketplace folder. Same as an AT_CATEGORY but different display methods.
AT_CURRENT_OUTFIT = 46,
@@ -132,7 +135,16 @@ public:
AT_MESH = 49,
// Mesh data in our proprietary SLM format
- AT_COUNT = 50,
+ AT_RESERVED_1 = 50,
+ AT_RESERVED_2 = 51,
+ AT_RESERVED_3 = 52,
+ AT_RESERVED_4 = 53,
+ AT_RESERVED_5 = 54,
+ AT_RESERVED_6 = 55,
+
+ AT_SETTINGS = 56, // Collection of settings
+
+ AT_COUNT = 57,
// +*********************************************************+
// | TO ADD AN ELEMENT TO THIS ENUM: |
@@ -143,7 +155,7 @@ public:
// | 4. ADD TO LLViewerAssetType.cpp |
// | 5. ADD TO DEFAULT_ASSET_FOR_INV in LLInventoryType.cpp |
// +*********************************************************+
-
+ AT_UNKNOWN = 255,
AT_NONE = -1
};
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index e6b688ee0..3cb14a2ca 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -120,6 +120,7 @@ namespace {
LL_INFOS() << "Error setting log file to " << filename << LL_ENDL;
}
mWantsTime = true;
+ mWantsTags = true;
}
~RecordToFile()
@@ -252,23 +253,13 @@ namespace
{
#ifdef __GNUC__
// GCC: type_info::name() returns a mangled class name,st demangle
-
- static size_t abi_name_len = 100;
- static char* abi_name_buf = (char*)malloc(abi_name_len);
- // warning: above is voodoo inferred from the GCC manual,
- // do NOT change
-
- int status;
- // We don't use status, and shouldn't have to pass apointer to it
- // but gcc 3.3 libstc++'s implementation of demangling is broken
- // and fails without.
-
- char* name = abi::__cxa_demangle(type.name(),
- abi_name_buf, &abi_name_len, &status);
- // this call can realloc the abi_name_buf pointer (!)
-
- return name ? name : type.name();
-
+ // passing nullptr, 0 forces allocation of a unique buffer we can free
+ // fixing MAINT-8724 on OSX 10.14
+ int status = -1;
+ char* name = abi::__cxa_demangle(type.name(), nullptr, 0, &status);
+ std::string result(name ? name : type.name());
+ free(name);
+ return result;
#elif LL_WINDOWS
// DevStudio: type_info::name() includes the text "class " at the start
@@ -600,7 +591,7 @@ namespace LLError
mFunctionString += std::string(mFunction) + ":";
for (size_t i = 0; i < mTagCount; i++)
{
- mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : " ");
+ mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : ",");
}
}
}
@@ -983,13 +974,19 @@ namespace
}
if (show_level && r->wantsLevel())
- {
- message_stream << site.mLevelString << " ";
- }
+ {
+ message_stream << site.mLevelString;
+ }
if (show_tags && r->wantsTags())
{
- message_stream << site.mTagString << " ";
+ message_stream << site.mTagString;
+ }
+
+ if ((show_level && r->wantsLevel())||
+ (show_tags && r->wantsTags()))
+ {
+ message_stream << " ";
}
if (show_function && r->wantsFunctionName())
diff --git a/indra/llcommon/llformat.cpp b/indra/llcommon/llformat.cpp
index f9f16006a..834bcf753 100644
--- a/indra/llcommon/llformat.cpp
+++ b/indra/llcommon/llformat.cpp
@@ -36,18 +36,38 @@
#include "llformat.h"
#include
+#include
// common used function with va_list argument
// wrapper for vsnprintf to be called from llformatXXX functions.
-static void va_format(std::string& out, const char *fmt, va_list va)
+static void va_format(std::string& out, const char *fmt, va_list& va)
{
- char tstr[1024]; /* Flawfinder: ignore */
-#if LL_WINDOWS
- _vsnprintf(tstr, 1024, fmt, va);
+ if (!fmt || !fmt[0]) return; // Don't bother if null or empty c_str
+
+ typedef typename std::vector> vec_t;
+ static thread_local vec_t charvector(1024); // Evolves into charveleon
+ #define vsnprintf(va) std::vsnprintf(charvector.data(), charvector.capacity(), fmt, va)
+#ifdef LL_WINDOWS // We don't have to copy on windows
+ #define va2 va
#else
- vsnprintf(tstr, 1024, fmt, va); /* Flawfinder: ignore */
+ va_list va2;
+ va_copy(va2, va);
#endif
- out.assign(tstr);
+ const auto smallsize(charvector.capacity());
+ const auto size = vsnprintf(va);
+ if (size < 0)
+ {
+ LL_ERRS() << "Encoding failed, code " << size << ". String hint: " << out << '/' << fmt << LL_ENDL;
+ }
+ else if (static_cast(size) >= smallsize) // Resize if we need more space
+ {
+ charvector.resize(1+size); // Use the String Stone
+ vsnprintf(va2);
+ }
+#ifndef LL_WINDOWS
+ va_end(va2);
+#endif
+ out.assign(charvector.data());
}
std::string llformat(const char *fmt, ...)
diff --git a/indra/llcommon/llsdjson.cpp b/indra/llcommon/llsdjson.cpp
new file mode 100644
index 000000000..5b49f247a
--- /dev/null
+++ b/indra/llcommon/llsdjson.cpp
@@ -0,0 +1,126 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+/**
+ * @file llsdjson.cpp
+ * @brief LLSD flexible data system
+ *
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2015, 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$
+ */
+
+// Must turn on conditional declarations in header file so definitions end up
+// with proper linkage.
+#define LLSD_DEBUG_INFO
+#include "linden_common.h"
+
+#include "llsdjson.h"
+
+#include "llerror.h"
+
+
+//=========================================================================
+LLSD LlsdFromJson(const nlohmann::json &val)
+{
+ LLSD result;
+
+ switch (val.type())
+ {
+ default:
+ case nlohmann::json::value_t::null:
+ break;
+ case nlohmann::json::value_t::number_integer:
+ result = LLSD(val.get());
+ break;
+ case nlohmann::json::value_t::number_unsigned:
+ result = LLSD(val.get());
+ break;
+ case nlohmann::json::value_t::number_float:
+ result = LLSD(val.get());
+ break;
+ case nlohmann::json::value_t::string:
+ result = LLSD(val.get());
+ break;
+ case nlohmann::json::value_t::boolean:
+ result = LLSD(val.get());
+ break;
+ case nlohmann::json::value_t::array:
+ result = LLSD::emptyArray();
+ for (const auto &element : val)
+ {
+ result.append(LlsdFromJson(element));
+ }
+ break;
+ case nlohmann::json::value_t::object:
+ result = LLSD::emptyMap();
+ for (auto it = val.cbegin(); it != val.cend(); ++it)
+ {
+ result[it.key()] = LlsdFromJson(it.value());
+ }
+ break;
+ }
+ return result;
+}
+
+//=========================================================================
+nlohmann::json LlsdToJson(const LLSD &val)
+{
+ nlohmann::json result;
+
+ switch (val.type())
+ {
+ case LLSD::TypeUndefined:
+ result = nullptr;
+ break;
+ case LLSD::TypeBoolean:
+ result = val.asBoolean();
+ break;
+ case LLSD::TypeInteger:
+ result = val.asInteger();
+ break;
+ case LLSD::TypeReal:
+ result = val.asReal();
+ break;
+ case LLSD::TypeURI:
+ case LLSD::TypeDate:
+ case LLSD::TypeUUID:
+ case LLSD::TypeString:
+ result = val.asString();
+ break;
+ case LLSD::TypeMap:
+ for (LLSD::map_const_iterator it = val.beginMap(); it != val.endMap(); ++it)
+ {
+ result[it->first] = LlsdToJson(it->second);
+ }
+ break;
+ case LLSD::TypeArray:
+ for (LLSD::array_const_iterator it = val.beginArray(); it != val.endArray(); ++it)
+ {
+ result.push_back(LlsdToJson(*it));
+ }
+ break;
+ case LLSD::TypeBinary:
+ default:
+ LL_ERRS("LlsdToJson") << "Unsupported conversion to JSON from LLSD type (" << val.type() << ")." << LL_ENDL;
+ break;
+ }
+
+ return result;
+}
diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
new file mode 100644
index 000000000..bc76acbc8
--- /dev/null
+++ b/indra/llcommon/llsdjson.h
@@ -0,0 +1,77 @@
+/**
+ * @file llsdjson.cpp
+ * @brief LLSD flexible data system
+ *
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2015, 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_LLSDJSON_H
+#define LL_LLSDJSON_H
+
+#include
- InventorySortOrder
-
Blacklist.Settings
+ ActiveFloaterTransparency
+
AdvanceSnapshot
+ DebugHideEmptySystemFolders
+
DebugInventoryFilters
+ RadarColumnNotesWidth
+
RadarColumnAgeWidth
+ RadarColumnNotesHidden
+
RadarColumnAgeHidden
+ RadarAlertFlood
+
+ RadarAlertFloodLeaving
+
RadarAlertShowDist
- FloaterOutboxRect
+ FloaterMarketplaceListingsRect
+ FloaterMarketplaceValidationRect
+
+ HTMLAgentColor
+
HTMLLinkColor
+ InactiveFloaterTransparency
+
InBandwidth
- InventoryDisplayOutbox
+ InventoryOutboxDisplayBoth
+ InventoryOutboxMakeVisible
+
InventoryOutboxMaxFolderCount
InventoryOutboxMaxFolderDepth
+ InventoryOutboxMaxStockItemCount
+
InventorySortOrder
+ MarketplaceListingsSortOrder
+
InvertMouse
+ MarketplaceListingsLogging
+
MaxDragDistance
RenderHideGroupTitle
+ SinguCmdLineSetting
+
SinguCmdLineURL
- SinguMotionResetsCamera
-
SinguLastKnownReleaseBuild
+ SinguMotionResetsCamera
+
+ SinguMotionResetsCameraReset
+
+ SinguPostProcessDefault
+
+ SinguReplaceLinks
+
WarnRecommendedUpdate
+ EmergencyTeleportSeconds
+
+ LiruEnableWIPUI
+
LiruFlashWhenMinimized
+ ToolbarVisibleMarketplaceListings
+
ToolbarVisibleMeanEvents
- ToolbarVisibleOutbox
+ ToolbarVisibleMarketplaceListings
- ToolbarVisibleOutbox
-
ToolbarVisibleOutfit
+ AODefaultTyping
+
+ AODefaultFloat
+
+ AODefaultSwim
+
+ AODefaultSwimUp
+
+ AODefaultSwimDown
+
AODefaultStandUp
+ ShowFavoritesOnLogin
+
KeywordsChangeColor
- default
+ Default
- PyFx None
-
PyFX CatVision v1
- PyFX v1
+ PyFX Twilight v1 Cold
+ PyFX Twilight v1 Warm
+
@@ -950,7 +954,69 @@
vignette_strength
1
- PyFx default
+ PyFX Vivid v1 Cold
+
+ PyFX v1
+ PyFX v2
+
+ PyFX v3
+
+ PyFX Default
+
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Black.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Black.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Black.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Black.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark%20Blue.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark%20Blue.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark%20Blue.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark%20Blue.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray%20Blue.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray%20Blue.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray%20Blue.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray%20Blue.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Underwater.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Underwater.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Underwater.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Underwater.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White%20Wash.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White%20Wash.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White%20Wash.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White%20Wash.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White.xml
similarity index 95%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White.xml
index b33f7ad69..c91588466 100644
--- a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White.xml
@@ -2,10 +2,10 @@
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Flamesight.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Flamesight.xml
new file mode 100644
index 000000000..aafbc189f
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Flamesight.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Bright.xml
new file mode 100644
index 000000000..16ce75e17
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Cloudy.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Cloudy.xml
new file mode 100644
index 000000000..40bbf3b88
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Cloudy.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Evening.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Evening.xml
new file mode 100644
index 000000000..c10d7dc87
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Evening.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Night.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Night.xml
new file mode 100644
index 000000000..2958cad7e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Night.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Bright.xml
new file mode 100644
index 000000000..7b4cebdb9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City%20Bright.xml
new file mode 100644
index 000000000..19951bad6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City.xml
new file mode 100644
index 000000000..8fa2e039f
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Rainy.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Rainy.xml
new file mode 100644
index 000000000..522c66109
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Rainy.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
index 3b4c08934..a1be61d2f 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
@@ -2,10 +2,10 @@
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%201.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%201.xml
new file mode 100644
index 000000000..b299d5c02
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%201.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%20Spotlight.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%20Spotlight.xml
new file mode 100644
index 000000000..7e919afff
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%20Spotlight.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
index 5276d856e..114564084 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
@@ -2,10 +2,10 @@
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
index 05556e43a..3fe84a505 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
@@ -23,16 +23,16 @@
cloud_color
- 0.09999998658895492553710938
- 0.09999998658895492553710938
- 0.09999998658895492553710938
- 0.0999999940395355224609375
+ 0
+ 0.02999999932944774627685547
+ 0.05999999865889549255371094
+ 0.05999999865889549255371094
cloud_pos_density1
1
1
- 0.1499999910593032836914063
+ 0.1199999973177909851074219
1
cloud_pos_density2
@@ -44,7 +44,7 @@
cloud_scale
- 0.0999999940395355224609375
+ 0.07000000029802322387695313
0
0
1
diff --git a/indra/newview/app_settings/windlight/water/%5BPyFX%5D%20Ice.xml b/indra/newview/app_settings/windlight/water/%5BPyFX%5D%20Ice.xml
new file mode 100644
index 000000000..a5cdf76ae
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/%5BPyFX%5D%20Ice.xml
@@ -0,0 +1,43 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
index 1129333af..b945a41d8 100644
--- a/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
@@ -1,16 +1,16 @@
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
index 4b3fa5a4f..1c443156c 100644
--- a/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
@@ -1,43 +1,43 @@
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%20%2B%20Texture.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%20%2B%20Texture.xml
new file mode 100644
index 000000000..edd3e9a97
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%20%2B%20Texture.xml
@@ -0,0 +1,43 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202%20%2B%20Texture.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202%20%2B%20Texture.xml
new file mode 100644
index 000000000..5eaa00845
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202%20%2B%20Texture.xml
@@ -0,0 +1,43 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202.xml
new file mode 100644
index 000000000..6866eacad
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202.xml
@@ -0,0 +1,43 @@
+
+
+
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index a2c577d0d..5c8ddc9e9 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -77,7 +77,6 @@ LLPrefsAscentSys::LLPrefsAscentSys()
getChild("AlchemyChatCommandHoverHeight")->setCommitCallback(lineEditorControl);
//Security ----------------------------------------------------------------------------
- getChild("UISndRestart")->setCommitCallback(lineEditorControl);
//Build -------------------------------------------------------------------------------
getChild("next_owner_copy")->setCommitCallback(boost::bind(&LLPrefsAscentSys::onCommitCheckBox, this, _1, _2));
@@ -207,8 +206,7 @@ void LLPrefsAscentSys::refreshValues()
mDisableClickSitOtherOwner = gSavedSettings.getBOOL("DisableClickSitOtherOwner");
mDisplayScriptJumps = gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
mNumScriptDiff = gSavedSettings.getF32("Ascentnumscriptdiff");
- mRestartMinimized = gSavedSettings.getBOOL("LiruRegionRestartMinimized");
- mRestartSound = gSavedSettings.getString("UISndRestart");
+ mReplaceLinks = gSavedSettings.getBOOL("SinguReplaceLinks");
mLandmark = gSavedPerAccountSettings.getString("EmergencyTeleportLandmark");
mLandmarkBackup = gSavedPerAccountSettings.getString("EmergencyTeleportLandmarkBackup");
@@ -266,8 +264,6 @@ void LLPrefsAscentSys::refresh()
childSetValue("AlchemyChatCommandHoverHeight", mCmdLineHover);
//Security ----------------------------------------------------------------------------
- getChildView("UISndRestart")->setValue(mRestartSound);
-
if (LLComboBox* combo = getChild("lookat_namesystem_combobox"))
combo->setValue(mLookAtNames);
@@ -356,8 +352,7 @@ void LLPrefsAscentSys::cancel()
gSavedSettings.setBOOL("DisableClickSitOtherOwner", mDisableClickSitOtherOwner);
gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
gSavedSettings.setF32("Ascentnumscriptdiff", mNumScriptDiff);
- gSavedSettings.setBOOL("LiruRegionRestartMinimized", mRestartMinimized);
- gSavedSettings.setString("UISndRestart", mRestartSound);
+ gSavedSettings.setBOOL("SinguReplaceLinks", mReplaceLinks);
gSavedPerAccountSettings.setString("EmergencyTeleportLandmark", mLandmark);
gSavedPerAccountSettings.setString("EmergencyTeleportLandmarkBackup", mLandmarkBackup);
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index ae7a07cab..187212b38 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -116,9 +116,8 @@ private:
bool mDisableClickSit;
bool mDisableClickSitOtherOwner;
bool mDisplayScriptJumps;
- bool mRestartMinimized;
+ bool mReplaceLinks;
F32 mNumScriptDiff;
- std::string mRestartSound;
std::string mLandmark;
std::string mLandmarkBackup;
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 6a51b580f..0c6216647 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -62,6 +62,8 @@ LLPrefsAscentVan::LLPrefsAscentVan()
getChild("tag_spoofing_combobox")->setCommitCallback(boost::bind(&LLPrefsAscentVan::onCommitClientTag, this, _1));
getChild("custom_tag_label_box")->setCommitCallback(boost::bind(&LLControlGroup::setString, boost::ref(gSavedSettings), "AscentCustomTagLabel", _2));
+ commit_callback_t lineEditorControl(boost::bind(&LLControlGroup::setString, boost::ref(gSavedSettings), boost::bind(&LLUICtrl::getName, _1), _2));
+ getChild("UISndRestart")->setCommitCallback(lineEditorControl);
getChild("update_clientdefs")->setCommitCallback(boost::bind(LLPrefsAscentVan::onManualClientUpdate));
@@ -126,10 +128,13 @@ void LLPrefsAscentVan::refreshValues()
mCustomizeAnim = gSavedSettings.getBOOL("LiruCustomizeAnim");
mAnnounceSnapshots = gSavedSettings.getBOOL("AnnounceSnapshots");
mAnnounceStreamMetadata = gSavedSettings.getBOOL("AnnounceStreamMetadata");
- mUnfocusedFloatersOpaque = gSavedSettings.getBOOL("FloaterUnfocusedBackgroundOpaque");
+ mInactiveFloaterTransparency = gSavedSettings.getF32("InactiveFloaterTransparency");
+ mActiveFloaterTransparency = gSavedSettings.getF32("ActiveFloaterTransparency");
mCompleteNameProfiles = gSavedSettings.getBOOL("SinguCompleteNameProfiles");
mScriptErrorsStealFocus = gSavedSettings.getBOOL("LiruScriptErrorsStealFocus");
mConnectToNeighbors = gSavedSettings.getBOOL("AlchemyConnectToNeighbors");
+ mRestartMinimized = gSavedSettings.getBOOL("LiruRegionRestartMinimized");
+ mRestartSound = gSavedSettings.getString("UISndRestart");
//Tags\Colors ----------------------------------------------------------------------------
mAscentBroadcastTag = gSavedSettings.getBOOL("AscentBroadcastTag");
@@ -169,6 +174,7 @@ void LLPrefsAscentVan::refreshValues()
void LLPrefsAscentVan::refresh()
{
//Main -----------------------------------------------------------------------------------
+ getChildView("UISndRestart")->setValue(mRestartSound);
//Tags\Colors ----------------------------------------------------------------------------
LLComboBox* combo = getChild("tag_spoofing_combobox");
@@ -197,10 +203,13 @@ void LLPrefsAscentVan::cancel()
gSavedSettings.setBOOL("LiruCustomizeAnim", mCustomizeAnim);
gSavedSettings.setBOOL("AnnounceSnapshots", mAnnounceSnapshots);
gSavedSettings.setBOOL("AnnounceStreamMetadata", mAnnounceStreamMetadata);
- gSavedSettings.setBOOL("FloaterUnfocusedBackgroundOpaque", mUnfocusedFloatersOpaque);
+ gSavedSettings.setF32("InactiveFloaterTransparency", mInactiveFloaterTransparency);
+ gSavedSettings.setF32("ActiveFloaterTransparency", mActiveFloaterTransparency);
gSavedSettings.setBOOL("SinguCompleteNameProfiles", mCompleteNameProfiles);
gSavedSettings.setBOOL("LiruScriptErrorsStealFocus", mScriptErrorsStealFocus);
gSavedSettings.setBOOL("AlchemyConnectToNeighbors", mConnectToNeighbors);
+ gSavedSettings.setBOOL("LiruRegionRestartMinimized", mRestartMinimized);
+ gSavedSettings.setString("UISndRestart", mRestartSound);
//Tags\Colors ----------------------------------------------------------------------------
gSavedSettings.setBOOL("AscentBroadcastTag", mAscentBroadcastTag);
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index b45adf652..d8e27338e 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -62,10 +62,12 @@ private:
bool mCustomizeAnim;
bool mAnnounceSnapshots;
bool mAnnounceStreamMetadata;
- bool mUnfocusedFloatersOpaque;
+ F32 mInactiveFloaterTransparency, mActiveFloaterTransparency;
bool mCompleteNameProfiles;
bool mScriptErrorsStealFocus;
bool mConnectToNeighbors;
+ bool mRestartMinimized;
+ std::string mRestartSound;
//Tags\Colors
bool mAscentBroadcastTag;
std::string mReportClientUUID;
diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp
index c03d8424c..2863cfe92 100644
--- a/indra/newview/chatbar_as_cmdline.cpp
+++ b/indra/newview/chatbar_as_cmdline.cpp
@@ -42,6 +42,7 @@
#include "llagentui.h"
#include "llavataractions.h"
#include "llnotificationsutil.h"
+#include "llsdserialize.h"
#include "llviewerregion.h"
#include "llworld.h"
#include "lleventtimer.h"
@@ -242,11 +243,11 @@ bool cmd_line_chat(std::string data, EChatType type)
static LLCachedControl enableChatCmd(gSavedSettings, "AscentCmdLine", true);
if (enableChatCmd)
{
- data = utf8str_tolower(data);
std::istringstream input(data);
std::string cmd;
if (!(input >> cmd)) return true;
+ cmd = utf8str_tolower(cmd);
static LLCachedControl sDrawDistanceCommand(gSavedSettings, "AscentCmdLineDrawDistance");
static LLCachedControl sHeightCommand(gSavedSettings, "AscentCmdLineHeight");
@@ -266,6 +267,7 @@ bool cmd_line_chat(std::string data, EChatType type)
static LLCachedControl sTP2Command(gSavedSettings, "AscentCmdLineTP2");
static LLCachedControl sAwayCommand(gSavedSettings, "SinguCmdLineAway");
static LLCachedControl sURLCommand(gSavedSettings, "SinguCmdLineURL");
+ static LLCachedControl sSettingCommand(gSavedSettings, "SinguCmdLineSetting");
if (cmd == utf8str_tolower(sDrawDistanceCommand)) // dd
{
@@ -396,7 +398,7 @@ bool cmd_line_chat(std::string data, EChatType type)
slurl = LLSLURL(slurl.getRegion(), LLVector3(fmod(agentPos.mdV[VX], (F64)REGION_WIDTH_METERS), fmod(agentPos.mdV[VY], (F64)REGION_WIDTH_METERS), agentPos.mdV[VZ]));
}
- LLUrlAction::teleportToLocation(LLWeb::escapeURL(std::string("secondlife:///app/teleport/")+slurl.getLocationString()));
+ LLUrlAction::teleportToLocation(LLWeb::escapeURL("secondlife:///app/teleport/"+slurl.getLocationString()));
}
return false;
}
@@ -535,7 +537,55 @@ bool cmd_line_chat(std::string data, EChatType type)
LLAvatarActions::showProfile(id);
return false;
}
- LLUrlAction::clickAction(sub);
+ LLUrlAction::clickAction(sub, true);
+ }
+ return false;
+ }
+ else if (cmd == utf8str_tolower(sSettingCommand))
+ {
+ std::string control_name;
+ if (input >> control_name)
+ {
+ // Find out if this control even exists.
+ auto control = gSavedSettings.getControl(control_name);
+ if (!control) gSavedPerAccountSettings.getControl(control_name);
+ if (!control) return false;
+
+ LLSD val;
+ // Toggle if we weren't given a value,
+ if (input.eof()) val = !control->get();
+ else // otherwise use what we were given.
+ {
+ switch (control->type()) // Convert to the right type, we can't be a string forever.
+ {
+ case TYPE_U32: // Integer is Integer, sucks but whatever
+ case TYPE_S32:
+ {
+ LLSD::Integer i;
+ input >> i;
+ val = i;
+ break;
+ }
+ case TYPE_F32:
+ {
+ LLSD::Float f;
+ input >> f;
+ val = f;
+ break;
+ }
+ case TYPE_STRING:
+ {
+ LLSD::String str;
+ std::getline(input, str, '\0'); // Read the entire rest of the stream into str
+ LLStringUtil::trim(str); // There's no setting where a space would be necessary here.
+ val = str;
+ break;
+ }
+ default: // Just parse it like JSON (or accept one of the many boolean value options!
+ LLSDSerialize::fromNotation(val, input, LLSDSerialize::SIZE_UNLIMITED);
+ }
+ }
+ control->set(val);
}
return false;
}
@@ -586,10 +636,10 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
std::string av_name;
LLStringUtil::toLower(partial_name);
LLWorld::getInstance()->getAvatars(&avatars);
- auto instance = (LLFloaterAvatarList::instanceExists() ? &LLFloaterAvatarList::instance() : nullptr);
+ auto radar = (LLFloaterAvatarList::instanceExists() ? LLFloaterAvatarList::getInstance() : nullptr);
for(const auto& id : avatars)
{
- if (LLAvatarListEntry* entry = instance ? instance->getAvatarEntry(id) : nullptr)
+ if (LLAvatarListEntry* entry = radar ? radar->getAvatarEntry(id) : nullptr)
av_name = entry->getName();
else if (gCacheName->getFullName(id, av_name));
else if (LLVOAvatar* avatarp = gObjectList.findAvatar(id))
diff --git a/indra/newview/floaterao.cpp b/indra/newview/floaterao.cpp
index 0d584e6e5..2038aaa13 100644
--- a/indra/newview/floaterao.cpp
+++ b/indra/newview/floaterao.cpp
@@ -16,13 +16,8 @@
#include "llstartup.h"
#include "llpreviewnotecard.h"
#include "llviewertexteditor.h"
-#include "llcheckboxctrl.h"
#include "llcombobox.h"
-#include "llspinctrl.h"
-#include "chatbar_as_cmdline.h"
-//#include "llfloaterchat.h"
#include "llfirstuse.h"
-#include "lltrans.h"
#include "llinventory.h"
#include "llinventoryfunctions.h"
@@ -31,15 +26,24 @@
#include "roles_constants.h"
#include "llviewerregion.h"
-#include "llpanelobjectinventory.h"
#include "llinventorybridge.h"
-#include "llboost.h"
#include
// Uncomment and use instead if we ever add the chatbar as a command line - MC
void cmdline_printchat(const std::string& message);
+namespace
+{
+ bool sSwimming = false;
+ bool enable_swim()
+ {
+ static const LLCachedControl swim(gSavedSettings, "AOSwimEnabled", false);
+ return swim;
+ }
+ bool is_underwater() { return enable_swim() && gAgentAvatarp && gAgentAvatarp->mBelowWater; }
+}
+
class AONotecardCallback : public LLInventoryCallback
{
public:
@@ -52,28 +56,32 @@ public:
{
if (!mFileName.empty())
{
- LLPreviewNotecard* nc;
- nc = (LLPreviewNotecard*)LLPreview::find(inv_item);
- if(nc)
+ LLPreviewNotecard* nc = (LLPreviewNotecard*)LLPreview::show(inv_item);
+ if (!nc)
{
- nc->open();
- LLTextEditor *text = nc->getEditor();
- if (text)
+ auto item = gInventory.getItem(inv_item);
+ open_notecard(item, "Note: " + item->getName(), LLUUID::null, false);
+ nc = (LLPreviewNotecard*)LLPreview::find(inv_item);
+ }
+
+ if (nc)
+ {
+ if (LLTextEditor *text = nc->getEditor())
{
text->clear();
text->makePristine();
std::ifstream file(mFileName.c_str());
-
+
std::string line;
while (!file.eof())
- {
+ {
getline(file, line);
- line = line + "\n";
+ line += '\n';
text->insertText(line);
}
file.close();
-
+
nc->saveIfNeeded();
}
}
@@ -84,7 +92,7 @@ private:
std::string mFileName;
};
-AOInvTimer* gAOInvTimer = NULL;
+AOInvTimer* gAOInvTimer = nullptr;
// -------------------------------------------------------
@@ -93,7 +101,7 @@ AOStandTimer* mAOStandTimer;
AOStandTimer::AOStandTimer() : LLEventTimer( gSavedSettings.getF32("AOStandInterval") )
{
- AOStandTimer::tick();
+ tick();
}
AOStandTimer::~AOStandTimer()
{
@@ -110,13 +118,13 @@ BOOL AOStandTimer::tick()
LLFloaterAO::stand_iterator++;
// LL_INFOS() << "tick" << LL_ENDL;
LLFloaterAO::ChangeStand();
- return FALSE;
+ return false;
// return LLFloaterAO::ChangeStand(); //timer is always active now ..
}
// -------------------------------------------------------
-AOInvTimer::AOInvTimer() : LLEventTimer( (F32)1.0 )
+AOInvTimer::AOInvTimer() : LLEventTimer( 1.0f )
{
}
AOInvTimer::~AOInvTimer()
@@ -124,22 +132,21 @@ AOInvTimer::~AOInvTimer()
}
BOOL AOInvTimer::tick()
{
- if (!(gSavedSettings.getBOOL("AOEnabled"))) return TRUE;
if(LLStartUp::getStartupState() >= STATE_INVENTORY_SEND)
{
if(LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
{
// cmdline_printchat("Inventory fetched, loading AO.");
- LLFloaterAO::init();
- return TRUE;
+ LLFloaterAO::getInstance(); // Initializes everything
+ return true;
}
}
- return FALSE;
+ return !gSavedSettings.getBOOL("AOEnabled");
}
// STUFF -------------------------------------------------------
-int LLFloaterAO::mAnimationState = 0;
+AOState LLFloaterAO::mAnimationState = STATE_AGENT_IDLE;
int LLFloaterAO::stand_iterator = 0;
LLUUID LLFloaterAO::invfolderid = LLUUID::null;
@@ -160,14 +167,19 @@ LLComboBox* mcomboBox_flyslows;
LLComboBox* mcomboBox_flyups;
LLComboBox* mcomboBox_flydowns;
LLComboBox* mcomboBox_lands;
+LLComboBox* mcomboBox_typings;
+LLComboBox* mcomboBox_floats;
+LLComboBox* mcomboBox_swims;
+LLComboBox* mcomboBox_swimups;
+LLComboBox* mcomboBox_swimdowns;
LLComboBox* mcomboBox_standups;
LLComboBox* mcomboBox_prejumps;
struct struct_overrides
{
LLUUID orig_id;
- LLUUID ao_id;
- int state;
+ LLUUID ao_id = LLUUID::null;
+ AOState state;
};
std::vector mAOOverrides;
@@ -178,139 +190,101 @@ struct struct_stands
};
std::vector mAOStands;
-struct struct_tokens
+LLFloaterAO::LLFloaterAO(const LLSD&) : LLFloater("floater_ao")
{
- std::string token;
- int state;
-};
-std::vector mAOTokens;
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_ao.xml", nullptr, false);
+ init();
+ gSavedSettings.getControl("AOEnabled")->getSignal()->connect(boost::bind(&LLFloaterAO::run));
+ gSavedSettings.getControl("AOEnabled")->getSignal()->connect(std::bind([](const LLSD& enabled)
+ {
+ // Toggle typing AO the moment we toggle AO
+ const bool typing = gAgent.getRenderState() & AGENT_STATE_TYPING;
+ gAgent.sendAnimationRequest(GetAnimIDFromState(STATE_AGENT_TYPING), enabled && typing ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
+ }, std::placeholders::_2));
+ gSavedSettings.getControl("AOSitsEnabled")->getSignal()->connect(boost::bind(&LLFloaterAO::run));
+ sSwimming = is_underwater();
+ gSavedSettings.getControl("AOSwimEnabled")->getSignal()->connect(boost::bind(&LLFloaterAO::toggleSwim, boost::bind(is_underwater)));
+}
-LLFloaterAO* LLFloaterAO::sInstance = NULL;
-
-LLFloaterAO::LLFloaterAO()
-:LLFloater(std::string("floater_ao"))
+void LLFloaterAO::onOpen()
{
-// init();
- llassert_always(sInstance == NULL);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_ao.xml");
- sInstance = this;
+ LLFirstUse::useAO();
}
LLFloaterAO::~LLFloaterAO()
{
- sInstance=NULL;
- mcomboBox_stands = 0;
- mcomboBox_walks = 0;
- mcomboBox_runs = 0;
- mcomboBox_jumps = 0;
- mcomboBox_sits = 0;
- mcomboBox_gsits = 0;
- mcomboBox_crouchs = 0;
- mcomboBox_cwalks = 0;
- mcomboBox_falls = 0;
- mcomboBox_hovers = 0;
- mcomboBox_flys = 0;
- mcomboBox_flyslows = 0;
- mcomboBox_flyups = 0;
- mcomboBox_flydowns = 0;
- mcomboBox_lands = 0;
- mcomboBox_standups = 0;
- mcomboBox_prejumps = 0;
+ mcomboBox_stands = nullptr;
+ mcomboBox_walks = nullptr;
+ mcomboBox_runs = nullptr;
+ mcomboBox_jumps = nullptr;
+ mcomboBox_sits = nullptr;
+ mcomboBox_gsits = nullptr;
+ mcomboBox_crouchs = nullptr;
+ mcomboBox_cwalks = nullptr;
+ mcomboBox_falls = nullptr;
+ mcomboBox_hovers = nullptr;
+ mcomboBox_flys = nullptr;
+ mcomboBox_flyslows = nullptr;
+ mcomboBox_flyups = nullptr;
+ mcomboBox_flydowns = nullptr;
+ mcomboBox_lands = nullptr;
+ mcomboBox_typings = nullptr;
+ mcomboBox_floats = nullptr;
+ mcomboBox_swims = nullptr;
+ mcomboBox_swimups = nullptr;
+ mcomboBox_swimdowns = nullptr;
+ mcomboBox_standups = nullptr;
+ mcomboBox_prejumps = nullptr;
// LL_INFOS() << "floater destroyed" << LL_ENDL;
}
-void LLFloaterAO::show(void*)
-{
- if (!sInstance)
- {
- sInstance = new LLFloaterAO();
- updateLayout(sInstance);
- init();
-
- sInstance->open();
- }
- else
- {
- sInstance->close();
- }
- LLFirstUse::useAO();
-}
-
-bool LLFloaterAO::getInstance()
-{
- if (sInstance)
- return true;
- else
- return false;
-}
-
BOOL LLFloaterAO::postBuild()
{
- childSetAction("more_btn", onClickMore, this);
- childSetAction("less_btn", onClickLess, this);
+ gSavedSettings.getControl("AOAdvanced")->getSignal()->connect(boost::bind(&LLFloaterAO::updateLayout, this, _2));
- childSetAction("reloadcard",onClickReloadCard,this);
- childSetAction("opencard",onClickOpenCard,this);
- childSetAction("newcard",onClickNewCard,this);
- childSetAction("prevstand",onClickPrevStand,this);
- childSetAction("nextstand",onClickNextStand,this);
- getChild("AOEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleAO));
- getChild("AOSitsEnabled")->setCommitCallback(boost::bind(&LLFloaterAO::onClickToggleSits));
- getChild("standtime")->setCommitCallback(boost::bind(&LLFloaterAO::onSpinnerCommit,_1));
- mcomboBox_stands = getChild("stands");
- mcomboBox_walks = getChild("walks");
- mcomboBox_runs = getChild("runs");
- mcomboBox_jumps = getChild("jumps");
- mcomboBox_sits = getChild("sits");
- mcomboBox_gsits = getChild("gsits");
- mcomboBox_crouchs = getChild("crouchs");
- mcomboBox_cwalks = getChild("cwalks");
- mcomboBox_falls = getChild("falls");
- mcomboBox_hovers = getChild("hovers");
- mcomboBox_flys = getChild("flys");
- mcomboBox_flyslows = getChild("flyslows");
- mcomboBox_flyups = getChild("flyups");
- mcomboBox_flydowns = getChild("flydowns");
- mcomboBox_lands = getChild("lands");
- mcomboBox_standups = getChild("standups");
- mcomboBox_prejumps = getChild("prejumps");
- getChild("stands")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("walks")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("runs")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("jumps")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("sits")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("gsits")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("crouchs")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("cwalks")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("falls")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("hovers")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("flys")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("flyslows")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("flyups")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("flydowns")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("lands")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("standups")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
- getChild("prejumps")->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ getChild("reloadcard")->setCommitCallback(boost::bind(&LLFloaterAO::onClickReloadCard));
+ getChild("opencard")->setCommitCallback(boost::bind(&LLFloaterAO::onClickOpenCard));
+ getChild("newcard")->setCommitCallback(boost::bind(&LLFloaterAO::onClickNewCard));
+ getChild("prevstand")->setCommitCallback(boost::bind(&LLFloaterAO::onClickCycleStand, false));
+ getChild("nextstand")->setCommitCallback(boost::bind(&LLFloaterAO::onClickCycleStand, true));
+ getChild("standtime")->setCommitCallback(boost::bind(&LLFloaterAO::onSpinnerCommit));
- return TRUE;
+ (mcomboBox_stands = getChild("stands"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_walks = getChild("walks"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_runs = getChild("runs"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_jumps = getChild("jumps"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_sits = getChild("sits"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_gsits = getChild("gsits"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_crouchs = getChild("crouchs"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_cwalks = getChild("cwalks"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_falls = getChild("falls"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_hovers = getChild("hovers"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_flys = getChild("flys"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_flyslows = getChild("flyslows"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_flyups = getChild("flyups"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_flydowns = getChild("flydowns"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_lands = getChild("lands"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_typings = getChild("typings"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_floats = getChild("floats"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_swims = getChild("swims"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_swimups = getChild("swimups"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_swimdowns = getChild("swimdowns"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit, _1));
+ (mcomboBox_standups = getChild("standups"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+ (mcomboBox_prejumps = getChild("prejumps"))->setCommitCallback(boost::bind(&LLFloaterAO::onComboBoxCommit,_1));
+
+ updateLayout(gSavedSettings.getBOOL("AOAdvanced"));
+
+ return true;
}
-void LLFloaterAO::onSpinnerCommit(LLUICtrl* ctrl)
+void LLFloaterAO::onSpinnerCommit()
{
- LLSpinCtrl* spin = (LLSpinCtrl*) ctrl;
- if(spin)
- {
- if (spin->getName() == "standtime")
- {
- if (mAOStandTimer) mAOStandTimer->reset();
- }
- }
+ if (mAOStandTimer) mAOStandTimer->reset();
}
void LLFloaterAO::onComboBoxCommit(LLUICtrl* ctrl)
{
- LLComboBox* box = (LLComboBox*)ctrl;
- if(box)
+ if (LLComboBox* box = (LLComboBox*)ctrl)
{
if (box->getName() == "stands")
{
@@ -320,250 +294,81 @@ void LLFloaterAO::onComboBoxCommit(LLUICtrl* ctrl)
}
else
{
- int state = STATE_AGENT_IDLE;
+ AOState state = getStateFromCombo(box);
std::string stranim = box->getValue().asString();
-// LL_INFOS() << "state " << (gAgentAvatarp->isSitting()) << " - " << getAnimationState() << LL_ENDL;
- if (box->getName() == "walks")
+// LL_INFOS() << "state " << state << " - " << getAnimationState() << LL_ENDL;
+ gAgent.sendAnimationRequest(GetAnimIDFromState(state), ANIM_REQUEST_STOP);
+ bool start_cond = getAnimationState() == state && gSavedSettings.getBOOL("AOEnabled");
+ switch (state)
{
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_WALK), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultWalk",stranim);
- state = STATE_AGENT_WALK;
+ case STATE_AGENT_SIT:
+ case STATE_AGENT_GROUNDSIT:
+ start_cond &= gAgentAvatarp && gAgentAvatarp->isSitting() && gSavedSettings.getBOOL("AOSitsEnabled");
+ break;
+ default: break;
}
- else if (box->getName() == "runs")
+ LLUUID anim = getAssetIDByName(stranim);
+ if (start_cond) gAgent.sendAnimationRequest(anim, ANIM_REQUEST_START);
+ gSavedPerAccountSettings.setString(ctrl->getControlName(), stranim);
+ for (auto& ao : mAOOverrides)
{
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_RUN), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultRun",stranim);
- state = STATE_AGENT_RUN;
- }
- else if (box->getName() == "jumps")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_JUMP), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultJump",stranim);
- state = STATE_AGENT_JUMP;
- }
- else if (box->getName() == "sits")
- {
- if (gAgentAvatarp && (gSavedSettings.getBOOL("AOEnabled")) && (gSavedSettings.getBOOL("AOSitsEnabled")))
+ if (state == ao.state)
{
- if ((gAgentAvatarp->isSitting()) && (getAnimationState() == STATE_AGENT_SIT))
- {
-// LL_INFOS() << "sitting " << GetAnimID(ANIM_AGENT_SIT) << " " << getAssetIDByName(stranim) << LL_ENDL;
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_SIT), ANIM_REQUEST_STOP);
- gAgent.sendAnimationRequest(getAssetIDByName(stranim), ANIM_REQUEST_START);
- }
- }
- gSavedPerAccountSettings.setString("AODefaultSit",stranim);
- state = STATE_AGENT_SIT;
- }
- else if (box->getName() == "gsits")
- {
-// LL_INFOS() << "gsitting " << GetAnimID(ANIM_AGENT_SIT_GROUND) << " " << getAssetIDByName(stranim) << LL_ENDL;
- if (gAgentAvatarp)
- {
- if ((gAgentAvatarp->isSitting()) && (getAnimationState() == STATE_AGENT_GROUNDSIT))
- {
-// LL_INFOS() << "gsitting " << GetAnimID(ANIM_AGENT_SIT_GROUND) << " " << getAssetIDByName(stranim) << LL_ENDL;
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_SIT_GROUND), ANIM_REQUEST_STOP);
- gAgent.sendAnimationRequest(getAssetIDByName(stranim), ANIM_REQUEST_START);
- }
- }
- gSavedPerAccountSettings.setString("AODefaultGroundSit",stranim);
- state = STATE_AGENT_GROUNDSIT;
- }
- else if (box->getName() == "crouchs")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_CROUCH), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultCrouch",stranim);
- state = STATE_AGENT_CROUCH;
- }
- else if (box->getName() == "cwalks")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_CROUCHWALK), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultCrouchWalk",stranim);
- state = STATE_AGENT_CROUCHWALK;
- }
- else if (box->getName() == "falls")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_FALLDOWN), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultFall",stranim);
- state = STATE_AGENT_FALLDOWN;
- }
- else if (box->getName() == "hovers")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_HOVER), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultHover",stranim);
- state = STATE_AGENT_HOVER;
- }
- else if (box->getName() == "flys")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_FLY), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultFly",stranim);
- state = STATE_AGENT_FLY;
- }
- else if (box->getName() == "flyslows")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_FLYSLOW), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultFlySlow",stranim);
- state = STATE_AGENT_FLYSLOW;
- }
- else if (box->getName() == "flyups")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_HOVER_UP), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultFlyUp",stranim);
- state = STATE_AGENT_HOVER_UP;
- }
- else if (box->getName() == "flydowns")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_HOVER_DOWN), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultFlyDown",stranim);
- state = STATE_AGENT_HOVER_DOWN;
- }
- else if (box->getName() == "lands")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_LAND), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultLand",stranim);
- state = STATE_AGENT_LAND;
- }
- else if (box->getName() == "standups")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_STAND), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultStandUp",stranim);
- state = STATE_AGENT_STAND;
- }
- else if (box->getName() == "prejumps")
- {
- gAgent.sendAnimationRequest(GetAnimID(ANIM_AGENT_PRE_JUMP), ANIM_REQUEST_STOP);
- gSavedPerAccountSettings.setString("AODefaultPreJump",stranim);
- state = STATE_AGENT_PRE_JUMP;
- }
- for (std::vector::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
- {
- if (state == iter->state)
- {
- iter->ao_id = getAssetIDByName(stranim);
+ ao.ao_id = anim;
+ break;
}
}
}
}
}
-void LLFloaterAO::updateLayout(LLFloaterAO* floater)
+void LLFloaterAO::updateLayout(bool advanced)
{
- if (floater)
- {
- BOOL advanced = gSavedSettings.getBOOL( "AOAdvanced");
- if (advanced)
- {
- floater->reshape(610,380); //view->getRect().getWidth(), view->getUIWinHeightLong());
- }
- else
- {
- floater->reshape(200,380); //view->getRect().getWidth(), view->getUIWinHeightShort());
- }
-
- floater->childSetVisible("more_btn", !advanced);
- floater->childSetVisible("less_btn", advanced);
-
- floater->childSetVisible("tabcontainer", advanced);
- floater->childSetVisible("tabdefaultanims", advanced);
-
- floater->childSetVisible("textdefaultwalk", advanced);
- floater->childSetVisible("textdefaultrun", advanced);
- floater->childSetVisible("textdefaultjump", advanced);
- floater->childSetVisible("textdefaultsit", advanced);
- floater->childSetVisible("textdefaultgsit", advanced);
- floater->childSetVisible("textdefaultcrouch", advanced);
- floater->childSetVisible("textdefaultcrouchwalk", advanced);
- floater->childSetVisible("textdefaultfall", advanced);
- floater->childSetVisible("textdefaulthover", advanced);
- floater->childSetVisible("textdefaultfly", advanced);
- floater->childSetVisible("textdefaultflyslow", advanced);
- floater->childSetVisible("textdefaultflyup", advanced);
- floater->childSetVisible("textdefaultflydown", advanced);
- floater->childSetVisible("textdefaultland", advanced);
- floater->childSetVisible("textdefaultstandup", advanced);
- floater->childSetVisible("textdefaultprejump", advanced);
-
-
- floater->childSetVisible("walks", advanced);
- floater->childSetVisible("runs", advanced);
- floater->childSetVisible("jumps", advanced);
- floater->childSetVisible("sits", advanced);
- floater->childSetVisible("gsits", advanced);
- floater->childSetVisible("crouchs", advanced);
- floater->childSetVisible("falls", advanced);
- floater->childSetVisible("hovers", advanced);
- floater->childSetVisible("flys", advanced);
- floater->childSetVisible("flyslows", advanced);
- floater->childSetVisible("flyups", advanced);
- floater->childSetVisible("flydowns", advanced);
- floater->childSetVisible("lands", advanced);
- floater->childSetVisible("standups", advanced);
- floater->childSetVisible("prejumps", advanced);
- }
+ reshape(advanced ? 800 : 200, getRect().getHeight());
+ childSetVisible("tabcontainer", advanced);
}
void LLFloaterAO::init()
{
mAOStands.clear();
- mAOTokens.clear();
mAOOverrides.clear();
- struct_tokens tokenloader;
- tokenloader.token =
- tokenloader.token = "[ Sitting On Ground ]"; tokenloader.state = STATE_AGENT_GROUNDSIT; mAOTokens.push_back(tokenloader); // 0
- tokenloader.token = "[ Sitting ]"; tokenloader.state = STATE_AGENT_SIT; mAOTokens.push_back(tokenloader); // 1
- tokenloader.token = "[ Crouching ]"; tokenloader.state = STATE_AGENT_CROUCH; mAOTokens.push_back(tokenloader); // 3
- tokenloader.token = "[ Crouch Walking ]"; tokenloader.state = STATE_AGENT_CROUCHWALK; mAOTokens.push_back(tokenloader); // 4
- tokenloader.token = "[ Standing Up ]"; tokenloader.state = STATE_AGENT_STANDUP; mAOTokens.push_back(tokenloader); // 6
- tokenloader.token = "[ Falling ]"; tokenloader.state = STATE_AGENT_FALLDOWN; mAOTokens.push_back(tokenloader); // 7
- tokenloader.token = "[ Flying Down ]"; tokenloader.state = STATE_AGENT_HOVER_DOWN; mAOTokens.push_back(tokenloader); // 8
- tokenloader.token = "[ Flying Up ]"; tokenloader.state = STATE_AGENT_HOVER_UP; mAOTokens.push_back(tokenloader); // 9
- tokenloader.token = "[ Flying Slow ]"; tokenloader.state = STATE_AGENT_FLYSLOW; mAOTokens.push_back(tokenloader); // 10
- tokenloader.token = "[ Flying ]"; tokenloader.state = STATE_AGENT_FLY; mAOTokens.push_back(tokenloader); // 11
- tokenloader.token = "[ Hovering ]"; tokenloader.state = STATE_AGENT_HOVER; mAOTokens.push_back(tokenloader); // 12
- tokenloader.token = "[ Jumping ]"; tokenloader.state = STATE_AGENT_JUMP; mAOTokens.push_back(tokenloader); // 13
- tokenloader.token = "[ Pre Jumping ]"; tokenloader.state = STATE_AGENT_PRE_JUMP; mAOTokens.push_back(tokenloader); // 14
- tokenloader.token = "[ Running ]"; tokenloader.state = STATE_AGENT_RUN; mAOTokens.push_back(tokenloader); // 15
- tokenloader.token = "[ Turning Right ]"; tokenloader.state = STATE_AGENT_TURNRIGHT; mAOTokens.push_back(tokenloader); // 16
- tokenloader.token = "[ Turning Left ]"; tokenloader.state = STATE_AGENT_TURNLEFT; mAOTokens.push_back(tokenloader); // 17
- tokenloader.token = "[ Walking ]"; tokenloader.state = STATE_AGENT_WALK; mAOTokens.push_back(tokenloader); // 18
- tokenloader.token = "[ Landing ]"; tokenloader.state = STATE_AGENT_LAND; mAOTokens.push_back(tokenloader); // 19
- tokenloader.token = "[ Standing ]"; tokenloader.state = STATE_AGENT_STAND; mAOTokens.push_back(tokenloader); // 20
- tokenloader.token = "[ Swimming Down ]"; tokenloader.state = 999; mAOTokens.push_back(tokenloader); // 21
- tokenloader.token = "[ Swimming Up ]"; tokenloader.state = 999; mAOTokens.push_back(tokenloader); // 22
- tokenloader.token = "[ Swimming Forward ]"; tokenloader.state = 999; mAOTokens.push_back(tokenloader); // 23
- tokenloader.token = "[ Floating ]"; tokenloader.state = 999; mAOTokens.push_back(tokenloader); // 24
-
struct_overrides overrideloader;
- overrideloader.orig_id = ANIM_AGENT_WALK; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_WALK; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_RUN; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_RUN; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_PRE_JUMP; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_PRE_JUMP; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_JUMP; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_JUMP; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_TURNLEFT; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_TURNLEFT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_TURNRIGHT; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_TURNRIGHT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_WALK; overrideloader.state = STATE_AGENT_WALK; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_RUN; overrideloader.state = STATE_AGENT_RUN; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_PRE_JUMP; overrideloader.state = STATE_AGENT_PRE_JUMP; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_JUMP; overrideloader.state = STATE_AGENT_JUMP; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_TURNLEFT; overrideloader.state = STATE_AGENT_TURNLEFT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_TURNRIGHT; overrideloader.state = STATE_AGENT_TURNRIGHT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_SIT; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_SIT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_SIT_FEMALE; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_SIT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_SIT_GENERIC; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_SIT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_SIT_GROUND; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_GROUNDSIT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_SIT_GROUND_CONSTRAINED; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_GROUNDSIT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_SIT; overrideloader.state = STATE_AGENT_SIT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_SIT_FEMALE; overrideloader.state = STATE_AGENT_SIT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_SIT_GENERIC; overrideloader.state = STATE_AGENT_SIT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_SIT_GROUND; overrideloader.state = STATE_AGENT_GROUNDSIT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_SIT_GROUND_CONSTRAINED; overrideloader.state = STATE_AGENT_GROUNDSIT; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_HOVER; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_HOVER; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_HOVER_DOWN; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_HOVER_DOWN; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_HOVER_UP; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_HOVER_UP; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_HOVER; overrideloader.state = STATE_AGENT_HOVER; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_HOVER_DOWN; overrideloader.state = STATE_AGENT_HOVER_DOWN; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_HOVER_UP; overrideloader.state = STATE_AGENT_HOVER_UP; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_CROUCH; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_CROUCH; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_CROUCHWALK; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_CROUCHWALK; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_CROUCH; overrideloader.state = STATE_AGENT_CROUCH; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_CROUCHWALK; overrideloader.state = STATE_AGENT_CROUCHWALK; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_FALLDOWN; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_FALLDOWN; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_STANDUP; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_STANDUP; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_LAND; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_LAND; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_FALLDOWN; overrideloader.state = STATE_AGENT_FALLDOWN; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_STANDUP; overrideloader.state = STATE_AGENT_STANDUP; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_LAND; overrideloader.state = STATE_AGENT_LAND; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_TYPE; overrideloader.state = STATE_AGENT_TYPING; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_FLY; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_FLY; mAOOverrides.push_back(overrideloader);
- overrideloader.orig_id = ANIM_AGENT_FLYSLOW; overrideloader.ao_id = LLUUID::null; overrideloader.state = STATE_AGENT_FLYSLOW; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_FLY; overrideloader.state = STATE_AGENT_FLY; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_FLYSLOW; overrideloader.state = STATE_AGENT_FLYSLOW; mAOOverrides.push_back(overrideloader);
- BOOL success = TRUE;
+ overrideloader.orig_id = ANIM_AGENT_HOVER; overrideloader.state = STATE_AGENT_FLOAT; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_HOVER_DOWN; overrideloader.state = STATE_AGENT_SWIM_DOWN; mAOOverrides.push_back(overrideloader);
+ overrideloader.orig_id = ANIM_AGENT_HOVER_UP; overrideloader.state = STATE_AGENT_SWIM_UP; mAOOverrides.push_back(overrideloader);
+
+ overrideloader.orig_id = ANIM_AGENT_FLY; overrideloader.state = STATE_AGENT_SWIM; mAOOverrides.push_back(overrideloader);
+
+ bool success = true;
if(LLStartUp::getStartupState() >= STATE_INVENTORY_SEND)
{
@@ -572,7 +377,7 @@ void LLFloaterAO::init()
LLUUID configncitem = (LLUUID)gSavedPerAccountSettings.getString("AOConfigNotecardID");
if (configncitem.notNull())
{
- success = FALSE;
+ success = false;
const LLInventoryItem* item = gInventory.getItem(configncitem);
if(item)
{
@@ -593,8 +398,8 @@ void LLFloaterAO::init()
item->getType(),
&onNotecardLoadComplete,
(void*)new_uuid,
- TRUE);
- success = TRUE;
+ true);
+ success = true;
}
}
}
@@ -607,41 +412,20 @@ void LLFloaterAO::init()
cmdline_printchat("Could not read the specified Config Notecard");
}
-// mAnimationState = 0;
+// mAnimationState = STATE_AGENT_IDLE;
// mCurrentStandId = LLUUID::null;
// setAnimationState(STATE_AGENT_IDLE);
-
-}
-
-void LLFloaterAO::onClickMore(void* data)
-{
- gSavedSettings.setBOOL( "AOAdvanced", TRUE );
- updateLayout(sInstance);
-}
-void LLFloaterAO::onClickLess(void* data)
-{
- gSavedSettings.setBOOL( "AOAdvanced", FALSE );
- updateLayout(sInstance);
-}
-
-void LLFloaterAO::onClickToggleAO()
-{
- run();
-}
-
-void LLFloaterAO::onClickToggleSits()
-{
- run();
}
void LLFloaterAO::run()
{
setAnimationState(STATE_AGENT_IDLE); // reset state
- int state = getAnimationState(); // check if sitting or hovering
- if ((state == STATE_AGENT_IDLE) || (state == STATE_AGENT_STAND))
+ AOState state = getAnimationState(); // check if sitting or hovering
+ bool enabled = gSavedSettings.getBOOL("AOEnabled");
+ if (state == STATE_AGENT_IDLE || state == STATE_AGENT_STAND)
{
- if (gSavedSettings.getBOOL("AOEnabled"))
+ if (enabled)
{
if (mAOStandTimer)
{
@@ -655,18 +439,63 @@ void LLFloaterAO::run()
}
else
{
- stopMotion(getCurrentStandId(), FALSE, TRUE); //stop stand first then set state
+ stopMotion(getCurrentStandId(), true); //stop stand first then set state
setAnimationState(STATE_AGENT_IDLE);
}
}
else
{
- if (state == STATE_AGENT_SIT) gAgent.sendAnimationRequest(GetAnimIDFromState(state), (gSavedSettings.getBOOL("AOEnabled") && gSavedSettings.getBOOL("AOSitsEnabled")) ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
- else gAgent.sendAnimationRequest(GetAnimIDFromState(state), gSavedSettings.getBOOL("AOEnabled") ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
+ bool sit = false;
+ switch (state)
+ {
+ case STATE_AGENT_SIT:
+ case STATE_AGENT_GROUNDSIT:
+ sit = true;
+ stopMotion(getCurrentStandId(), true); // Stop the current stand
+ break;
+ default: break;
+ }
+ gAgent.sendAnimationRequest(GetAnimIDFromState(state), (enabled && (!sit || gSavedSettings.getBOOL("AOSitsEnabled"))) ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
}
}
-int LLFloaterAO::getAnimationState()
+void LLFloaterAO::typing(bool start)
+{
+ uuid_vec_t anims;
+ // If we're stopping, stop regardless, just in case the setting was toggled during (e.g.: keyboard shortcut)
+ if (!start || gSavedSettings.getBOOL("PlayTypingAnim")) // Linden typing
+ anims.push_back(ANIM_AGENT_TYPE);
+ if (gSavedSettings.getBOOL("AOEnabled")) // Typing override
+ anims.push_back(GetAnimIDFromState(STATE_AGENT_TYPING));
+ if (anims.empty()) return;
+ gAgent.sendAnimationRequests(anims, start ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
+}
+
+AOState LLFloaterAO::flyToSwimState(const AOState& state)
+{
+ switch (state)
+ {
+ case STATE_AGENT_HOVER: return STATE_AGENT_FLOAT;
+ case STATE_AGENT_FLY: return STATE_AGENT_SWIM;
+ case STATE_AGENT_HOVER_UP: return STATE_AGENT_SWIM_UP;
+ case STATE_AGENT_HOVER_DOWN: return STATE_AGENT_SWIM_DOWN;
+ default: return state;
+ }
+}
+
+AOState LLFloaterAO::swimToFlyState(const AOState& state)
+{
+ switch (state)
+ {
+ case STATE_AGENT_FLOAT: return STATE_AGENT_HOVER;
+ case STATE_AGENT_SWIM: return STATE_AGENT_FLY;
+ case STATE_AGENT_SWIM_UP: return STATE_AGENT_HOVER_UP;
+ case STATE_AGENT_SWIM_DOWN: return STATE_AGENT_HOVER_DOWN;
+ default: return state;
+ }
+}
+
+AOState LLFloaterAO::getAnimationState()
{
if (gAgentAvatarp)
{
@@ -676,9 +505,9 @@ int LLFloaterAO::getAnimationState()
return mAnimationState;
}
-void LLFloaterAO::setAnimationState(const int state)
+void LLFloaterAO::setAnimationState(const AOState& state)
{
- mAnimationState = state;
+ mAnimationState = sSwimming ? flyToSwimState(state) : state;
}
LLUUID LLFloaterAO::getCurrentStandId()
@@ -691,81 +520,113 @@ void LLFloaterAO::setCurrentStandId(const LLUUID& id)
mCurrentStandId = id;
}
+bool LLFloaterAO::swimCheck(const AOState& state)
+{
+ switch (state)
+ {
+ case STATE_AGENT_HOVER:
+ case STATE_AGENT_FLY:
+ case STATE_AGENT_HOVER_UP:
+ case STATE_AGENT_HOVER_DOWN:
+ return !sSwimming;
+ case STATE_AGENT_FLOAT:
+ case STATE_AGENT_SWIM:
+ case STATE_AGENT_SWIM_UP:
+ case STATE_AGENT_SWIM_DOWN:
+ return sSwimming;
+ default: return true;
+ }
+}
+
LLUUID LLFloaterAO::GetAnimID(const LLUUID& id)
{
- for (std::vector::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
+ for (const auto& ao : mAOOverrides)
{
- if (iter->orig_id == id) return iter->ao_id;
+ if (swimCheck(ao.state) && ao.orig_id == id)
+ {
+ return ao.ao_id;
+ }
}
return LLUUID::null;
}
-int LLFloaterAO::GetStateFromAnimID(const LLUUID& id)
+AOState LLFloaterAO::GetStateFromAnimID(const LLUUID& id)
{
- for (std::vector::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
+ for (const auto& ao : mAOOverrides)
{
- if (iter->orig_id == id) return iter->state;
+ if (swimCheck(ao.state) && ao.orig_id == id) return ao.state;
}
return STATE_AGENT_IDLE;
}
-LLUUID LLFloaterAO::GetAnimIDFromState(const int state)
+LLUUID LLFloaterAO::GetAnimIDFromState(const AOState& state)
{
- for (std::vector::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
+ for (const auto& ao : mAOOverrides)
{
- if (iter->state == state) return iter->ao_id;
+ if (ao.state == state) return ao.ao_id;
}
return LLUUID::null;
}
-int LLFloaterAO::GetStateFromToken(std::string strtoken)
+AOState LLFloaterAO::GetStateFromToken(std::string strtoken)
{
- for (std::vector::iterator iter = mAOTokens.begin(); iter != mAOTokens.end(); ++iter)
- {
- if (iter->token == strtoken) return iter->state;
- }
+ if (strtoken == "[ Sitting On Ground ]") return STATE_AGENT_GROUNDSIT;
+ if (strtoken == "[ Sitting ]") return STATE_AGENT_SIT;
+ if (strtoken == "[ Crouching ]") return STATE_AGENT_CROUCH;
+ if (strtoken == "[ Crouch Walking ]") return STATE_AGENT_CROUCHWALK;
+ if (strtoken == "[ Standing Up ]") return STATE_AGENT_STANDUP;
+ if (strtoken == "[ Falling ]") return STATE_AGENT_FALLDOWN;
+ if (strtoken == "[ Flying Down ]") return STATE_AGENT_HOVER_DOWN;
+ if (strtoken == "[ Flying Up ]") return STATE_AGENT_HOVER_UP;
+ if (strtoken == "[ Flying Slow ]") return STATE_AGENT_FLYSLOW;
+ if (strtoken == "[ Flying ]") return STATE_AGENT_FLY;
+ if (strtoken == "[ Hovering ]") return STATE_AGENT_HOVER;
+ if (strtoken == "[ Jumping ]") return STATE_AGENT_JUMP;
+ if (strtoken == "[ Pre Jumping ]") return STATE_AGENT_PRE_JUMP;
+ if (strtoken == "[ Running ]") return STATE_AGENT_RUN;
+ if (strtoken == "[ Turning Right ]") return STATE_AGENT_TURNRIGHT;
+ if (strtoken == "[ Turning Left ]") return STATE_AGENT_TURNLEFT;
+ if (strtoken == "[ Walking ]") return STATE_AGENT_WALK;
+ if (strtoken == "[ Landing ]") return STATE_AGENT_LAND;
+ if (strtoken == "[ Standing ]") return STATE_AGENT_STAND;
+ if (strtoken == "[ Swimming Down ]") return STATE_AGENT_SWIM_DOWN;
+ if (strtoken == "[ Swimming Up ]") return STATE_AGENT_SWIM_UP;
+ if (strtoken == "[ Swimming Forward ]") return STATE_AGENT_SWIM;
+ if (strtoken == "[ Floating ]") return STATE_AGENT_FLOAT;
+ if (strtoken == "[ Typing ]") return STATE_AGENT_TYPING;
return STATE_AGENT_IDLE;
}
-void LLFloaterAO::onClickPrevStand(void* user_data)
+void LLFloaterAO::onClickCycleStand(bool next)
{
- if (!(mAOStands.size() > 0)) return;
- stand_iterator=stand_iterator-1;
+ if (mAOStands.empty()) return;
+ stand_iterator += (next ? 1 : -1);
if (stand_iterator < 0) stand_iterator = int( mAOStands.size()-stand_iterator);
if (stand_iterator > int( mAOStands.size()-1)) stand_iterator = 0;
cmdline_printchat(llformat("Changing stand to %s.",mAOStands[stand_iterator].anim_name.c_str()));
ChangeStand();
}
-void LLFloaterAO::onClickNextStand(void* user_data)
-{
- if (!(mAOStands.size() > 0)) return;
- stand_iterator=stand_iterator+1;
- if (stand_iterator < 0) stand_iterator = int( mAOStands.size()-stand_iterator);
- if (stand_iterator > int( mAOStands.size()-1)) stand_iterator = 0;
- cmdline_printchat(llformat("Changing stand to %s.",mAOStands[stand_iterator].anim_name.c_str()));
- ChangeStand();
-}
-
-BOOL LLFloaterAO::ChangeStand()
+void LLFloaterAO::ChangeStand()
{
if (gSavedSettings.getBOOL("AOEnabled"))
{
if (gAgentAvatarp)
{
- if (gSavedSettings.getBOOL("AONoStandsInMouselook") && gAgentCamera.cameraMouselook()) return FALSE;
+ if (gSavedSettings.getBOOL("AONoStandsInMouselook") && gAgentCamera.cameraMouselook()) return;
if (gAgentAvatarp->isSitting())
{
-// stopMotion(getCurrentStandId(), FALSE, TRUE); //stop stand first then set state
+// stopMotion(getCurrentStandId(), true); //stop stand first then set state
// if (getAnimationState() != STATE_AGENT_GROUNDSIT) setAnimationState(STATE_AGENT_SIT);
// setCurrentStandId(LLUUID::null);
- return FALSE;
+ return;
}
}
- if ((getAnimationState() == STATE_AGENT_IDLE) || (getAnimationState() == STATE_AGENT_STAND))// stands have lowest priority
+ AOState state = getAnimationState();
+ if (state == STATE_AGENT_IDLE || state == STATE_AGENT_STAND)// stands have lowest priority
{
- if (!(mAOStands.size() > 0)) return TRUE;
+ if (mAOStands.empty()) return;
if (gSavedSettings.getBOOL("AOStandRandomize"))
{
stand_iterator = ll_rand(mAOStands.size()-1);
@@ -779,113 +640,107 @@ BOOL LLFloaterAO::ChangeStand()
if (mAOStands[stand_iterator].ao_id.notNull())
{
- stopMotion(getCurrentStandId(), FALSE, TRUE); //stop stand first then set state
- startMotion(mAOStands[stand_iterator].ao_id, 0, TRUE);
+ stopMotion(getCurrentStandId(), true); //stop stand first then set state
+ startMotion(mAOStands[stand_iterator].ao_id, true);
setAnimationState(STATE_AGENT_STAND);
setCurrentStandId(mAOStands[stand_iterator].ao_id);
- if ((sInstance)&&(mcomboBox_stands)) mcomboBox_stands->selectNthItem(stand_iterator);
+ if (mcomboBox_stands) mcomboBox_stands->selectNthItem(stand_iterator);
// LL_INFOS() << "changing stand to " << mAOStands[stand_iterator].anim_name << LL_ENDL;
- return FALSE;
}
}
}
- else
- {
- stopMotion(getCurrentStandId(), FALSE, TRUE);
- return TRUE; //stop if ao is off
- }
- return TRUE;
+ else stopMotion(getCurrentStandId(), true);
}
-
-BOOL LLFloaterAO::startMotion(const LLUUID& id, F32 time_offset, BOOL stand)
+void LLFloaterAO::toggleSwim(bool underwater)
{
+ static const LLCachedControl enabled(gSavedSettings, "AOEnabled", false);
+
+ sSwimming = underwater && enable_swim();
+
+ // Don't send requests if we have the AO disabled.
+ if (enabled)
+ {
+ AOState state = getAnimationState();
+ if (state != STATE_AGENT_IDLE && state != STATE_AGENT_STAND) // Don't bother if we're just standing or idle (Who pushed us?!)
+ {
+ // Stop all of the previous states
+ constexpr std::array swim_states = { STATE_AGENT_FLOAT, STATE_AGENT_SWIM, STATE_AGENT_SWIM_UP, STATE_AGENT_SWIM_DOWN };
+ constexpr std::array fly_states = { STATE_AGENT_HOVER, STATE_AGENT_FLY, STATE_AGENT_HOVER_UP, STATE_AGENT_HOVER_DOWN };
+ uuid_vec_t vec;
+ for (const auto& state : sSwimming ? fly_states : swim_states)
+ vec.push_back(GetAnimIDFromState(state));
+ gAgent.sendAnimationRequests(vec, ANIM_REQUEST_STOP);
+ // Process new animations
+ gAgentAvatarp->processAnimationStateChanges();
+ }
+ }
+}
+
+void LLFloaterAO::doMotion(const LLUUID& id, bool start, bool stand)
+{
+ if (id.isNull()) return;
+ LLUUID anim = id;
if (stand)
{
- if (id.notNull())
+ if (start)
{
- BOOL sitting = FALSE;
- if (gAgentAvatarp)
- {
- sitting = gAgentAvatarp->isSitting();
- }
- if (sitting) return FALSE;
- gAgent.sendAnimationRequest(id, ANIM_REQUEST_START);
- return TRUE;
+ if (gAgentAvatarp && gAgentAvatarp->isSitting())
+ return;
}
+ else setAnimationState(STATE_AGENT_IDLE);
}
else
{
- if (GetAnimID(id).notNull() && gSavedSettings.getBOOL("AOEnabled"))
+ anim = GetAnimID(id);
+ if (anim.isNull() || !gSavedSettings.getBOOL("AOEnabled")) return;
+ AOState state = GetStateFromAnimID(id);
+ if (start)
{
- stopMotion(getCurrentStandId(), FALSE, TRUE); //stop stand first then set state
- setAnimationState(GetStateFromAnimID(id));
-
-// LL_INFOS() << " state " << getAnimationState() << " start anim " << id << " overriding with " << GetAnimID(id) << LL_ENDL;
- if ((GetStateFromAnimID(id) == STATE_AGENT_SIT) && !(gSavedSettings.getBOOL("AOSitsEnabled"))) return TRUE;
- gAgent.sendAnimationRequest(GetAnimID(id), ANIM_REQUEST_START);
- return TRUE;
+ stopMotion(getCurrentStandId(), true); //stop stand first then set state
+ setAnimationState(state);
+// LL_INFOS() << " state " << getAnimationState() << " start anim " << id << " overriding with " << anim << LL_ENDL;
+ if (state == STATE_AGENT_SIT && !gSavedSettings.getBOOL("AOSitsEnabled")) return;
+ }
+ else
+ {
+// LL_INFOS() << " state " << getAnimationState() << "/" << state << "(now 0) stop anim " << id << " overriding with " << anim << LL_ENDL;
+ if (getAnimationState() == state) setAnimationState(STATE_AGENT_IDLE);
+ ChangeStand(); // startMotion(getCurrentStandId(), true);
}
}
- return FALSE;
+ gAgent.sendAnimationRequest(anim, start ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
}
-BOOL LLFloaterAO::stopMotion(const LLUUID& id, BOOL stop_immediate, BOOL stand)
-{
- if (stand)
- {
- setAnimationState(STATE_AGENT_IDLE);
- gAgent.sendAnimationRequest(id, ANIM_REQUEST_STOP);
- return TRUE;
- }
- else
- {
- if (GetAnimID(id).notNull() && gSavedSettings.getBOOL("AOEnabled"))
- {
-// LL_INFOS() << " state " << getAnimationState() << "/" << GetStateFromAnimID(id) << "(now 0) stop anim " << id << " overriding with " << GetAnimID(id) << LL_ENDL;
- if (getAnimationState() == GetStateFromAnimID(id))
- {
- setAnimationState(STATE_AGENT_IDLE);
- }
- ChangeStand(); // startMotion(getCurrentStandId(), 0, TRUE);
- gAgent.sendAnimationRequest(GetAnimID(id), ANIM_REQUEST_STOP);
- return TRUE;
- }
- }
- return FALSE;
-}
-
-void LLFloaterAO::onClickReloadCard(void* user_data)
+void LLFloaterAO::onClickReloadCard()
{
- if(LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
+ if (LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
{
- LLFloaterAO::init();
+ init();
}
}
-void LLFloaterAO::onClickOpenCard(void* user_data)
+void LLFloaterAO::onClickOpenCard()
{
- if(LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
+ if (LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
{
LLUUID configncitem = (LLUUID)gSavedPerAccountSettings.getString("AOConfigNotecardID");
if (configncitem.notNull())
{
- const LLInventoryItem* item = gInventory.getItem(configncitem);
- if(item)
+ if (LLViewerInventoryItem* item = gInventory.getItem(configncitem))
{
if (gAgent.allowOperation(PERM_COPY, item->getPermissions(),GP_OBJECT_MANIPULATE) || gAgent.isGodlike())
{
if(!item->getAssetUUID().isNull())
- open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), LLUUID::null, FALSE);
- // open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), LLUUID::null, FALSE, LLUUID::null, FALSE);
+ open_notecard(item, "Note: " + item->getName(), LLUUID::null, false);
}
}
}
}
}
-void LLFloaterAO::onClickNewCard(void* user_data)
+void LLFloaterAO::onClickNewCard()
{
// load the template file from app_settings/ao_template.ini then
// create a new properly-formatted notecard in the user's inventory
@@ -893,7 +748,7 @@ void LLFloaterAO::onClickNewCard(void* user_data)
if (!ao_template.empty())
{
LLPointer cb = new AONotecardCallback(ao_template);
- create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
+ create_inventory_item(gAgentID, gAgentSessionID,
LLUUID::null, LLTransactionID::tnull, "New AO Notecard",
"Drop this notecard in your AO window to use", LLAssetType::AT_NOTECARD,
LLInventoryType::IT_NOTECARD, NOT_WEARABLE, PERM_ALL, cb);
@@ -906,10 +761,66 @@ void LLFloaterAO::onClickNewCard(void* user_data)
struct AOAssetInfo
{
- std::string path;
- std::string name;
+ std::string path, name;
};
+AOState LLFloaterAO::getStateFromCombo(const LLComboBox* combo)
+{
+ if (combo == mcomboBox_stands) return STATE_AGENT_STAND;
+ if (combo == mcomboBox_walks) return STATE_AGENT_WALK;
+ if (combo == mcomboBox_runs) return STATE_AGENT_RUN;
+ if (combo == mcomboBox_jumps) return STATE_AGENT_JUMP;
+ if (combo == mcomboBox_sits) return STATE_AGENT_SIT;
+ if (combo == mcomboBox_gsits) return STATE_AGENT_GROUNDSIT;
+ if (combo == mcomboBox_crouchs) return STATE_AGENT_CROUCH;
+ if (combo == mcomboBox_cwalks) return STATE_AGENT_CROUCHWALK;
+ if (combo == mcomboBox_falls) return STATE_AGENT_FALLDOWN;
+ if (combo == mcomboBox_hovers) return STATE_AGENT_HOVER;
+ if (combo == mcomboBox_flys) return STATE_AGENT_FLY;
+ if (combo == mcomboBox_flyslows) return STATE_AGENT_FLYSLOW;
+ if (combo == mcomboBox_flyups) return STATE_AGENT_HOVER_UP;
+ if (combo == mcomboBox_flydowns) return STATE_AGENT_HOVER_DOWN;
+ if (combo == mcomboBox_lands) return STATE_AGENT_LAND;
+ if (combo == mcomboBox_typings) return STATE_AGENT_TYPING;
+ if (combo == mcomboBox_floats) return STATE_AGENT_FLOAT;
+ if (combo == mcomboBox_swims) return STATE_AGENT_SWIM;
+ if (combo == mcomboBox_swimups) return STATE_AGENT_SWIM_UP;
+ if (combo == mcomboBox_swimdowns) return STATE_AGENT_SWIM_DOWN;
+ if (combo == mcomboBox_standups) return STATE_AGENT_STANDUP;
+ if (combo == mcomboBox_prejumps) return STATE_AGENT_PRE_JUMP;
+ return STATE_AGENT_IDLE;
+}
+
+LLComboBox* LLFloaterAO::getComboFromState(const AOState& state)
+{
+ switch (state)
+ {
+ case STATE_AGENT_STAND: return mcomboBox_stands;
+ case STATE_AGENT_WALK: return mcomboBox_walks;
+ case STATE_AGENT_RUN: return mcomboBox_runs;
+ case STATE_AGENT_JUMP: return mcomboBox_jumps;
+ case STATE_AGENT_SIT: return mcomboBox_sits;
+ case STATE_AGENT_GROUNDSIT: return mcomboBox_gsits;
+ case STATE_AGENT_CROUCH: return mcomboBox_crouchs;
+ case STATE_AGENT_CROUCHWALK: return mcomboBox_cwalks;
+ case STATE_AGENT_FALLDOWN: return mcomboBox_falls;
+ case STATE_AGENT_HOVER: return mcomboBox_hovers;
+ case STATE_AGENT_FLY: return mcomboBox_flys;
+ case STATE_AGENT_FLYSLOW: return mcomboBox_flyslows;
+ case STATE_AGENT_HOVER_UP: return mcomboBox_flyups;
+ case STATE_AGENT_HOVER_DOWN: return mcomboBox_flydowns;
+ case STATE_AGENT_LAND: return mcomboBox_lands;
+ case STATE_AGENT_TYPING: return mcomboBox_typings;
+ case STATE_AGENT_FLOAT: return mcomboBox_floats;
+ case STATE_AGENT_SWIM: return mcomboBox_swims;
+ case STATE_AGENT_SWIM_UP: return mcomboBox_swimups;
+ case STATE_AGENT_SWIM_DOWN: return mcomboBox_swimdowns;
+ case STATE_AGENT_STANDUP: return mcomboBox_standups;
+ case STATE_AGENT_PRE_JUMP: return mcomboBox_prejumps;
+ default: return nullptr;
+ }
+}
+
void LLFloaterAO::onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::EType type,void* user_data, S32 status, LLExtStat ext_status)
{
if(status == LL_ERR_NOERR)
@@ -946,187 +857,66 @@ void LLFloaterAO::onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLA
if (mcomboBox_flyups) mcomboBox_flyups->clear();
if (mcomboBox_flydowns) mcomboBox_flydowns->clear();
if (mcomboBox_lands) mcomboBox_lands->clear();
+ if (mcomboBox_typings) mcomboBox_typings->clear();
+ if (mcomboBox_floats) mcomboBox_floats->clear();
+ if (mcomboBox_swims) mcomboBox_swims->clear();
+ if (mcomboBox_swimups) mcomboBox_swimups->clear();
+ if (mcomboBox_swimdowns) mcomboBox_swimdowns->clear();
if (mcomboBox_standups) mcomboBox_standups->clear();
if (mcomboBox_prejumps) mcomboBox_prejumps->clear();
-
- struct_stands loader;
-
typedef boost::tokenizer > tokenizer;
boost::char_separator sep("\n");
tokenizer tokline(card, sep);
- for (tokenizer::iterator line = tokline.begin(); line != tokline.end(); ++line)
+ for (const auto& strline : tokline)
{
-// LL_INFOS() << *line << LL_ENDL;
- std::string strline(*line);
// LL_INFOS() << "uncommented line: " << strline << LL_ENDL;
boost::regex type("^(\\s*)(\\[ )(.*)( \\])");
boost::smatch what;
if (boost::regex_search(strline, what, type))
{
-// LL_INFOS() << "type: " << what[0] << LL_ENDL;
+ std::string strtoken(what[0]);
+// LL_INFOS() << "type: " << strtoken << LL_ENDL;
// LL_INFOS() << "anims in type: " << boost::regex_replace(strline, type, "") << LL_ENDL;
boost::char_separator sep("|,");
std::string stranimnames(boost::regex_replace(strline, type, ""));
tokenizer tokanimnames(stranimnames, sep);
- for (tokenizer::iterator anim = tokanimnames.begin(); anim != tokanimnames.end(); ++anim)
+ for (const auto& stranim : tokanimnames)
{
- std::string strtoken(what[0]);
- std::string stranim(*anim);
LLUUID animid(getAssetIDByName(stranim));
// LL_INFOS() << invfolderid.asString().c_str() << LL_ENDL;
// LL_INFOS() << "anim: " << stranim.c_str() << " assetid: " << animid << LL_ENDL;
- if (!(animid.notNull()))
+ if (animid.isNull())
{
cmdline_printchat(llformat("Warning: animation '%s' could not be found (Section: %s).",stranim.c_str(),strtoken.c_str()));
}
else
{
- switch(GetStateFromToken(strtoken.c_str()))
+ const AOState state = GetStateFromToken(strtoken);
+ switch (state)
{
case STATE_AGENT_STAND:
- loader.ao_id = animid; loader.anim_name = stranim.c_str(); mAOStands.push_back(loader);
- if(mcomboBox_stands != NULL) mcomboBox_stands->add(stranim.c_str(), ADD_BOTTOM, TRUE);
- break;
- case STATE_AGENT_WALK:
- {
- if (sInstance && (mcomboBox_walks != NULL))
- {
- //LL_INFOS() << "1 anim: " << stranim.c_str() << " assetid: " << animid << LL_ENDL;
- if (!(mcomboBox_walks->selectByValue(stranim.c_str()))) mcomboBox_walks->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_RUN:
- {
- if (sInstance && (mcomboBox_runs != NULL))
- {
- if (!(mcomboBox_runs->selectByValue(stranim.c_str()))) mcomboBox_runs->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_JUMP:
- {
- if (sInstance && (mcomboBox_jumps != NULL))
- {
- if (!(mcomboBox_jumps->selectByValue(stranim.c_str()))) mcomboBox_jumps->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_SIT:
- {
- if (sInstance && (mcomboBox_sits != NULL))
- {
- if (!(mcomboBox_sits->selectByValue(stranim.c_str()))) mcomboBox_sits->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_GROUNDSIT:
- {
- if (sInstance && (mcomboBox_gsits != NULL))
- {
- if (!(mcomboBox_gsits->selectByValue(stranim.c_str()))) mcomboBox_gsits->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_CROUCH:
- {
- if (sInstance && (mcomboBox_crouchs != NULL))
- {
- if (!(mcomboBox_crouchs->selectByValue(stranim.c_str()))) mcomboBox_crouchs->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_CROUCHWALK:
- {
- if (sInstance && (mcomboBox_cwalks != NULL))
- {
- if (!(mcomboBox_cwalks->selectByValue(stranim.c_str()))) mcomboBox_cwalks->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_FALLDOWN:
- {
- if (sInstance && (mcomboBox_falls != NULL))
- {
- if (!(mcomboBox_falls->selectByValue(stranim.c_str()))) mcomboBox_falls->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_HOVER:
- {
- if (sInstance && (mcomboBox_hovers != NULL))
- {
- if (!(mcomboBox_hovers->selectByValue(stranim.c_str()))) mcomboBox_hovers->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_FLY:
- {
- if (sInstance && (mcomboBox_flys != NULL))
- {
- if (!(mcomboBox_flys->selectByValue(stranim.c_str()))) mcomboBox_flys->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_FLYSLOW:
- {
- if (sInstance && (mcomboBox_flyslows != NULL))
- {
- if (!(mcomboBox_flyslows->selectByValue(stranim.c_str()))) mcomboBox_flyslows->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_HOVER_UP:
- {
- if (sInstance && (mcomboBox_flyups != NULL))
- {
- if (!(mcomboBox_flyups->selectByValue(stranim.c_str()))) mcomboBox_flyups->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_HOVER_DOWN:
- {
- if (sInstance && (mcomboBox_flydowns != NULL))
- {
- if (!(mcomboBox_flydowns->selectByValue(stranim.c_str()))) mcomboBox_flydowns->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_LAND:
- {
- if (sInstance && (mcomboBox_lands != NULL))
- {
- if (!(mcomboBox_lands->selectByValue(stranim.c_str()))) mcomboBox_lands->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_STANDUP:
- {
- if (sInstance && (mcomboBox_standups != NULL))
- {
- if (!(mcomboBox_standups->selectByValue(stranim.c_str()))) mcomboBox_standups->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
- case STATE_AGENT_PRE_JUMP:
- {
- if (sInstance && (mcomboBox_prejumps != NULL))
- {
- if (!(mcomboBox_prejumps->selectByValue(stranim.c_str()))) mcomboBox_prejumps->add(stranim.c_str(), ADD_BOTTOM, TRUE); //check if exist
- }
- }
- break;
+ mAOStands.push_back({ animid, stranim });
+ default: break;
}
- for (std::vector::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
+
+ if (LLComboBox* combo = getComboFromState(state))
{
- if (GetStateFromToken(strtoken.c_str()) == iter->state)
+ //LL_INFOS() << "1 anim: " << stranim.c_str() << " assetid: " << animid << LL_ENDL;
+ if (!combo->selectByValue(stranim)) //check if exist
+ combo->add(stranim, ADD_BOTTOM, true);
+ }
+
+ for (auto& ao : mAOOverrides)
+ {
+ if (state == ao.state)
{
- iter->ao_id = animid;
+ ao.ao_id = animid;
+ break;
}
}
}
@@ -1135,123 +925,14 @@ void LLFloaterAO::onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLA
}
LL_INFOS() << "ao nc read sucess" << LL_ENDL;
- for (std::vector::iterator iter = mAOOverrides.begin(); iter != mAOOverrides.end(); ++iter)
+ for (auto& ao : mAOOverrides)
{
- switch(iter->state)
+ if (LLComboBox* combo = getComboFromState(ao.state))
{
-
- case STATE_AGENT_WALK:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultWalk");
- SetDefault(mcomboBox_walks,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_RUN:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultRun");
- SetDefault(mcomboBox_runs,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_JUMP:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultJump");
- SetDefault(mcomboBox_jumps,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_SIT:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultSit");
- SetDefault(mcomboBox_sits,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_CROUCH:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultCrouch");
- SetDefault(mcomboBox_crouchs,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_GROUNDSIT:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultGroundSit");
- SetDefault(mcomboBox_gsits,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_CROUCHWALK:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultCrouchWalk");
- SetDefault(mcomboBox_cwalks,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_FALLDOWN:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultFall");
- SetDefault(mcomboBox_falls,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_HOVER:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultHover");
- SetDefault(mcomboBox_hovers,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_FLY:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultFly");
- SetDefault(mcomboBox_flys,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_HOVER_UP:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultFlyUp");
- SetDefault(mcomboBox_flyups,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_FLYSLOW:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultFlySlow");
- SetDefault(mcomboBox_flyslows,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_HOVER_DOWN:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultFlyDown");
- SetDefault(mcomboBox_flydowns,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_LAND:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultLand");
- SetDefault(mcomboBox_lands,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_STANDUP:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultStandUp");
- SetDefault(mcomboBox_standups,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
- case STATE_AGENT_PRE_JUMP:
- {
- std::string defaultanim = gSavedPerAccountSettings.getString("AODefaultPreJump");
- SetDefault(mcomboBox_prejumps,iter->ao_id,defaultanim);
- if (getAssetIDByName(defaultanim) != LLUUID::null) iter->ao_id = getAssetIDByName(defaultanim);
- }
- break;
+ std::string defaultanim = gSavedPerAccountSettings.getString(combo->getControlName());
+ const LLUUID ao_id = getAssetIDByName(defaultanim);
+ if (ao_id != LLUUID::null) ao.ao_id = ao_id;
+ combo->selectByValue(defaultanim);
}
}
run();
@@ -1268,44 +949,14 @@ void LLFloaterAO::onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLA
}
}
-BOOL LLFloaterAO::SetDefault(void* userdata, LLUUID ao_id, std::string defaultanim)
-{
- if (sInstance && (userdata))
- {
- LLComboBox *box = (LLComboBox *) userdata;
- if (ao_id.isNull())
- {
- box->clear();
- box->removeall();
- }
- else
- {
- box->selectByValue(defaultanim);
- }
- }
- return TRUE;
-}
-
class ObjectNameMatches : public LLInventoryCollectFunctor
{
public:
- ObjectNameMatches(std::string name)
- {
- sName = name;
- }
+ ObjectNameMatches(std::string name) : sName(name) {}
virtual ~ObjectNameMatches() {}
- virtual bool operator()(LLInventoryCategory* cat,
- LLInventoryItem* item)
+ virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item)
{
- if(item)
- {
- if (item->getParentUUID() == LLFloaterAO::invfolderid)
- {
- return (item->getName() == sName);
- }
- return false;
- }
- return false;
+ return item && item->getParentUUID() == LLFloaterAO::invfolderid && item->getName() == sName;
}
private:
std::string sName;
@@ -1313,16 +964,12 @@ private:
const LLUUID& LLFloaterAO::getAssetIDByName(const std::string& name)
{
- if (name.empty() || !(LLInventoryModelBackgroundFetch::instance().isEverythingFetched())) return LLUUID::null;
+ if (name.empty() || !LLInventoryModelBackgroundFetch::instance().isEverythingFetched()) return LLUUID::null;
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
- ObjectNameMatches objectnamematches(name);
- gInventory.collectDescendentsIf(LLUUID::null,cats,items,FALSE,objectnamematches);
+ ObjectNameMatches matches(name);
+ gInventory.collectDescendentsIf(LLUUID::null,cats,items,false, matches);
- if (items.size())
- {
- return items[0]->getAssetUUID();
- }
- return LLUUID::null;
+ return items.empty() ? LLUUID::null : items[0]->getAssetUUID();
};
diff --git a/indra/newview/floaterao.h b/indra/newview/floaterao.h
index b8a63f0da..2aaa789c9 100644
--- a/indra/newview/floaterao.h
+++ b/indra/newview/floaterao.h
@@ -8,32 +8,42 @@
#include "lleventtimer.h"
-const int STATE_AGENT_IDLE = 0;
-const int STATE_AGENT_WALK = 1;
-const int STATE_AGENT_RUN = 2;
-const int STATE_AGENT_STAND = 3;
+enum AOState
+{
+ STATE_AGENT_IDLE = 0,
+ STATE_AGENT_WALK = 1,
+ STATE_AGENT_RUN = 2,
+ STATE_AGENT_STAND = 3,
-const int STATE_AGENT_PRE_JUMP = 4;
-const int STATE_AGENT_JUMP = 5;
-const int STATE_AGENT_TURNLEFT = 6;
-const int STATE_AGENT_TURNRIGHT = 7;
+ STATE_AGENT_PRE_JUMP = 4,
+ STATE_AGENT_JUMP = 5,
+ STATE_AGENT_TURNLEFT = 6,
+ STATE_AGENT_TURNRIGHT = 7,
-const int STATE_AGENT_SIT = 8;
-const int STATE_AGENT_GROUNDSIT = 9;
+ STATE_AGENT_SIT = 8,
+ STATE_AGENT_GROUNDSIT = 9,
-const int STATE_AGENT_HOVER = 10;
-const int STATE_AGENT_HOVER_DOWN = 11;
-const int STATE_AGENT_HOVER_UP = 12;
+ STATE_AGENT_HOVER = 10,
+ STATE_AGENT_HOVER_DOWN = 11,
+ STATE_AGENT_HOVER_UP = 12,
-const int STATE_AGENT_CROUCH = 13;
-const int STATE_AGENT_CROUCHWALK = 14;
-const int STATE_AGENT_FALLDOWN = 15;
-const int STATE_AGENT_STANDUP = 16;
-const int STATE_AGENT_LAND = 17;
+ STATE_AGENT_CROUCH = 13,
+ STATE_AGENT_CROUCHWALK = 14,
+ STATE_AGENT_FALLDOWN = 15,
+ STATE_AGENT_STANDUP = 16,
+ STATE_AGENT_LAND = 17,
-const int STATE_AGENT_FLY = 18;
-const int STATE_AGENT_FLYSLOW = 19;
+ STATE_AGENT_FLY = 18,
+ STATE_AGENT_FLYSLOW = 19,
+ STATE_AGENT_TYPING = 20,
+
+ STATE_AGENT_SWIM_DOWN = 21,
+ STATE_AGENT_SWIM_UP = 22,
+ STATE_AGENT_SWIM = 23,
+ STATE_AGENT_FLOAT = 24,
+ STATE_AGENT_END
+};
@@ -43,8 +53,8 @@ class AOStandTimer : public LLEventTimer
public:
AOStandTimer();
~AOStandTimer();
- virtual BOOL tick();
- virtual void reset();
+ BOOL tick() override;
+ void reset();
};
class AOInvTimer : public LLEventTimer
@@ -52,73 +62,69 @@ class AOInvTimer : public LLEventTimer
public:
AOInvTimer();
~AOInvTimer();
- BOOL tick();
+ BOOL tick() override;
};
-class LLFloaterAO : public LLFloater
+class LLFloaterAO : public LLFloater, public LLFloaterSingleton
{
public:
- LLFloaterAO();
- virtual BOOL postBuild();
+ LLFloaterAO(const LLSD&);
+ BOOL postBuild() override;
+ void onOpen() override;
virtual ~LLFloaterAO();
- static void show(void*);
static void init();
- static void onClickToggleAO();
- static void onClickToggleSits();
static void run();
- static void updateLayout(LLFloaterAO* floater);
+ void updateLayout(bool advanced);
- static BOOL loadAnims();
+ //static bool loadAnims();
- static int getAnimationState();
- static void setAnimationState(int state);
- static void setStates(const LLUUID& id, BOOL start);
+ static void typing(bool start);
+ static AOState flyToSwimState(const AOState& state);
+ static AOState swimToFlyState(const AOState& state);
+ static AOState getAnimationState();
+ static void setAnimationState(const AOState& state);
static LLUUID getCurrentStandId();
static void setCurrentStandId(const LLUUID& id);
static int stand_iterator;
- static BOOL ChangeStand();
+ static void ChangeStand();
+ static void toggleSwim(bool underwater);
- static BOOL startMotion(const LLUUID& id, F32 time_offset = 0.f, BOOL stand = FALSE);
- static BOOL stopMotion(const LLUUID& id, BOOL stop_immediate, BOOL stand = FALSE);
+ static void doMotion(const LLUUID& id, bool start, bool stand = false);
+ static void startMotion(const LLUUID& id, bool stand = false) { doMotion(id, true, stand); }
+ static void stopMotion(const LLUUID& id, bool stand = false) { doMotion(id, false, stand); }
+ static bool swimCheck(const AOState& state);
static LLUUID GetAnimID(const LLUUID& id);
- static int GetStateFromAnimID(const LLUUID& id);
- static LLUUID GetAnimIDFromState(const int state);
- static int GetStateFromToken(std::string strtoken);
+ static AOState GetStateFromAnimID(const LLUUID& id);
+ static LLUUID GetAnimIDFromState(const AOState& state);
+ static AOState GetStateFromToken(std::string strtoken);
- static void onClickLess(void* data) ;
- static void onClickMore(void* data) ;
-
- static void onClickPrevStand(void* userdata);
- static void onClickNextStand(void* userdata);
- static void onClickReloadCard(void* userdata);
- static void onClickOpenCard(void* userdata);
- static void onClickNewCard(void* userdata);
+ static void onClickCycleStand(bool next);
+ static void onClickReloadCard();
+ static void onClickOpenCard();
+ static void onClickNewCard();
static LLUUID invfolderid;
static const LLUUID& getAssetIDByName(const std::string& name);
-
- static bool getInstance();
private:
- static LLFloaterAO* sInstance;
- static int mAnimationState;
+ static AOState mAnimationState;
static LLUUID mCurrentStandId;
- static void onSpinnerCommit(LLUICtrl* ctrl);
+ static void onSpinnerCommit();
static void onComboBoxCommit(LLUICtrl* ctrl);
- static BOOL SetDefault(void *userdata, LLUUID ao_id, std::string defaultanim);
-
- BOOL mDirty;
protected:
+ static AOState getStateFromCombo(const class LLComboBox* combo);
+ static LLComboBox* getComboFromState(const AOState& state);
+
static void onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::EType type,void* user_data, S32 status, LLExtStat ext_status);
};
diff --git a/indra/newview/floaterlocalassetbrowse.cpp b/indra/newview/floaterlocalassetbrowse.cpp
index 3c8e4fae7..5ee0445a2 100644
--- a/indra/newview/floaterlocalassetbrowse.cpp
+++ b/indra/newview/floaterlocalassetbrowse.cpp
@@ -64,6 +64,8 @@ this feature is still a work in progress.
#include "llviewermenufile.h"
#include "llfloaterimagepreview.h"
#include "llfile.h"
+#include "llsdparam.h"
+#include "llsdserialize.h"
/* including to force rebakes when needed */
#include "llvoavatarself.h"
@@ -93,21 +95,29 @@ bool LocalAssetBrowser::mSculptUpdated;
containing one loaded local texture.
*/
-LocalBitmap::LocalBitmap(std::string fullpath)
+LocalBitmap::Params::Params(const std::string& path)
+: fullpath("path", path)
+, keep_updating("update", gSavedSettings.getBOOL("LocalBitmapUpdate"))
+, type("type", TYPE_TEXTURE)
+, id("id", LLUUID::generateNewID())
{
+}
+
+LocalBitmap::LocalBitmap(const Params& p)
+{
+ llassert(!p.fullpath().empty());
valid = false;
- if ( gDirUtilp->fileExists(fullpath) )
+ if ( gDirUtilp->fileExists(p.fullpath) )
{
/* taking care of basic properties */
- id.generate();
- filename = fullpath;
- keep_updating = gSavedSettings.getBOOL("LocalBitmapUpdate");
+ id = p.id;
+ filename = p.fullpath;
+ keep_updating = p.keep_updating;
linkstatus = keep_updating ? LINK_ON : LINK_OFF;
shortname = gDirUtilp->getBaseFileName(filename, true);
- bitmap_type = TYPE_TEXTURE;
+ bitmap_type = p.type;
sculpt_dirty = false;
volume_dirty = false;
- valid = false;
/* taking care of extension type now to avoid switch madness */
std::string temp_exten = gDirUtilp->getExtension(filename);
@@ -143,6 +153,7 @@ LocalBitmap::LocalBitmap(std::string fullpath)
/* filename is valid, bitmap is decoded and valid, i can haz liftoff! */
valid = true;
+ LocalAssetBrowser::add(*this);
}
}
}
@@ -293,64 +304,64 @@ void LocalBitmap::setType( S32 type )
bitmap_type = type;
}
+void LocalBitmap::setID(const LLUUID& uuid)
+{
+ LLViewerFetchedTexture* image = gTextureList.findImage(id);
+ gTextureList.deleteImage(image);
+ id = uuid;
+ image->setID(id);
+ gTextureList.addImage(image);
+}
+
/* [information query functions] */
-std::string LocalBitmap::getShortName()
+std::string LocalBitmap::getShortName() const
{
return shortname;
}
-std::string LocalBitmap::getFileName()
+std::string LocalBitmap::getFileName() const
{
return filename;
}
-LLUUID LocalBitmap::getID()
+LLUUID LocalBitmap::getID() const
{
return id;
}
-LLSD LocalBitmap::getLastModified()
+LLSD LocalBitmap::getLastModified() const
{
return last_modified;
}
-std::string LocalBitmap::getLinkStatus()
+std::string LocalBitmap::getLinkStatus() const
{
switch(linkstatus)
{
- case LINK_ON:
- return "On";
-
- case LINK_OFF:
- return "Off";
-
- case LINK_BROKEN:
- return "Broken";
-
- case LINK_UPDATING:
- return "Updating";
-
- default:
- return "Unknown";
+ case LINK_ON: return "On";
+ case LINK_OFF: return "Off";
+ case LINK_BROKEN: return "Broken";
+ case LINK_UPDATING: return "Updating";
+ default: return "Unknown";
}
}
-bool LocalBitmap::getUpdateBool()
+bool LocalBitmap::getUpdateBool() const
{
return keep_updating;
}
-bool LocalBitmap::getIfValidBool()
+bool LocalBitmap::getIfValidBool() const
{
return valid;
}
-S32 LocalBitmap::getType()
+S32 LocalBitmap::getType() const
{
return bitmap_type;
}
-std::vector LocalBitmap::getFaceUsesThis(LLDrawable* drawable)
+std::vector LocalBitmap::getFaceUsesThis(LLDrawable* drawable) const
{
std::vector matching_faces;
@@ -365,7 +376,7 @@ std::vector LocalBitmap::getFaceUsesThis(LLDrawable* drawable)
return matching_faces;
}
-std::vector LocalBitmap::getUsingObjects(bool seek_by_type, bool seek_textures, bool seek_sculptmaps)
+std::vector LocalBitmap::getUsingObjects(bool seek_by_type, bool seek_textures, bool seek_sculptmaps) const
{
std::vector affected_vector;
@@ -413,21 +424,29 @@ std::vector LocalBitmap::getUsingObjects(bool seek_by_type, boo
return affected_vector;
}
-void LocalBitmap::getDebugInfo()
+void LocalBitmap::getDebugInfo() const
{
/* debug function: dumps everything human readable into llinfos */
- LL_INFOS() << "===[local bitmap debug]===" << "\n"
- << "path: " << filename << "\n"
- << "name: " << shortname << "\n"
- << "extension: " << extension << "\n"
- << "uuid: " << id << "\n"
- << "last modified: " << last_modified << "\n"
- << "link status: " << getLinkStatus() << "\n"
- << "keep updated: " << keep_updating << "\n"
- << "type: " << bitmap_type << "\n"
- << "is valid: " << valid << "\n"
+ LL_INFOS() << "===[local bitmap debug]===" << '\n'
+ << "path: " << filename << '\n'
+ << "name: " << shortname << '\n'
+ << "extension: " << extension << '\n'
+ << "uuid: " << id << '\n'
+ << "last modified: " << last_modified << '\n'
+ << "link status: " << getLinkStatus() << '\n'
+ << "keep updated: " << keep_updating << '\n'
+ << "type: " << bitmap_type << '\n'
+ << "is valid: " << valid << '\n'
<< "==========================" << LL_ENDL;
-
+}
+
+LLSD LocalBitmap::asLLSD() const
+{
+ return LLSD()
+ .with("path", filename)
+ .with("id", id)
+ .with("update", keep_updating)
+ .with("type", bitmap_type);
}
/*=======================================*/
@@ -439,15 +458,47 @@ void LocalBitmap::getDebugInfo()
Sits in memory until the viewer is closed.
*/
+const std::string LocalAssetBrowser::getFileName() const
+{
+ return gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "local_assets.xml");
+}
+
LocalAssetBrowser::LocalAssetBrowser()
{
+ gLocalBrowser = this;
mLayerUpdated = false;
mSculptUpdated = false;
+
+ // Load bitmaps
+ llifstream file(getFileName());
+ if (!file) return;
+ LLSD saved_assets;
+ LLSDSerialize::fromXML(saved_assets, file);
+ file.close();
+ for (auto it = saved_assets.beginArray(), end = saved_assets.endArray(); it < end; ++it)
+ {
+ const auto&& p = LLSDParamAdapter(*it);
+ LocalBitmap bm(p); // Creating one adds it to the list
+ }
+
+ if (!loaded_bitmaps.empty()) PingTimer();
}
LocalAssetBrowser::~LocalAssetBrowser()
{
-
+ // Save bitmaps
+ llofstream file(getFileName());
+ if (!file)
+ {
+ LL_WARNS() << "Could not open file " << getFileName() << " for saving." << LL_ENDL;
+ return;
+ }
+ LLSD saved_assets(LLSD::emptyArray());
+ for (const auto& bitmap : loaded_bitmaps)
+ saved_assets.append(bitmap.asLLSD());
+ LLSDSerialize::toPrettyXML(saved_assets, file);
+ file.close();
+ gLocalBrowser = nullptr;
}
void LocalAssetBrowser::AddBitmap()
@@ -463,20 +514,13 @@ void LocalAssetBrowser::AddBitmap_continued(AIFilePicker* filepicker)
return;
bool change_happened = false;
- std::vector const& filenames(filepicker->getFilenames());
- for(std::vector::const_iterator filename = filenames.begin(); filename != filenames.end(); ++filename)
- {
- LocalBitmap unit(*filename);
- if (unit.getIfValidBool())
- {
- loaded_bitmaps.push_back(unit);
+
+ for(const auto& filename : filepicker->getFilenames())
+ if (LocalBitmap(filename).getIfValidBool())
change_happened = true;
- }
- }
if (change_happened) onChangeHappened();
}
-
void LocalAssetBrowser::DelBitmap( std::vector delete_vector, S32 column )
{
bool change_happened = false;
@@ -592,21 +636,20 @@ void LocalAssetBrowser::UpdateTextureCtrlList(LLScrollListCtrl* ctrl)
if (ctrl) // checking again in case called externally for some silly reason.
{
ctrl->clearRows();
- if ( !loaded_bitmaps.empty() )
+ for (const auto& bitmap : loaded_bitmaps)
{
- for (local_list_iter iter = loaded_bitmaps.begin(); iter != loaded_bitmaps.end(); ++iter)
- {
- LLSD element;
- element["columns"][0]["column"] = "unit_name";
- element["columns"][0]["type"] = "text";
- element["columns"][0]["value"] = (*iter).shortname;
+ auto row = LLScrollListItem::Params();
+ row.columns.add(LLScrollListCell::Params()
+ .column("unit_name")
+ .type("text")
+ .value(bitmap.shortname));
- element["columns"][1]["column"] = "unit_id_HIDDEN";
- element["columns"][1]["type"] = "text";
- element["columns"][1]["value"] = (*iter).id;
+ row.columns.add(LLScrollListCell::Params()
+ .column("unit_id_HIDDEN")
+ .type("text")
+ .value(bitmap.id));
- ctrl->addElement(element);
- }
+ ctrl->addRow(row);
}
}
}
@@ -731,6 +774,11 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser()
// checkbox callbacks
mUpdateChkBox->setCommitCallback(boost::bind(&FloaterLocalAssetBrowser::onClickUpdateChkbox,this));
+
+ // Allow changing the ID!
+ mUUIDTxt->setCommitCallback(boost::bind(&FloaterLocalAssetBrowser::onUpdateID, this, _2));
+ mUUIDTxt->setCommitOnReturn(true);
+ mUUIDTxt->setCommitOnFocusLost(true);
}
void FloaterLocalAssetBrowser::show(void*)
@@ -798,6 +846,21 @@ void FloaterLocalAssetBrowser::onCommitTypeCombo()
}
}
+void FloaterLocalAssetBrowser::onUpdateID(const LLSD& val)
+{
+ const auto& id = val.asUUID();
+ const auto& col = mBitmapList->getFirstSelected()->getColumn(BITMAPLIST_COL_ID);
+ const auto& old_id = col->getValue().asString();
+ if (id.isNull() && id.asString() != old_id) // Just reset if invalid or unchanged
+ mUUIDTxt->setValue(old_id);
+ else
+ {
+ gLocalBrowser->GetBitmapUnit(LLUUID(old_id))->setID(id);
+ mTextureView->setImageAssetID(id);
+ col->setValue(id);
+ }
+}
+
void FloaterLocalAssetBrowser::FloaterResize(bool expand)
{
mMoreBtn->setVisible(!expand);
@@ -855,10 +918,9 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
*/
if (!mTextureView->getVisible()) return;
- if (!mBitmapList->getAllSelected().empty())
+ if (const auto& selected = mBitmapList->getFirstSelected())
{
- LocalBitmap* unit = gLocalBrowser->GetBitmapUnit( LLUUID(mBitmapList->getSelectedItemLabel(BITMAPLIST_COL_ID)) );
-
+ LocalBitmap* unit = gLocalBrowser->GetBitmapUnit(LLUUID(selected->getColumn(BITMAPLIST_COL_ID)->getValue().asString()));
if ( unit )
{
mTextureView->setImageAssetID(unit->getID());
@@ -873,6 +935,7 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
mTextureView->setEnabled(true);
mUpdateChkBox->setEnabled(true);
mTypeComboBox->setEnabled(true);
+ mUUIDTxt->setEnabled(true);
}
}
else
@@ -884,12 +947,14 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
mTypeComboBox->selectFirstItem();
mTypeComboBox->setEnabled(false);
+ mUUIDTxt->setEnabled(false);
- mPathTxt->setText(LLStringExplicit("None"));
- mUUIDTxt->setText(LLStringExplicit("None"));
- mNameTxt->setText(LLStringExplicit("None"));
- mLinkTxt->setText(LLStringExplicit("None"));
- mTimeTxt->setText(LLStringExplicit("None"));
+ const auto none = LLStringExplicit("None");
+ mPathTxt->setText(none);
+ mUUIDTxt->setText(none);
+ mNameTxt->setText(none);
+ mLinkTxt->setText(none);
+ mTimeTxt->setText(none);
}
}
@@ -931,7 +996,7 @@ void LocalAssetBrowserTimer::stop()
mEventTimer.stop();
}
-bool LocalAssetBrowserTimer::isRunning()
+bool LocalAssetBrowserTimer::isRunning() const
{
return mEventTimer.getStarted();
}
diff --git a/indra/newview/floaterlocalassetbrowse.h b/indra/newview/floaterlocalassetbrowse.h
index dd7e618ea..290fbe4e3 100644
--- a/indra/newview/floaterlocalassetbrowse.h
+++ b/indra/newview/floaterlocalassetbrowse.h
@@ -97,7 +97,15 @@ struct affected_object
class LocalBitmap
{
public:
- LocalBitmap(std::string filename);
+ struct Params : public LLInitParam::Block
+ {
+ Mandatory fullpath;
+ Optional keep_updating;
+ Optional type;
+ Optional id;
+ Params(const std::string& path = LLStringUtil::null);
+ };
+ LocalBitmap(const Params& p);
virtual ~LocalBitmap();
friend class LocalAssetBrowser;
@@ -127,25 +135,28 @@ class LocalBitmap
};
public: /* [information query functions] */
- std::string getShortName();
- std::string getFileName();
- LLUUID getID();
- LLSD getLastModified();
- std::string getLinkStatus();
- bool getUpdateBool();
+ std::string getShortName() const;
+ std::string getFileName() const;
+ LLUUID getID() const;
+ void setID(const LLUUID&);
+ LLSD getLastModified() const;
+ std::string getLinkStatus() const;
+ bool getUpdateBool() const;
void setType( S32 );
- bool getIfValidBool();
- S32 getType();
- void getDebugInfo();
+ bool getIfValidBool() const;
+ S32 getType() const;
+ void getDebugInfo() const;
+ LLSD asLLSD() const;
+
private: /* [maintenence functions] */
void updateSelf();
bool decodeSelf(LLImageRaw* rawimg);
void setUpdateBool();
- std::vector getFaceUsesThis(LLDrawable*);
+ std::vector getFaceUsesThis(LLDrawable*) const;
std::vector getUsingObjects(bool seek_by_type = true,
- bool seek_textures = false, bool seek_sculptmaps = false);
+ bool seek_textures = false, bool seek_sculptmaps = false) const;
protected: /* [basic properties] */
std::string shortname;
@@ -173,9 +184,10 @@ class LocalBitmap
class AIFilePicker;
-class LocalAssetBrowser
+class LocalAssetBrowser : public LLSingleton
{
public:
+ const std::string getFileName() const;
LocalAssetBrowser();
virtual ~LocalAssetBrowser();
friend class FloaterLocalAssetBrowser;
@@ -183,6 +195,7 @@ class LocalAssetBrowser
static void UpdateTextureCtrlList(LLScrollListCtrl*);
static void setLayerUpdated(bool toggle) { mLayerUpdated = toggle; }
static void setSculptUpdated(bool toggle) { mSculptUpdated = toggle; }
+ static void add(const LocalBitmap& unit) { loaded_bitmaps.push_back(unit); }
static void AddBitmap();
static void AddBitmap_continued(AIFilePicker* filepicker);
static void DelBitmap( std::vector, S32 column = BITMAPLIST_COL_ID );
@@ -241,6 +254,8 @@ private:
// Combobox type select
void onCommitTypeCombo();
+ void onUpdateID(const LLSD& val);
+
// Widgets
LLButton* mAddBtn;
LLButton* mDelBtn;
@@ -289,10 +304,10 @@ class LocalAssetBrowserTimer : public LLEventTimer
public:
LocalAssetBrowserTimer();
~LocalAssetBrowserTimer();
- virtual BOOL tick();
+ BOOL tick() override;
void start();
void stop();
- bool isRunning();
+ bool isRunning() const;
};
#endif
diff --git a/indra/newview/hippogridmanager.cpp b/indra/newview/hippogridmanager.cpp
index 5295aac95..315b7cf8b 100644
--- a/indra/newview/hippogridmanager.cpp
+++ b/indra/newview/hippogridmanager.cpp
@@ -48,6 +48,7 @@ HippoGridInfo::HippoGridInfo(const std::string& gridName) :
mWebSite(LLStringUtil::null),
mSupportUrl(LLStringUtil::null),
mRegisterUrl(LLStringUtil::null),
+ mPartnerUrl(LLStringUtil::null),
mPasswordUrl(LLStringUtil::null),
mSearchUrl(LLStringUtil::null),
mGridMessage(""),
@@ -81,7 +82,7 @@ const std::string& HippoGridInfo::getGridOwner() const
}
else
{
- return this->getGridName();
+ return getGridName();
}
}
@@ -102,12 +103,11 @@ void HippoGridInfo::setPlatform(Platform platform)
void HippoGridInfo::setPlatform(const std::string& platform)
{
std::string tmp = platform;
- for (unsigned i=0; imXmlState = XML_SUPPORT;
else if ((strcasecmp(name, "register") == 0) || (strcasecmp(name, "account") == 0))
self->mXmlState = XML_REGISTER;
+ else if (strcasecmp(name, "partner") == 0)
+ self->mXmlState = XML_PARTNER;
else if (strcasecmp(name, "password") == 0)
self->mXmlState = XML_PASSWORD;
else if (strcasecmp(name, "search") == 0)
@@ -337,7 +344,7 @@ void HippoGridInfo::onXmlCharacterData(void* userData, const XML_Char* s, int le
case XML_GRIDNAME:
{
- if (self->mGridName == "")
+ if (self->mGridName.empty())
{
self->mGridName.assign(s, len);
}
@@ -348,6 +355,7 @@ void HippoGridInfo::onXmlCharacterData(void* userData, const XML_Char* s, int le
case XML_WEBSITE: self->mWebSite.assign(s, len); break;
case XML_SUPPORT: self->mSupportUrl.assign(s, len); break;
case XML_REGISTER: self->mRegisterUrl.assign(s, len); break;
+ case XML_PARTNER: self->mPartnerUrl.assign(s, len); break;
case XML_PASSWORD: self->mPasswordUrl.assign(s, len); break;
case XML_MESSAGE: self->mGridMessage.assign(s, len); break;
@@ -366,7 +374,7 @@ void HippoGridInfo::getGridInfo()
// Make sure the uri ends on a '/'.
std::string uri = mLoginUri;
- if (uri.compare(uri.length() - 1, 1, "/") != 0)
+ if (uri.back() != '/')
{
uri += '/';
}
@@ -482,9 +490,9 @@ std::string HippoGridInfo::getGridNick() const
// static
const char* HippoGridInfo::getPlatformString(Platform platform)
{
- static const char* platformStrings[PLATFORM_LAST] =
+ constexpr const char* platformStrings[PLATFORM_LAST] =
{
- "Other", "Aurora", "OpenSim", "SecondLife"
+ "Other", "WhiteCore", "OpenSim", "SecondLife"
};
if ((platform < PLATFORM_OTHER) || (platform >= PLATFORM_LAST))
@@ -894,6 +902,7 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
if (gridMap.has("website")) grid->setWebSite(gridMap["website"]);
if (gridMap.has("support")) grid->setSupportUrl(gridMap["support"]);
if (gridMap.has("register")) grid->setRegisterUrl(gridMap["register"]);
+ if (gridMap.has("partner")) grid->setPartnerUrl(gridMap["partner"]);
if (gridMap.has("password")) grid->setPasswordUrl(gridMap["password"]);
if (gridMap.has("search")) grid->setSearchUrl(gridMap["search"]);
if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]);
@@ -929,6 +938,7 @@ void HippoGridManager::saveFile()
gridInfo[i]["website"] = grid->getWebSite();
gridInfo[i]["support"] = grid->getSupportUrl();
gridInfo[i]["register"] = grid->getRegisterUrl();
+ gridInfo[i]["partner"] = grid->getPartnerUrl();
gridInfo[i]["password"] = grid->getPasswordUrl();
gridInfo[i]["search"] = grid->getSearchUrl();
diff --git a/indra/newview/hippogridmanager.h b/indra/newview/hippogridmanager.h
index 450cc35f7..8d2ae9650 100644
--- a/indra/newview/hippogridmanager.h
+++ b/indra/newview/hippogridmanager.h
@@ -26,7 +26,7 @@ class HippoGridInfo
public:
enum Platform {
PLATFORM_OTHER = 0,
- PLATFORM_AURORA,
+ PLATFORM_WHITECORE,
PLATFORM_OPENSIM,
PLATFORM_SECONDLIFE,
PLATFORM_LAST
@@ -35,8 +35,8 @@ public:
explicit HippoGridInfo(const std::string& gridName);
Platform getPlatform() { return mPlatform; }
- bool isOpenSimulator() const { return (mPlatform == PLATFORM_OPENSIM || mPlatform == PLATFORM_AURORA); }
- bool isAurora() const { return (mPlatform == PLATFORM_AURORA); }
+ bool isOpenSimulator() const { return (mPlatform == PLATFORM_OPENSIM || mPlatform == PLATFORM_WHITECORE); }
+ bool isWhiteCore() const { return (mPlatform == PLATFORM_WHITECORE); }
bool isSecondLife() const { return (mPlatform == PLATFORM_SECONDLIFE); }
bool isAvination() const { return mIsInAvination; }
bool isInProductionGrid() const { llassert(mPlatform == PLATFORM_SECONDLIFE); return mIsInProductionGrid; } // Should only be called if isSecondLife() returns true.
@@ -48,6 +48,7 @@ public:
const std::string& getWebSite() const { return mWebSite; }
const std::string& getSupportUrl() const { return mSupportUrl; }
const std::string& getRegisterUrl() const { return mRegisterUrl; }
+ const std::string& getPartnerUrl() const { return mPartnerUrl; }
const std::string& getPasswordUrl() const { return mPasswordUrl; }
// Returns the url base used for the Web Search tab
const std::string& getSearchUrl() const { return mSearchUrl; }
@@ -75,6 +76,7 @@ public:
void setWebSite (const std::string& website);
void setSupportUrl(const std::string& url);
void setRegisterUrl(const std::string& url);
+ void setPartnerUrl(const std::string& url);
void setPasswordUrl(const std::string& url);
// sets the url base used for the Web Search tab
void setSearchUrl(const std::string& url);
@@ -111,6 +113,7 @@ private:
std::string mWebSite;
std::string mSupportUrl;
std::string mRegisterUrl;
+ std::string mPartnerUrl;
std::string mPasswordUrl;
std::string mSearchUrl;
std::string mVoiceConnector;
@@ -134,7 +137,7 @@ private:
{
XML_VOID, XML_PLATFORM, XML_GRIDNAME, XML_GRIDNICK,
XML_LOGINURI, XML_LOGINPAGE, XML_HELPERURI,
- XML_WEBSITE, XML_SUPPORT, XML_REGISTER, XML_PASSWORD, XML_SEARCH, XML_MESSAGE
+ XML_WEBSITE, XML_SUPPORT, XML_REGISTER, XML_PARTNER, XML_PASSWORD, XML_SEARCH, XML_MESSAGE
};
XmlState mXmlState;
diff --git a/indra/newview/hippolimits.cpp b/indra/newview/hippolimits.cpp
index 8e7462511..439af0157 100644
--- a/indra/newview/hippolimits.cpp
+++ b/indra/newview/hippolimits.cpp
@@ -21,8 +21,8 @@ void HippoLimits::setLimits()
{
if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
setSecondLifeLimits();
- } else if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_AURORA) {
- setAuroraLimits();
+ } else if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_WHITECORE) {
+ setWhiteCoreLimits();
} else {
setOpenSimLimits();
}
@@ -53,20 +53,19 @@ void HippoLimits::setOpenSimLimits()
setMaxAgentGroups();
mMaxPrimScale = 8192.0f;
mMaxHeight = 10000.0f;
+ mMinPrimScale = 0.001f;
if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
LL_INFOS() << "Using rendering compatible OpenSim limits." << LL_ENDL;
- mMinPrimScale = 0.01f;
mMinHoleSize = 0.05f;
mMaxHollow = 0.95f;
} else {
LL_INFOS() << "Using Hippo OpenSim limits." << LL_ENDL;
- mMinPrimScale = 0.001f;
mMinHoleSize = 0.01f;
mMaxHollow = 0.99f;
}
}
-void HippoLimits::setAuroraLimits()
+void HippoLimits::setWhiteCoreLimits()
{
setMaxAgentGroups();
mMaxPrimScale = 8192.0f;
diff --git a/indra/newview/hippolimits.h b/indra/newview/hippolimits.h
index 0c119cd34..6c48fc298 100644
--- a/indra/newview/hippolimits.h
+++ b/indra/newview/hippolimits.h
@@ -27,7 +27,7 @@ private:
void setMaxAgentGroups();
void setOpenSimLimits();
- void setAuroraLimits();
+ void setWhiteCoreLimits();
void setSecondLifeLimits();
};
diff --git a/indra/newview/hippopanelgrids.cpp b/indra/newview/hippopanelgrids.cpp
index d5570e84a..53446f17c 100644
--- a/indra/newview/hippopanelgrids.cpp
+++ b/indra/newview/hippopanelgrids.cpp
@@ -130,6 +130,7 @@ BOOL HippoPanelGridsImpl::postBuild()
requires("website");
requires("support");
requires("register");
+ requires("partner");
requires("password");
requires("search");
requires("btn_delete");
@@ -172,7 +173,7 @@ void HippoPanelGridsImpl::refresh()
LLComboBox *grids = getChild("grid_selector");
S32 selectIndex = -1, i = 0;
grids->removeall();
- if (defaultGrid != "") {
+ if (!defaultGrid.empty()) {
grids->add(defaultGrid);
selectIndex = i++;
}
@@ -192,10 +193,10 @@ void HippoPanelGridsImpl::refresh()
if (selectIndex >= 0) {
grids->setCurrentByIndex(selectIndex);
} else {
- grids->setLabel(LLStringExplicit("")); // LLComboBox::removeall() does not clear the label
+ grids->setLabel(LLStringUtil::null); // LLComboBox::removeall() does not clear the label
}
- childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " ");
+ childSetTextArg("default_grid", "[DEFAULT]", !defaultGrid.empty() ? defaultGrid : " ");
childSetEnabled("btn_delete", (selectIndex >= 0) && mIsEditable );
childSetEnabled("btn_copy", (mState == NORMAL) && (selectIndex >= 0));
@@ -244,11 +245,12 @@ void HippoPanelGridsImpl::loadCurGrid()
childSetText("support", gridInfo->getSupportUrl());
childSetText("search", gridInfo->getSearchUrl());
childSetText("register", gridInfo->getRegisterUrl());
+ childSetText("partner", gridInfo->getPartnerUrl());
childSetText("password", gridInfo->getPasswordUrl());
childSetValue("render_compat", gridInfo->isRenderCompat());
enableEditing(!gridInfo->getLocked());
} else {
- std::string empty = "";
+ const std::string& empty = LLStringUtil::null;
LLComboBox *platform = getChild("platform");
if (platform) platform->setCurrentByIndex(HippoGridInfo::PLATFORM_OTHER);
childSetText("gridname", empty);
@@ -259,6 +261,7 @@ void HippoPanelGridsImpl::loadCurGrid()
childSetText("support", empty);
childSetText("search", empty);
childSetText("register", empty);
+ childSetText("partner", empty);
childSetText("password", empty);
childSetValue("render_compat", true);
enableEditing(true);
@@ -288,9 +291,9 @@ bool HippoPanelGridsImpl::saveCurGrid()
refresh();
std::string gridname = childGetValue("gridname");
- if (gridname == "") gridname = "";
+ if (gridname == "") gridname.clear();
std::string loginuri = childGetValue("loginuri");
- if (loginuri == "") loginuri = "";
+ if (loginuri == "") loginuri.clear();
if (gridname.empty() && !loginuri.empty())
this->retrieveGridInfo();
@@ -299,8 +302,8 @@ bool HippoPanelGridsImpl::saveCurGrid()
// check nickname
std::string gridname = childGetValue("gridname");
- childSetValue("gridname", (gridname != "")? gridname: "");
- if (gridname == "") {
+ childSetValue("gridname", !gridname.empty() ? gridname : "");
+ if (gridname.empty()) {
LLNotificationsUtil::add("GridsNoNick");
return false;
}
@@ -312,7 +315,7 @@ bool HippoPanelGridsImpl::saveCurGrid()
}
// check login URI
- if (loginuri == "") {
+ if (loginuri.empty()) {
LLSD args;
args["NAME"] = gridname;
LLNotificationsUtil::add("GridsNoLoginUri", args);
@@ -361,6 +364,7 @@ bool HippoPanelGridsImpl::saveCurGrid()
gridInfo->setWebSite(childGetValue("website"));
gridInfo->setSupportUrl(childGetValue("support"));
gridInfo->setRegisterUrl(childGetValue("register"));
+ gridInfo->setPartnerUrl(childGetValue("partner"));
gridInfo->setPasswordUrl(childGetValue("password"));
gridInfo->setSearchUrl(childGetValue("search"));
gridInfo->setRenderCompat(childGetValue("render_compat"));
@@ -384,7 +388,7 @@ void HippoPanelGridsImpl::reset()
void HippoPanelGridsImpl::retrieveGridInfo()
{
std::string loginuri = childGetValue("loginuri");
- if ((loginuri == "") || (loginuri == "")) {
+ if ((loginuri.empty()) || (loginuri == "")) {
LLNotificationsUtil::add("GridInfoNoLoginUri");
return;
}
@@ -394,7 +398,7 @@ void HippoPanelGridsImpl::retrieveGridInfo()
if (mState == NORMAL) {
grid = gHippoGridManager->getGrid(mCurGrid);
} else if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
- grid = new HippoGridInfo("");
+ grid = new HippoGridInfo(LLStringUtil::null);
cleanupGrid = true;
} else {
LL_ERRS() << "Illegal state " << mState << '.' << LL_ENDL;
@@ -412,16 +416,17 @@ void HippoPanelGridsImpl::retrieveGridInfo()
if (grid->getPlatform() != HippoGridInfo::PLATFORM_OTHER)
getChild("platform")->setCurrentByIndex(grid->getPlatform());
- if (grid->getGridName() != "") childSetText("gridname", grid->getGridName());
- if (grid->getLoginUri() != "") childSetText("loginuri", grid->getLoginUri());
- if (grid->getLoginPage() != "") childSetText("loginpage", grid->getLoginPage());
- if (grid->getHelperUri() != "") childSetText("helperuri", grid->getHelperUri());
- if (grid->getWebSite() != "") childSetText("website", grid->getWebSite());
- if (grid->getSupportUrl() != "") childSetText("support", grid->getSupportUrl());
- if (grid->getRegisterUrl() != "") childSetText("register", grid->getRegisterUrl());
- if (grid->getPasswordUrl() != "") childSetText("password", grid->getPasswordUrl());
- if (grid->getSearchUrl() != "") childSetText("search", grid->getSearchUrl());
- if (grid->getGridMessage() != "") childSetText("gridmessage", grid->getGridMessage());
+ if (!grid->getGridName().empty()) childSetText("gridname", grid->getGridName());
+ if (!grid->getLoginUri().empty()) childSetText("loginuri", grid->getLoginUri());
+ if (!grid->getLoginPage().empty()) childSetText("loginpage", grid->getLoginPage());
+ if (!grid->getHelperUri().empty()) childSetText("helperuri", grid->getHelperUri());
+ if (!grid->getWebSite().empty()) childSetText("website", grid->getWebSite());
+ if (!grid->getSupportUrl().empty()) childSetText("support", grid->getSupportUrl());
+ if (!grid->getRegisterUrl().empty()) childSetText("register", grid->getRegisterUrl());
+ if (!grid->getPartnerUrl().empty()) childSetText("partner", grid->getPartnerUrl());
+ if (!grid->getPasswordUrl().empty()) childSetText("password", grid->getPasswordUrl());
+ if (!grid->getSearchUrl().empty()) childSetText("search", grid->getSearchUrl());
+ if (!grid->getGridMessage().empty()) childSetText("gridmessage", grid->getGridMessage());
}
catch(AIAlert::ErrorCode const& error)
{
@@ -532,6 +537,8 @@ void HippoPanelGridsImpl::onClickAdvanced(void *data)
self->childSetVisible("support", false);
self->childSetVisible("register_label", false);
self->childSetVisible("register", false);
+ self->childSetVisible("partner_label", false);
+ self->childSetVisible("partner", false);
self->childSetVisible("password_label", false);
self->childSetVisible("password", false);
self->childSetVisible("search_label", false);
@@ -551,6 +558,8 @@ void HippoPanelGridsImpl::onClickAdvanced(void *data)
self->childSetVisible("support", true);
self->childSetVisible("register_label", true);
self->childSetVisible("register", true);
+ self->childSetVisible("partner_label", true);
+ self->childSetVisible("partner", true);
self->childSetVisible("password_label", true);
self->childSetVisible("password", true);
self->childSetVisible("search_label", true);
@@ -578,6 +587,7 @@ void HippoPanelGridsImpl::enableEditing(bool b)
"website",
"support",
"register",
+ "partner",
"password",
"search",
"btn_delete",
diff --git a/indra/newview/icons/alpha/viewer.png b/indra/newview/icons/alpha/viewer.png
index 3e4c44fe5..8d7619f95 100644
Binary files a/indra/newview/icons/alpha/viewer.png and b/indra/newview/icons/alpha/viewer.png differ
diff --git a/indra/newview/installers/darwin/firstlook-dmg/background.jpg b/indra/newview/installers/darwin/firstlook-dmg/background.jpg
index 55294dcc9..3962e2fb3 100644
Binary files a/indra/newview/installers/darwin/firstlook-dmg/background.jpg and b/indra/newview/installers/darwin/firstlook-dmg/background.jpg differ
diff --git a/indra/newview/installers/darwin/publicnightly-dmg/background.jpg b/indra/newview/installers/darwin/publicnightly-dmg/background.jpg
index 55294dcc9..3962e2fb3 100644
Binary files a/indra/newview/installers/darwin/publicnightly-dmg/background.jpg and b/indra/newview/installers/darwin/publicnightly-dmg/background.jpg differ
diff --git a/indra/newview/installers/darwin/release-dmg/background.jpg b/indra/newview/installers/darwin/release-dmg/background.jpg
index 55294dcc9..3962e2fb3 100644
Binary files a/indra/newview/installers/darwin/release-dmg/background.jpg and b/indra/newview/installers/darwin/release-dmg/background.jpg differ
diff --git a/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg b/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg
index 55294dcc9..3962e2fb3 100644
Binary files a/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg and b/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg differ
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index ed160f8a1..8ff723f76 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -24,6 +24,10 @@
;;
;; Author: James Cook, Don Kjer, Callum Prentice, Drake Arconis
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;--------------------------------
+;Unicode
+ Unicode true
+
;--------------------------------
;Include Modern UI
@@ -72,7 +76,7 @@
InstallDirRegKey HKLM "SOFTWARE\${VENDORSTR}\${APPNAMEONEWORD}" ""
!endif
- ;Request application privileges for Windows Vista
+ ;Request application privileges for Windows UAC
RequestExecutionLevel admin
;Compression
@@ -139,7 +143,11 @@
!define MUI_STARTMENUPAGE_REGISTRY_KEY "SOFTWARE\${VENDORSTR}\${APPNAMEONEWORD}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!define MUI_PAGE_CUSTOMFUNCTION_PRE check_skip
+!ifdef WIN64_BIN_BUILD
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APPNAME} (64 bit) Viewer"
+!else
+ !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APPNAME} Viewer"
+!endif
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENUFOLDER
;Install Progress Page
@@ -150,6 +158,10 @@
!define MUI_PAGE_CUSTOMFUNCTION_PRE check_skip_finish
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION launch_viewer
+ !define MUI_FINISHPAGE_SHOWREADME
+ !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
+ !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ !define MUI_FINISHPAGE_SHOWREADME_FUNCTION create_desktop_shortcut
!define MUI_FINISHPAGE_NOREBOOTSUPPORT
!insertmacro MUI_PAGE_FINISH
@@ -185,12 +197,12 @@
;because this will make your installer start faster.
!insertmacro MUI_RESERVEFILE_LANGDLL
- ReserveFile "${NSISDIR}\Plugins\NSISdl.dll"
- ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
- ReserveFile "${NSISDIR}\Plugins\StartMenu.dll"
- ReserveFile "${NSISDIR}\Plugins\StdUtils.dll"
- ReserveFile "${NSISDIR}\Plugins\System.dll"
- ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\NSISdl.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\nsDialogs.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\StartMenu.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\StdUtils.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\System.dll"
+ ReserveFile "${NSISDIR}\Plugins\x86-unicode\UserInfo.dll"
;--------------------------------
; Local Functions
@@ -212,6 +224,14 @@ Function launch_viewer
${StdUtils.ExecShellAsUser} $0 "$INSTDIR\$INSTEXE" "open" "$SHORTCUT_LANG_PARAM"
FunctionEnd
+Function create_desktop_shortcut
+!ifdef WIN64_BIN_BUILD
+ CreateShortCut "$DESKTOP\$INSTSHORTCUT x64.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$INSTEXE"
+!else
+ CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$INSTEXE"
+!endif
+FunctionEnd
+
;Check version compatibility
Function CheckWindowsVersion
!ifdef WIN64_BIN_BUILD
@@ -221,7 +241,7 @@ Function CheckWindowsVersion
${EndIf}
!endif
- ${If} ${AtMostWinXP}
+ ${If} ${AtMostWinVista}
MessageBox MB_OK $(CheckWindowsVersionMB)
Quit
${EndIf}
@@ -229,20 +249,6 @@ FunctionEnd
;Check service pack compatibility and suggest upgrade
Function CheckWindowsServPack
- ${If} ${IsWinVista}
- ${AndIfNot} ${IsServicePack} 2
- MessageBox MB_OK $(CheckWindowsServPackMB)
- DetailPrint $(UseLatestServPackDP)
- Return
- ${EndIf}
-
- ${If} ${IsWin2008}
- ${AndIfNot} ${IsServicePack} 2
- MessageBox MB_OK $(CheckWindowsServPackMB)
- DetailPrint $(UseLatestServPackDP)
- Return
- ${EndIf}
-
${If} ${IsWin7}
${AndIfNot} ${IsServicePack} 1
MessageBox MB_OK $(CheckWindowsServPackMB)
@@ -321,6 +327,8 @@ Function CloseSecondLife
StrCmp $SKIP_DIALOGS "true" CLOSE
MessageBox MB_YESNOCANCEL $(CloseSecondLifeInstMB) IDYES CLOSE IDNO DONE
+
+; CANCEL_INSTALL:
Quit
CLOSE:
@@ -346,7 +354,9 @@ Function un.CloseSecondLife
Push $0
FindWindow $0 "Second Life" ""
IntCmp $0 0 DONE
- MessageBox MB_YESNOCANCEL $(CloseSecondLifeUnInstMB) IDYES CLOSE IDNO DONE
+ MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
+
+ CANCEL_UNINSTALL:
Quit
CLOSE:
@@ -491,18 +501,46 @@ Section "Viewer"
;Write URL registry info
- WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(Default)" "URL:Second Life"
+ DeleteRegKey HKEY_CLASSES_ROOT "${URLNAME}"
+ WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "" "URL:Second Life"
WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" "$INSTDIR\$INSTEXE"
;; URL param must be last item passed to viewer, it ignores subsequent params
;; to avoid parameter injection attacks.
+ WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\shell" "" "open"
+!ifdef WIN64_BIN_BUILD
+ WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open" "FriendlyAppName" "$INSTSHORTCUT (64 bit) Viewer"
+!else
+ WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open" "FriendlyAppName" "$INSTSHORTCUT Viewer"
+!endif
WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" "$\"$INSTDIR\$INSTEXE$\" -url $\"%1$\""
- WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "(Default)" "URL:Second Life"
+ DeleteRegKey HKEY_CLASSES_ROOT "x-grid-info"
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-info" "" "URL:Hypergrid"
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-info" "URL Protocol" ""
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-info\DefaultIcon" "" "$INSTDIR\$INSTEXE"
+ ;; URL param must be last item passed to viewer, it ignores subsequent params
+ ;; to avoid parameter injection attacks.
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-info\shell" "" "open"
+!ifdef WIN64_BIN_BUILD
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-info\shell\open" "FriendlyAppName" "$INSTSHORTCUT (64 bit) Viewer"
+!else
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-info\shell\open" "FriendlyAppName" "$INSTSHORTCUT Viewer"
+!endif
+ WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-info\shell\open\command" "" "$\"$INSTDIR\$INSTEXE$\" -url $\"%1$\""
+
+ DeleteRegKey HKEY_CLASSES_ROOT "x-grid-location-info"
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "" "URL:Hypergrid legacy"
WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""
WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" "$\"$INSTDIR\$INSTEXE$\""
;; URL param must be last item passed to viewer, it ignores subsequent params
;; to avoid parameter injection attacks.
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\shell" "" "open"
+!ifdef WIN64_BIN_BUILD
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open" "FriendlyAppName" "$INSTSHORTCUT (64 bit) Viewer"
+!else
+ WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open" "FriendlyAppName" "$INSTSHORTCUT Viewer"
+!endif
WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" "$\"$INSTDIR\$INSTEXE$\" -url $\"%1$\""
;Create uninstaller
diff --git a/indra/newview/lffloaterinvpanel.cpp b/indra/newview/lffloaterinvpanel.cpp
index 5fde1fa10..2578c90a2 100644
--- a/indra/newview/lffloaterinvpanel.cpp
+++ b/indra/newview/lffloaterinvpanel.cpp
@@ -32,7 +32,7 @@ LFFloaterInvPanel::LFFloaterInvPanel(const LLUUID& cat_id, LLInventoryModel* mod
mCommitCallbackRegistrar.add("InvPanel.Search", boost::bind(&LLInventoryPanel::setFilterSubString, boost::ref(mPanel), _2));
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inv_panel.xml");
LLPanel* panel = getChild("placeholder_panel");
- mPanel = new LLInventoryPanel("inv_panel", LLInventoryPanel::DEFAULT_SORT_ORDER, cat_id.asString(), panel->getRect(), model, true);
+ mPanel = new LLInventoryPanel("inv_panel", LLInventoryPanel::DEFAULT_SORT_ORDER, LLSD().with("id", cat_id), panel->getRect(), model, true);
mPanel->postBuild();
mPanel->setFollows(FOLLOWS_ALL);
mPanel->setEnabled(true);
diff --git a/indra/newview/lfsimfeaturehandler.cpp b/indra/newview/lfsimfeaturehandler.cpp
index 65d1e6e55..dbdf2e5de 100644
--- a/indra/newview/lfsimfeaturehandler.cpp
+++ b/indra/newview/lfsimfeaturehandler.cpp
@@ -92,6 +92,7 @@ void LFSimFeatureHandler::setSupportedFeatures()
mGridName = gHippoGridManager->getConnectedGrid()->getGridName() != grid_name ? grid_name : LLStringUtil::null;
}
}
+ has_feature_or_default(mEventsURL, extras, "EventsURL");
has_feature_or_default(mSayRange, extras, "say-range");
has_feature_or_default(mShoutRange, extras, "shout-range");
has_feature_or_default(mWhisperRange, extras, "whisper-range");
@@ -105,6 +106,7 @@ void LFSimFeatureHandler::setSupportedFeatures()
mMapServerURL = LLStringUtil::null;
mSearchURL.reset();
mGridName.reset();
+ mEventsURL.reset();
}
mSayRange.reset();
mShoutRange.reset();
diff --git a/indra/newview/lfsimfeaturehandler.h b/indra/newview/lfsimfeaturehandler.h
index 893edb5a0..9b7554e32 100644
--- a/indra/newview/lfsimfeaturehandler.h
+++ b/indra/newview/lfsimfeaturehandler.h
@@ -65,6 +65,7 @@ public:
boost::signals2::connection setSupportsExportCallback(const SignaledType::slot_t& slot) { return mSupportsExport.connect(slot); }
boost::signals2::connection setDestinationGuideURLCallback(const SignaledType::slot_t& slot) { return mDestinationGuideURL.connect(slot); }
boost::signals2::connection setSearchURLCallback(const SignaledType::slot_t& slot) { return mSearchURL.connect(slot); }
+ boost::signals2::connection setEventsURLCallback(const SignaledType::slot_t& slot) { return mEventsURL.connect(slot); }
boost::signals2::connection setSayRangeCallback(const SignaledType::slot_t& slot) { return mSayRange.connect(slot); }
boost::signals2::connection setShoutRangeCallback(const SignaledType::slot_t& slot) { return mShoutRange.connect(slot); }
boost::signals2::connection setWhisperRangeCallback(const SignaledType::slot_t& slot) { return mWhisperRange.connect(slot); }
@@ -74,6 +75,7 @@ public:
std::string destinationGuideURL() const { return mDestinationGuideURL; }
std::string mapServerURL() const { return mMapServerURL; }
std::string searchURL() const { return mSearchURL; }
+ const std::string& getEventsURL() const { return mEventsURL.ref(); }
const std::string& gridName() const { return mGridName.ref(); }
U32 sayRange() const { return mSayRange; }
U32 shoutRange() const { return mShoutRange; }
@@ -87,6 +89,7 @@ private:
std::string mMapServerURL;
SignaledType mSearchURL;
SignaledType mGridName;
+ SignaledType mEventsURL;
SignaledType mSayRange;
SignaledType mShoutRange;
SignaledType mWhisperRange;
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index c447a4925..457de28d5 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -103,6 +103,7 @@
#include "lluictrlfactory.h" //For LLUICtrlFactory::getLayeredXMLNode
+#include "floaterao.h" // for Typing override
#include "hippolimits.h" // for getMaxAgentGroups
// [RLVa:KB] - Checked: 2011-11-04 (RLVa-1.4.4a)
#include "rlvactions.h"
@@ -2014,10 +2015,7 @@ void LLAgent::startTyping()
}
}
- if (gSavedSettings.getBOOL("PlayTypingAnim"))
- {
- sendAnimationRequest(ANIM_AGENT_TYPE, ANIM_REQUEST_START);
- }
+ LLFloaterAO::typing(true); // Singu Note: Typing anims handled by AO/settings.
gChatBar->
sendChatFromViewer("", CHAT_TYPE_START, FALSE);
}
@@ -2030,7 +2028,7 @@ void LLAgent::stopTyping()
if (mRenderState & AGENT_STATE_TYPING)
{
clearRenderState(AGENT_STATE_TYPING);
- sendAnimationRequest(ANIM_AGENT_TYPE, ANIM_REQUEST_STOP);
+ LLFloaterAO::typing(false); // Singu Note: Typing anims handled by AO/settings.
gChatBar->
sendChatFromViewer("", CHAT_TYPE_STOP, FALSE);
}
@@ -4123,6 +4121,12 @@ void LLAgent::handleTeleportFinished()
LLNotificationsUtil::add("PreferredMaturityChanged", args);
mIsMaturityRatingChangingDuringTeleport = false;
}
+
+ // Init SLM Marketplace connection so we know which UI should be used for the user as a merchant
+ // Note: Eventually, all merchant will be migrated to the new SLM system and there will be no reason to show the old UI at all.
+ // Note: Some regions will not support the SLM cap for a while so we need to do that check for each teleport.
+ // *TODO : Suppress that line from here once the whole grid migrated to SLM and move it to idle_startup() (llstartup.cpp)
+ check_merchant_status();
}
void LLAgent::handleTeleportFailed()
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index e76bd28c3..bb3317005 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2270,7 +2270,7 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate)
mMouselookTimer.reset();
gFocusMgr.setKeyboardFocus(NULL);
- if (gSavedSettings.getBOOL("AONoStandsInMouselook")) LLFloaterAO::stopMotion(LLFloaterAO::getCurrentStandId(), FALSE,TRUE);
+ if (gSavedSettings.getBOOL("AONoStandsInMouselook")) LLFloaterAO::stopMotion(LLFloaterAO::getCurrentStandId(), true);
updateLastCamera();
mCameraMode = CAMERA_MODE_MOUSELOOK;
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 446626b5e..bf5d47d0a 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -32,6 +32,7 @@
#include "llagentcamera.h"
#include "llagentwearablesfetch.h"
#include "llappearancemgr.h"
+#include "llattachmentsmgr.h"
#include "llcallbacklist.h"
#include "llfloatercustomize.h"
#include "llfolderview.h"
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 7f55b00c9..baa6809ea 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1568,9 +1568,11 @@ void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
break;
case LLAssetType::AT_OBJECT:
- {
- rez_attachment(item_to_wear, NULL, replace);
- }
+ {
+ LL_DEBUGS("Avatar") << "ATT wearing object. calling rez_attachment, item " << item_to_wear->getName()
+ << " id " << item_to_wear->getLinkedUUID() << LL_ENDL;
+ rez_attachment(item_to_wear, NULL, replace);
+ }
break;
default: continue;
@@ -3759,7 +3761,7 @@ void RequestAgentUpdateAppearanceResponder::onRequestRequested()
}
// Actually send the request.
- LL_DEBUGS("Avatar") << "Will send request for cof_version " << cof_version << LL_ENDL;
+ LL_DEBUGS("Avatar") << "ATT sending bake request for cof_version " << cof_version << LL_ENDL;
mRetryPolicy->reset();
sendRequest();
}
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 2aee3a578..a0c7fc3d8 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -321,6 +321,7 @@ private:
nullary_func_t mPostUpdateFunc;
};
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-08-31 (Catznip-2.1)
class LLUpdateAppearanceAndEditWearableOnDestroy: public LLInventoryCallback
{
public:
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1950f5194..a10b6a6e3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -165,6 +165,7 @@
// in save_settings_to_globals()
#include "llbutton.h"
#include "llcombobox.h"
+#include "floaterlocalassetbrowse.h"
#include "llstatusbar.h"
#include "llsurface.h"
#include "llvosky.h"
@@ -773,7 +774,6 @@ bool LLAppViewer::init()
writeSystemInfo();
-
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -818,7 +818,14 @@ bool LLAppViewer::init()
LLUrlAction::setOpenURLInternalCallback(boost::bind(&LLWeb::loadURLInternal, _1, LLStringUtil::null, LLStringUtil::null));
LLUrlAction::setOpenURLExternalCallback(boost::bind(&LLWeb::loadURLExternal, _1, true, LLStringUtil::null));
LLUrlAction::setExecuteSLURLCallback(&LLURLDispatcher::dispatchFromTextEditor);
-
+
+ LL_INFOS("InitInfo") << "UI initialization is done." << LL_ENDL ;
+
+ // Load translations for tooltips
+ LLFloater::initClass();
+
+ /////////////////////////////////////////////////
+
LLToolMgr::getInstance(); // Initialize tool manager if not already instantiated
/////////////////////////////////////////////////
@@ -884,7 +891,7 @@ bool LLAppViewer::init()
std::ostringstream msg;
msg << LLTrans::getString("MBUnableToAccessFile");
OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
- return 1;
+ return true;
}
LL_INFOS("InitInfo") << "Cache initialization is done." << LL_ENDL ;
@@ -913,7 +920,7 @@ bool LLAppViewer::init()
load_default_bindings(gSavedSettings.getBOOL("LiruUseZQSDKeys"));
// If we don't have the right GL requirements, exit.
- if (!gGLManager.mHasRequirements && !gNoRender)
+ if (!gGLManager.mHasRequirements)
{
// can't use an alert here since we're exiting and
// all hell breaks lose.
@@ -923,10 +930,9 @@ bool LLAppViewer::init()
msg,
LLStringUtil::null,
OSMB_OK);
- return 0;
+ return false;
}
-#if (_M_IX86_FP > 1 || defined(__SSE2__))
// Without SSE2 support we will crash almost immediately, warn here.
if (!gSysCPU.hasSSE2())
{
@@ -938,23 +944,8 @@ bool LLAppViewer::init()
msg,
LLStringUtil::null,
OSMB_OK);
- return 0;
+ return false;
}
-#elif (_M_IX86_FP == 1 || defined(__SSE__))
- // Without SSE support we will crash almost immediately, warn here.
- if (!gSysCPU.hasSSE())
- {
- // can't use an alert here since we're exiting and
- // all hell breaks lose.
- std::string msg = LNotificationTemplates::instance().getGlobalString("UnsupportedCPUSSE2");
- LLStringUtil::format(msg,LLTrans::getDefaultArgs());
- OSMessageBox(
- msg,
- LLStringUtil::null,
- OSMB_OK);
- return 0;
- }
-#endif
// alert the user if they are using unsupported hardware
if(!gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
@@ -1172,18 +1163,18 @@ bool LLAppViewer::mainLoop()
BOOL restore_rendering_masks = FALSE;
// Handle messages
- while (!LLApp::isExiting())
+ try
{
- LLFastTimer::nextFrame(); // Should be outside of any timer instances
-
- //clear call stack records
- LL_CLEAR_CALLSTACKS();
-
- //check memory availability information
- checkMemory() ;
-
- try
+ while (!LLApp::isExiting())
{
+ LLFastTimer::nextFrame(); // Should be outside of any timer instances
+
+ //clear call stack records
+ LL_CLEAR_CALLSTACKS();
+
+ //check memory availability information
+ checkMemory() ;
+
// Check if we need to restore rendering masks.
if (restore_rendering_masks)
{
@@ -1236,12 +1227,10 @@ bool LLAppViewer::mainLoop()
#endif
//memory leaking simulation
- LLFloaterMemLeak* mem_leak_instance =
- LLFloaterMemLeak::getInstance();
- if(mem_leak_instance)
+ if (auto mem_leak_instance = LLFloaterMemLeak::getInstance())
{
- mem_leak_instance->idle() ;
- }
+ mem_leak_instance->idle();
+ }
// canonical per-frame event
mainloop.post(newFrame);
@@ -1424,54 +1413,29 @@ bool LLAppViewer::mainLoop()
// LLAppViewer::getTextureFetch()->pause(); // Don't pause the fetch (IO) thread
}
//LLVFSThread::sLocal->pause(); // Prevent the VFS thread from running while rendering.
- //LLLFSThread::sLocal->pause(); // Prevent the LFS thread from running while rendering.
resumeMainloopTimeout();
pingMainloopTimeout("Main:End");
}
}
- catch(std::bad_alloc)
- {
- LLMemory::logMemoryInfo(TRUE) ;
- //stop memory leaking simulation
- LLFloaterMemLeak* mem_leak_instance =
- LLFloaterMemLeak::getInstance();
- if(mem_leak_instance)
- {
- mem_leak_instance->stop() ;
- LL_WARNS() << "Bad memory allocation in LLAppViewer::mainLoop()!" << LL_ENDL ;
- }
- else
- {
- //output possible call stacks to log file.
- LLError::LLCallStacks::print() ;
-
- LL_ERRS() << "Bad memory allocation in LLAppViewer::mainLoop()!" << LL_ENDL ;
- }
- }
- }
-
- // Save snapshot for next time, if we made it through initialization
- if (STATE_STARTED == LLStartUp::getStartupState())
- {
- try
- {
+ // Save snapshot for next time, if we made it through initialization
+ if (STATE_STARTED == LLStartUp::getStartupState())
saveFinalSnapshot();
- }
- catch(std::bad_alloc)
- {
- LL_WARNS() << "Bad memory allocation when saveFinalSnapshot() is called!" << LL_ENDL ;
+ }
+ catch(std::bad_alloc)
+ {
+ LLMemory::logMemoryInfo(TRUE);
- //stop memory leaking simulation
- LLFloaterMemLeak* mem_leak_instance =
- LLFloaterMemLeak::getInstance();
- if(mem_leak_instance)
- {
- mem_leak_instance->stop() ;
- }
- }
+ //stop memory leaking simulation
+ if (auto mem_leak_instance = LLFloaterMemLeak::getInstance())
+ mem_leak_instance->stop();
+
+ //output possible call stacks to log file.
+ LLError::LLCallStacks::print();
+
+ LL_ERRS() << "Bad memory allocation in LLAppViewer::mainLoop()!" << LL_ENDL;
}
delete gServicePump;
@@ -1733,6 +1697,8 @@ bool LLAppViewer::cleanup()
LLFloaterTeleportHistory::saveFile("teleport_history.xml");
+ LocalAssetBrowser::deleteSingleton(); //
+
// save mute list. gMuteList used to also be deleted here too.
LLMuteList::getInstance()->cache(gAgent.getID());
@@ -2474,12 +2440,11 @@ bool LLAppViewer::initConfiguration()
//
// Set the name of the window
//
- gWindowTitle = LLTrans::getString("APP_NAME");
+ gWindowTitle = LLTrans::getString("APP_NAME") + llformat(" (%d) ", LLVersionInfo::getBuild())
#if LL_DEBUG
- gWindowTitle += std::string(" [DEBUG] ") + gArgs;
-#else
- gWindowTitle += std::string(" ") + gArgs;
+ + "[DEBUG] "
#endif
+ + gArgs;
LLStringUtil::truncate(gWindowTitle, 255);
//RN: if we received a URL, hand it off to the existing instance.
@@ -2679,6 +2644,8 @@ void LLAppViewer::cleanupSavedSettings()
{
gSavedSettings.setF32("RenderFarClip", gAgentCamera.mDrawDistance);
}
+
+ LLSpeakerVolumeStorage::deleteSingleton();
}
void LLAppViewer::removeCacheFiles(const std::string& file_mask)
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 21ca02e38..e556ec61b 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -39,6 +39,7 @@
#include "rlvhandler.h"
#include "rlvlocks.h"
// [/RLVa:KB]
+#include
const F32 COF_LINK_BATCH_TIME = 5.0F;
const F32 MAX_ATTACHMENT_REQUEST_LIFETIME = 30.0F;
@@ -478,9 +479,17 @@ void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
{
LLTimer timer;
bool expected = mAttachmentRequests.getTime(inv_item_id, timer);
+ LLInventoryItem *item = gInventory.getItem(inv_item_id);
+
+ if (item && boost::algorithm::contains(item->getName(), " Bridge v") && gSavedSettings.getBOOL("SGDetachBridge"))
+ {
+ LL_INFOS() << "Bridge detected! detaching" << LL_ENDL;
+ LLVOAvatarSelf::detachAttachmentIntoInventory(item->getUUID());
+ return;
+ }
+
if (!expected)
{
- LLInventoryItem *item = gInventory.getItem(inv_item_id);
LL_WARNS() << "ATT Attachment was unexpected or arrived after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds: "
<< (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
}
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 9609d60ff..269c24956 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -546,20 +546,12 @@ void LLAvatarActions::csr(const LLUUID& id)
if (!gCacheName->getFullName(id, name)) return;
std::string url = "http://csr.lindenlab.com/agent/";
-
- // slow and stupid, but it's late
- S32 len = name.length();
- for (S32 i = 0; i < len; i++)
+ if (char* output = curl_easy_escape(nullptr, name.c_str(), name.length()))
{
- if (name[i] == ' ')
- {
- url += "%20";
- }
- else
- {
- url += name[i];
- }
+ name = output;
+ curl_free(output);
}
+ url += name;
LLWeb::loadURL(url);
}
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index f11e228ba..75ab16c18 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -113,7 +113,7 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
unshift_extents[0] = extents[0] - mPositionConstraintFixup;
unshift_extents[1] = extents[1] - mPositionConstraintFixup;
LLVector3 box_dims = extents[1]-extents[0];
- F32 box_size = llmax(box_dims[0],box_dims[1],box_dims[2]);
+ //F32 box_size = llmax(box_dims[0],box_dims[1],box_dims[2]);
if (!mRootVolp->isAttachment())
{
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
index 7609358b5..3320e609b 100644
--- a/indra/newview/llcurrencyuimanager.cpp
+++ b/indra/newview/llcurrencyuimanager.cpp
@@ -387,6 +387,7 @@ void LLCurrencyUIManager::Impl::updateUI()
}
mPanel.childSetTextArg("currency_est", "[USD]", llformat("%#.2f", mSiteCurrencyEstimatedCost / 100.0));
+ mPanel.childSetTextArg("currency_est", "[REALCURRENCY]", gHippoGridManager->getConnectedGrid()->getRealCurrencySymbol());
mPanel.childSetVisible("currency_est", mSiteCurrencyEstimated && mUserCurrencyBuy > 0);
if (mPanel.childIsEnabled("buy_btn")
diff --git a/indra/newview/lldebugmessagebox.cpp b/indra/newview/lldebugmessagebox.cpp
index d485c7a9d..7073d9b05 100644
--- a/indra/newview/lldebugmessagebox.cpp
+++ b/indra/newview/lldebugmessagebox.cpp
@@ -56,25 +56,25 @@ LLDebugVarMessageBox::LLDebugVarMessageBox(const std::string& title, EDebugVarTy
switch(var_type)
{
case VAR_TYPE_F32:
- mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, *((F32*)var), -100.f, 100.f, 0.1f, LLStringUtil::null);
+ mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, NULL, *((F32*)var), -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider1->setPrecision(3);
addChild(mSlider1);
mSlider2 = NULL;
mSlider3 = NULL;
break;
case VAR_TYPE_S32:
- mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, LLStringUtil::null);
+ mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, LLStringUtil::null);
mSlider1->setPrecision(0);
addChild(mSlider1);
mSlider2 = NULL;
mSlider3 = NULL;
break;
case VAR_TYPE_VEC3:
- mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), std::string("x: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, LLStringUtil::null);
+ mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), std::string("x: "), NULL, 70, 130, TRUE, TRUE, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider1->setPrecision(3);
- mSlider2 = new LLSliderCtrl(std::string("slider 2"), LLRect(20,100,190,80), std::string("y: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, LLStringUtil::null);
+ mSlider2 = new LLSliderCtrl(std::string("slider 2"), LLRect(20,100,190,80), std::string("y: "), NULL, 70, 130, TRUE, TRUE, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider2->setPrecision(3);
- mSlider3 = new LLSliderCtrl(std::string("slider 3"), LLRect(20,70,190,50), std::string("z: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, LLStringUtil::null);
+ mSlider3 = new LLSliderCtrl(std::string("slider 3"), LLRect(20,70,190,50), std::string("z: "), NULL, 70, 130, TRUE, TRUE, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider3->setPrecision(3);
addChild(mSlider1);
addChild(mSlider2);
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
index 4abd7fc8e..d2fb204cc 100644
--- a/indra/newview/llenvmanager.cpp
+++ b/indra/newview/llenvmanager.cpp
@@ -505,7 +505,7 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
mRegionSettingsChangeSignal();
// reset
- if (!gHippoGridManager->getConnectedGrid()->isAurora()) // On Aurora, the region says when to refresh
+ if (!gHippoGridManager->getConnectedGrid()->isWhiteCore()) // On WhiteCore, the region says when to refresh
mInterpNextChangeMessage = false;
}
@@ -704,7 +704,7 @@ void LLEnvManagerNew::onRegionChange()
}
}
-// Aurora-sim windlight refresh
+// WhiteCore windlight refresh
class WindLightRefresh : public LLHTTPNode
{
/*virtual*/ void post(LLHTTPNode::ResponsePtr response, const LLSD& context, const LLSD& input) const
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 22b715590..b804b81be 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -190,6 +190,20 @@ namespace
mErrorCount = 0;
makeRequest();
}
+ else if (mStatus == HTTP_NOT_FOUND)
+ { // Event polling for this server has been canceled. In
+ // some cases the server gets ahead of the viewer and will
+ // return a 404 error (Not Found) before the cancel event
+ // comes back in the queue
+ LL_WARNS("LLEventPollImpl") << "Canceling coroutine" << LL_ENDL;
+ stop();
+ }
+ else if (mCode != CURLE_OK)
+ {
+ /// Some LLCore or LIBCurl error was returned. This is unlikely to be recoverable
+ LL_WARNS("LLEventPollImpl") << "Critical error from poll request returned from libraries. Canceling coroutine." << LL_ENDL;
+ stop();
+ }
else if (mErrorCount < MAX_EVENT_POLL_HTTP_ERRORS)
{
++mErrorCount;
@@ -213,6 +227,7 @@ namespace
// They are essentially disconnected from the region even though some things may still work.
// Since things won't get better until they relog we force a disconnect now.
+ /* Singu Note: There's no reason to disconnect, just because this failed a few too many times
// *NOTE:Mani - The following condition check to see if this failing event poll
// is attached to the Agent's main region. If so we disconnect the viewer.
// Else... its a child region and we just leave the dead event poll stopped and
@@ -222,6 +237,7 @@ namespace
LL_WARNS() << "Forcing disconnect due to stalled main region event poll." << LL_ENDL;
LLAppViewer::instance()->forceDisconnect(LLTrans::getString("AgentLostConnection"));
}
+ */
}
}
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
new file mode 100644
index 000000000..d578b6062
--- /dev/null
+++ b/indra/newview/llfavoritesbar.cpp
@@ -0,0 +1,1802 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+/**
+ * @file llfavoritesbar.cpp
+ * @brief LLFavoritesBarCtrl class implementation
+ *
+ * $LicenseInfo:firstyear=2009&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 "llviewerprecompiledheaders.h"
+#include "llfavoritesbar.h"
+
+//#include "llfloaterreg.h"
+#include "llfocusmgr.h"
+#include "llinventory.h"
+#include "lllandmarkactions.h"
+//#include "lltoolbarview.h"
+#include "lltrans.h"
+#include "llmenugl.h"
+//#include "lltooltip.h"
+#include "lluictrlfactory.h"
+
+#include "llagent.h"
+#include "llavatarnamecache.h"
+#include "llclipboard.h"
+#include "llinventorybridge.h"
+#include "llinventoryclipboard.h"
+#include "llinventoryfunctions.h"
+//#include "llfloatersidepanelcontainer.h"
+#include "llfloaterworldmap.h"
+#include "lllandmarkactions.h"
+//#include "lllogininstance.h"
+#include "llnotificationsutil.h"
+//#include "lltoggleablemenu.h"
+#include "llviewerinventory.h"
+#include "llviewermenu.h"
+#include "hippogridmanager.h" //"llviewernetwork.h"
+#include "lltooldraganddrop.h"
+#include "llsdserialize.h"
+
+void open_landmark(LLViewerInventoryItem* inv_item, const std::string& title, BOOL show_keep_discard, const LLUUID& source_id, BOOL take_focus);
+
+static LLRegisterWidget r("favorites_bar");
+
+const S32 DROP_DOWN_MENU_WIDTH = 250;
+const S32 DROP_DOWN_MENU_TOP_PAD = 13;
+
+/**
+ * Helper for LLFavoriteLandmarkButton and LLFavoriteLandmarkMenuItem.
+ * Performing requests for SLURL for given Landmark ID
+ */
+class LLLandmarkInfoGetter
+{
+public:
+ LLLandmarkInfoGetter()
+ : mLandmarkID(LLUUID::null),
+ mName("(Loading...)"),
+ mPosX(0),
+ mPosY(0),
+ mPosZ(0),
+ mLoaded(false)
+ {
+ mHandle.bind(this);
+ }
+
+ void setLandmarkID(const LLUUID& id) { mLandmarkID = id; }
+ const LLUUID& getLandmarkId() const { return mLandmarkID; }
+
+ const std::string& getName()
+ {
+ if(!mLoaded)
+ requestNameAndPos();
+
+ return mName;
+ }
+
+ S32 getPosX()
+ {
+ if (!mLoaded)
+ requestNameAndPos();
+ return mPosX;
+ }
+
+ S32 getPosY()
+ {
+ if (!mLoaded)
+ requestNameAndPos();
+ return mPosY;
+ }
+
+ S32 getPosZ()
+ {
+ if (!mLoaded)
+ requestNameAndPos();
+ return mPosZ;
+ }
+
+private:
+ /**
+ * Requests landmark data from server.
+ */
+ void requestNameAndPos()
+ {
+ if (mLandmarkID.isNull())
+ return;
+
+ LLVector3d g_pos;
+ if(LLLandmarkActions::getLandmarkGlobalPos(mLandmarkID, g_pos))
+ {
+ LLLandmarkActions::getRegionNameAndCoordsFromPosGlobal(g_pos,
+ boost::bind(&LLLandmarkInfoGetter::landmarkNameCallback, static_cast >(mHandle), _1, _2, _3, _4));
+ }
+ }
+
+ static void landmarkNameCallback(LLHandle handle, const std::string& name, S32 x, S32 y, S32 z)
+ {
+ LLLandmarkInfoGetter* getter = handle.get();
+ if (getter)
+ {
+ getter->mPosX = x;
+ getter->mPosY = y;
+ getter->mPosZ = z;
+ getter->mName = name;
+ getter->mLoaded = true;
+ }
+ }
+
+ LLUUID mLandmarkID;
+ std::string mName;
+ S32 mPosX;
+ S32 mPosY;
+ S32 mPosZ;
+ bool mLoaded;
+ LLRootHandle mHandle;
+};
+
+/**
+ * This class is needed to override LLButton default handleToolTip function and
+ * show SLURL as button tooltip.
+ * *NOTE: dzaporozhan: This is a workaround. We could set tooltips for buttons
+ * in createButtons function but landmark data is not available when Favorites Bar is
+ * created. Thats why we are requesting landmark data after
+ */
+class LLFavoriteLandmarkButton : public LLButton
+{
+public:
+
+ BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect) override
+ {
+ std::string region_name = mLandmarkInfoGetter.getName();
+
+ if (!region_name.empty())
+ {
+ std::string extra_message = llformat("%s (%d, %d, %d)", region_name.c_str(),
+ mLandmarkInfoGetter.getPosX(), mLandmarkInfoGetter.getPosY(), mLandmarkInfoGetter.getPosZ());
+
+ msg = llformat("%s\n%s", getLabelSelected().c_str(), extra_message.c_str());
+ *sticky_rect = calcScreenRect();
+ }
+ return TRUE;
+ }
+
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override
+ {
+ LLFavoritesBarCtrl* fb = dynamic_cast(getParent());
+
+ if (fb)
+ {
+ fb->handleHover(x, y, mask);
+ }
+
+ return LLButton::handleHover(x, y, mask);
+ }
+
+ void setLandmarkID(const LLUUID& id){ mLandmarkInfoGetter.setLandmarkID(id); }
+ const LLUUID& getLandmarkId() const { return mLandmarkInfoGetter.getLandmarkId(); }
+
+ void onMouseEnter(S32 x, S32 y, MASK mask) override
+ {
+ if (LLToolDragAndDrop::getInstance()->hasMouseCapture())
+ {
+ LLUICtrl::onMouseEnter(x, y, mask);
+ }
+ else
+ {
+ LLButton::onMouseEnter(x, y, mask);
+ }
+ }
+
+//protected:
+ LLFavoriteLandmarkButton(const LLButton::Params& p) : LLButton(p) {}
+ friend class LLUICtrlFactory;
+
+private:
+ LLLandmarkInfoGetter mLandmarkInfoGetter;
+};
+
+/**
+ * This class is needed to override LLMenuItemCallGL default handleToolTip function and
+ * show SLURL as button tooltip.
+ * *NOTE: dzaporozhan: This is a workaround. We could set tooltips for buttons
+ * in showDropDownMenu function but landmark data is not available when Favorites Bar is
+ * created. Thats why we are requesting landmark data after
+ */
+class LLFavoriteLandmarkMenuItem : public LLMenuItemCallGL
+{
+public:
+ BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect) override
+ {
+ std::string region_name = mLandmarkInfoGetter.getName();
+ if (!region_name.empty())
+ {
+ msg = llformat("%s\n%s (%d, %d)", getLabel().c_str(), region_name.c_str(), mLandmarkInfoGetter.getPosX(), mLandmarkInfoGetter.getPosY());
+ *sticky_rect = calcScreenRect();
+ }
+ return TRUE;
+ }
+
+ void setLandmarkID(const LLUUID& id){ mLandmarkInfoGetter.setLandmarkID(id); }
+
+ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override
+ {
+ if (mMouseDownSignal)
+ (*mMouseDownSignal)(this, x, y, mask);
+ return LLMenuItemCallGL::handleMouseDown(x, y, mask);
+ }
+
+ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override
+ {
+ if (mMouseUpSignal)
+ (*mMouseUpSignal)(this, x, y, mask);
+ return LLMenuItemCallGL::handleMouseUp(x, y, mask);
+ }
+
+ BOOL handleHover(S32 x, S32 y, MASK mask) override
+ {
+ if (fb)
+ {
+ fb->handleHover(x, y, mask);
+ }
+
+ return TRUE;
+ }
+
+ void initFavoritesBarPointer(LLFavoritesBarCtrl* fb) { this->fb = fb; }
+
+//protected:
+
+ LLFavoriteLandmarkMenuItem(const LLMenuItemCallGL::Params& p) : LLMenuItemCallGL(p.name(), p.label(), nullptr), fb(nullptr) {}
+ friend class LLUICtrlFactory;
+
+private:
+ LLLandmarkInfoGetter mLandmarkInfoGetter;
+ LLFavoritesBarCtrl* fb;
+};
+
+/**
+ * This class was introduced just for fixing the following issue:
+ * EXT-836 Nav bar: Favorites overflow menu passes left-mouse click through.
+ * We must explicitly handle drag and drop event by returning TRUE
+ * because otherwise LLToolDragAndDrop will initiate drag and drop operation
+ * with the world.
+ */
+class LLFavoriteLandmarkToggleableMenu : public LLMenuGL
+{
+public:
+ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg) override
+ {
+ *accept = ACCEPT_NO;
+ return TRUE;
+ }
+
+//protected:
+ LLFavoriteLandmarkToggleableMenu():
+ LLMenuGL("favorites menu")
+ {
+ }
+
+ friend class LLUICtrlFactory;
+};
+
+/**
+ * This class is needed to update an item being copied to the favorites folder
+ * with a sort field value (required to save favorites bar's tabs order).
+ * See method handleNewFavoriteDragAndDrop for more details on how this class is used.
+ */
+class LLItemCopiedCallback : public LLInventoryCallback
+{
+public:
+ LLItemCopiedCallback(S32 sortField): mSortField(sortField) {}
+
+ void fire(const LLUUID& inv_item) override
+ {
+ LLViewerInventoryItem* item = gInventory.getItem(inv_item);
+
+ if (item)
+ {
+ LLFavoritesOrderStorage::instance().setSortIndex(item, mSortField);
+
+ item->setComplete(TRUE);
+ item->updateServer(FALSE);
+
+ gInventory.updateItem(item);
+ gInventory.notifyObservers();
+ LLFavoritesOrderStorage::instance().saveOrder();
+ }
+
+ LLView::getWindow()->setCursor(UI_CURSOR_ARROW);
+ }
+
+private:
+ S32 mSortField;
+};
+
+// updateButtons's helper
+struct LLFavoritesSort
+{
+ // Sorting by creation date and name
+ // TODO - made it customizible using gSavedSettings
+ bool operator()(const LLViewerInventoryItem* const& a, const LLViewerInventoryItem* const& b) const
+ {
+ S32 sortField1 = LLFavoritesOrderStorage::instance().getSortIndex(a->getUUID());
+ S32 sortField2 = LLFavoritesOrderStorage::instance().getSortIndex(b->getUUID());
+
+ if (!(sortField1 < 0 && sortField2 < 0))
+ {
+ return sortField2 > sortField1;
+ }
+
+ time_t first_create = a->getCreationDate();
+ time_t second_create = b->getCreationDate();
+ if (first_create == second_create)
+ {
+ return (LLStringUtil::compareDict(a->getName(), b->getName()) < 0);
+ }
+ else
+ {
+ return (first_create > second_create);
+ }
+ }
+};
+
+LLFavoritesBarCtrl::Params::Params()
+: image_drag_indication("image_drag_indication"),
+ more_button("more_button"),
+ label("label")
+{
+}
+
+LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p)
+: LLUICtrl(p),
+ mOverflowMenuHandle(),
+ mContextMenuHandle(),
+ mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall()),
+ mUpdateDropDownItems(true),
+ mRestoreOverflowMenu(false),
+ mImageDragIndication(p.image_drag_indication),
+ mShowDragMarker(FALSE),
+ mLandingTab(NULL)
+ , mLastTab(NULL)
+, mTabsHighlightEnabled(TRUE)
+{
+ // Register callback for menus with current registrar (will be parent panel's registrar)
+ LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Favorites.DoToSelected",
+ boost::bind(&LLFavoritesBarCtrl::doToSelected, this, _2));
+
+ // Add this if we need to selectively enable items
+ LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Favorites.EnableSelected",
+ boost::bind(&LLFavoritesBarCtrl::enableSelected, this, _2));
+
+ gInventory.addObserver(this);
+
+ //make chevron button
+ mMoreTextBox = new LLTextBox(">>", "\u0032", 50);
+ mMoreTextBox->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+ mMoreTextBox->setToolTip(LLStringExplicit("Show more of My Favorites"));
+ mMoreTextBox->setTabStop(false);
+ mMoreTextBox->setClickedCallback(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this));
+ addChild(mMoreTextBox);
+
+ mDropDownItemsCount = 0;
+
+ mBarLabel = new LLTextBox(p.label.name, p.label.label);
+ addChild(mBarLabel);
+}
+
+LLFavoritesBarCtrl::~LLFavoritesBarCtrl()
+{
+ gInventory.removeObserver(this);
+
+ if (mOverflowMenuHandle.get()) mOverflowMenuHandle.get()->die();
+ if (mContextMenuHandle.get()) mContextMenuHandle.get()->die();
+}
+
+BOOL LLFavoritesBarCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg)
+{
+ *accept = ACCEPT_NO;
+
+ LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource();
+ if (LLToolDragAndDrop::SOURCE_AGENT != source && LLToolDragAndDrop::SOURCE_LIBRARY != source) return FALSE;
+
+ switch (cargo_type)
+ {
+
+ case DAD_LANDMARK:
+ {
+ /*
+ * add a callback to the end drag event.
+ * the callback will disconnet itself immediately after execution
+ * this is done because LLToolDragAndDrop is a common tool so it shouldn't
+ * be overloaded with redundant callbacks.
+ */
+ if (!mEndDragConnection.connected())
+ {
+ mEndDragConnection = LLToolDragAndDrop::getInstance()->setEndDragCallback(boost::bind(&LLFavoritesBarCtrl::onEndDrag, this));
+ }
+
+ // Copy the item into the favorites folder (if it's not already there).
+ LLInventoryItem *item = (LLInventoryItem *)cargo_data;
+
+ if (LLFavoriteLandmarkButton* dest = dynamic_cast(findChildByLocalCoords(x, y)))
+ {
+ setLandingTab(dest);
+ }
+ else if (mLastTab && (x >= mLastTab->getRect().mRight))
+ {
+ /*
+ * the condition dest == NULL can be satisfied not only in the case
+ * of dragging to the right from the last tab of the favbar. there is a
+ * small gap between each tab. if the user drags something exactly there
+ * then mLandingTab will be set to NULL and the dragged item will be pushed
+ * to the end of the favorites bar. this is incorrect behavior. that's why
+ * we need an additional check which excludes the case described previously
+ * making sure that the mouse pointer is beyond the last tab.
+ */
+ setLandingTab(NULL);
+ }
+
+ // check if we are dragging an existing item from the favorites bar
+ if (item && mDragItemId == item->getUUID())
+ {
+ *accept = ACCEPT_YES_SINGLE;
+
+ showDragMarker(TRUE);
+
+ if (drop)
+ {
+ handleExistingFavoriteDragAndDrop(x, y);
+ }
+ }
+ else
+ {
+ const LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+ if (item && item->getParentUUID() == favorites_id)
+ {
+ LL_WARNS("FavoritesBar") << "Attemt to copy a favorite item into the same folder." << LL_ENDL;
+ break;
+ }
+
+ *accept = ACCEPT_YES_COPY_MULTI;
+
+ showDragMarker(TRUE);
+
+ if (drop)
+ {
+ if (mItems.empty())
+ {
+ setLandingTab(NULL);
+ }
+ handleNewFavoriteDragAndDrop(item, favorites_id, x, y);
+ }
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ return TRUE;
+}
+
+void LLFavoritesBarCtrl::handleExistingFavoriteDragAndDrop(S32 x, S32 y)
+{
+ // Identify the button hovered and the side to drop
+ LLFavoriteLandmarkButton* dest = dynamic_cast(mLandingTab);
+ bool insert_before = true;
+ if (!dest)
+ {
+ insert_before = false;
+ dest = dynamic_cast(mLastTab);
+ }
+
+ // There is no need to handle if an item was dragged onto itself
+ if (dest && dest->getLandmarkId() == mDragItemId)
+ {
+ return;
+ }
+
+ // Insert the dragged item in the right place
+ if (dest)
+ {
+ LLInventoryModel::updateItemsOrder(mItems, mDragItemId, dest->getLandmarkId(), insert_before);
+ }
+ else
+ {
+ // This can happen when the item list is empty
+ mItems.push_back(gInventory.getItem(mDragItemId));
+ }
+
+ LLFavoritesOrderStorage::instance().saveItemsOrder(mItems);
+
+ LLMenuGL* menu = (LLMenuGL*) mOverflowMenuHandle.get();
+
+ if (menu && menu->getVisible())
+ {
+ menu->setVisible(FALSE);
+ showDropDownMenu();
+ }
+}
+
+void LLFavoritesBarCtrl::handleNewFavoriteDragAndDrop(LLInventoryItem *item, const LLUUID& favorites_id, S32 x, S32 y)
+{
+ if (!item) return;
+ // Identify the button hovered and the side to drop
+ LLFavoriteLandmarkButton* dest = NULL;
+ bool insert_before = true;
+ if (!mItems.empty())
+ {
+ // [MAINT-2386] When multiple landmarks are selected and dragged onto an empty favorites bar,
+ // the viewer would crash when casting mLastTab below, as mLastTab is still null when the
+ // second landmark is being added.
+ // To ensure mLastTab is valid, we need to call updateButtons() at the end of this function
+ dest = dynamic_cast(mLandingTab);
+ if (!dest)
+ {
+ insert_before = false;
+ dest = dynamic_cast(mLastTab);
+ }
+ }
+
+ // There is no need to handle if an item was dragged onto itself
+ if (dest && dest->getLandmarkId() == mDragItemId)
+ {
+ return;
+ }
+
+ LLPointer viewer_item = new LLViewerInventoryItem(item);
+
+ // Insert the dragged item in the right place
+ if (dest)
+ {
+ insertItem(mItems, dest->getLandmarkId(), viewer_item, insert_before);
+ }
+ else
+ {
+ // This can happen when the item list is empty
+ mItems.push_back(viewer_item);
+ }
+
+ int sortField = 0;
+ LLPointer cb;
+
+ // current order is saved by setting incremental values (1, 2, 3, ...) for the sort field
+ for (LLInventoryModel::item_array_t::iterator i = mItems.begin(); i != mItems.end(); ++i)
+ {
+ LLViewerInventoryItem* currItem = *i;
+
+ if (currItem->getUUID() == item->getUUID())
+ {
+ cb = new LLItemCopiedCallback(++sortField);
+ }
+ else
+ {
+ LLFavoritesOrderStorage::instance().setSortIndex(currItem, ++sortField);
+
+ currItem->setComplete(TRUE);
+ currItem->updateServer(FALSE);
+
+ gInventory.updateItem(currItem);
+ }
+ }
+
+ LLToolDragAndDrop* tool_dad = LLToolDragAndDrop::getInstance();
+ if (tool_dad->getSource() == LLToolDragAndDrop::SOURCE_NOTECARD)
+ {
+ viewer_item->setType(LLAssetType::AT_LANDMARK);
+ copy_inventory_from_notecard(favorites_id,
+ tool_dad->getObjectID(),
+ tool_dad->getSourceID(),
+ viewer_item.get(),
+ gInventoryCallbacks.registerCB(cb));
+ }
+ else
+ {
+ copy_inventory_item(
+ gAgent.getID(),
+ item->getPermissions().getOwner(),
+ item->getUUID(),
+ favorites_id,
+ std::string(),
+ cb);
+ }
+
+ // [MAINT-2386] Ensure the favorite button has been created and is valid.
+ // This also ensures that mLastTab will be valid when dropping multiple
+ // landmarks to an empty favorites bar.
+ updateButtons();
+
+ LL_INFOS("FavoritesBar") << "Copied inventory item #" << item->getUUID() << " to favorites." << LL_ENDL;
+}
+
+//virtual
+void LLFavoritesBarCtrl::changed(U32 mask)
+{
+ if (mFavoriteFolderId.isNull())
+ {
+ mFavoriteFolderId = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+
+ if (mFavoriteFolderId.notNull())
+ {
+ gInventory.fetchDescendentsOf(mFavoriteFolderId);
+ }
+ }
+ else
+ {
+ LLInventoryModel::item_array_t items;
+ LLInventoryModel::cat_array_t cats;
+ LLIsType is_type(LLAssetType::AT_LANDMARK);
+ gInventory.collectDescendentsIf(mFavoriteFolderId, cats, items, LLInventoryModel::EXCLUDE_TRASH, is_type);
+
+ for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i)
+ {
+ LLFavoritesOrderStorage::instance().getSLURL((*i)->getAssetUUID());
+ }
+
+ updateButtons();
+ }
+}
+
+//virtual
+void LLFavoritesBarCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ LLUICtrl::reshape(width, height, called_from_parent);
+ updateButtons();
+}
+
+void LLFavoritesBarCtrl::draw()
+{
+ LLUICtrl::draw();
+
+ if (mShowDragMarker)
+ {
+ S32 w = mImageDragIndication->getWidth();
+ S32 h = mImageDragIndication->getHeight();
+
+ if (mLandingTab)
+ {
+ // mouse pointer hovers over an existing tab
+ LLRect rect = mLandingTab->getRect();
+ mImageDragIndication->draw(rect.mLeft, rect.getHeight(), w, h);
+ }
+ else if (mLastTab)
+ {
+ // mouse pointer hovers over the favbar empty space (right to the last tab)
+ LLRect rect = mLastTab->getRect();
+ mImageDragIndication->draw(rect.mRight, rect.getHeight(), w, h);
+ }
+ // Once drawn, mark this false so we won't draw it again (unless we hit the favorite bar again)
+ mShowDragMarker = FALSE;
+ }
+}
+
+const LLButton::Params& LLFavoritesBarCtrl::getButtonParams()
+{
+ static LLButton::Params button_params;
+ static bool params_initialized = false;
+
+ if (!params_initialized)
+ {
+ button_params.image_overlay(LLUI::getUIImage("Favorite_Link_Over"))
+ .hover_glow_amount(0.15f)
+ .use_ellipses(true).tab_stop(false)
+ .name("favorites_bar_btn")
+ .follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
+ params_initialized = true;
+ }
+
+ return button_params;
+}
+
+void LLFavoritesBarCtrl::updateButtons()
+{
+ mItems.clear();
+
+ if (!collectFavoriteItems(mItems))
+ {
+ return;
+ }
+
+ const LLButton::Params& button_params = getButtonParams();
+
+ if(mItems.empty())
+ {
+ mBarLabel->setVisible(TRUE);
+ }
+ else
+ {
+ mBarLabel->setVisible(FALSE);
+ }
+ const child_list_t* childs = getChildList();
+ child_list_const_iter_t child_it = childs->begin();
+ int first_changed_item_index = 0;
+ int rightest_point = getRect().mRight - mMoreTextBox->getRect().getWidth();
+ //lets find first changed button
+ while (child_it != childs->end() && first_changed_item_index < mItems.size())
+ {
+ LLFavoriteLandmarkButton* button = dynamic_cast (*child_it);
+ if (button)
+ {
+ const LLViewerInventoryItem *item = mItems[first_changed_item_index].get();
+ if (item)
+ {
+ // an child's order and mItems should be same
+ if (button->getLandmarkId() != item->getUUID() // sort order has been changed
+ || button->getLabelSelected() != item->getName() // favorite's name has been changed
+ || button->getRect().mRight < rightest_point) // favbar's width has been changed
+ {
+ break;
+ }
+ }
+ first_changed_item_index++;
+ }
+ child_it++;
+ }
+ // now first_changed_item_index should contains a number of button that need to change
+
+ if (first_changed_item_index <= mItems.size())
+ {
+ // Rebuild the buttons only
+ // child_list_t is a linked list, so safe to erase from the middle if we pre-increment the iterator
+
+ while (child_it != childs->end())
+ {
+ //lets remove other landmarks button and rebuild it
+ child_list_const_iter_t cur_it = child_it++;
+ LLFavoriteLandmarkButton* button =
+ dynamic_cast (*cur_it);
+ if (button)
+ {
+ removeChild(button);
+ delete button;
+ }
+ }
+ // we have to remove ChevronButton to make sure that the last item will be LandmarkButton to get the right aligning
+ // keep in mind that we are cutting all buttons in space between the last visible child of favbar and ChevronButton
+ if (mMoreTextBox->getParent() == this)
+ {
+ removeChild(mMoreTextBox);
+ }
+ int last_right_edge = 0;
+ //calculate new buttons offset
+ if (getChildList()->size() > 0)
+ {
+ //find last visible child to get the rightest button offset
+ child_list_const_reverse_iter_t last_visible_it = std::find_if(childs->rbegin(), childs->rend(),
+ std::mem_fn(&LLView::getVisible));
+ if(last_visible_it != childs->rend())
+ {
+ last_right_edge = (*last_visible_it)->getRect().mRight;
+ }
+ }
+ //last_right_edge is saving coordinates
+ LLButton* last_new_button = NULL;
+ int j = first_changed_item_index;
+ for (; j < mItems.size(); j++)
+ {
+ last_new_button = createButton(mItems[j], button_params, last_right_edge);
+ if (!last_new_button)
+ {
+ break;
+ }
+ sendChildToBack(last_new_button);
+ last_right_edge = last_new_button->getRect().mRight;
+
+ mLastTab = last_new_button;
+ }
+ mFirstDropDownItem = j;
+ // Chevron button
+ if (mFirstDropDownItem < mItems.size())
+ {
+ // if updateButton had been called it means:
+ //or there are some new favorites, or width had been changed
+ // so if we need to display chevron button, we must update dropdown items too.
+ mUpdateDropDownItems = true;
+ S32 buttonHGap = button_params.rect.left; // default value
+ LLRect rect;
+ // Chevron button should stay right aligned
+ rect.setOriginAndSize(getRect().mRight - mMoreTextBox->getRect().getWidth() - buttonHGap, 0,
+ mMoreTextBox->getRect().getWidth(),
+ mMoreTextBox->getRect().getHeight());
+
+ addChild(mMoreTextBox);
+ mMoreTextBox->setRect(rect);
+ mMoreTextBox->setVisible(TRUE);
+ }
+ // Update overflow menu
+ LLMenuGL* overflow_menu = static_cast (mOverflowMenuHandle.get());
+ if (overflow_menu && overflow_menu->getVisible() && (overflow_menu->getItemCount() != mDropDownItemsCount))
+ {
+ overflow_menu->setVisible(FALSE);
+ if (mUpdateDropDownItems)
+ {
+ showDropDownMenu();
+ }
+ }
+ }
+ else
+ {
+ mUpdateDropDownItems = false;
+ }
+
+}
+
+LLButton* LLFavoritesBarCtrl::createButton(const LLPointer item, const LLButton::Params& button_params, S32 x_offset)
+{
+ S32 def_button_width = button_params.rect.width;
+ S32 button_x_delta = button_params.rect.left; // default value
+ S32 curr_x = x_offset;
+
+ /**
+ * WORKAROUND:
+ * There are some problem with displaying of fonts in buttons.
+ * Empty space or ellipsis might be displayed instead of last symbols, even though the width of the button is enough.
+ * The problem disappears if we pad the button with 20 pixels.
+ */
+ int required_width = mFont->getWidth(item->getName()) + 20;
+ int width = required_width > def_button_width? def_button_width : required_width;
+ LLFavoriteLandmarkButton* fav_btn = NULL;
+
+ // do we have a place for next button + double buttonHGap + mMoreTextBox ?
+ if(curr_x + width + 2*button_x_delta + mMoreTextBox->getRect().getWidth() > getRect().mRight )
+ {
+ return NULL;
+ }
+ LLButton::Params fav_btn_params(button_params);
+ fav_btn = new LLFavoriteLandmarkButton(fav_btn_params);
+ if (NULL == fav_btn)
+ {
+ LL_WARNS("FavoritesBar") << "Unable to create LLFavoriteLandmarkButton widget: " << item->getName() << LL_ENDL;
+ return NULL;
+ }
+
+ addChild(fav_btn);
+
+ LLRect butt_rect (fav_btn->getRect());
+ fav_btn->setLandmarkID(item->getUUID());
+ butt_rect.setOriginAndSize(curr_x + button_x_delta, fav_btn->getRect().mBottom, width, fav_btn->getRect().getHeight());
+
+ fav_btn->setRect(butt_rect);
+ // change only left and save bottom
+ fav_btn->setFont(mFont);
+ fav_btn->setLabel(item->getName());
+ fav_btn->setToolTip(item->getName());
+ fav_btn->setCommitCallback(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
+ fav_btn->setRightMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID(), _1, _2, _3,_4 ));
+
+ fav_btn->LLUICtrl::setMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonMouseDown, this, item->getUUID(), _1, _2, _3, _4));
+ fav_btn->LLUICtrl::setMouseUpCallback(boost::bind(&LLFavoritesBarCtrl::onButtonMouseUp, this, item->getUUID(), _1, _2, _3, _4));
+
+ return fav_btn;
+}
+
+
+BOOL LLFavoritesBarCtrl::postBuild()
+{
+ // make the popup menu available
+ LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_favorites.xml", gMenuHolder);
+ if (!menu)
+ {
+ return FALSE; //menu = LLUICtrlFactory::getDefaultWidget("inventory_menu");
+ }
+ menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
+ mContextMenuHandle = menu->getHandle();
+
+ return TRUE;
+}
+
+BOOL collectFavoriteItems(LLInventoryModel::item_array_t& items)
+{
+
+ auto mFavoriteFolderId = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+ if (mFavoriteFolderId.isNull())
+ return FALSE;
+
+
+ LLInventoryModel::cat_array_t cats;
+
+ LLIsType is_type(LLAssetType::AT_LANDMARK);
+ gInventory.collectDescendentsIf(mFavoriteFolderId, cats, items, LLInventoryModel::EXCLUDE_TRASH, is_type);
+
+ std::sort(items.begin(), items.end(), LLFavoritesSort());
+
+ BOOL needToSaveItemsOrder(const LLInventoryModel::item_array_t& items);
+ //if (needToSaveItemsOrder(items))
+ {
+ S32 sortField = 0;
+ for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i)
+ {
+ LLFavoritesOrderStorage::instance().setSortIndex((*i), ++sortField);
+ }
+ }
+
+ return TRUE;
+}
+BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t& items) { return ::collectFavoriteItems(items); }
+
+void LLFavoritesBarCtrl::showDropDownMenu()
+{
+ if (mOverflowMenuHandle.isDead())
+ {
+ createOverflowMenu();
+ }
+
+ LLMenuGL* menu = (LLMenuGL*)mOverflowMenuHandle.get();
+ if (menu)
+ {
+
+ if (mUpdateDropDownItems)
+ {
+ updateMenuItems(menu);
+ }
+
+ menu->buildDrawLabels();
+ menu->updateParent(LLMenuGL::sMenuContainer);
+ //menu->setButtonRect(mMoreTextBox->getRect(), this);
+ positionAndShowMenu(menu);
+ mDropDownItemsCount = menu->getItemCount();
+ }
+}
+
+void LLFavoritesBarCtrl::createOverflowMenu()
+{
+ LLMenuGL* menu = new LLFavoriteLandmarkToggleableMenu();
+ menu->setCanTearOff(false);
+ menu->setVisible(false);
+ menu->setScrollable(true);
+ //menu_p.max_scrollable_items = 10;
+ //menu_p.preferred_width = DROP_DOWN_MENU_WIDTH;
+ mOverflowMenuHandle = menu->getHandle();
+}
+
+void LLFavoritesBarCtrl::updateMenuItems(LLMenuGL* menu)
+{
+ menu->empty();
+
+ U32 widest_item = 0;
+
+ for (S32 i = mFirstDropDownItem; i < mItems.size(); i++)
+ {
+ LLViewerInventoryItem* item = mItems.at(i);
+ const std::string& item_name = item->getName();
+
+ LLFavoriteLandmarkMenuItem::Params item_params;
+ item_params.name(item_name);
+ item_params.label(item_name);
+
+ LLFavoriteLandmarkMenuItem *menu_item = new LLFavoriteLandmarkMenuItem(item_params);
+ menu_item->setMouseUpCallback(std::bind(&LLFavoritesBarCtrl::onButtonClick, this, item->getUUID()));
+ menu_item->initFavoritesBarPointer(this);
+ menu_item->setRightMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonRightClick, this, item->getUUID(), _1, _2, _3, _4));
+ menu_item->LLUICtrl::setMouseDownCallback(boost::bind(&LLFavoritesBarCtrl::onButtonMouseDown, this, item->getUUID(), _1, _2, _3, _4));
+ menu_item->LLUICtrl::setMouseUpCallback(boost::bind(&LLFavoritesBarCtrl::onButtonMouseUp, this, item->getUUID(), _1, _2, _3, _4));
+ menu_item->setLandmarkID(item->getUUID());
+
+ fitLabelWidth(menu_item);
+
+ widest_item = llmax(widest_item, menu_item->getNominalWidth());
+
+ menu->addChild(menu_item);
+ }
+
+ addOpenLandmarksMenuItem(menu);
+ mUpdateDropDownItems = false;
+}
+
+void LLFavoritesBarCtrl::fitLabelWidth(LLMenuItemCallGL* menu_item)
+{
+ U32 max_width = llmin(DROP_DOWN_MENU_WIDTH, getRect().getWidth());
+ std::string item_name = menu_item->getName();
+
+ // Check whether item name wider than menu
+ if (menu_item->getNominalWidth() > max_width)
+ {
+ S32 chars_total = item_name.length();
+ S32 chars_fitted = 1;
+ menu_item->setLabel(LLStringExplicit(""));
+ S32 label_space = max_width - menu_item->getFont()->getWidth("...") -
+ menu_item->getNominalWidth();// This returns width of menu item with empty label (pad pixels)
+
+ while (chars_fitted < chars_total
+ && menu_item->getFont()->getWidth(item_name, 0, chars_fitted) < label_space)
+ {
+ chars_fitted++;
+ }
+ chars_fitted--; // Rolling back one char, that doesn't fit
+
+ menu_item->setLabel(item_name.substr(0, chars_fitted) + "...");
+ }
+}
+
+void LLFavoritesBarCtrl::addOpenLandmarksMenuItem(LLMenuGL* menu)
+{
+ std::string label_untrans = "Open landmarks";
+ std::string label_transl;
+ bool translated = LLTrans::findString(label_transl, label_untrans);
+
+ LLMenuItemCallGL* menu_item = new LLMenuItemCallGL(std::string("open_my_landmarks"), std::string(translated ? label_transl : label_untrans), nullptr);
+ void show_floater(const std::string& floater_name);
+ menu_item->setMouseUpCallback(std::bind(show_floater, "floater_inventory_favs.xml"));
+
+ fitLabelWidth(menu_item);
+
+ LLMenuItemSeparatorGL* separator = new LLMenuItemSeparatorGL;
+
+ menu->addChild(separator);
+ menu->addChild(menu_item);
+}
+
+void LLFavoritesBarCtrl::positionAndShowMenu(LLMenuGL* menu)
+{
+ U32 max_width = llmin(DROP_DOWN_MENU_WIDTH, getRect().getWidth());
+
+ S32 menu_x = getRect().getWidth() - max_width;
+ S32 menu_y = getParent()->getRect().mBottom - DROP_DOWN_MENU_TOP_PAD;
+
+ /* Singu TODO: Side Toolbar?
+ // the menu should be offset of the right edge of the window
+ // so it's no covered by buttons in the right-side toolbar.
+ LLToolBar* right_toolbar = gToolBarView->getChild("toolbar_right");
+ if (right_toolbar && right_toolbar->hasButtons())
+ {
+ S32 toolbar_top = 0;
+
+ if (LLView* top_border_panel = right_toolbar->getChild("button_panel"))
+ {
+ toolbar_top = top_border_panel->calcScreenRect().mTop;
+ }
+
+ // Calculating the bottom (in screen coord) of the drop down menu
+ S32 menu_top = getParent()->getRect().mBottom - DROP_DOWN_MENU_TOP_PAD;
+ S32 menu_bottom = menu_top - menu->getRect().getHeight();
+ S32 menu_bottom_screen = 0;
+
+ localPointToScreen(0, menu_bottom, &menu_top, &menu_bottom_screen);
+
+ if (menu_bottom_screen < toolbar_top)
+ {
+ menu_x -= right_toolbar->getRect().getWidth();
+ }
+ }
+ */
+
+ LLMenuGL::showPopup(this, menu, menu_x, menu_y);
+}
+
+void LLFavoritesBarCtrl::onButtonClick(LLUUID item_id)
+{
+ // We only have one Inventory, gInventory. Some day this should be better abstracted.
+ LLInvFVBridgeAction::doAction(item_id,&gInventory);
+}
+
+void LLFavoritesBarCtrl::onButtonRightClick( LLUUID item_id,LLView* fav_button,S32 x,S32 y,MASK mask)
+{
+ mSelectedItemID = item_id;
+
+ LLMenuGL* menu = (LLMenuGL*)mContextMenuHandle.get();
+ if (!menu)
+ {
+ return;
+ }
+
+ // Remember that the context menu was shown simultaneously with the overflow menu,
+ // so that we can restore the overflow menu when user clicks a context menu item
+ // (which hides the overflow menu).
+ {
+ LLView* overflow_menu = mOverflowMenuHandle.get();
+ mRestoreOverflowMenu = overflow_menu && overflow_menu->getVisible();
+ }
+
+ // Release mouse capture so hover events go to the popup menu
+ // because this is happening during a mouse down.
+ gFocusMgr.setMouseCapture(NULL);
+
+ menu->updateParent(LLMenuGL::sMenuContainer);
+ LLMenuGL::showPopup(fav_button, menu, x, y);
+}
+
+BOOL LLFavoritesBarCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+ BOOL handled = childrenHandleRightMouseDown( x, y, mask) != NULL;
+ /*if(!handled && !gMenuHolder->hasVisibleMenu())
+ {
+ show_navbar_context_menu(this,x,y);
+ handled = true;
+ }*/
+
+ return handled;
+}
+void copy_slurl_to_clipboard_cb(std::string& slurl)
+{
+ LLView::getWindow()->copyTextToClipboard(utf8str_to_wstring(slurl));
+
+ LLSD args;
+ args["SLURL"] = slurl;
+ LLNotificationsUtil::add("CopySLURL", args);
+}
+
+
+bool LLFavoritesBarCtrl::enableSelected(const LLSD& userdata)
+{
+ std::string param = userdata.asString();
+
+ if (param == std::string("can_paste"))
+ {
+ return isClipboardPasteable();
+ }
+
+ return false;
+}
+
+void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
+{
+ std::string action = userdata.asString();
+ LL_INFOS("FavoritesBar") << "Action = " << action << " Item = " << mSelectedItemID.asString() << LL_ENDL;
+
+ LLViewerInventoryItem* item = gInventory.getItem(mSelectedItemID);
+ if (!item)
+ return;
+
+ if (action == "open")
+ {
+ onButtonClick(item->getUUID());
+ }
+ else if (action == "about")
+ {
+ LLSD key;
+ key["type"] = "landmark";
+ key["id"] = mSelectedItemID;
+
+ open_landmark(item, "Favorite", false, mSelectedItemID, true);
+ }
+ else if (action == "copy_slurl")
+ {
+ LLVector3d posGlobal;
+ LLLandmarkActions::getLandmarkGlobalPos(mSelectedItemID, posGlobal);
+
+ if (!posGlobal.isExactlyZero())
+ {
+ LLLandmarkActions::getSLURLfromPosGlobal(posGlobal, copy_slurl_to_clipboard_cb);
+ }
+ }
+ else if (action == "show_on_map")
+ {
+ LLFloaterWorldMap* worldmap_instance = gFloaterWorldMap;
+
+ LLVector3d posGlobal;
+ LLLandmarkActions::getLandmarkGlobalPos(mSelectedItemID, posGlobal);
+
+ if (!posGlobal.isExactlyZero() && worldmap_instance)
+ {
+ worldmap_instance->trackLocation(posGlobal);
+ LLFloaterWorldMap::show(true);
+ }
+ }
+ else if (action == "cut")
+ {
+ }
+ else if (action == "copy")
+ {
+ LLInventoryClipboard::instance().add(mSelectedItemID);
+ }
+ else if (action == "paste")
+ {
+ pasteFromClipboard();
+ }
+ else if (action == "delete")
+ {
+ gInventory.removeItem(mSelectedItemID);
+ }
+
+ // Pop-up the overflow menu again (it gets hidden whenever the user clicks a context menu item).
+ // See EXT-4217 and STORM-207.
+ LLMenuGL* menu = (LLMenuGL*) mOverflowMenuHandle.get();
+ if (mRestoreOverflowMenu && menu && !menu->getVisible())
+ {
+ menu->resetScrollPositionOnShow(false);
+ showDropDownMenu();
+ menu->resetScrollPositionOnShow(true);
+ }
+}
+
+BOOL LLFavoritesBarCtrl::isClipboardPasteable() const
+{
+ if (!LLInventoryClipboard::instance().hasContents())
+ {
+ return FALSE;
+ }
+
+ std::vector objects;
+ LLInventoryClipboard::instance().retrieve(objects);
+ S32 count = objects.size();
+ for(S32 i = 0; i < count; i++)
+ {
+ const LLUUID &item_id = objects.at(i);
+
+ // Can't paste folders
+ const LLInventoryCategory *cat = gInventory.getCategory(item_id);
+ if (cat)
+ {
+ return FALSE;
+ }
+
+ const LLInventoryItem *item = gInventory.getItem(item_id);
+ if (item && LLAssetType::AT_LANDMARK != item->getType())
+ {
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+void LLFavoritesBarCtrl::pasteFromClipboard() const
+{
+ LLInventoryModel* model = &gInventory;
+ if(model && isClipboardPasteable())
+ {
+ LLInventoryItem* item = NULL;
+ std::vector objects;
+ LLInventoryClipboard::instance().retrieve(objects);
+ S32 count = objects.size();
+ LLUUID parent_id(mFavoriteFolderId);
+ for(S32 i = 0; i < count; i++)
+ {
+ item = model->getItem(objects.at(i));
+ if (item)
+ {
+ copy_inventory_item(
+ gAgent.getID(),
+ item->getPermissions().getOwner(),
+ item->getUUID(),
+ parent_id,
+ std::string(),
+ LLPointer(NULL));
+ }
+ }
+ }
+}
+
+void LLFavoritesBarCtrl::onButtonMouseDown(LLUUID id, LLUICtrl* ctrl, S32 x, S32 y, MASK mask)
+{
+ // EXT-6997 (Fav bar: Pop-up menu for LM in overflow dropdown is kept after LM was dragged away)
+ // mContextMenuHandle.get() - is a pop-up menu (of items) in already opened dropdown menu.
+ // We have to check and set visibility of pop-up menu in such a way instead of using
+ // LLMenuHolderGL::hideMenus() because it will close both menus(dropdown and pop-up), but
+ // we need to close only pop-up menu while dropdown one should be still opened.
+ LLMenuGL* menu = (LLMenuGL*)mContextMenuHandle.get();
+ if(menu && menu->getVisible())
+ {
+ menu->setVisible(FALSE);
+ }
+
+ mDragItemId = id;
+ mStartDrag = TRUE;
+
+ S32 screenX, screenY;
+ localPointToScreen(x, y, &screenX, &screenY);
+
+ LLToolDragAndDrop::getInstance()->setDragStart(screenX, screenY);
+}
+
+void LLFavoritesBarCtrl::onButtonMouseUp(LLUUID id, LLUICtrl* ctrl, S32 x, S32 y, MASK mask)
+{
+ mStartDrag = FALSE;
+ mDragItemId = LLUUID::null;
+}
+
+void LLFavoritesBarCtrl::onEndDrag()
+{
+ mEndDragConnection.disconnect();
+
+ showDragMarker(FALSE);
+ mDragItemId = LLUUID::null;
+ LLView::getWindow()->setCursor(UI_CURSOR_ARROW);
+}
+
+BOOL LLFavoritesBarCtrl::handleHover(S32 x, S32 y, MASK mask)
+{
+ if (mDragItemId != LLUUID::null && mStartDrag)
+ {
+ S32 screenX, screenY;
+ localPointToScreen(x, y, &screenX, &screenY);
+
+ if(LLToolDragAndDrop::getInstance()->isOverThreshold(screenX, screenY))
+ {
+ LLToolDragAndDrop::getInstance()->beginDrag(
+ DAD_LANDMARK, mDragItemId,
+ LLToolDragAndDrop::SOURCE_LIBRARY);
+
+ mStartDrag = FALSE;
+
+ return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask);
+ }
+ }
+
+ return TRUE;
+}
+
+LLUICtrl* LLFavoritesBarCtrl::findChildByLocalCoords(S32 x, S32 y)
+{
+ LLUICtrl* ctrl = NULL;
+ const child_list_t* list = getChildList();
+
+ for (child_list_const_iter_t i = list->begin(); i != list->end(); ++i)
+ {
+ // Look only for children that are favorite buttons
+ if ((*i)->getName() == "favorites_bar_btn")
+ {
+ LLRect rect = (*i)->getRect();
+ // We consider a button hit if the cursor is left of the right side
+ // This makes the hit a bit less finicky than hitting directly on the button itself
+ if (x <= rect.mRight)
+ {
+ ctrl = dynamic_cast(*i);
+ break;
+ }
+ }
+ }
+ return ctrl;
+}
+
+BOOL needToSaveItemsOrder(const LLInventoryModel::item_array_t& items)
+{
+ BOOL result = FALSE;
+
+ // if there is an item without sort order field set, we need to save items order
+ for (LLInventoryModel::item_array_t::const_iterator i = items.begin(); i != items.end(); ++i)
+ {
+ if (LLFavoritesOrderStorage::instance().getSortIndex((*i)->getUUID()) < 0)
+ {
+ result = TRUE;
+ break;
+ }
+ }
+
+ return result;
+}
+BOOL LLFavoritesBarCtrl::needToSaveItemsOrder(const LLInventoryModel::item_array_t& items) { return ::needToSaveItemsOrder(items); }
+
+void LLFavoritesBarCtrl::insertItem(LLInventoryModel::item_array_t& items, const LLUUID& dest_item_id, LLViewerInventoryItem* insertedItem, bool insert_before)
+{
+ // Get the iterator to the destination item
+ LLInventoryModel::item_array_t::iterator it_dest = LLInventoryModel::findItemIterByUUID(items, dest_item_id);
+ if (it_dest == items.end())
+ return;
+
+ // Go to the next element if one wishes to insert after the dest element
+ if (!insert_before)
+ {
+ ++it_dest;
+ }
+
+ // Insert the source item in the right place
+ if (it_dest != items.end())
+ {
+ items.insert(it_dest, insertedItem);
+ }
+ else
+ {
+ // Append to the list if it_dest reached the end
+ items.push_back(insertedItem);
+ }
+}
+
+const std::string LLFavoritesOrderStorage::SORTING_DATA_FILE_NAME = "landmarks_sorting.xml";
+const S32 LLFavoritesOrderStorage::NO_INDEX = -1;
+
+void LLFavoritesOrderStorage::setSortIndex(const LLViewerInventoryItem* inv_item, S32 sort_index)
+{
+ mSortIndexes[inv_item->getUUID()] = sort_index;
+ mIsDirty = true;
+ getSLURL(inv_item->getAssetUUID());
+}
+
+S32 LLFavoritesOrderStorage::getSortIndex(const LLUUID& inv_item_id)
+{
+ sort_index_map_t::const_iterator it = mSortIndexes.find(inv_item_id);
+ if (it != mSortIndexes.end())
+ {
+ return it->second;
+ }
+ return NO_INDEX;
+}
+
+void LLFavoritesOrderStorage::removeSortIndex(const LLUUID& inv_item_id)
+{
+ mSortIndexes.erase(inv_item_id);
+ mIsDirty = true;
+}
+
+void LLFavoritesOrderStorage::getSLURL(const LLUUID& asset_id)
+{
+ slurls_map_t::iterator slurl_iter = mSLURLs.find(asset_id);
+ if (slurl_iter != mSLURLs.end()) return; // SLURL for current landmark is already cached
+
+ LLLandmark* lm = gLandmarkList.getAsset(asset_id,
+ boost::bind(&LLFavoritesOrderStorage::onLandmarkLoaded, this, asset_id, _1));
+ if (lm)
+ {
+ LL_DEBUGS("FavoritesBar") << "landmark for " << asset_id << " already loaded" << LL_ENDL;
+ onLandmarkLoaded(asset_id, lm);
+ }
+}
+
+// static
+std::string LLFavoritesOrderStorage::getStoredFavoritesFilename()
+{
+ std::string user_dir = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "");
+
+ return (user_dir.empty() ? ""
+ : gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
+ "stored_favorites_"
+ + gHippoGridManager->getCurrentGridName()
+ + ".xml")
+ );
+}
+
+// static
+void LLFavoritesOrderStorage::destroyClass()
+{
+ LLFavoritesOrderStorage::instance().cleanup();
+
+
+ std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
+ llifstream file;
+ file.open(old_filename.c_str());
+ if (file.is_open())
+ {
+ file.close();
+ std::string new_filename = getStoredFavoritesFilename();
+ LL_INFOS("FavoritesBar") << "moving favorites from old name '" << old_filename
+ << "' to new name '" << new_filename << "'"
+ << LL_ENDL;
+ LLFile::rename(old_filename,new_filename);
+ }
+
+ if (gSavedPerAccountSettings.getBOOL("ShowFavoritesOnLogin"))
+ {
+ LLFavoritesOrderStorage::instance().saveFavoritesSLURLs();
+ }
+ else
+ {
+ LLFavoritesOrderStorage::instance().removeFavoritesRecordOfUser();
+ }
+}
+
+std::string LLFavoritesOrderStorage::getSavedOrderFileName()
+{
+ // If we quit from the login screen we will not have an SL account
+ // name. Don't try to save, otherwise we'll dump a file in
+ // C:\Program Files\SecondLife\ or similar. JC
+ std::string user_dir = gDirUtilp->getLindenUserDir();
+ return (user_dir.empty() ? "" : gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, SORTING_DATA_FILE_NAME));
+}
+
+void LLFavoritesOrderStorage::load()
+{
+ // load per-resident sorting information
+ std::string filename = getSavedOrderFileName();
+ LLSD settings_llsd;
+ llifstream file;
+ file.open(filename.c_str());
+ if (file.is_open())
+ {
+ LLSDSerialize::fromXML(settings_llsd, file);
+ LL_INFOS("FavoritesBar") << "loaded favorites order from '" << filename << "' "
+ << (settings_llsd.isMap() ? "" : "un") << "successfully"
+ << LL_ENDL;
+ file.close();
+ }
+ else
+ {
+ LL_WARNS("FavoritesBar") << "unable to open favorites order file at '" << filename << "'" << LL_ENDL;
+ }
+
+ for (LLSD::map_const_iterator iter = settings_llsd.beginMap();
+ iter != settings_llsd.endMap(); ++iter)
+ {
+ mSortIndexes.insert(std::make_pair(LLUUID(iter->first), (S32)iter->second.asInteger()));
+ }
+}
+
+void LLFavoritesOrderStorage::saveFavoritesSLURLs()
+{
+ // Do not change the file if we are not logged in yet.
+ if (gAgentID.isNull()) //LLLoginInstance::getInstance()->authSuccess())
+ {
+ LL_WARNS("FavoritesBar") << "Cannot save favorites: not logged in" << LL_ENDL;
+ return;
+ }
+
+ std::string filename = getStoredFavoritesFilename();
+ if (!filename.empty())
+ {
+ llifstream in_file;
+ in_file.open(filename.c_str());
+ LLSD fav_llsd;
+ if (in_file.is_open())
+ {
+ LLSDSerialize::fromXML(fav_llsd, in_file);
+ LL_INFOS("FavoritesBar") << "loaded favorites from '" << filename << "' "
+ << (fav_llsd.isMap() ? "" : "un") << "successfully"
+ << LL_ENDL;
+ in_file.close();
+ }
+ else
+ {
+ LL_WARNS("FavoritesBar") << "unable to open favorites from '" << filename << "'" << LL_ENDL;
+ }
+
+ const LLUUID fav_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+ LLInventoryModel::cat_array_t cats;
+ LLInventoryModel::item_array_t items;
+ gInventory.collectDescendents(fav_id, cats, items, LLInventoryModel::EXCLUDE_TRASH);
+
+ LLSD user_llsd;
+ for (LLInventoryModel::item_array_t::const_iterator it = items.cbegin(); it != items.cend(); ++it)
+ {
+ if (it->get()->getActualType() != LLAssetType::AT_LANDMARK) continue;
+ LLSD value;
+ value["name"] = (*it)->getName();
+ value["asset_id"] = (*it)->getAssetUUID();
+
+ slurls_map_t::const_iterator slurl_iter = mSLURLs.find(value["asset_id"]);
+ if (slurl_iter != mSLURLs.cend())
+ {
+ LL_DEBUGS("FavoritesBar") << "Saving favorite: idx=" << LLFavoritesOrderStorage::instance().getSortIndex((*it)->getUUID())
+ << ", SLURL=" << slurl_iter->second
+ << ", value=" << value << LL_ENDL;
+ value["slurl"] = slurl_iter->second;
+ user_llsd[LLFavoritesOrderStorage::instance().getSortIndex((*it)->getUUID())] = value;
+ }
+ else
+ {
+ LL_WARNS("FavoritesBar") << "Not saving favorite " << value["name"] << ": no matching SLURL" << LL_ENDL;
+ }
+ }
+
+ LLAvatarName av_name;
+ LLAvatarNameCache::get( gAgentID, &av_name );
+ // Note : use the "John Doe" and not the "john.doe" version of the name
+ // as we'll compare it with the stored credentials in the login panel.
+ fav_llsd[av_name.getUserName()] = user_llsd;
+
+ llofstream file;
+ file.open(filename.c_str());
+ if ( file.is_open() )
+ {
+ LLSDSerialize::toPrettyXML(fav_llsd, file);
+ LL_INFOS("FavoritesBar") << "saved favorites for '" << av_name.getUserName()
+ << "' to '" << filename << "' "
+ << LL_ENDL;
+ file.close();
+ }
+ else
+ {
+ LL_WARNS("FavoritesBar") << "unable to open favorites storage for '" << av_name.getUserName()
+ << "' at '" << filename << "' "
+ << LL_ENDL;
+ }
+ }
+}
+
+void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
+{
+ std::string filename = getStoredFavoritesFilename();
+ if (!filename.empty())
+ {
+ LLSD fav_llsd;
+ llifstream file;
+ file.open(filename.c_str());
+ if (file.is_open())
+ {
+ LLSDSerialize::fromXML(fav_llsd, file);
+ file.close();
+
+ LLAvatarName av_name;
+ LLAvatarNameCache::get( gAgentID, &av_name );
+ // Note : use the "John Doe" and not the "john.doe" version of the name.
+ // See saveFavoritesSLURLs() here above for the reason why.
+ if (fav_llsd.has(av_name.getUserName()))
+ {
+ LL_INFOS("FavoritesBar") << "Removed favorites for " << av_name.getUserName() << LL_ENDL;
+ fav_llsd.erase(av_name.getUserName());
+ }
+
+ llofstream out_file;
+ out_file.open(filename.c_str());
+ if ( out_file.is_open() )
+ {
+ LLSDSerialize::toPrettyXML(fav_llsd, out_file);
+ LL_INFOS("FavoritesBar") << "saved favorites to '" << filename << "' "
+ << LL_ENDL;
+ out_file.close();
+ }
+ }
+ }
+}
+
+void LLFavoritesOrderStorage::onLandmarkLoaded(const LLUUID& asset_id, LLLandmark* landmark)
+{
+ if (landmark)
+ {
+ LL_DEBUGS("FavoritesBar") << "landmark for " << asset_id << " loaded" << LL_ENDL;
+ LLVector3d pos_global;
+ if (!landmark->getGlobalPos(pos_global))
+ {
+ // If global position was unknown on first getGlobalPos() call
+ // it should be set for the subsequent calls.
+ landmark->getGlobalPos(pos_global);
+ }
+
+ if (!pos_global.isExactlyZero())
+ {
+ LL_DEBUGS("FavoritesBar") << "requesting slurl for landmark " << asset_id << LL_ENDL;
+ LLLandmarkActions::getSLURLfromPosGlobal(pos_global,
+ boost::bind(&LLFavoritesOrderStorage::storeFavoriteSLURL, this, asset_id, _1));
+ }
+ }
+}
+
+void LLFavoritesOrderStorage::storeFavoriteSLURL(const LLUUID& asset_id, std::string& slurl)
+{
+ LL_DEBUGS("FavoritesBar") << "Saving landmark SLURL '" << slurl << "' for " << asset_id << LL_ENDL;
+ mSLURLs[asset_id] = slurl;
+}
+
+void LLFavoritesOrderStorage::save()
+{
+ if (mIsDirty)
+ {
+ // something changed, so save it
+ std::string filename = LLFavoritesOrderStorage::getInstance()->getSavedOrderFileName();
+ if (!filename.empty())
+ {
+ LLSD settings_llsd;
+
+ for(sort_index_map_t::const_iterator iter = mSortIndexes.begin(); iter != mSortIndexes.end(); ++iter)
+ {
+ settings_llsd[iter->first.asString()] = iter->second;
+ }
+
+ llofstream file;
+ file.open(filename.c_str());
+ if ( file.is_open() )
+ {
+ LLSDSerialize::toPrettyXML(settings_llsd, file);
+ LL_INFOS("FavoritesBar") << "saved favorites order to '" << filename << "' " << LL_ENDL;
+ }
+ else
+ {
+ LL_WARNS("FavoritesBar") << "failed to open favorites order file '" << filename << "' " << LL_ENDL;
+ }
+ }
+ else
+ {
+ LL_DEBUGS("FavoritesBar") << "no user directory available to store favorites order file" << LL_ENDL;
+ }
+ }
+}
+
+
+void LLFavoritesOrderStorage::cleanup()
+{
+ // nothing to clean
+ if (!mIsDirty) return;
+
+ const LLUUID fav_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+ LLInventoryModel::cat_array_t cats;
+ LLInventoryModel::item_array_t items;
+ gInventory.collectDescendents(fav_id, cats, items, LLInventoryModel::EXCLUDE_TRASH);
+
+ IsNotInFavorites is_not_in_fav(items);
+
+ sort_index_map_t aTempMap;
+ //copy unremoved values from mSortIndexes to aTempMap
+ std::remove_copy_if(mSortIndexes.begin(), mSortIndexes.end(),
+ inserter(aTempMap, aTempMap.begin()),
+ is_not_in_fav);
+
+ //Swap the contents of mSortIndexes and aTempMap
+ mSortIndexes.swap(aTempMap);
+}
+
+// See also LLInventorySort where landmarks in the Favorites folder are sorted.
+class LLViewerInventoryItemSort
+{
+public:
+ bool operator()(const LLPointer& a, const LLPointer& b) const
+ {
+ return LLFavoritesOrderStorage::instance().getSortIndex(a->getUUID())
+ < LLFavoritesOrderStorage::instance().getSortIndex(b->getUUID());
+ }
+};
+
+void LLFavoritesOrderStorage::saveOrder()
+{
+ LLInventoryModel::cat_array_t cats;
+ LLInventoryModel::item_array_t items;
+ LLIsType is_type(LLAssetType::AT_LANDMARK);
+ LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+ gInventory.collectDescendentsIf(favorites_id, cats, items, LLInventoryModel::EXCLUDE_TRASH, is_type);
+ std::sort(items.begin(), items.end(), LLViewerInventoryItemSort());
+ saveItemsOrder(items);
+}
+
+void LLFavoritesOrderStorage::saveItemsOrder( const LLInventoryModel::item_array_t& items )
+{
+
+ int sortField = 0;
+ // current order is saved by setting incremental values (1, 2, 3, ...) for the sort field
+ for (LLInventoryModel::item_array_t::const_iterator i = items.begin(); i != items.end(); ++i)
+ {
+ LLViewerInventoryItem* item = *i;
+
+ setSortIndex(item, ++sortField);
+
+ item->setComplete(TRUE);
+ item->updateServer(FALSE);
+
+ gInventory.updateItem(item);
+
+ // Tell the parent folder to refresh its sort order.
+ gInventory.addChangedMask(LLInventoryObserver::SORT, item->getParentUUID());
+ }
+
+ gInventory.notifyObservers();
+}
+
+
+// * @param source_item_id - LLUUID of the source item to be moved into new position
+// * @param target_item_id - LLUUID of the target item before which source item should be placed.
+void LLFavoritesOrderStorage::rearrangeFavoriteLandmarks(const LLUUID& source_item_id, const LLUUID& target_item_id)
+{
+ LLInventoryModel::cat_array_t cats;
+ LLInventoryModel::item_array_t items;
+ //LLIsType is_type(LLAssetType::AT_LANDMARK); // Singu Note: We can have anything here~
+ LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
+ gInventory.collectDescendents(favorites_id, cats, items, LLInventoryModel::EXCLUDE_TRASH/*, is_type*/);
+
+ // ensure items are sorted properly before changing order. EXT-3498
+ std::sort(items.begin(), items.end(), LLViewerInventoryItemSort());
+
+ // update order
+ gInventory.updateItemsOrder(items, source_item_id, target_item_id);
+
+ saveItemsOrder(items);
+}
+
+void AddFavoriteLandmarkCallback::fire(const LLUUID& inv_item_id)
+{
+ if (mTargetLandmarkId.isNull()) return;
+
+ LLFavoritesOrderStorage::instance().rearrangeFavoriteLandmarks(inv_item_id, mTargetLandmarkId);
+}
+// EOF
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
new file mode 100644
index 000000000..ef6f55c5e
--- /dev/null
+++ b/indra/newview/llfavoritesbar.h
@@ -0,0 +1,274 @@
+/**
+ * @file llfavoritesbar.h
+ * @brief LLFavoritesBarCtrl base class
+ *
+ * $LicenseInfo:firstyear=2009&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_LLFAVORITESBARCTRL_H
+#define LL_LLFAVORITESBARCTRL_H
+
+#include "llbutton.h"
+#include "lluictrl.h"
+#include "lltextbox.h"
+
+#include "llinventoryobserver.h"
+#include "llinventorymodel.h"
+#include "llviewerinventory.h"
+#include "llui.h" //"llinitdestroyclass.h"
+
+class LLMenuItemCallGL;
+class LLMenuGL;
+
+class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver
+{
+public:
+ struct Params : public LLInitParam::Block
+ {
+ Optional image_drag_indication;
+ Optional more_button;
+ Optional label;
+ Params();
+ };
+
+protected:
+ LLFavoritesBarCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ virtual ~LLFavoritesBarCtrl();
+
+ /*virtual*/ BOOL postBuild() override;
+
+ /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg) override;
+
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+ // LLInventoryObserver observer trigger
+ void changed(U32 mask) override;
+ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
+ void draw() override;
+
+ void showDragMarker(BOOL show) { mShowDragMarker = show; }
+ void setLandingTab(LLUICtrl* tab) { mLandingTab = tab; }
+
+protected:
+ void updateButtons();
+ LLButton* createButton(const LLPointer item, const LLButton::Params& button_params, S32 x_offset );
+ const LLButton::Params& getButtonParams();
+ BOOL collectFavoriteItems(LLInventoryModel::item_array_t &items);
+
+ void onButtonClick(LLUUID id);
+ void onButtonRightClick(LLUUID id,LLView* button,S32 x,S32 y,MASK mask);
+
+ void onButtonMouseDown(LLUUID id, LLUICtrl* button, S32 x, S32 y, MASK mask);
+ void onOverflowMenuItemMouseDown(LLUUID id, LLUICtrl* item, S32 x, S32 y, MASK mask);
+ void onButtonMouseUp(LLUUID id, LLUICtrl* button, S32 x, S32 y, MASK mask);
+
+ void onEndDrag();
+
+ bool enableSelected(const LLSD& userdata);
+ void doToSelected(const LLSD& userdata);
+ BOOL isClipboardPasteable() const;
+ void pasteFromClipboard() const;
+
+ void showDropDownMenu();
+
+ LLHandle mOverflowMenuHandle;
+ LLHandle mContextMenuHandle;
+
+ LLUUID mFavoriteFolderId;
+ const LLFontGL *mFont;
+ S32 mFirstDropDownItem;
+ S32 mDropDownItemsCount;
+ bool mUpdateDropDownItems;
+ bool mRestoreOverflowMenu;
+
+ LLUUID mSelectedItemID;
+
+ LLUIImage* mImageDragIndication;
+
+private:
+ /*
+ * Helper function to make code more readable. It handles all drag and drop
+ * operations of the existing favorites items on the favorites bar.
+ */
+ void handleExistingFavoriteDragAndDrop(S32 x, S32 y);
+
+ /*
+ * Helper function to make code more readable. It handles all drag and drop
+ * operations of the new landmark to the favorites bar.
+ */
+ void handleNewFavoriteDragAndDrop(LLInventoryItem *item, const LLUUID& favorites_id, S32 x, S32 y);
+
+ // finds a control under the specified LOCAL point
+ LLUICtrl* findChildByLocalCoords(S32 x, S32 y);
+
+ // checks if the current order of the favorites items must be saved
+ BOOL needToSaveItemsOrder(const LLInventoryModel::item_array_t& items);
+
+ /**
+ * inserts an item identified by insertedItemId BEFORE an item identified by beforeItemId.
+ * this function assumes that an item identified by insertedItemId doesn't exist in items array.
+ */
+ void insertItem(LLInventoryModel::item_array_t& items, const LLUUID& dest_item_id, LLViewerInventoryItem* insertedItem, bool insert_before);
+
+ // finds an item by it's UUID in the items array
+ LLInventoryModel::item_array_t::iterator findItemByUUID(LLInventoryModel::item_array_t& items, const LLUUID& id);
+
+ void createOverflowMenu();
+
+ void updateMenuItems(LLMenuGL* menu);
+
+ // Fits menu item label width with favorites menu width
+ void fitLabelWidth(LLMenuItemCallGL* menu_item);
+
+ void addOpenLandmarksMenuItem(LLMenuGL* menu);
+
+ void positionAndShowMenu(LLMenuGL* menu);
+
+ BOOL mShowDragMarker;
+ LLUICtrl* mLandingTab;
+ LLUICtrl* mLastTab;
+ LLTextBox* mMoreTextBox;
+ LLTextBox* mBarLabel;
+
+ LLUUID mDragItemId;
+ BOOL mStartDrag;
+ LLInventoryModel::item_array_t mItems;
+
+ BOOL mTabsHighlightEnabled;
+
+ boost::signals2::connection mEndDragConnection;
+};
+
+/**
+ * Class to store sorting order of favorites landmarks in a local file. EXT-3985.
+ * It replaced previously implemented solution to store sort index in landmark's name as a "@" prefix.
+ * Data are stored in user home directory.
+ */
+class LLFavoritesOrderStorage : public LLSingleton
+ , public LLDestroyClass
+{
+ friend class LLSingleton;
+ LLFavoritesOrderStorage(); //LLSINGLETON(LLFavoritesOrderStorage);
+ ~LLFavoritesOrderStorage() { save(); }
+ LOG_CLASS(LLFavoritesOrderStorage);
+public:
+ /**
+ * Sets sort index for specified with LLUUID favorite landmark
+ */
+ void setSortIndex(const LLViewerInventoryItem* inv_item, S32 sort_index);
+
+ /**
+ * Gets sort index for specified with LLUUID favorite landmark
+ */
+ S32 getSortIndex(const LLUUID& inv_item_id);
+ void removeSortIndex(const LLUUID& inv_item_id);
+
+ void getSLURL(const LLUUID& asset_id);
+
+ // Saves current order of the passed items using inventory item sort field.
+ // Resets 'items' sort fields and saves them on server.
+ // Is used to save order for Favorites folder.
+ void saveItemsOrder(const LLInventoryModel::item_array_t& items);
+
+ void saveOrder();
+
+ void rearrangeFavoriteLandmarks(const LLUUID& source_item_id, const LLUUID& target_item_id);
+
+ /**
+ * Implementation of LLDestroyClass. Calls cleanup() instance method.
+ *
+ * It is important this callback is called before gInventory is cleaned.
+ * For now it is called from LLAppViewer::cleanup() -> LLAppViewer::disconnectViewer(),
+ * Inventory is cleaned later from LLAppViewer::cleanup() after LLAppViewer::disconnectViewer() is called.
+ * @see cleanup()
+ */
+ static void destroyClass();
+
+ const static S32 NO_INDEX;
+private:
+ /**
+ * Removes sort indexes for items which are not in Favorites bar for now.
+ */
+ void cleanup();
+
+ const static std::string SORTING_DATA_FILE_NAME;
+ std::string getSavedOrderFileName();
+ static std::string getStoredFavoritesFilename();
+
+ void load();
+ void save();
+
+ void saveFavoritesSLURLs();
+
+ // Remove record of current user's favorites from file on disk.
+ void removeFavoritesRecordOfUser();
+
+ void onLandmarkLoaded(const LLUUID& asset_id, class LLLandmark* landmark);
+ void storeFavoriteSLURL(const LLUUID& asset_id, std::string& slurl);
+
+ typedef std::map sort_index_map_t;
+ sort_index_map_t mSortIndexes;
+
+ typedef std::map slurls_map_t;
+ slurls_map_t mSLURLs;
+ std::set mMissingSLURLs;
+ bool mIsDirty;
+
+ struct IsNotInFavorites
+ {
+ IsNotInFavorites(const LLInventoryModel::item_array_t& items)
+ : mFavoriteItems(items)
+ {
+
+ }
+
+ /**
+ * Returns true if specified item is not found among inventory items
+ */
+ bool operator()(const sort_index_map_t::value_type& id_index_pair) const
+ {
+ LLPointer item = gInventory.getItem(id_index_pair.first);
+ if (item.isNull()) return true;
+
+ LLInventoryModel::item_array_t::const_iterator found_it =
+ std::find(mFavoriteItems.begin(), mFavoriteItems.end(), item);
+
+ return found_it == mFavoriteItems.end();
+ }
+ private:
+ LLInventoryModel::item_array_t mFavoriteItems;
+ };
+
+};
+
+inline
+LLFavoritesOrderStorage::LLFavoritesOrderStorage() :
+ mIsDirty(false)
+{ load(); }
+
+#endif // LL_LLFAVORITESBARCTRL_H
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 42f46fb2e..096df5cde 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -421,6 +421,9 @@ void LLFeatureManager::parseGPUTable(std::string filename)
else
{
LL_WARNS("RenderInit") << "GPU '" << rawRenderer << "' not recognized" << LL_ENDL;
+ mGPUString = rawRenderer;
+ mGPUClass = EGPUClass::GPU_CLASS_3;
+ mGPUSupported = true;
}
}
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 48bf7a836..7c991e4d4 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -144,7 +144,7 @@ LLFloaterAbout::LLFloaterAbout()
__DATE__, __TIME__,
LLVersionInfo::getChannel().c_str()));
support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
- support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
+ support_widget->appendText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
std::string support;
support.append("\n\n");
@@ -209,7 +209,7 @@ LLFloaterAbout::LLFloaterAbout()
{
LLStyleSP server_link_style(new LLStyle(*viewer_link_style));
server_link_style->setLinkHREF(url);
- support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
+ support_widget->appendText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
}
support = "\n\n";
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 7c67b9a3d..cbd8d9e92 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -70,7 +70,7 @@ const S32& radar_namesystem()
namespace
{
- void chat_avatar_status(const std::string& name, const LLUUID& key, ERadarStatType type, bool entering, const F32& dist)
+ void chat_avatar_status(const std::string& name, const LLUUID& key, ERadarStatType type, bool entering, const F32& dist, bool flood = false)
{
static LLCachedControl radar_chat_alerts(gSavedSettings, "RadarChatAlerts");
if (!radar_chat_alerts) return;
@@ -82,6 +82,8 @@ namespace
}
//
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS)) return; // RLVa:LF Don't announce people are around when blind, that cheats the system.
+ static LLCachedControl radar_alert_flood(gSavedSettings, "RadarAlertFlood");
+ if (flood && !radar_alert_flood) return;
static LLCachedControl radar_alert_sim(gSavedSettings, "RadarAlertSim");
static LLCachedControl radar_alert_draw(gSavedSettings, "RadarAlertDraw");
static LLCachedControl radar_alert_shout_range(gSavedSettings, "RadarAlertShoutRange");
@@ -96,11 +98,11 @@ namespace
case STAT_TYPE_DRAW: if (radar_alert_draw) args["[RANGE]"] = LLTrans::getString("draw_distance"); break;
case STAT_TYPE_SHOUTRANGE: if (radar_alert_shout_range) args["[RANGE]"] = LLTrans::getString("shout_range"); break;
case STAT_TYPE_CHATRANGE: if (radar_alert_chat_range) args["[RANGE]"] = LLTrans::getString("chat_range"); break;
- case STAT_TYPE_AGE: if (radar_alert_age) chat.mText = name + " " + LLTrans::getString("has_triggered_your_avatar_age_alert") + "."; break;
+ case STAT_TYPE_AGE: if (radar_alert_age) chat.mText = name + ' ' + LLTrans::getString("has_triggered_your_avatar_age_alert") + '.'; break;
default: llassert(type); break;
}
args["[NAME]"] = name;
- args["[ACTION]"] = LLTrans::getString(entering ? "has_entered" : "has_left");
+ args["[ACTION]"] = LLTrans::getString((entering ? "has_entered" : "has_left") + (flood ? "_flood" : LLStringUtil::null));
if (args.find("[RANGE]") != args.end())
chat.mText = LLTrans::getString("radar_alert_template", args);
else if (chat.mText.empty()) return;
@@ -110,6 +112,7 @@ namespace
if (radar_show_dist) chat.mText += llformat(" (%.2fm)", dist);
}
chat.mFromName = name;
+ chat.mFromID = key;
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) // RLVa:LF - No way!
chat.mURL = llformat("secondlife:///app/agent/%s/about", key.asString().c_str());
chat.mSourceType = CHAT_SOURCE_SYSTEM;
@@ -140,62 +143,75 @@ LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string& name,
LLAvatarPropertiesProcessor& inst(LLAvatarPropertiesProcessor::instance());
inst.addObserver(mID, this);
inst.sendAvatarPropertiesRequest(mID);
+ inst.sendAvatarNotesRequest(mID);
}
LLAvatarListEntry::~LLAvatarListEntry()
{
- setPosition(mPosition, F32_MIN, false); // Dead and gone
+ static LLCachedControl radar_alert_flood_leaving(gSavedSettings, "RadarAlertFloodLeaving");
+ bool cleanup = LLFloaterAvatarList::isCleanup();
+ if (radar_alert_flood_leaving || !cleanup)
+ {
+ setPosition(mPosition, F32_MIN, false, cleanup); // Dead and gone
+ }
LLAvatarPropertiesProcessor::instance().removeObserver(mID, this);
}
// virtual
void LLAvatarListEntry::processProperties(void* data, EAvatarProcessorType type)
{
- if (type == APT_PROPERTIES)
+ // If one wanted more information that gets displayed on profiles to be displayed, here would be the place to do it.
+ switch(type)
{
- LLAvatarPropertiesProcessor& inst(LLAvatarPropertiesProcessor::instance());
- inst.removeObserver(mID, this);
- const LLAvatarData* pAvatarData = static_cast(data);
- if (pAvatarData && (pAvatarData->avatar_id != LLUUID::null))
- {
- using namespace boost::gregorian;
- int year, month, day;
- sscanf(pAvatarData->born_on.c_str(),"%d/%d/%d",&month,&day,&year);
- try
+ case APT_PROPERTIES:
+ if (mAge == -1)
{
- mAge = (day_clock::local_day() - date(year, month, day)).days();
- }
- catch(const std::exception&)
- {
- LL_WARNS() << "Failed to extract age from APT_PROPERTIES for " << mID << ", received \"" << pAvatarData->born_on << "\". Requesting properties again." << LL_ENDL;
- inst.addObserver(mID, this);
- inst.sendAvatarPropertiesRequest(mID);
- return;
- }
- if (!mStats[STAT_TYPE_AGE] && mAge >= 0) //Only announce age once per entry.
- {
- static const LLCachedControl sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays");
- if ((U32)mAge < sAvatarAgeAlertDays)
+ LLAvatarPropertiesProcessor& inst(LLAvatarPropertiesProcessor::instance());
+ const LLAvatarData* pAvatarData = static_cast(data);
+ if (pAvatarData && (pAvatarData->avatar_id.notNull()))
{
- chat_avatar_status(mName, mID, STAT_TYPE_AGE, mStats[STAT_TYPE_AGE] = true, (mPosition - gAgent.getPositionGlobal()).magVec());
+ using namespace boost::gregorian;
+ int year, month, day;
+ if (sscanf(pAvatarData->born_on.c_str(),"%d/%d/%d",&month,&day,&year) == 3)
+ try
+ {
+ mAge = (day_clock::local_day() - date(year, month, day)).days();
+ }
+ catch(const std::out_of_range&) {} // date throws this, so we didn't assign
+
+ if (mAge >= 0)
+ {
+ static const LLCachedControl sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays");
+ if (!mStats[STAT_TYPE_AGE] && (U32)mAge < sAvatarAgeAlertDays) //Only announce age once per entry.
+ chat_avatar_status(mName, mID, STAT_TYPE_AGE, mStats[STAT_TYPE_AGE] = true, (mPosition - gAgent.getPositionGlobal()).magVec());
+ }
+ else // Something failed, resend request
+ {
+ LL_WARNS() << "Failed to extract age from APT_PROPERTIES for " << mID << ", received \"" << pAvatarData->born_on << "\". Requesting properties again." << LL_ENDL;
+ inst.sendAvatarPropertiesRequest(mID);
+ }
}
}
- // If one wanted more information that gets displayed on profiles to be displayed, here would be the place to do it.
- }
+ break;
+ case APT_NOTES:
+ if (const LLAvatarNotes* pAvatarNotes = static_cast(data))
+ mNotes = !pAvatarNotes->notes.empty();
+ break;
+ default: break;
}
}
-void LLAvatarListEntry::setPosition(const LLVector3d& position, const F32& dist, bool drawn)
+void LLAvatarListEntry::setPosition(const LLVector3d& position, const F32& dist, bool drawn, bool flood)
{
mPosition = position;
bool here(dist != F32_MIN); // F32_MIN only if dead
bool this_sim(here && (gAgent.getRegion()->pointInRegionGlobal(position) || !(LLWorld::getInstance()->positionRegionValidGlobal(position))));
- if (this_sim != mStats[STAT_TYPE_SIM]) chat_avatar_status(mName, mID, STAT_TYPE_SIM, mStats[STAT_TYPE_SIM] = this_sim, dist);
- if (drawn != mStats[STAT_TYPE_DRAW]) chat_avatar_status(mName, mID, STAT_TYPE_DRAW, mStats[STAT_TYPE_DRAW] = drawn, dist);
+ if (this_sim != mStats[STAT_TYPE_SIM]) chat_avatar_status(mName, mID, STAT_TYPE_SIM, mStats[STAT_TYPE_SIM] = this_sim, dist, flood);
+ if (drawn != mStats[STAT_TYPE_DRAW]) chat_avatar_status(mName, mID, STAT_TYPE_DRAW, mStats[STAT_TYPE_DRAW] = drawn, dist, flood);
bool shoutrange(here && dist < LFSimFeatureHandler::getInstance()->shoutRange());
- if (shoutrange != mStats[STAT_TYPE_SHOUTRANGE]) chat_avatar_status(mName, mID, STAT_TYPE_SHOUTRANGE, mStats[STAT_TYPE_SHOUTRANGE] = shoutrange, dist);
+ if (shoutrange != mStats[STAT_TYPE_SHOUTRANGE]) chat_avatar_status(mName, mID, STAT_TYPE_SHOUTRANGE, mStats[STAT_TYPE_SHOUTRANGE] = shoutrange, dist, flood);
bool chatrange(here && dist < LFSimFeatureHandler::getInstance()->sayRange());
- if (chatrange != mStats[STAT_TYPE_CHATRANGE]) chat_avatar_status(mName, mID, STAT_TYPE_CHATRANGE, mStats[STAT_TYPE_CHATRANGE] = chatrange, dist);
+ if (chatrange != mStats[STAT_TYPE_CHATRANGE]) chat_avatar_status(mName, mID, STAT_TYPE_CHATRANGE, mStats[STAT_TYPE_CHATRANGE] = chatrange, dist, flood);
}
void LLAvatarListEntry::resetName(const bool& hide_tags, const bool& anon_names, const std::string& hidden)
@@ -240,6 +256,8 @@ LLFloaterAvatarList::LLFloaterAvatarList() : LLFloater(std::string("radar")),
LLFloaterAvatarList::~LLFloaterAvatarList()
{
+ mCleanup = true;
+ mAvatars.clear();
}
//static
@@ -315,7 +333,7 @@ namespace
{
bool handleEvent(LLPointer event, const LLSD& userdata)
{
- LLFloaterAvatarList::instance().setFocusAvatar(get_focused_list_id_selected());
+ LLFloaterAvatarList::setFocusAvatar(get_focused_list_id_selected());
return true;
}
};
@@ -401,6 +419,7 @@ BOOL LLFloaterAvatarList::postBuild()
gSavedSettings.getControl("RadarColumnAltitudeHidden")->getSignal()->connect(boost::bind(&LLFloaterAvatarList::assessColumns, this));
gSavedSettings.getControl("RadarColumnActivityHidden")->getSignal()->connect(boost::bind(&LLFloaterAvatarList::assessColumns, this));
gSavedSettings.getControl("RadarColumnVoiceHidden")->getSignal()->connect(boost::bind(&LLFloaterAvatarList::assessColumns, this));
+ gSavedSettings.getControl("RadarColumnNotesHidden")->getSignal()->connect(boost::bind(&LLFloaterAvatarList::assessColumns, this));
gSavedSettings.getControl("RadarColumnAgeHidden")->getSignal()->connect(boost::bind(&LLFloaterAvatarList::assessColumns, this));
gSavedSettings.getControl("RadarColumnTimeHidden")->getSignal()->connect(boost::bind(&LLFloaterAvatarList::assessColumns, this));
@@ -413,7 +432,7 @@ BOOL LLFloaterAvatarList::postBuild()
mAvatarList->setSortChangedCallback(boost::bind(&LLFloaterAvatarList::onAvatarSortingChanged,this));
for (LLViewerRegion* region : LLWorld::instance().getRegionList())
{
- updateAvatarList(region);
+ updateAvatarList(region, true);
}
assessColumns();
@@ -445,6 +464,21 @@ void col_helper(const bool hide, LLCachedControl &setting, LLScrollListColu
}
}
+enum AVATARS_COLUMN_ORDER
+{
+ LIST_MARK,
+ LIST_AVATAR_NAME,
+ LIST_DISTANCE,
+ LIST_POSITION,
+ LIST_ALTITUDE,
+ LIST_ACTIVITY,
+ LIST_VOICE,
+ LIST_NOTES,
+ LIST_AGE,
+ LIST_TIME,
+ LIST_CLIENT,
+};
+
//Macro to reduce redundant lines. Preprocessor concatenation and stringizing avoids bloat that
//wrapping in a class would create.
#define BIND_COLUMN_TO_SETTINGS(col, name)\
@@ -459,6 +493,7 @@ void LLFloaterAvatarList::assessColumns()
BIND_COLUMN_TO_SETTINGS(LIST_ALTITUDE,Altitude);
BIND_COLUMN_TO_SETTINGS(LIST_ACTIVITY,Activity);
BIND_COLUMN_TO_SETTINGS(LIST_VOICE,Voice);
+ BIND_COLUMN_TO_SETTINGS(LIST_NOTES,Notes);
BIND_COLUMN_TO_SETTINGS(LIST_AGE,Age);
BIND_COLUMN_TO_SETTINGS(LIST_TIME,Time);
@@ -515,7 +550,7 @@ const F32& radar_range_radius()
return radius;
}
-void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region)
+void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region, bool first)
{
// Check whether updates are enabled
if (!mUpdate)
@@ -561,7 +596,7 @@ void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region)
}
// Announce position
- entry->setPosition(position, (position - mypos).magVec(), avatarp);
+ entry->setPosition(position, (position - mypos).magVec(), avatarp, first);
// Mark as typing if they are typing
if (avatarp && avatarp->isTyping()) entry->setActivity(LLAvatarListEntry::ACTIVITY_TYPING);
@@ -582,13 +617,13 @@ void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region)
U32 num_ids = 0;
while(!announce_keys.empty())
{
- ids << "," << announce_keys.front().asString();
+ ids << ',' << announce_keys.front().asString();
++num_ids;
if (ids.tellp() > 200)
{
send_keys_message(transact_num, num_ids, ids.str());
ids.seekp(num_ids = 0);
- ids.str("");
+ ids.str(LLStringUtil::null);
}
announce_keys.pop();
}
@@ -903,6 +938,12 @@ void LLFloaterAvatarList::refreshAvatarList()
element.columns.add(voice);
}
+ static const LLCachedControl hide_notes("RadarColumnNotesHidden");
+ if (!hide_notes)
+ {
+ element.columns.add(LLScrollListCell::Params().column("notes").type("checkbox").enabled(false).value(entry->mNotes));
+ }
+
static const LLCachedControl hide_age("RadarColumnAgeHidden");
if (!hide_age)
{
@@ -1092,7 +1133,6 @@ void LLFloaterAvatarList::trackAvatar(const LLAvatarListEntry* entry) const
LLAvatarListEntry* LLFloaterAvatarList::getAvatarEntry(const LLUUID& avatar) const
{
- if (avatar.isNull()) return NULL;
av_list_t::const_iterator iter = std::find_if(mAvatars.begin(),mAvatars.end(),LLAvatarListEntry::uuidMatch(avatar));
return (iter != mAvatars.end()) ? iter->get() : NULL;
}
@@ -1149,9 +1189,16 @@ void LLFloaterAvatarList::removeFocusFromAll()
}
}
+// static
void LLFloaterAvatarList::setFocusAvatar(const LLUUID& id)
{
if (!gAgentCamera.lookAtObject(id, false) && !lookAtAvatar(id)) return;
+ if (auto inst = getIfExists())
+ inst->setFocusAvatarInternal(id);
+}
+
+void LLFloaterAvatarList::setFocusAvatarInternal(const LLUUID& id)
+{
av_list_t::iterator iter = std::find_if(mAvatars.begin(),mAvatars.end(),LLAvatarListEntry::uuidMatch(id));
if (iter == mAvatars.end()) return;
removeFocusFromAll();
@@ -1255,13 +1302,13 @@ void LLFloaterAvatarList::sendKeys() const
for (U32 i = 0; i < regionp->mMapAvatarIDs.size(); ++i)
{
- ids << "," << regionp->mMapAvatarIDs.at(i);
+ ids << ',' << regionp->mMapAvatarIDs.at(i);
++num_ids;
if (ids.tellp() > 200)
{
send_keys_message(transact_num, num_ids, ids.str());
ids.seekp(num_ids = 0);
- ids.str("");
+ ids.str(LLStringUtil::null);
}
}
if (num_ids > 0) send_keys_message(transact_num, num_ids, ids.str());
@@ -1400,7 +1447,7 @@ std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
std::string LLFloaterAvatarList::getSelectedName() const
{
LLAvatarListEntry* entry = getAvatarEntry(getSelectedID());
- return entry ? entry->getName() : "";
+ return entry ? entry->getName() : LLStringUtil::null;
}
LLUUID LLFloaterAvatarList::getSelectedID() const
diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
index 93230f9a5..233eb4618 100644
--- a/indra/newview/llfloateravatarlist.h
+++ b/indra/newview/llfloateravatarlist.h
@@ -79,7 +79,7 @@ enum ACTIVITY_TYPE
* Update world position.
* Affects age.
*/
- void setPosition(const LLVector3d& position, const F32& dist, bool drawn);
+ void setPosition(const LLVector3d& position, const F32& dist, bool drawn, bool flood = false);
const LLVector3d& getPosition() const { return mPosition; }
@@ -143,6 +143,7 @@ private:
bool mMarked;
bool mFocused;
bool mIsInList;
+ bool mNotes = false;
int mAge;
/**
@@ -202,7 +203,7 @@ public:
/**
* @brief Updates the internal avatar list with the currently present avatars.
*/
- void updateAvatarList(const class LLViewerRegion* region);
+ void updateAvatarList(const class LLViewerRegion* region, bool first = false);
/**
* @brief Refresh avatar list (display)
@@ -239,20 +240,6 @@ public:
// when a line editor loses keyboard focus, it is committed.
// commit callbacks are named onCommitWidgetName by convention.
//void onCommitBaz(LLUICtrl* ctrl, void *userdata);
-
- enum AVATARS_COLUMN_ORDER
- {
- LIST_MARK,
- LIST_AVATAR_NAME,
- LIST_DISTANCE,
- LIST_POSITION,
- LIST_ALTITUDE,
- LIST_ACTIVITY,
- LIST_VOICE,
- LIST_AGE,
- LIST_TIME,
- LIST_CLIENT,
- };
typedef boost::function avlist_command_t;
@@ -264,7 +251,7 @@ public:
/**
* @brief Focus camera on specified avatar
*/
- void setFocusAvatar(const LLUUID& id);
+ static void setFocusAvatar(const LLUUID& id);
/**
* @brief Focus camera on previous avatar
@@ -318,8 +305,6 @@ public:
static bool onConfirmRadarChatKeys(const LLSD& notification, const LLSD& response );
- static void callbackIdle(void *userdata);
-
void doCommand(avlist_command_t cmd, bool single = false) const;
/**
@@ -330,14 +315,22 @@ public:
*/
void expireAvatarList(const std::list& ids);
void updateAvatarSorting();
+ static bool isCleanup()
+ {
+ const auto& inst = getIfExists();
+ return inst && inst->mCleanup;
+ }
private:
+ void setFocusAvatarInternal(const LLUUID& id);
+
/**
* @brief Pointer to the avatar scroll list
*/
LLScrollListCtrl* mAvatarList;
av_list_t mAvatars;
bool mDirtyAvatarSorting;
+ bool mCleanup = false;
/**
* @brief true when Updating
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 95c683582..b0607210f 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -45,6 +45,7 @@
#include "llcombobox.h"
#include "lltextparser.h"
#include "lltrans.h"
+#include "llurlregistry.h"
#include "llwindow.h"
// project include
@@ -94,7 +95,6 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
LLTextEditor* history_editor_with_mute = getChild("Chat History Editor with mute");
getChild("show mutes")->setCommitCallback(boost::bind(&LLFloaterChat::onClickToggleShowMute, this, _2, getChild("Chat History Editor"), history_editor_with_mute));
- history_editor_with_mute->setVisible(false);
getChild("chat_history_open")->setCommitCallback(boost::bind(show_log_browser, "chat", "chat"));
}
@@ -201,7 +201,7 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
if (chat.mSourceType == CHAT_SOURCE_OBJECT)
{
LLStringUtil::trim(chat.mFromName);
- if (!chat.mFromName.length())
+ if (chat.mFromName.empty())
{
chat.mFromName = LLTrans::getString("Unnamed");
line = chat.mFromName + line;
@@ -212,19 +212,19 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
bool is_irc = italicize && chat.mChatStyle == CHAT_STYLE_IRC;
// If the chat line has an associated url, link it up to the name.
if (!chat.mURL.empty()
- && (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+ && boost::algorithm::starts_with(line, chat.mFromName))
{
- std::string start_line = line.substr(0, chat.mFromName.length() + 1);
- line = line.substr(chat.mFromName.length() + 1);
+ line = line.substr(chat.mFromName.length());
LLStyleSP sourceStyle = LLStyleMap::instance().lookup(chat.mFromID, chat.mURL);
sourceStyle->mItalic = is_irc;
- edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
+ edit->appendText(chat.mFromName, false, prepend_newline, sourceStyle, false);
prepend_newline = false;
}
LLStyleSP style(new LLStyle);
style->setColor(color);
style->mItalic = is_irc;
- edit->appendStyledText(line, false, prepend_newline, style);
+ style->mBold = chat.mChatType == CHAT_TYPE_SHOUT;
+ edit->appendText(line, false, prepend_newline, style, false);
}
void log_chat_text(const LLChat& chat)
@@ -339,8 +339,6 @@ void LLFloaterChat::setHistoryCursorAndScrollToEnd()
//static
void LLFloaterChat::onClickToggleShowMute(bool show_mute, LLTextEditor* history_editor, LLTextEditor* history_editor_with_mute)
{
- history_editor->setVisible(!show_mute);
- history_editor_with_mute->setVisible(show_mute);
(show_mute ? history_editor_with_mute : history_editor)->setCursorAndScrollToEnd();
}
@@ -387,7 +385,19 @@ void LLFloaterChat::addChat(const LLChat& chat,
// We display anything if it's not an IM. If it's an IM, check pref...
if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatConsole") )
{
- gConsole->addConsoleLine(chat.mText, text_color);
+ // Replace registered urls in the console so it looks right.
+ std::string chit(chat.mText), // Read through this
+ chat; // Add parts to this
+ LLUrlMatch match;
+ while (!chit.empty() && LLUrlRegistry::instance().findUrl(chit, match))
+ {
+ const auto start(match.getStart()), length(match.getEnd()+1-start);
+ if (start > 0) chat += chit.substr(0, start); // Add up to the start of the match
+ chat += match.getLabel() + match.getQuery(); // Add the label and the query
+ chit.erase(0, start+length); // remove the url match and all before it
+ }
+ if (!chit.empty()) chat += chit; // Add any leftovers
+ gConsole->addConsoleLine(chat, text_color);
}
}
diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 657920701..63aa904dd 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -55,8 +55,7 @@
#include "statemachine/aifilepicker.h"
#include "hippogridmanager.h"
-//#include "aixmllindengenepool.h"
-#include "aifile.h"
+#include "aixmllindengenepool.h"
using namespace LLAvatarAppearanceDefines;
@@ -119,9 +118,9 @@ LLFloaterCustomize::LLFloaterCustomize()
gInventory.addObserver(mInventoryObserver);
LLOutfitObserver& outfit_observer = LLOutfitObserver::instance();
- outfit_observer.addBOFReplacedCallback(boost::bind(&LLFloaterCustomize::refreshCurrentOutfitName, this, ""));
- outfit_observer.addBOFChangedCallback(boost::bind(&LLFloaterCustomize::refreshCurrentOutfitName, this, ""));
- outfit_observer.addCOFChangedCallback(boost::bind(&LLFloaterCustomize::refreshCurrentOutfitName, this, ""));
+ outfit_observer.addBOFReplacedCallback(boost::bind(&LLFloaterCustomize::refreshCurrentOutfitName, this, LLStringUtil::null));
+ outfit_observer.addBOFChangedCallback(boost::bind(&LLFloaterCustomize::refreshCurrentOutfitName, this, LLStringUtil::null));
+ outfit_observer.addCOFChangedCallback(boost::bind(&LLFloaterCustomize::refreshCurrentOutfitName, this, LLStringUtil::null));
LLCallbackMap::map_t factory_map;
const std::string &invalid_name = LLWearableType::getTypeName(LLWearableType::WT_INVALID);
@@ -238,7 +237,11 @@ void LLFloaterCustomize::editWearable(LLViewerWearable* wearable, bool disable_c
{
if(!wearable)
return;
- LLFloaterCustomize::getInstance()->setCurrentWearableType(wearable->getType(), disable_camera_switch);
+ auto& inst = LLFloaterCustomize::instance();
+ inst.setCurrentWearableType(wearable->getType(), disable_camera_switch);
+ U32 index(0);
+ gAgentWearables.getWearableIndex(wearable, index);
+ static_cast(inst.mTabContainer->getCurrentPanel())->setWearableIndex(index);
}
//static
@@ -314,7 +317,6 @@ void LLFloaterCustomize::onBtnImport()
void LLFloaterCustomize::onBtnImport_continued(AIFilePicker* filepicker)
{
-#if 0
if (!filepicker->hasFilename())
{
// User canceled import.
@@ -457,7 +459,6 @@ void LLFloaterCustomize::onBtnImport_continued(AIFilePicker* filepicker)
{
AIAlert::add("AIXMLImportWearableTypeMismatch", args("[TYPE]", label)("[ARCHETYPENAME]", wearable_types));
}
-#endif
}
// reX: new function
@@ -502,7 +503,6 @@ void LLFloaterCustomize::onBtnExport()
//static
void LLFloaterCustomize::onBtnExport_continued(LLViewerWearable* edit_wearable, AIFilePicker* filepicker)
{
-#if 0
if (!filepicker->hasFilename())
{
// User canceled export.
@@ -514,9 +514,7 @@ void LLFloaterCustomize::onBtnExport_continued(LLViewerWearable* edit_wearable,
bool success = false;
try
{
- AIFile outfile(filename, "wb");
-
- AIXMLLindenGenepool linden_genepool(outfile);
+ AIXMLLindenGenepool linden_genepool(filename);
linden_genepool.child(edit_wearable->getArchetype());
success = true;
@@ -530,7 +528,6 @@ void LLFloaterCustomize::onBtnExport_continued(LLViewerWearable* edit_wearable,
{
AIAlert::add_modal("AIXMLExportSuccess", AIArgs("[FILE]", filename));
}
-#endif
}
void LLFloaterCustomize::onBtnOk()
@@ -677,7 +674,8 @@ const S32 HEADER_HEIGHT = 3 * (LINE_HEIGHT + LLFLOATER_VPAD) + (2 * LLPANEL_BORD
void LLFloaterCustomize::wearablesChanged(LLWearableType::EType type)
{
llassert( type < LLWearableType::WT_COUNT );
- gSavedSettings.setU32("AvatarSex", (gAgentAvatarp->getSex() == SEX_MALE) );
+ if (type == LLWearableType::WT_SHAPE)
+ gSavedSettings.setU32("AvatarSex", (gAgentAvatarp->getSex() == SEX_MALE));
LLPanelEditWearable* panel = mWearablePanelList[ type ];
if( panel )
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index b024b0eee..7e5861276 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -556,7 +556,7 @@ void LLPanelRegionTools::onSaveState(void* userdata)
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_DataBlock);
- gMessageSystem->addStringFast(_PREHASH_Filename, NULL);
+ gMessageSystem->addStringFast(_PREHASH_Filename, nullptr);
gAgent.sendReliableMessage();
}
}
@@ -1354,7 +1354,7 @@ void LLPanelRequestTools::onClickRequest()
if(dest == SELECTION)
{
std::string req =getChild("request")->getValue();
- req = req.substr(0, req.find_first_of(" "));
+ req = req.substr(0, req.find_first_of(' '));
std::string param = getChild("parameter")->getValue();
LLSelectMgr::getInstance()->sendGodlikeRequest(req, param);
}
@@ -1401,11 +1401,11 @@ void LLPanelRequestTools::sendRequest(const LLHost& host)
host,
FALSE,
terrain_download_done,
- NULL);
+ nullptr);
}
else
{
- req = req.substr(0, req.find_first_of(" "));
+ req = req.substr(0, req.find_first_of(' '));
sendRequest(req, getChild("parameter")->getValue().asString(), host);
}
}
diff --git a/indra/newview/llfloaterlandmark.cpp b/indra/newview/llfloaterlandmark.cpp
index 00d7cd86c..d94546a08 100644
--- a/indra/newview/llfloaterlandmark.cpp
+++ b/indra/newview/llfloaterlandmark.cpp
@@ -104,7 +104,7 @@ BOOL LLFloaterLandmark::postBuild()
mInventoryPanel->setAllowMultiSelect(FALSE);
// store this filter as the default one
- mInventoryPanel->getRootFolder()->getFilter()->markDefault();
+ mInventoryPanel->getRootFolder()->getFilter().markDefault();
// Commented out to stop opening all folders with textures
mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_LANDMARK);
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
new file mode 100644
index 000000000..e51cbd6c7
--- /dev/null
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -0,0 +1,967 @@
+/**
+ * @file llfloatermarketplacelistings.cpp
+ * @brief Implementation of the marketplace listings floater and panels
+ * @author merov@lindenlab.com
+ *
+ * $LicenseInfo:firstyear=2001&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 "llviewerprecompiledheaders.h"
+
+#include "llfloatermarketplacelistings.h"
+
+//#include "llfloaterreg.h"
+#include "llfiltereditor.h"
+#include "llfolderview.h"
+#include "llinventorybridge.h"
+#include "llinventorymodelbackgroundfetch.h"
+#include "llinventoryobserver.h"
+#include "llinventoryfunctions.h"
+#include "llmarketplacefunctions.h"
+//#include "llnotificationhandler.h"
+//#include "llnotificationmanager.h"
+#include "llnotificationsutil.h"
+//#include "llsidepaneliteminfo.h"
+#include "lltextbox.h"
+#include "lltrans.h"
+
+///----------------------------------------------------------------------------
+/// LLPanelMarketplaceListings
+///----------------------------------------------------------------------------
+
+static LLPanelInjector t_panel_status("llpanelmarketplacelistings");
+
+LLPanelMarketplaceListings::LLPanelMarketplaceListings()
+: mRootFolder(NULL)
+, mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME)
+, mFilterListingFoldersOnly(false)
+{
+}
+
+LLPanelMarketplaceListings::~LLPanelMarketplaceListings() { delete mMenu; }
+
+void showMenu(LLView* button, LLMenuGL* menu)
+{
+ menu->buildDrawLabels();
+ menu->updateParent(LLMenuGL::sMenuContainer);
+ const auto& rect = button->getRect();
+ LLMenuGL::showPopup(button->getParent(), menu, rect.mLeft, rect.mBottom);
+}
+
+BOOL LLPanelMarketplaceListings::postBuild()
+{
+ childSetAction("add_btn", boost::bind(&LLPanelMarketplaceListings::onAddButtonClicked, this));
+ childSetAction("audit_btn", boost::bind(&LLPanelMarketplaceListings::onAuditButtonClicked, this));
+ mMenu = LLUICtrlFactory::instance().buildMenu("menu_marketplace_view.xml", LLMenuGL::sMenuContainer);
+ auto sort = getChild("sort_btn");
+ sort->setCommitCallback(boost::bind(showMenu, _1, mMenu));
+
+ mFilterEditor = getChild("filter_editor");
+ mFilterEditor->setCommitCallback(boost::bind(&LLPanelMarketplaceListings::onFilterEdit, this, _2));
+
+ mAuditBtn = getChild("audit_btn");
+ mAuditBtn->setEnabled(FALSE);
+
+ return LLPanel::postBuild();
+}
+
+BOOL LLPanelMarketplaceListings::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg)
+{
+ LLView * handled_view = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+ BOOL handled = (handled_view != NULL);
+ // Special case the drop zone
+ if (handled && (handled_view->getName() == "marketplace_drop_zone"))
+ {
+ LLFolderView* root_folder = getRootFolder();
+ handled = root_folder->handleDragAndDropToThisFolder(mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+ }
+ return handled;
+}
+
+void LLPanelMarketplaceListings::buildAllPanels()
+{
+ // Build the All panel first
+ LLInventoryPanel* panel_all_items;
+ panel_all_items = buildInventoryPanel("All Items", "panel_marketplace_listings_inventory.xml");
+ panel_all_items->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
+ panel_all_items->getFilter().markDefault();
+
+ // Build the other panels
+ LLInventoryPanel* panel;
+ panel = buildInventoryPanel("Active Items", "panel_marketplace_listings_listed.xml");
+ panel->getFilter().setFilterMarketplaceActiveFolders();
+ panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
+ panel->getFilter().markDefault();
+ panel = buildInventoryPanel("Inactive Items", "panel_marketplace_listings_unlisted.xml");
+ panel->getFilter().setFilterMarketplaceInactiveFolders();
+ panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
+ panel->getFilter().markDefault();
+ panel = buildInventoryPanel("Unassociated Items", "panel_marketplace_listings_unassociated.xml");
+ panel->getFilter().setFilterMarketplaceUnassociatedFolders();
+ panel->getFilter().setEmptyLookupMessage("MarketplaceNoMatchingItems");
+ panel->getFilter().markDefault();
+
+ // Set the tab panel
+ LLTabContainer* tabs_panel = getChild("marketplace_filter_tabs");
+ tabs_panel->setCommitCallback(boost::bind(&LLPanelMarketplaceListings::onTabChange, this));
+ tabs_panel->selectTabPanel(panel_all_items); // All panel selected by default
+ mRootFolder = panel_all_items->getRootFolder(); // Keep the root of the all panel
+
+ // Set the default sort order
+ setSortOrder(gSavedSettings.getU32("MarketplaceListingsSortOrder"));
+}
+
+LLInventoryPanel* LLPanelMarketplaceListings::buildInventoryPanel(const std::string& childname, const std::string& filename)
+{
+ LLTabContainer* tabs_panel = getChild("marketplace_filter_tabs");
+ // Singu Note: These should already be built!!
+ LLInventoryPanel* panel = tabs_panel->getChild(childname, false, false);
+ llassert(panel != NULL);
+
+ // Set sort order and callbacks
+ panel->getRootFolder()->setSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME);
+ panel->setSelectCallback(boost::bind(&LLPanelMarketplaceListings::onSelectionChange, this, panel, _1, _2));
+
+ return panel;
+}
+
+void LLPanelMarketplaceListings::setSortOrder(U32 sort_order)
+{
+ mSortOrder = sort_order;
+ gSavedSettings.setU32("MarketplaceListingsSortOrder", sort_order);
+
+ // Set each panel with that sort order
+ LLTabContainer* tabs_panel = getChild("marketplace_filter_tabs");
+ LLInventoryPanel* panel = (LLInventoryPanel*)tabs_panel->getPanelByName("All Items");
+ panel->setSortOrder(mSortOrder);
+ panel = (LLInventoryPanel*)tabs_panel->getPanelByName("Active Items");
+ panel->setSortOrder(mSortOrder);
+ panel = (LLInventoryPanel*)tabs_panel->getPanelByName("Inactive Items");
+ panel->setSortOrder(mSortOrder);
+ panel = (LLInventoryPanel*)tabs_panel->getPanelByName("Unassociated Items");
+ panel->setSortOrder(mSortOrder);
+}
+
+void LLPanelMarketplaceListings::onFilterEdit(const std::string& search_string)
+{
+ // Find active panel
+ LLInventoryPanel* panel = (LLInventoryPanel*)getChild("marketplace_filter_tabs")->getCurrentPanel();
+ if (panel)
+ {
+ // Save filter string (needed when switching tabs)
+ mFilterSubString = search_string;
+ // Set filter string on active panel
+ panel->setFilterSubString(mFilterSubString);
+ }
+}
+
+void LLPanelMarketplaceListings::draw()
+{
+ if (LLMarketplaceData::instance().checkDirtyCount())
+ {
+ update_all_marketplace_count();
+ }
+
+ // Get the audit button enabled only after the whole inventory is fetched
+ if (!mAuditBtn->getEnabled())
+ {
+ mAuditBtn->setEnabled(LLInventoryModelBackgroundFetch::instance().isEverythingFetched());
+ }
+
+ LLPanel::draw();
+}
+
+void LLPanelMarketplaceListings::onSelectionChange(LLInventoryPanel *panel, const std::deque& items, BOOL user_action)
+{
+ panel->onSelectionChange(items, user_action);
+}
+
+bool LLPanelMarketplaceListings::allowDropOnRoot()
+{
+ LLInventoryPanel* panel = (LLInventoryPanel*)getChild("marketplace_filter_tabs")->getCurrentPanel();
+ return (panel ? panel->getAllowDropOnRoot() : false);
+}
+
+void LLPanelMarketplaceListings::onTabChange()
+{
+ // Find active panel
+ LLInventoryPanel* panel = (LLInventoryPanel*)getChild("marketplace_filter_tabs")->getCurrentPanel();
+ if (panel)
+ {
+ // If the panel doesn't allow drop on root, it doesn't allow the creation of new folder on root either
+ LLButton* add_btn = getChild("add_btn");
+ add_btn->setEnabled(panel->getAllowDropOnRoot());
+
+ // Set filter string on active panel
+ panel->setFilterSubString(mFilterSubString);
+
+ // Show/hide the drop zone and resize the inventory tabs panel accordingly
+ LLPanel* drop_zone = (LLPanel*)getChild("marketplace_drop_zone");
+ bool drop_zone_visible = drop_zone->getVisible();
+ bool allow_drop_on_root = panel->getAllowDropOnRoot() && gSavedSettings.getBOOL("LiruEnableWIPUI");
+ if (drop_zone_visible != allow_drop_on_root)
+ {
+ LLPanel* tabs = (LLPanel*)getChild("tab_container_panel");
+ S32 delta_height = drop_zone->getRect().getHeight();
+ delta_height = (drop_zone_visible ? delta_height : -delta_height);
+ tabs->reshape(tabs->getRect().getWidth(),tabs->getRect().getHeight() + delta_height);
+ tabs->translate(0,-delta_height);
+ }
+ drop_zone->setVisible(allow_drop_on_root);
+ }
+}
+
+void LLPanelMarketplaceListings::onAddButtonClicked()
+{
+ // Find active panel
+ LLInventoryPanel* panel = (LLInventoryPanel*)getChild("marketplace_filter_tabs")->getCurrentPanel();
+ if (panel)
+ {
+ LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+ llassert(marketplacelistings_id.notNull());
+ LLFolderType::EType preferred_type = LLFolderType::lookup("category");
+ LLUUID category = gInventory.createNewCategory(marketplacelistings_id, preferred_type, LLStringUtil::null);
+ gInventory.notifyObservers();
+ panel->setSelectionByID(category, TRUE);
+ panel->getRootFolder()->setNeedsAutoRename(TRUE);
+ }
+}
+
+void LLPanelMarketplaceListings::onAuditButtonClicked()
+{
+ LLSD data(LLSD::emptyMap());
+ new LLFloaterMarketplaceValidation(data); // It tracks itself *sigh*
+}
+
+void LLPanelMarketplaceListings::onViewSortMenuItemClicked(const LLSD& userdata)
+{
+ std::string chosen_item = userdata.asString();
+
+ // Sort options
+ if ((chosen_item == "sort_by_stock_amount") || (chosen_item == "sort_by_name") || (chosen_item == "sort_by_recent"))
+ {
+ // We're making sort options exclusive, default is SO_FOLDERS_BY_NAME
+ if (chosen_item == "sort_by_stock_amount")
+ {
+ setSortOrder(LLInventoryFilter::SO_FOLDERS_BY_WEIGHT);
+ }
+ else if (chosen_item == "sort_by_name")
+ {
+ setSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME);
+ }
+ else if (chosen_item == "sort_by_recent")
+ {
+ setSortOrder(LLInventoryFilter::SO_DATE);
+ }
+ }
+ // Filter option
+ else if (chosen_item == "show_only_listing_folders")
+ {
+ mFilterListingFoldersOnly = !mFilterListingFoldersOnly;
+ // Set each panel with that filter flag
+ LLTabContainer* tabs_panel = getChild("marketplace_filter_tabs");
+ LLInventoryPanel* panel = (LLInventoryPanel*)tabs_panel->getPanelByName("All Items");
+ panel->getFilter().setFilterMarketplaceListingFolders(mFilterListingFoldersOnly);
+ panel = (LLInventoryPanel*)tabs_panel->getPanelByName("Active Items");
+ panel->getFilter().setFilterMarketplaceListingFolders(mFilterListingFoldersOnly);
+ panel = (LLInventoryPanel*)tabs_panel->getPanelByName("Inactive Items");
+ panel->getFilter().setFilterMarketplaceListingFolders(mFilterListingFoldersOnly);
+ panel = (LLInventoryPanel*)tabs_panel->getPanelByName("Unassociated Items");
+ panel->getFilter().setFilterMarketplaceListingFolders(mFilterListingFoldersOnly);
+ }
+}
+
+bool LLPanelMarketplaceListings::onViewSortMenuItemCheck(const LLSD& userdata)
+{
+ std::string chosen_item = userdata.asString();
+
+ if ((chosen_item == "sort_by_stock_amount") || (chosen_item == "sort_by_name") || (chosen_item == "sort_by_recent"))
+ {
+ if (chosen_item == "sort_by_stock_amount")
+ {
+ return (mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_WEIGHT);
+ }
+ else if (chosen_item == "sort_by_name")
+ {
+ return (mSortOrder & LLInventoryFilter::SO_FOLDERS_BY_NAME);
+ }
+ else if (chosen_item == "sort_by_recent")
+ {
+ return (mSortOrder & LLInventoryFilter::SO_DATE);
+ }
+ }
+ else if (chosen_item == "show_only_listing_folders")
+ {
+ return mFilterListingFoldersOnly;
+ }
+ return false;
+}
+
+///----------------------------------------------------------------------------
+/// LLMarketplaceListingsAddedObserver helper class
+///----------------------------------------------------------------------------
+
+class LLMarketplaceListingsAddedObserver : public LLInventoryCategoryAddedObserver
+{
+public:
+ LLMarketplaceListingsAddedObserver(LLFloaterMarketplaceListings * marketplace_listings_floater)
+ : LLInventoryCategoryAddedObserver()
+ , mMarketplaceListingsFloater(marketplace_listings_floater)
+ {
+ }
+
+ void done()
+ {
+ for (cat_vec_t::iterator it = mAddedCategories.begin(); it != mAddedCategories.end(); ++it)
+ {
+ LLViewerInventoryCategory* added_category = *it;
+
+ LLFolderType::EType added_category_type = added_category->getPreferredType();
+
+ if (added_category_type == LLFolderType::FT_MARKETPLACE_LISTINGS)
+ {
+ mMarketplaceListingsFloater->initializeMarketPlace();
+ }
+ }
+ }
+
+private:
+ LLFloaterMarketplaceListings * mMarketplaceListingsFloater;
+};
+
+///----------------------------------------------------------------------------
+/// LLFloaterMarketplaceListings
+///----------------------------------------------------------------------------
+
+LLFloaterMarketplaceListings::LLFloaterMarketplaceListings(const LLSD& key)
+: LLFloater(key)
+, mCategoriesObserver(NULL)
+, mCategoryAddedObserver(NULL)
+, mRootFolderId(LLUUID::null)
+, mInventoryStatus(NULL)
+, mInventoryInitializationInProgress(NULL)
+, mInventoryPlaceholder(NULL)
+, mInventoryText(NULL)
+, mInventoryTitle(NULL)
+, mPanelListings(NULL)
+, mPanelListingsSet(false)
+{
+ //buildFromFile("floater_marketplace_listings.xml");
+ mFactoryMap["panel_marketplace_listing"] = LLCallbackMap([&](void*) { return mPanelListings = new LLPanelMarketplaceListings; });
+ LLUICtrlFactory::instance().buildFloater(this, "floater_marketplace_listings.xml", &getFactoryMap());
+}
+
+LLFloaterMarketplaceListings::~LLFloaterMarketplaceListings()
+{
+ if (mCategoriesObserver && gInventory.containsObserver(mCategoriesObserver))
+ {
+ gInventory.removeObserver(mCategoriesObserver);
+ }
+ delete mCategoriesObserver;
+
+ if (mCategoryAddedObserver && gInventory.containsObserver(mCategoryAddedObserver))
+ {
+ gInventory.removeObserver(mCategoryAddedObserver);
+ }
+ delete mCategoryAddedObserver;
+}
+
+BOOL LLFloaterMarketplaceListings::postBuild()
+{
+ mInventoryStatus = getChild("marketplace_status");
+ mInventoryInitializationInProgress = getChild