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

Merge Firestorm LGPL

meow-7.2.2
Ansariel 2018-05-25 22:06:51 +02:00
parent e97c25531c 82afd1628a
commit c5709bc91d
26 changed files with 554 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.hgpatchinfo/.RLVa.dep
View File

1
.hgpatchinfo/Appearance-Misc.dep
View File

@ -1 +0,0 @@
4ef383e7a5cdbf1dedd7458a56a9d13ebb7fddf2

21
.hgpatchinfo/Appearance-Misc.desc
View File

@ -1,21 +0,0 @@
[Appearance/Misc]
- fixed : LLAppearanceMgr::filterWearableItems() doesn't properly filter body parts
- fixed : LLWearableList::processGetAssetReply() creates multiple LLWearable instances for the same asset UUID
-> fix for http://jira.secondlife.com/browse/VWR-20608
- fixed : attachments sometimes detach only to instantly get reattached after logon
- fixed : Add to/Replace Outfit removes newly worn attachments on completion
-> fix for http://jira.secondlife.com/browse/VWR-18512
- fixed : attachments that attach and then instantly detach don't have their COF link removed
- fixed : multiple LLWearableHoldingPattern instances lead to "COF corruption"
- fixed : get_is_item_worn() shouldn't make the assumption that items in COFs are always worn
- fixed : drag-and-drop wear behaviour of an attachment onto self isn't consistant with the drag-and-drop behaviour of wearables
-> normal-drop : replace wear
-> Ctrl-drop : add wear
- fixed : LLAppearanceMgr::registerAttachment() fails to (re)add a link for worn attachments that aren't linked to in COF at log-on
- fixed : LLViewerObject::getAttachmentItemID() sometimes returns the NULL UUID for the avatar's own attachments
- fixed : LLAppearanceMgr::updateAppearanceFromCOF() doesn't properly filter items collected from folder links
-> create an outfit with a folder link + "Replace Outfit" == wearables that exist in both COF and the linked folder will end up worn multiple times
- changed : enable "Replace Current Outfit" on the base outfit if it's marked dirty
- changed : "RenderUnloadedAvatar" no longer affects the user's own avatar
-> side-effect of the fix above due to the change to LLVOAvatar::isFullyLoaded()
- added : InitialWearablesLoadedSignal signal which is emitted *once* when the initial wearables are loaded

1
.hgpatchinfo/Appearance-MixedViewers.dep
View File

@ -1 +0,0 @@
23a6fee23f1d6a2432201906d41e80f3471e8700

5
.hgpatchinfo/Appearance-MixedViewers.desc
View File

@ -1,5 +0,0 @@
[Appearance/MixedViewers]
- fixed : "Worn items in Viewer 2 and Viewer 1.x aren't synchronized" [see http://jira.secondlife.com/browse/VWR-17594]
-> current fix compares *only* the wearables in COF with the wearables specified by AgentWearablesUpdate
-> controlled by "VerifyInitialWearables" (defaults to FALSE with SL-3.0)
- fixed : minor memory leak in LLInitialWearablesFetch::processWearablesMessage()

1
.hgpatchinfo/Chat-NearbyChat.dep
View File

@ -1 +0,0 @@
d370e6c8ece17733128371a4d0eeaff9ebb52c7f

7
.hgpatchinfo/Chat-NearbyChat.desc
View File

@ -1,7 +0,0 @@
[Chat/NearbyChat]
- added : (user-resizable) multi-line chat bar to the nearby chat floater
- added : "NearbyChatFloaterBarType" setting to control the appearance of the chat bar in the nearby chat floater
-> 0 - legacy, now single line; 1 - single line (default); 2 - multi line (can be toggled at run-time)
- added : Shift+Enter to whisper from the chatbar(s)
- added : "NearbyChatFloaterWindow" setting to optionally embed the nearby chat floater in the tabbed conversations floater
- added : "save_tearoff_state" for floaters to track the torn off state of LLMultiFloater hosted floaters across viewer sessions

1
.hgpatchinfo/Misc-Spellcheck.dep
View File

@ -1 +0,0 @@
5697118601ade0f70f851639661ba637174b3024

1
.hgpatchinfo/RLVa.dep
View File

@ -1 +0,0 @@
a2a692a4b575df65deec805e8eae2a9c84985855

1
.hgpatchinfo/UI-Base.dep
View File

@ -1 +0,0 @@
ea427b73d98383faebb9d0209b753dc71b846676

6
.hgpatchinfo/UI-Base.desc
View File

@ -1,6 +0,0 @@
[UI/Base]
- added : static registration of an LLPanel derived class with a custom class creator
-> used in the UI-SidepanelOutfits patch branch
- added : registration of an LLFloater derived class with a callback for the XML filename
-> used in the Chat-Misc patch branch
-> used in the Chat-NearbyChat patch branch

1
.hgpatchinfo/Viewer-Build.dep
View File

@ -1 +0,0 @@
43f5dc9c781eb7528a08abd58b2e4fea6ff1838e

10
.hgpatchinfo/Viewer-Build.desc
View File

@ -1,10 +0,0 @@
[Viewer/Build]
* Changed compiler options for "Release with Debug" builds
* Changed compiler and linker options for "Release" builds
* Removed LL's changeset tags and added new (consistent) SL-X.Y.Z tags for releases
* Break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds
-> Windows only
* CATZ-234: Updated FMOD Ex library to v4.44.61 (Windows)
* CATZ-232: Updated OpenJPEG library to v1.5.2 (Windows)
* [FIXED] Viewer fails to compile with only the Windows 8 SDK installed
* [FIXED] JpegLib is built with "Whole Program Optimization" and causing slow linker performance

21
.hgpatchinfo/World-Minimap.desc
View File

@ -1,21 +0,0 @@
[World/Minimap]
- added : "MiniMapObjects" setting to control the rendering of objects on the minimap
-> enabled by default
- added : property line overlay on the minimap
- added : "Property Lines" context menu option on the mini-map to toggle showing property lines
-> controls 'MiniMapPropertyLines' setting, defaults to on
- added : (optionally) use world map tile texture for the mini-map region texture
- added : "Terrain Textures" as an option to the mini-map "Show" context menu
-> with "Terrain Textures" and "World Map Textures" as separated options it will hopefully become clearer what the texture option entails
- added : (optionally) show for-sale parcels with a yellow highlight on the mini-map
-> controlled by 'MiniMapForSaleParcels', defaults to off
- added : colour collision parcels a transparent red
-> controlled by 'MiniMapCollisionParcels', defaults to on
- added : user-configurable "MiniMapParcelOverylay" color for the property lines on the mini-map
- added : "Place Profile" menu item to the mini-map context menu
- added : "View Profile" context menu item for singular and context sub-menu for multiple dots on the mini-map
- changed : removed title bar from the mini-map + fixed vertical centering of directions
- changed : moved mini-map zoom options into a "Zoom" sub-menu
- changed : mini-map zoom levels for "Close", "Medium" and "Far" options
-> removed dead code in LLFloaterMap::handleZoom()
- changed : only show the "Stop Tracking" mini-map context menu item if we're actually tracking something

66
autobuild.xml
View File

@ -3,6 +3,36 @@
<map>
<key>installables</key>
<map>
<key>dullahan-gcc5</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2017, Linden Research, Inc.</string>
<key>description</key>
<string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
<key>license</key>
<string>MPL</string>
<key>license_file</key>
<string>LICENSES/LICENSE.txt</string>
<key>name</key>
<string>dullahan-gcc5</string>
<key>platforms</key>
<map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>cffd8a7f9d8e55ecd50c72cc39b41f3d</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/dullahan_gcc5-1.1.1080_3.3325.1750.gaabe4c4-linux64-181420123.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
<key>version</key>
<string>1.1.1080_3.3325.1750.gaabe4c4</string>
</map>
<key>ndPhysicsStub</key>
<map>
<key>license</key>
@ -156,9 +186,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2dd97d8bd012be4cdc58f550395feb7d</string>
<string>ff2e4df5bffe0203dc654b111347e617</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux-180871815.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux-181412059.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -168,9 +198,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>608dfd27f7aed9d57cf1f581c995b680</string>
<string>64c1dff0e19792acec7fd32556bf4d7b</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux64-180841947.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux64-181411635.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -882,11 +912,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9f69c9fa0932d54d17c159fc33faea87</string>
<string>5946db540ecd6da093d15c7f793359f9</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-1.10.04-darwin-180681405.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-1.10.05-darwin-181440931.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -896,11 +926,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a379240b46b13b2b9e858baa79d1a6ab</string>
<string>32c7ddbc7a5134c849c8c58323dac1cd</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-1.10.04-linux-180891813.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-1.10.05-linux-181440917.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -910,11 +940,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>e0b59ec3b5549b9a0f9caf8c7116af4e</string>
<string>eb04055057a549ac778c7f1391963dfe</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-1.10.04-linux64-180891838.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-1.10.05-linux64-181440918.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -924,11 +954,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>7cf0785fa38889c9028fe776eda060f6</string>
<string>79dca4b585181c18f983cb3adc4f9633</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.04-windows-180672209.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.05-windows-181432216.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -938,11 +968,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>fe0951c7fffbf1cd0154bcdb5bcaa5c9</string>
<string>9e2a8fa5e4bdb0a1eba8be3717029c31</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.04-windows64-180672211.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.05-windows64-181432218.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@ -2828,9 +2858,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>86cb59b79ce0aafe28d4055a17d1f748</string>
<string>c5404596040e5f6e66a09a6de5edeefa</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3.180871824-linux-180871824.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3.181412109-linux-181412109.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -2840,9 +2870,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>4df349abfc942fb8e674244d1bd0a515</string>
<string>774e6a85deb149309f1ccf59d2f5c5a4</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3.180841957-linux64-180841957.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3.181411657-linux64-181411657.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>

5
indra/cmake/CEFPlugin.cmake
View File

@ -6,7 +6,12 @@ if (USESYSTEMLIBS)
set(CEFPLUGIN OFF CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.")
else (USESYSTEMLIBS)
if (LINUX AND ( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9.4 ) )
message( "Using dullahan for GCC >= 5 " )
use_prebuilt_binary(dullahan-gcc5)
else()
use_prebuilt_binary(dullahan)
endif()
set(CEFPLUGIN ON CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.")
set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)

815
indra/newview/fsfloatersearch.cpp
View File

File diff suppressed because it is too large Load Diff

13
indra/newview/llviewercontrol.cpp
View File

@ -199,18 +199,7 @@ static bool handleAvatarHoverOffsetChanged(const LLSD& newvalue)
{
if (isAgentAvatarValid())
{
// <FS:Ansariel> [Legacy bake]
//gAgentAvatarp->setHoverIfRegionEnabled();
if (gAgent.getRegion()->avatarHoverHeightEnabled())
{
LLVector3 avOffset(0.0f, 0.0f, llclamp<F32>(newvalue.asReal(), MIN_HOVER_Z, MAX_HOVER_Z));
gAgentAvatarp->setHoverOffset(avOffset, true);
}
else if (!gAgentAvatarp->isUsingServerBakes())
{
gAgentAvatarp->computeBodySize();
}
// </FS:Ansariel> [Legacy bake]
gAgentAvatarp->setHoverIfRegionEnabled();
}
return true;
}

6
indra/newview/llvoavatarself.cpp
View File

@ -296,6 +296,12 @@ void LLVOAvatarSelf::setHoverIfRegionEnabled()
setHoverOffset(LLVector3(0.0, 0.0, llclamp(hover_z,MIN_HOVER_Z,MAX_HOVER_Z)));
LL_INFOS("Avatar") << avString() << " set hover height from debug setting " << hover_z << LL_ENDL;
}
// <FS:Ansariel> [Legacy bake]
else if (!isUsingServerBakes())
{
computeBodySize();
}
// </FS:Ansariel> [Legacy bake]
else
{
setHoverOffset(LLVector3(0.0, 0.0, 0.0));

5
indra/newview/skins/default/xui/es/strings.xml
View File

@ -34,7 +34,7 @@
Error de inicialización de gráficos. Actualiza tu controlador de gráficos.
</string>
<string name="AboutHeader">
[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) ([CHANNEL])
[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL] [ADDRESS_SIZE]bit)
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
<string name="BuildConfig">
@ -64,10 +64,11 @@ Tarjeta gráfica: [GRAPHICS_CARD]
Versión de OpenGL: [OPENGL_VERSION]
</string>
<string name="AboutLibs">
RestrainedLove API: [RLV_VERSION]
Versión de libcurl: [LIBCURL_VERSION]
Versión de J2C Decoder: [J2C_VERSION]
Versión de Audio Driver: [AUDIO_DRIVER_VERSION]
[LIBCEF_VERSION]
[LIBCEF_VERSION]
Versión LibVLC: [LIBVLC_VERSION]
Versión del servidor de voz: [VOICE_VERSION]
</string>

2
indra/newview/skins/default/xui/pl/floater_buy_land.xml
View File

@ -210,7 +210,7 @@ Działka ta zawiera 512 m² ziemi.
<text name="currency_balance">
Masz 2,100 L$.
</text>
<check_box label="Usuń [AMOUNT] m² z kontrybucji w grupie." name="remove_contribution"/>
<button label="Zakup" name="buy_btn"/>
<check_box label="Usuń [AMOUNT] m² z kontrybucji w grupie." name="remove_contribution"/>
<button label="Anuluj" name="cancel_btn"/>
</floater>

1
indra/newview/skins/default/xui/pl/menu_viewer.xml
View File

@ -390,7 +390,6 @@
<menu_item_check label="Pokaż macierze" name="Show Matrices"/>
<menu_item_check label="Pokaż kolor pod kursorem" name="Show Color Under Cursor"/>
<menu_item_check label="Pokaż pamięć" name="Show Memory"/>
<menu_item_check label="Pokaż informacje o pamięci prywatnej" name="Show Private Mem Info"/>
<menu_item_check label="Pokaż aktualizacje obiektów" name="Show Updates"/>
</menu>
<menu label="Wymuś błąd" name="Force Errors">

8
indra/newview/skins/default/xui/pl/notifications.xml
View File

@ -3437,14 +3437,10 @@ Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim r
<usetemplate name="okignore" ignoretext="Ostrzegaj mnie, gdy przeglądarka nie może połączyć się z serwerem głosu" />
</notification>
<notification name="NoVoiceConnect-GIAB">
Nie możemy połączyć się z serwerem głosowym.
Porty, które muszą być otwarte dla połączeń głosowych, to:
:TCP: 80, 443
:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
Występuje problem z Twoim połączeniem głosowym.
Komunikacja głosowa nie będzie dostępna.
Proszę sprawdź swoją sieć i ustawienia firewall.
Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim routerze.
[http://wiki.phoenixviewer.com/fs_voice Więcej wskazówek można znaleźć tutaj]
</notification>

3
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -269,8 +269,7 @@ Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
</string>
<string name="LoginFailedPendingLogout">
System w tej chwili Cię wylogowywuje.
Twoje konto będzie niedostępne do
[TIME] czasu pacyficznego.
Poczekaj chwilę, zanim spróbujesz zalogować się ponownie.
</string>
<string name="LoginFailedUnableToCreateSession">
Nie można utworzyć poprawnej sesji.

5
indra/newview/skins/default/xui/ru/strings.xml
View File

@ -41,7 +41,7 @@
Инициализация графики не удалась. Пожалуйста, обновите драйвер видеокарты!
</string>
<string name="AboutHeader">
[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([ADDRESS_SIZE]bit) ([CHANNEL]) [BUILD_TYPE]
[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL] [ADDRESS_SIZE]bit)
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
<string name="BuildConfig">
@ -75,13 +75,14 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
Версия libcurl: [LIBCURL_VERSION]
Версия декодера J2C: [J2C_VERSION]
Версия аудиодрайвера: [AUDIO_DRIVER_VERSION]
[LIBCEF_VERSION]
[LIBCEF_VERSION]
Версия LibVLC: [LIBVLC_VERSION]
Версия речевого сервера: [VOICE_VERSION]
</string>
<string name="AboutSettings">
Режим настроек: [MODE]
Графическое оформление: [SKIN] ([THEME])
Window size: [WINDOW_WIDTH]x[WINDOW_HEIGHT] px
Используемый шрифт: [FONT] ([FONT_SCREEN_DPI])
Размер шрифта: [FONT_SIZE] pt
Масштаб UI: [UI_SCALE_FACTOR]

2
indra/newview/viewer_manifest.py
View File

@ -2039,7 +2039,7 @@ class LinuxManifest(ViewerManifest):
self.path("featuretable_linux.txt")
with self.prefix(src=pkgdir,dst=""):
with self.prefix(src=pkgdir,dst="bin"):
self.path("ca-bundle.crt")
if self.is_packaging_viewer():