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

Merge Firestorm LGPL

meow-7.2.2
Ansariel 2019-03-25 17:56:44 +01:00
parent 10592f7856 ef44648b43
commit cdb7f1591c
26 changed files with 164 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
autobuild.xml
View File

@ -52,9 +52,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>cffd8a7f9d8e55ecd50c72cc39b41f3d</string>
<string>08358023ceab8b055af5c3594b3dcc2c</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/dullahan_gcc5-1.1.1080_3.3325.1750.gaabe4c4-linux64-181420123.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/dullahan_gcc5-1.1.1320_3.3626.1895.g7001d56-linux64-190811112.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -814,9 +814,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>118987b1a5b56214cfdbd0c763e180da</string>
<string>23aeaf23e7db2484a1850017141860dd</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -838,9 +838,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c01b1a180f6c12d00d359996ecd1cf52</string>
<string>607f824220ac11cdc7ae9b5297f5f57a</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1080_3.3325.1750.gaabe4c4-linux64-181051505.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1320_3.3626.1895.g7001d56-linux64-190811046.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -850,9 +850,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>acf7ce31ef174df000889516767b5a1d</string>
<string>71fa66203326aca918796e874976c080</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-181191512.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -862,16 +862,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>bcafca464648fb949f1b02edce0fb488</string>
<string>c7162e4805f50a3609f5dc63d0cf2bc0</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-181191514.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.1.1080_3.3325.1750.gaabe4c4</string>
<string>1.1.1320_3.3626.1895.g7001d56</string>
</map>
<key>elfio</key>
<map>
@ -1006,11 +1006,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>177f3e948368aa09803ffae0884acc12</string>
<string>d10a431d6dbd90f4ab900e4650e65b5c</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-1.10.10-darwin-183562214.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-1.10.12-darwin-190751902.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1034,11 +1034,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5b69c9bf9290ab643bbd810206490a44</string>
<string>30795e5ffa33613fa6397c9e33d18e42</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-1.10.11-linux64-190370442.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-1.10.12-linux64-190751836.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -1048,11 +1048,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a635ed64f929404f7735e733d08ebeb9</string>
<string>35fe52bc6b78ed954fe649c31df13a3c</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.11-windows-190371728.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.12-windows-190751143.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1062,18 +1062,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f4c6ad04419e9cd5f7010e879f8e1d7a</string>
<string>9329deb7581ed08b52a694975de2ae54</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.11-windows64-190371729.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.12-windows64-190751144.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.10.04</string>
<string>1.10.12</string>
</map>
<key>fmodex</key>
<map>
@ -2069,7 +2069,7 @@
</map>
</map>
<key>version</key>
<string>7.A.4</string>
<string>7.A.6</string>
</map>
<key>libhunspell</key>
<map>

12
indra/CMakeLists.txt
View File

@ -31,6 +31,9 @@ if (OPENSIM)
message("compiling with OpenSim support")
endif (SINGLEGRID)
else (OPENSIM)
if (SINGLEGRID)
message( WARNING "Value for SINGLEGRID is unused during Havok/SecondLife builds" )
endif()
message("compiling without OpenSim support")
endif (OPENSIM)
#</FS:AW optional opensim support>
@ -47,8 +50,12 @@ endif(TESTBUILD AND TESTBUILDPERIOD)
option(USE_AVX_OPTIMIZATION "AVX optimization support" OFF)
option(USE_AVX2_OPTIMIZATION "AVX2 optimization support" OFF)
if (USE_AVX_OPTIMIZATION)
add_definitions(-DUSE_AVX_OPTIMIZATION=1)
message("compiling with AVX optimizations")
if (USE_AVX2_OPTIMIZATION)
message(FATAL_ERROR "You cannot use AVX and AVX2 at the same time!")
else (USE_AVX2_OPTIMIZATION)
add_definitions(-DUSE_AVX_OPTIMIZATION=1)
message("compiling with AVX optimizations")
endif (USE_AVX2_OPTIMIZATION)
elseif (USE_AVX2_OPTIMIZATION)
add_definitions(-DUSE_AVX2_OPTIMIZATION=1)
message("compiling with AVX2 optimizations")
@ -81,7 +88,6 @@ if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
add_custom_target(viewer)
add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
add_subdirectory(${LIBS_OPEN_PREFIX}llui)

4
indra/cmake/NGHTTP2.cmake
View File

@ -9,7 +9,9 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(nghttp2)
if (WINDOWS)
set(NGHTTP2_LIBRARIES
${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
# <FS:Ansariel> ARCH_PREBUILT_DIRS_RELEASE is "." and would cause searching for the lib in the wrong place when not using VS
#${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
nghttp2.lib
)
elseif (DARWIN)
set(NGHTTP2_LIBRARIES libnghttp2.dylib)

12
indra/llcommon/llevents.h
View File

@ -582,11 +582,12 @@ public:
/// Generate a distinct name for a listener -- see listen()
static std::string inventName(const std::string& pfx="listener");
private:
friend class LLEventPumps;
/// flush queued events
virtual void flush() {}
private:
friend class LLEventPumps;
virtual void reset();
@ -675,12 +676,14 @@ public:
virtual ~LLEventMailDrop() {}
/// Post an event to all listeners
virtual bool post(const LLSD& event);
virtual bool post(const LLSD& event) override;
/// Remove any history stored in the mail drop.
virtual void flush() override { mEventHistory.clear(); LLEventStream::flush(); };
protected:
virtual LLBoundListener listen_impl(const std::string& name, const LLEventListener&,
const NameList& after,
const NameList& before);
const NameList& before) override;
private:
typedef std::list<LLSD> EventList;
@ -703,7 +706,6 @@ public:
/// Post an event to all listeners
virtual bool post(const LLSD& event);
private:
/// flush queued events
virtual void flush();

8
indra/llui/llurlentry.cpp
View File

@ -241,8 +241,14 @@ LLUrlEntryHTTP::LLUrlEntryHTTP()
: LLUrlEntryBase()
{
// <FS:Ansariel> FIRE-1715: Links using FTP protocol are not recognized
// <FS:ND> using \S causes FIRE-23012, the obvious strategy would be to update boost (viewer uses 1.57,
// current is 1.69 as of 2019-03-03).
// Unfortunately updating boost is not possible due to the viewer still relying on the old coroutine implementation.
// The second best solution is to use [^\s] for now
//mPattern = boost::regex("https?://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?",
mPattern = boost::regex("(https?|ftp)://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?",
//mPattern = boost::regex("(https?|ftp)://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/\\S*)?",
mPattern = boost::regex("(https?|ftp)://([^\\s/?\\.#]+\\.?)+\\.\\w+(:\\d+)?(/[^\\s]*)?",
// </FS:ND>
// </FS:Ansariel>
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_http.xml";

7
indra/llwindow/CMakeLists.txt
View File

@ -75,7 +75,7 @@ if (LINUX)
${LLMATH_LIBRARIES}
${LLRENDER_LIBRARIES}
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
#${LLWINDOW_LIBRARIES} # <FS:Ansariel> Don't link to itself - causes CMP0038
${LLXML_LIBRARIES}
${UI_LIBRARIES} # for GTK
${SDL_LIBRARY}
@ -187,11 +187,6 @@ endif (llwindow_HEADER_FILES)
list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
#<FS:TS> Turn off complaint about library linking to itself in Cmake 3
if(POLICY CMP0038)
cmake_policy(SET CMP0038 OLD)
endif(POLICY CMP0038)
add_library (llwindow
${llwindow_SOURCE_FILES}
${viewer_SOURCE_FILES}

1
indra/media_plugins/cef/media_plugin_cef.cpp
View File

@ -522,6 +522,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.webgl_enabled = true;
settings.log_file = mCefLogFile;
settings.log_verbose = mCefLogVerbose;
settings.autoplay_without_gesture = true;
std::vector<std::string> custom_schemes(1, "secondlife");
mCEFLib->setCustomSchemes(custom_schemes);

7
indra/newview/CMakeLists.txt
View File

@ -2540,9 +2540,10 @@ if (DARWIN)
# These all get set with PROPERTIES. It's not that the property names are
# magically known to CMake -- it's that these names are referenced in the
# Info-SecondLife.plist file in the configure_file() directive below.
set(product "${VIEWER_CHANNEL}")
set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}")
set(MACOSX_BUNDLE_INFO_STRING "${VIEWER_CHANNEL}")
#set(product "${VIEWER_CHANNEL}")
set(product "Firestorm")
set(MACOSX_EXECUTABLE_NAME "Firestorm")
set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer")
set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")

2
indra/newview/Info-Firestorm.plist
View File

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<string>${MACOSX_EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>

BIN
indra/newview/installers/windows/lang_pl.nsi
View File

Binary file not shown.

82
indra/newview/llvoavatar.cpp
View File

@ -211,9 +211,6 @@ const F32 NAMETAG_VERTICAL_SCREEN_OFFSET = 25.f;
const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.17f;
const U32 LLVOAvatar::VISUAL_COMPLEXITY_UNKNOWN = 0;
const F32 LLVOAvatar::VISUAL_COMPLEXITY_UPDATE_SECONDS = 10.0f;
const F32 VISUAL_COMPLEXITY_FRAC_CHANGE_THRESH = 0.05f; // Changes to self will not be displayed unless they exceed this fraction of previous value.
const F32 VISUAL_COMPLEXITY_ABS_CHANGE_THRESH = 1000; // ... and this absolute amount of change.
const F64 HUD_OVERSIZED_TEXTURE_DATA_SIZE = 1024 * 1024;
enum ERenderName
@ -10922,6 +10919,7 @@ void LLVOAvatar::idleUpdateRenderComplexity()
void LLVOAvatar::updateVisualComplexity()
{
LL_DEBUGS("AvatarRender") << "avatar " << getID() << " appearance changed" << LL_ENDL;
// Set the cache time to in the past so it's updated ASAP
mVisualComplexityStale = true;
}
@ -11090,13 +11088,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
// <FS:Ansariel> Disable useless diagnostics
//static std::set<LLUUID> all_textures;
// <FS:Beq> remove the timer based complexity updates
//bool needs_update = mVisualComplexityStale &&
// (mVisualComplexity==VISUAL_COMPLEXITY_UNKNOWN ||
// mVisualComplexityUpdateTimer.getElapsedTimeF32()>VISUAL_COMPLEXITY_UPDATE_SECONDS);
bool needs_update = mVisualComplexityStale;
if (needs_update)
if (mVisualComplexityStale)
{
// <FS:Ansariel> Show per-item complexity in COF
@ -11214,64 +11206,26 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
//}
// </FS:Ansariel>
bool cost_changed = false;
if ( mVisualComplexity == VISUAL_COMPLEXITY_UNKNOWN)
{
LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
<< " complexity initialized to " << cost
<< " reported " << mReportedVisualComplexity
<< LL_ENDL;
cost_changed = true;
}
else
{
if ( cost != mVisualComplexity )
{
// <FS:Beq> remove the threshold calcs
// F32 top_val = (1.0f+VISUAL_COMPLEXITY_FRAC_CHANGE_THRESH)*mVisualComplexity;
// F32 bottom_val = (1.0f/(1.0f+VISUAL_COMPLEXITY_FRAC_CHANGE_THRESH))*mVisualComplexity;
// top_val = llmax(top_val, mVisualComplexity + VISUAL_COMPLEXITY_ABS_CHANGE_THRESH);
// bottom_val = llmax(0.f, llmin(bottom_val, mVisualComplexity - VISUAL_COMPLEXITY_ABS_CHANGE_THRESH));
// if (isSelf() && cost > bottom_val && cost < top_val)
// {
// LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
// << " self complexity change from " << mVisualComplexity << " to " << cost
// << " is within range "
// << "(" << bottom_val << "," << top_val << ")"
// << ", not updated."
// << " reported " << mReportedVisualComplexity
// << LL_ENDL;
// }
// else
// {
// LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
// << " complexity updated was " << mVisualComplexity << " now " << cost
// << " reported " << mReportedVisualComplexity
// << LL_ENDL;
// cost_changed = true;
// }
//}
//else
//{
// LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
// << " complexity updated no change " << mVisualComplexity
// << " reported " << mReportedVisualComplexity
// << LL_ENDL;
cost_changed = true;
}
}
if (cost_changed)
{
mVisualComplexity = cost;
}
if ( cost != mVisualComplexity )
{
LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
<< " complexity updated was " << mVisualComplexity << " now " << cost
<< " reported " << mReportedVisualComplexity
<< LL_ENDL;
}
else
{
LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
<< " complexity updated no change " << mVisualComplexity
<< " reported " << mReportedVisualComplexity
<< LL_ENDL;
}
mVisualComplexity = cost;
mVisualComplexityStale = false;
// </FS:Beq> Remove the timer for now.
// mVisualComplexityUpdateTimer.reset();
static LLCachedControl<U32> show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 20);
if (isSelf() && cost_changed && show_my_complexity_changes)
if (isSelf() && show_my_complexity_changes)
{
// Avatar complexity
LLAvatarRenderNotifier::getInstance()->updateNotificationAgent(mVisualComplexity);

2
indra/newview/llvoavatar.h
View File

@ -308,7 +308,6 @@ public:
// </FS:Ansariel>
void calculateUpdateRenderComplexity();
static const U32 VISUAL_COMPLEXITY_UNKNOWN;
static const F32 VISUAL_COMPLEXITY_UPDATE_SECONDS;
void updateVisualComplexity();
U32 getVisualComplexity() { return mVisualComplexity; }; // Numbers calculated here by rendering AV
@ -488,7 +487,6 @@ public:
// the isTooComplex method uses these mutable values to avoid recalculating too frequently
mutable U32 mVisualComplexity;
mutable bool mVisualComplexityStale;
mutable LLFrameTimer mVisualComplexityUpdateTimer;
U32 mReportedVisualComplexity; // from other viewers through the simulator
bool mCachedInMuteList;

9
indra/newview/llvoicevivox.cpp
View File

@ -824,7 +824,11 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
{
#ifndef VIVOXDAEMON_REMOTEHOST
// Launch the voice daemon
#if defined(LL_WINDOWS) || defined(LL_LINUX)
std::string exe_path = gDirUtilp->getExecutableDir();
#else
std::string exe_path = gDirUtilp->getAppRODataDir();
#endif
#if LL_WINDOWS
// <FS:Ansariel> FIRE-22709: Local voice not working in OpenSim
#ifdef OPENSIM
@ -1587,6 +1591,11 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
LLSD timeoutResult(LLSDMap("session", "timeout"));
// We are about to start a whole new session. Anything that MIGHT still be in our
// maildrop is going to be stale and cause us much wailing and gnashing of teeth.
// Just flush it all out and start new.
voicePump.flush();
// It appears that I need to wait for BOTH the SessionGroup.AddSession response and the SessionStateChangeEvent with state 4
// before continuing from this state. They can happen in either order, and if I don't wait for both, things can get stuck.
// For now, the SessionGroup.AddSession response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined.

18
indra/newview/llvovolume.cpp
View File

@ -475,15 +475,6 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
{
retval |= MEDIA_FLAGS_CHANGED;
}
if (result && getRootEdit()->isAttachment() && getAvatarAncestor()==gAgentAvatarp )
{
// <FS:Beq> Reduce log spam
// LL_INFOS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags "
// << result << LL_ENDL;
LL_DEBUGS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags "
<< result << LL_ENDL;
// </FS:Beq>
}
}
else
{
@ -624,15 +615,6 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
{
retval |= MEDIA_FLAGS_CHANGED;
}
if (result && getRootEdit()->isAttachment() && getAvatarAncestor()==gAgentAvatarp )
{
// <FS:Beq> Reduce log spam
// LL_INFOS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags "
// << result << LL_ENDL;
LL_DEBUGS("AvatarRender") << "Volume attached to self av has updated TE properties. ARC may change accordingly. Change flags "
<< result << LL_ENDL;
// </FS:Beq>
}
}
}
}

2
indra/newview/skins/default/xui/de/floater_fs_import.xml
View File

@ -57,7 +57,7 @@
</text>
<check_box name="do_not_attach" label="Objekt nicht anziehen"/>
<check_box name="region_position" label="An Regionsposition wiederherst."/>
<check_box name="upload_asset" label="Hochladen"/>
<check_box name="upload_asset" label="Inhalte hochladen"/>
<check_box name="temp_asset" label="Temporär"/>
<button name="import_btn" label="Importieren"/>
</floater>

2
indra/newview/skins/default/xui/de/panel_preferences_chat.xml
View File

@ -302,7 +302,7 @@
</text>
<line_editor tool_tip="Würfelt - cmd [Anzahl Würfel] [Seiten pro Würfel] [Modifizierer-Typ (optional)] [Modifizierer-Wert (optional). Beispiel: cmd 1 20, cmd 1 20 + 5. Auslassen der Parameter entspricht cmd 1 6 (Standardwürfel)" name="FSCmdLineRollDice"/>
<text name="FSCmdLinePos_txt">
Teleport in Region (Befehl: cmd x z y)
Teleport innerhalb Region (Befehl: cmd x z y)
</text>
<text name="FSCmdLineGround_txt">
Teleport zur Oberfläche (Befehl: cmd)

2
indra/newview/skins/default/xui/en/floater_fs_import.xml
View File

@ -142,7 +142,7 @@
width="90"
enabled="false"
name="upload_asset"
label="Upload"
label="Upload Content"
top_pad="1" >
<check_box.commit_callback
function="Import.UploadAsset" />

6
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -2215,7 +2215,7 @@
height="14"
name="FSCmdLinePos_txt"
width="280">
Teleport within sim (usage: cmd x y z)
Teleport within region (usage: cmd x y z)
</text>
<line_editor
enabled_control="FSCmdLine"
@ -2348,7 +2348,7 @@
height="14"
name="FSCmdLineMapTo_txt"
width="280">
Teleport to sim x (usage: cmd simname)
Teleport to region x (usage: cmd regionname)
</text>
<line_editor
enabled_control="FSCmdLine"
@ -2365,7 +2365,7 @@
top_pad="2"
follows="left|top"
height="14"
label="Use same position between sims"
label="Use same position between regions"
name="toggle"
width="270"
control_name="FSCmdLineMapToKeepPos"/>

3
indra/newview/skins/default/xui/en/panel_preferences_colors.xml
View File

@ -1458,7 +1458,6 @@
name="FSMiniMapWhisperRing"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
top_pad="8"
left="40" />
@ -1503,7 +1502,6 @@
name="FSMiniMapChatRing"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="100"
top_pad="-20" />
@ -1548,7 +1546,6 @@
name="FSMiniMapShoutRing"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="100"
top_pad="-20" />

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

@ -57,7 +57,7 @@
</text>
<check_box name="do_not_attach" label="Nie zakładaj obiektu" />
<check_box name="region_position" label="Przywróć pozycję w regionie" />
<check_box name="upload_asset" label="Załaduj" />
<check_box name="upload_asset" label="Załaduj zasób" />
<check_box name="temp_asset" label="tymcz." />
<button name="import_btn" label="Importuj" />
</floater>

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

@ -1518,9 +1518,21 @@ Wybierz obiekt na sprzedaż i spróbuj jeszcze raz.
</notification>
<notification name="RequiredUpdate">
Do zalogowania się wymagana jest wersja [VERSION].
Wygląda na to, że nie została ona zaktualizowana.
Pobierz ją z https://secondlife.com/support/downloads/
</notification>
<notification name="PauseForUpdate">
Do zalogowania się wymagana jest wersja [VERSION].
Kliknij OK, aby pobrać i zainstalować.
</notification>
<notification name="OptionalUpdateReady">
Wersja [VERSION] została pobrana i jest gotowa do zainstalowania.
Kliknij OK, aby zainstalować.
</notification>
<notification name="PromptOptionalUpdate">
Wersja [VERSION] została pobrana i jest gotowa do zainstalowania.
Kontynuować?
<usetemplate canceltext="Nie teraz" name="yesnocancelbuttons" notext="Pomiń" yestext="Instaluj" />
</notification>
<notification name="LoginFailedUnknown">
Przepraszamy, ale nie udało się zalogować - powód jest nieznany.
Jeśli ciągle widzisz tą wiadomość sprawdź [SUPPORT_SITE].

4
indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
View File

@ -288,7 +288,7 @@
</text>
<line_editor tool_tip="Rzut kostką - cmd [ilość kostek] [ilość ścianek] [typ modyfikatora (opcjonalne)] [wartość modyfikatora (opcjonalne)]. Przykład: cmd 1 20, cmd 2 40 + 5. Brak parametrów jest równy cmd 1 6 (zwykła kostka)." name="FSCmdLineRollDice" />
<text name="FSCmdLinePos_txt">
Teleport wewn. sima (użycie: cmd x y z)
Teleport wewn. regionu (użycie: cmd x y z)
</text>
<text name="FSCmdLineGround_txt">
Teleport do ziemi (użycie: cmd)
@ -310,7 +310,7 @@
Teleport do Miejsca Startu (użycie: cmd)
</text>
<text name="FSCmdLineMapTo_txt">
Teleport do sima x (użycie: cmd nazwa)
Teleport do regionu x (użycie: cmd nazwa)
</text>
<check_box label="Ta sama pozycja między regionami" name="toggle" />
</panel>

1
indra/newview/skins/starlight/xui/en/floater_world_map.xml
View File

@ -14,6 +14,7 @@
single_instance="true"
title="World Map"
width="650">
<floater.string name="UnnamedParcel">(Unnamed Parcel)</floater.string>
<layout_stack
follows="all"
layout="topleft"

1
indra/newview/skins/starlightcui/xui/en/floater_world_map.xml
View File

@ -14,6 +14,7 @@
single_instance="true"
title="World Map"
width="650">
<floater.string name="UnnamedParcel">(Unnamed Parcel)</floater.string>
<layout_stack
follows="all"
layout="topleft"

92
indra/newview/viewer_manifest.py
View File

@ -185,7 +185,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
self.path("*/xui/*/*.xml")
self.path("*/xui/*/widgets/*.xml")
self.path("*/themes/*/colors.xml")
with self.prefix(src="*/themes/*/textures"):
with self.prefix(src_dst="*/themes/*/textures"):
self.path("*/*.tga")
self.path("*/*.j2c")
self.path("*/*.jpg")
@ -215,7 +215,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
self.path("*.tga")
# File in the newview/ directory
self.path("gpu_table.txt")
# self.path("gpu_table.txt")
#build_data.json. Standard with exception handling is fine. If we can't open a new file for writing, we have worse problems
#platform is computed above with other arg parsing
@ -724,7 +724,7 @@ class WindowsManifest(ViewerManifest):
self.path("dullahan_host.exe")
self.path("natives_blob.bin")
self.path("snapshot_blob.bin")
self.path("widevinecdmadapter.dll")
self.path("v8_context_snapshot.bin")
# MSVC DLLs needed for CEF and have to be in same directory as plugin
with self.prefix(src=os.path.join(self.args['build'], os.pardir,
@ -1345,7 +1345,8 @@ class DarwinManifest(ViewerManifest):
def construct(self):
# copy over the build result (this is a no-op if run within the xcode script)
self.path(self.args['configuration'] + "/Firestorm.app", dst="")
# self.path(os.path.join(self.args['configuration'], self.channel()+".app"), dst="")
self.path(os.path.join(self.args['configuration'], "Firestorm.app"), dst="")
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")
@ -1356,14 +1357,14 @@ class DarwinManifest(ViewerManifest):
idnadir = os.path.join(pkgdir, "lib", "python", "idna")
with self.prefix(dst="Contents"): # everything goes in Contents
self.path("Info.plist", dst="Info.plist")
# self.path("Info.plist", dst="Info.plist")
# copy additional libs in <bundle>/Contents/MacOS/
self.path(os.path.join(relpkgdir, "libndofdev.dylib"), dst="Resources/libndofdev.dylib")
self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib")
# self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib")
# Growl Frameworks
self.path("../packages/Frameworks/Growl", dst="Frameworks/Growl")
# self.path("../packages/Frameworks/Growl", dst="Frameworks/Growl")
# most everything goes in the Resources directory
with self.prefix(dst="Resources"):
@ -1432,18 +1433,19 @@ class DarwinManifest(ViewerManifest):
# in our bundled sub-apps. For each of these we'll create a
# symlink from sub-app/Contents/Resources to the real .dylib.
# Need to get the llcommon dll from any of the build directories as well.
libfile = "libllcommon.dylib"
dylibs = path_optional(self.find_existing_file(os.path.join(os.pardir,
"llcommon",
self.args['configuration'],
libfile),
os.path.join(relpkgdir, libfile)),
dst=libfile)
# libfile = "libllcommon.dylib"
# dylibs = path_optional(self.find_existing_file(os.path.join(os.pardir,
# "llcommon",
# self.args['configuration'],
# libfile),
# os.path.join(relpkgdir, libfile)),
# dst=libfile)
dylibs = []
for libfile in (
"libapr-1.0.dylib",
"libaprutil-1.0.dylib",
"libcollada14dom.dylib",
# "libcollada14dom.dylib",
"libexpat.1.dylib",
"libexception_handler.dylib",
"libGLOD.dylib",
@ -1453,17 +1455,17 @@ class DarwinManifest(ViewerManifest):
"libnghttp2.*dylib",
"libgrowl.dylib",
"libgrowl++.dylib",
"libLeap.dylib",
# "libLeap.dylib",
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
# SLVoice and vivox lols, no symlinks needed
for libfile in (
'libalut.dylib',
'libopenal.dylib',
# 'libalut.dylib',
# 'libopenal.dylib',
'libortp.dylib',
'libsndfile.dylib',
'libvivoxoal.dylib',
# 'libsndfile.dylib',
# 'libvivoxoal.dylib',
'libvivoxsdk.dylib',
'libvivoxplatform.dylib',
'SLVoice',
@ -1473,8 +1475,8 @@ class DarwinManifest(ViewerManifest):
# <FS:Ansariel/TS> FIRE-22709: Local voice not working in OpenSim
if self.fs_is_opensim():
with self.prefix(src=os.path.join(relpkgdir, 'voice_os'), dst="voice_os"):
self.path('libalut.dylib')
self.path('libopenal.dylib')
# self.path('libalut.dylib')
# self.path('libopenal.dylib')
self.path('libortp.dylib')
self.path('libsndfile.dylib')
self.path('libvivoxoal.dylib')
@ -1499,16 +1501,16 @@ class DarwinManifest(ViewerManifest):
# dylibs that vary based on configuration
if self.args['configuration'].lower() == 'debug':
for libfile in (
"libfmodexL.dylib",
):
dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile)
for libfile in (
"libfmodexL.dylib",
):
dylibs += path_optional(os.path.join(debpkgdir, libfile), libfile)
else:
for libfile in (
"libfmodex.dylib",
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
for libfile in (
"libfmodex.dylib",
):
dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
# our apps
executable_path = {}
for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"),
@ -1535,12 +1537,12 @@ class DarwinManifest(ViewerManifest):
#<FS:TS> Moved from the x86_64 specific version because code
# below that does symlinking and path fixup depends on it.
with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86')):
self.path("SLPlugin.app", "SLPlugin.app")
# with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86')):
# self.path("SLPlugin.app", "SLPlugin.app")
with self.prefix(src_dst="llplugin"):
self.path("media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
self.path("media_plugin_cef.dylib", "media_plugin_cef.dylib")
# with self.prefix(src_dst="llplugin"):
# self.path("media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
# self.path("media_plugin_cef.dylib", "media_plugin_cef.dylib")
# Dullahan helper apps go inside SLPlugin.app
with self.prefix(dst="SLPlugin.app/Contents/Frameworks"):
@ -1560,8 +1562,12 @@ class DarwinManifest(ViewerManifest):
'Frameworks/Chromium Embedded Framework.framework')
helperexecutablepath = self.dst_path_of('SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS/DullahanHelper')
#<FS:TS> Fix unannounced change in DullahanHelper app as supplied
# self.run_command_shell('install_name_tool -change '
# '"@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" '
# '"@executable_path/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % helperexecutablepath)
self.run_command_shell('install_name_tool -change '
'"@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" '
'"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" '
'"@executable_path/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % helperexecutablepath)
# SLPlugin plugins
@ -1590,8 +1596,8 @@ class DarwinManifest(ViewerManifest):
'"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % dylibexecutablepath)
#<FS:TS> Copy in prebuilt framework if it's there
with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86', 'Frameworks'), dst="Frameworks"):
self.path("Chromium Embedded Framework.framework")
# with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'packages', 'bin_x86', 'Frameworks'), dst="Frameworks"):
# self.path("Chromium Embedded Framework.framework")
# CEF framework goes inside Second Life.app/Contents/Frameworks
with self.prefix(dst="Frameworks"):
@ -1899,7 +1905,7 @@ class LinuxManifest(ViewerManifest):
self.path("firestorm_256.BMP","ll_icon.BMP")
# plugins
with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins', dst="bin/llplugin")):
with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins'), dst="bin/llplugin"):
self.path("gstreamer010/libmedia_plugin_gstreamer010.so",
"libmedia_plugin_gstreamer.so")
self.path2basename("libvlc", "libmedia_plugin_libvlc.so")
@ -1925,7 +1931,7 @@ class LinuxManifest(ViewerManifest):
self.path( "libcef.so" )
self.path( "libllceflib.so" )
with self.prefix(src=os.path.join(pkgdir, 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ):
with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ):
self.path( "*.so" )
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"):
@ -2246,6 +2252,10 @@ class Linux_x86_64_Manifest(LinuxManifest):
def construct(self):
super(Linux_x86_64_Manifest, self).construct()
pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
relpkgdir = os.path.join(pkgdir, "lib", "release")
debpkgdir = os.path.join(pkgdir, "lib", "debug")
if self.is_packaging_viewer():
with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
self.path("libffi*.so*")

11
scripts/configure_firestorm.sh
View File

@ -65,8 +65,8 @@ showUsage()
echo " --config : Generate a new architecture-specific config"
echo " --build : Build Firestorm"
echo " --version : Update version number"
echo " --chan [Release|Beta|Private] : Private is the default, sets channel"
echo " --btype [Release|RelWithDebInfo] : Release is default, whether to use symbols"
echo " --chan [Release|Beta|Private] : Private is the default, sets channel"
echo " --btype [Release|RelWithDebInfo|Debug] : Release is default, whether to use symbols"
echo " --kdu : Build with KDU"
echo " --package : Build installer"
echo " --no-package : Build without installer (Overrides --package)"
@ -81,6 +81,7 @@ showUsage()
echo " --testbuild <days> : Create time-limited test build (build date + <days>)"
echo " --platform <platform> : Build for specified platform (darwin | windows | linux)"
echo " --jobs <num> : Build with <num> jobs in parallel (Linux and Darwin only)"
echo " --ninja : Build using Ninja (Linux only)"
echo
echo "All arguments not in the above list will be passed through to LL's configure/build."
echo
@ -466,7 +467,11 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
BUILD_DIR=`pwd`
fi
# This name is consumed by indra/newview/CMakeLists.txt
VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2"
if [ $PLATFORM == "linux" ] ; then
VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2"
else
VIEWER_SYMBOL_FILE="${BUILD_DIR}/newview/$BTYPE/firestorm-symbols-${PLATFORM}-${AUTOBUILD_ADDRSIZE}.tar.bz2"
fi
CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=ON"
else
CRASH_REPORTING="-DRELEASE_CRASH_REPORTING:BOOL=OFF"