diff --git a/.gitignore b/.gitignore
index 0b55cb00aa9136febb23c6f8fc6a1dd90fb16c68..5368cd01e9fcd1476ffa7de98b653adc529b8133 100755
--- a/.gitignore
+++ b/.gitignore
@@ -17,13 +17,7 @@ debian/files
debian/secondlife-appearance-utility*
debian/secondlife-viewer*
indra/.distcc
-build-vc80/
-build-vc100/
-build-vc120/
-build-vc120-32/
-build-vc120-64/
-build-vc150-32/
-build-vc150-64/
+build-vc*
indra/CMakeFiles
indra/build-vc[0-9]*
indra/lib/mono/1.0/*.dll
diff --git a/autobuild.xml b/autobuild.xml
index 9bc40a50ed16ad2c7e4f049d435e9731a7ee4162..bd8b4304f7ff4b1f17420c395d0721f4e769e4d9 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1840,11 +1840,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3de8bf840cde51ec061ae1c12e39b620</string>
+ <string>9a13d5b3d5a4a038175461defb801963</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/tmpanext/libwebp-1.1.0.200900053-windows-200900053.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/libwebp/windows/libwebp-1.1.0.304-windows-304.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1854,18 +1854,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0063c0a3053b222014b6bec37a1311d4</string>
+ <string>85c1623e1d7bdf36cc3c7eb937749ea7</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/tmpanext/libwebp-1.1.0.200900052-windows64-200900052.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/libwebp/windows64/libwebp-1.1.0.304-windows64-304.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>1.1.0.202202257</string>
+ <string>1.1.0.304</string>
</map>
<key>libxml2</key>
<map>
@@ -2610,9 +2610,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>222a406ecb4071a9cc9635353afa337e</string>
+ <string>708d1abea051d34a8c40290bb052393e</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54977/511775/openjpeg-1.5.1.538970-windows-538970.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/openjpeg/windows/openjpeg-1.5.1.309-windows-309.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2622,18 +2624,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>07cff9eafaecfbe6f44e2a05b3465cae</string>
+ <string>590b392ce88b34645f6068e4a02ea44f</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/tmpanext/openjpeg-1.5.1.200900057-windows64-200900057.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/openjpeg/windows64/openjpeg-1.5.1.309-windows64-309.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>1.5.1</string>
+ <string>1.5.1.309</string>
</map>
<key>openssl</key>
<map>
@@ -3663,7 +3665,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>windows</key>
<map>
<key>build_directory</key>
- <string>build-vc${AUTOBUILD_VSVER|150}-$AUTOBUILD_ADDRSIZE</string>
+ <string>build-vc-$AUTOBUILD_ADDRSIZE</string>
<key>configurations</key>
<map>
<key>RelWithDebInfo</key>
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 061be9c358d554ce1fdf8bd32b6c9182bc9c2a32..5f244f5b8fa0d6ee6a07072ffbec2f72b0b97c6c 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -180,6 +180,11 @@ if (WINDOWS)
/DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
)
+ # library linkage defines
+ add_definitions(
+ /DWEBP_DLL
+ )
+
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
add_definitions(-DBOOST_USE_WINDOWS_H)
endif()
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a37ebd193b9e79aeac5326c3e5857ae2b563a196..49a10c512475528fa28abc7638f23b303e122b1f 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -62,6 +62,7 @@ if(WINDOWS)
glod.dll
libhunspell.dll
epoxy-0.dll
+ libwebp.dll
)
# Filenames are different for 32/64 bit BugSplat file and we don't
diff --git a/indra/cmake/WebP.cmake b/indra/cmake/WebP.cmake
index 6105b10d55c05daa823059bd9306a8c975ed01dd..3795cec31320c08e3365150595cd59f5022b16df 100644
--- a/indra/cmake/WebP.cmake
+++ b/indra/cmake/WebP.cmake
@@ -9,7 +9,10 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
use_prebuilt_binary(libwebp)
if (WINDOWS)
- set(WEBP_LIBRARIES libwebp)
+ set(WEBP_LIBRARIES
+ debug libwebp_debug_dll
+ optimized libwebp_dll
+ )
set(WEBP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/webp)
elseif(DARWIN)
set(WEBP_LIBRARIES webp)
diff --git a/indra/llcommon/is_approx_equal_fraction.h b/indra/llcommon/is_approx_equal_fraction.h
index 4a9b2e2725f58bfc69b65cc1a01d702855a926d9..6a567c78cb2fa7c9e582bdeae15ccf0e0ebe0d66 100644
--- a/indra/llcommon/is_approx_equal_fraction.h
+++ b/indra/llcommon/is_approx_equal_fraction.h
@@ -49,7 +49,7 @@ inline BOOL is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
FTYPE diff = (FTYPE) fabs(x - y);
S32 diffInt = (S32) diff;
- S32 diffFracTolerance = (S32) ((diff - (FTYPE) diffInt) * (1 << frac_bits));
+ S32 diffFracTolerance = (S32) ((diff - (FTYPE) diffInt) * (1U << frac_bits));
// if integer portion is not equal, not enough bits were used for packing
// so error out since either the use case is not correct OR there is
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 94d1141e1fa35249d5f75a4907546554a4994019..22b24a06b4f644078a83997d306914c9f3f4ef99 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -1296,15 +1296,16 @@ S32 LLSDNotationFormatter::format_impl(const LLSD& data, std::ostream& ostr,
}
bool need_comma = false;
- std::map<std::string, LLSD> sorted_map(data.beginMap(), data.endMap());
- for(const auto& out_pair : sorted_map)
+ LLSD::map_const_iterator iter = data.beginMap();
+ LLSD::map_const_iterator end = data.endMap();
+ for(; iter != end; ++iter)
{
if(need_comma) ostr << ",";
need_comma = true;
ostr << post << inner_pre << '\'';
- serialize_string(out_pair.first, ostr);
+ serialize_string((*iter).first, ostr);
ostr << "':";
- format_count += format_impl(out_pair.second, ostr, options, level + 2);
+ format_count += format_impl((*iter).second, ostr, options, level + 2);
}
ostr << post << pre << "}";
break;
@@ -1452,12 +1453,13 @@ S32 LLSDBinaryFormatter::format_impl(const LLSD& data, std::ostream& ostr,
ostr.put('{');
U32 size_nbo = htonl(data.size());
ostr.write((const char*)(&size_nbo), sizeof(U32));
- std::map<std::string, LLSD> sorted_map(data.beginMap(), data.endMap());
- for (const auto& out_pair : sorted_map)
+ LLSD::map_const_iterator iter = data.beginMap();
+ LLSD::map_const_iterator end = data.endMap();
+ for(; iter != end; ++iter)
{
ostr.put('k');
- formatString(out_pair.first, ostr);
- format_count += format_impl(out_pair.second, ostr, options, level+1);
+ formatString((*iter).first, ostr);
+ format_count += format_impl((*iter).second, ostr, options, level+1);
}
ostr.put('}');
break;
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index e3289fafeb781deddc664c184107e5d2642a3dfb..4a6a4a02fa699904cb6d0cdff347d22b32ffae7b 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -96,11 +96,12 @@ S32 LLSDXMLFormatter::format_impl(const LLSD& data, std::ostream& ostr,
else
{
ostr << pre << "<map>" << post;
- std::map<std::string, LLSD> sorted_map(data.beginMap(), data.endMap());
- for(const auto& out_pair : sorted_map)
+ LLSD::map_const_iterator iter = data.beginMap();
+ LLSD::map_const_iterator end = data.endMap();
+ for(; iter != end; ++iter)
{
- ostr << pre << "<key>" << escapeString(out_pair.first) << "</key>" << post;
- format_count += format_impl(out_pair.second, ostr, options, level + 1);
+ ostr << pre << "<key>" << escapeString((*iter).first) << "</key>" << post;
+ format_count += format_impl((*iter).second, ostr, options, level + 1);
}
ostr << pre << "</map>" << post;
}
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
index bd42497cb66b8957f7a07bd3df7d3e0a1a03a508..7ef2b9822ce10525666f93652182a1e225c87927 100644
--- a/indra/llui/lldockcontrol.cpp
+++ b/indra/llui/lldockcontrol.cpp
@@ -74,6 +74,8 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater,
{
mDockWidgetVisible = false;
}
+
+ mNonToolbarPanelHandle = dockableFloater->getRootView()->getChild<LLView>("non_toolbar_panel")->getHandle();
}
LLDockControl::~LLDockControl()
@@ -97,7 +99,10 @@ void LLDockControl::setDock(LLView* dockWidget)
void LLDockControl::getAllowedRect(LLRect& rect)
{
- rect = mDockableFloater->getRootView()->getChild<LLView>("non_toolbar_panel")->getRect();
+ if (!mNonToolbarPanelHandle.isDead())
+ {
+ rect = mNonToolbarPanelHandle.get()->getRect();
+ }
}
void LLDockControl::repositionDockable()
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h
index 98a9c7236d79ca9788cee21ba55f7933d55331f9..140e82fbdf8990bdbf1aebf0dd9c8dfc6d4f5a30 100644
--- a/indra/llui/lldockcontrol.h
+++ b/indra/llui/lldockcontrol.h
@@ -84,6 +84,7 @@ class LLDockControl
bool mDockWidgetVisible;
DocAt mDockAt;
LLHandle<LLView> mDockWidgetHandle;
+ LLHandle<LLView> mNonToolbarPanelHandle;
LLRect mPrevDockRect;
LLRect mRootRect;
LLRect mFloaterRect;
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d46c774e5659f9f901d8369a027631130f70001b..277b38c48a379fe152dadf09ee1afff9e905078e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -529,6 +529,8 @@ def construct(self):
# For OpenGL extensions
self.path("epoxy-0.dll")
+ self.path("libwebp.dll")
+
# SLVoice executable
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
self.path("SLVoice.exe")