Skip to content
Snippets Groups Projects
Commit e1714497 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Merge branch 'master' into sdl2

parents cf36b826 a1020c96
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 33 deletions
.gitignore
+ 1
− 7
View file @ e1714497
......@@ -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
......
autobuild.xml
+ 13
− 11
View file @ e1714497
......@@ -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>
......
indra/cmake/00-Common.cmake
+ 5
− 0
View file @ e1714497
......@@ -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()
......
indra/cmake/Copy3rdPartyLibs.cmake
+ 1
− 0
View file @ e1714497
......@@ -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
......
indra/cmake/WebP.cmake
+ 4
− 1
View file @ e1714497
......@@ -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)
......
indra/llcommon/is_approx_equal_fraction.h
+ 1
− 1
View file @ e1714497
......@@ -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
......
indra/llcommon/llsdserialize.cpp
+ 10
− 8
View file @ e1714497
......@@ -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;
......
indra/llcommon/llsdserialize_xml.cpp
+ 5
− 4
View file @ e1714497
......@@ -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;
}
......
indra/llui/lldockcontrol.cpp
+ 6
− 1
View file @ e1714497
......@@ -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()
......
indra/llui/lldockcontrol.h
+ 1
− 0
View file @ e1714497
......@@ -84,6 +84,7 @@ class LLDockControl
bool mDockWidgetVisible;
DocAt mDockAt;
LLHandle<LLView> mDockWidgetHandle;
LLHandle<LLView> mNonToolbarPanelHandle;
LLRect mPrevDockRect;
LLRect mRootRect;
LLRect mFloaterRect;
......
indra/newview/viewer_manifest.py
+ 2
− 0
View file @ e1714497
......@@ -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")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment