livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 

# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llpanelprofile.cpp
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/viewer_manifest.py
master
Ansariel 2022-10-04 14:17:44 +02:00
parent 567ab00ac9 d6e8a9109e
commit 7b2fa92f0e
7 changed files with 787 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@ -2708,9 +2708,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>53966a7ba6342395acb7ce15bc3fbe0a</string>
<string>6bb03fe0b9dd44d3850ae9cae2161d76</string>
<key>url</key>
<string>http://3p.firestormviewer.org/openjpeg-2.3.1.203000304-darwin-203000304.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105416/922669/openjpeg-2.5.0.575468-darwin64-575468.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -2732,9 +2732,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>ba2034b4a372fd46c3e09f56bede38a7</string>
<string>a01d66d72d7c865364cd5761e56e8735</string>
<key>url</key>
<string>http://3p.firestormviewer.org/openjpeg-2.4.0.211361403-windows-211361403.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105418/922681/openjpeg-2.5.0.575468-windows-575468.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -2744,16 +2744,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>d7ac606703a9330a2d8a3f7276cb6894</string>
<string>8bd727bc7d6e0e6223e9ea49c14dd511</string>
<key>url</key>
<string>http://3p.firestormviewer.org/openjpeg-2.4.0.211361407-windows64-211361407.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105419/922682/openjpeg-2.5.0.575468-windows64-575468.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.4.0</string>
<string>2.5.0.575468</string>
</map>
<key>openssl</key>
<map>

2
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -250,7 +250,7 @@ elseif(LINUX)
${EXPAT_COPY}
libhunspell-1.3.so.0.0.0
libopenal.so
#libopenjpeg.so
libopenjp2.so
libuuid.so.16
libuuid.so.16.0.22
libfontconfig.so.1.8.0

5
indra/cmake/FindOpenJPEG.cmake
View File

@ -9,16 +9,17 @@
# also defined, but not for general use are
# OPENJPEG_LIBRARY, where to find the OpenJPEG library.
FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
FIND_PATH(OPENJPEG_INCLUDE_DIR openjp2.h
/usr/local/include/openjpeg-2.1
/usr/local/include/openjpeg
/usr/local/include
/usr/include/openjpeg-2.1
/usr/include/openjpeg
/usr/include
include/openjpeg
)
SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg openjp2)
SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjp2)
FIND_LIBRARY(OPENJPEG_LIBRARY
NAMES ${OPENJPEG_NAMES}
PATHS /usr/lib /usr/local/lib

3
indra/cmake/OpenJPEG.cmake
View File

@ -8,8 +8,7 @@ if (USESYSTEMLIBS)
include(FindOpenJPEG)
else (USESYSTEMLIBS)
use_prebuilt_binary(openjpeg)
set(OPENJPEG_LIBRARIES openjp2)
set(OPENJPEG_LIBRARIES openjp2)
set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg)
endif (USESYSTEMLIBS)

1558
indra/llimagej2coj/llimagej2coj.cpp
View File

File diff suppressed because it is too large Load Diff

2
indra/newview/llpanelprofile.cpp
View File

@ -1589,6 +1589,8 @@ void LLPanelProfileSecondLife::fillRightsData()
void LLPanelProfileSecondLife::fillAgeData(const LLDate &born_on)
{
// <FS:Ansariel> Fix LL UI/UX design accident
//// Date from server comes already converted to stl timezone,
//// so display it as an UTC + 0
//std::string name_and_date = getString("date_format");
//LLSD args_name;
//args_name["datetime"] = (S32)born_on.secondsSinceEpoch();

2
indra/newview/viewer_manifest.py
View File

@ -2154,7 +2154,7 @@ class Linux_i686_Manifest(LinuxManifest):
self.path("libdirectfb-1.*.so.*")
self.path("libfusion-1.*.so.*")
self.path("libdirect-1.*.so.*")
self.path("libopenjpeg.so*")
self.path("libopenjp2.so*")
self.path("libdirectfb-1.4.so.5")
self.path("libfusion-1.4.so.5")
self.path("libdirect-1.4.so.5*")