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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 

# Conflicts:
#	indra/newview/llviewergenericmessage.cpp
master
Ansariel 2023-11-01 13:44:17 +01:00
parent 6c389316f1 019d2c6a0c
commit 34d2a78898
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README_BUILD_FIRESTORM_WINDOWS.txt
View File

@ -2,11 +2,11 @@ Before you start configuring your Windows build system, be aware of our tested c
Memory: You will need at least 2GB RAM, 4GB strongly recommended.
CPU: Multiple CPUs are strongly recommended.
A build can take over an hour.
Visual Studio 2017 Community Edition.
Visual Studio 2017/2022 Community Edition.
Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help
compiling Firestorm, make sure you can build the Second Life viewer first. If you try and skip this step, you may
receive much less help. http://wiki.secondlife.com/wiki/Visual_Studio_2013_Viewer_Builds
receive much less help. https://wiki.secondlife.com/wiki/Build_the_Viewer_on_Windows
If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself.
If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into:
@ -20,11 +20,11 @@ mailing list. We've created a non-KDU build target to make this easier. Everywhe
"ReleaseFS_open" instead. This will perform the same build, using OpenJpeg instead of KDU.
To build Firestorm:
To build Firestorm - a more detailed instruction can be found at https://wiki.firestormviewer.org/fs_compiling_firestorm_windows:
Open a CMD shell and navigating to your firestorm code repo:
autobuild build -c ReleaseFS
autobuild build -A 64 -c ReleaseFS
Other build targets you may use are:
@ -33,22 +33,18 @@ Other build targets you may use are:
RelWithDebInfoFS_open (no KDU, no FMOD)
Other examples:
autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure
autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure
autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel
autobuild configure -A 64 -c ReleaseFS # basic configuration step, don't build, just configure
autobuild configure -A 64 -c ReleaseFS -- --clean # clean the output area first, then configure
autobuild configure -A 64 -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel
autobuild build -c ReleaseFS --no-configure # default quick rebuild
autobuild build -A 64 -c ReleaseFS --no-configure # default quick rebuild
If you want to set custom configuration, do this in the configure step separately from build, then run "autobuild
build -c ReleaseFS --no-configure" as a secondary step.
If you want to build the 64bit version, add the parameter -A 64 to the autobuild commands, e.g.:
autobuild configure -A 64 -c ReleaseFS
autobuild build -A 64 -c ReleaseFS --no-configure
build -A 64 -c ReleaseFS --no-configure" as a secondary step.
Logs:
Look for logs in build-vc150-32/logs for 32bit builds and build-vc150-64/logs for 64bit
Look for logs in build-vc1x0-64/logs
Output:
Look for output in build-vc150-32/newview/Release for 32bit builds and build-vc150-64/newview/Release for 64bit
Look for output in build-vc1x0-32/newview/Release

4
autobuild.xml
View File

@ -952,11 +952,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>8ee7c21f3f109cf4e1709e4af0b4bebf</string>
<string>bfcc4acbe6b8dddaf10f0f7a47e4aad8</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-2.02.17-darwin64-232401806.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-2.02.18-darwin64-232960129.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>

10
indra/newview/skins/vintage/xui/en/panel_main_inventory.xml
View File

@ -81,6 +81,16 @@
function="Floater.Toggle"
parameter="fs_protectedfolders" />
</menu_item_check>
<menu_item_check
label="Inventory settings..."
name="inv_settings">
<menu_item_check.on_check
function="Floater.Visible"
parameter="inventory_settings" />
<menu_item_check.on_click
function="Floater.Toggle"
parameter="inventory_settings" />
</menu_item_check>
<menu_item_separator />
<menu_item_check
label="Add objects on double click"