Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
Ansariel
commit
24a0b190ba
|
|
@ -833,26 +833,14 @@
|
|||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
</map>
|
||||
<key>linux</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>bd0f62a03d846332adf07997e307cde6</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1080_3.3325.1750.gaabe4c4-linux-180871715.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux</string>
|
||||
</map>
|
||||
<key>linux64</key>
|
||||
<map>
|
||||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>48d316c0ceb898f7577015df75b6d303</string>
|
||||
<string>9fad2e6e1fb3c698afa2b9094deb8422</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.1.1320_3.3626.1895.g7001d56-linux64-191221910.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.6.4.202005232231_81.3.3_g072a5f5_chromium-81.0.4044.147-linux64-201442030.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1032,11 +1020,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>aed9fbd15995e71f9b600eb2ed2b73b1</string>
|
||||
<string>88b1ac40d0b2cc1cf862260bb1297a54</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/fmodstudio-2.00.08-linux64-201031328.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/fmodstudio-2.01.01-linux64-201412258.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -1046,11 +1034,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>670b2dc83403cc9024bc68728d851a4d</string>
|
||||
<string>5c182fe2303511c35480d00d9b6832dc</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.08-windows-200921513.tar.bz2</string>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.01-windows-201411851.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
@ -1060,18 +1048,18 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>b97c88e262d37dd1514c0e580a8cc775</string>
|
||||
<string>10fcd058ec0da77273c61aca78081ede</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.08-windows64-200921514.tar.bz2</string>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.01-windows64-201412005.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows64</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>version</key>
|
||||
<string>2.00.08</string>
|
||||
<string>2.01.01</string>
|
||||
</map>
|
||||
<key>fontconfig</key>
|
||||
<map>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
|
|||
set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
|
||||
endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
|
||||
set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
|
||||
set(TEMPLATE_VERIFIER_MASTER_URL "http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg" CACHE STRING "Location of the master message template")
|
||||
set(TEMPLATE_VERIFIER_MASTER_URL "https://bitbucket.org/lindenlab/master-message-template-git/raw/HEAD/message_template.msg" CACHE STRING "Location of the master message template")
|
||||
|
||||
if (NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
|
||||
|
|
|
|||
|
|
@ -250,15 +250,6 @@ public:
|
|||
* executable name.
|
||||
*/
|
||||
Optional<std::string> desc;
|
||||
|
||||
/**
|
||||
<FS:ND> HACK! libcef.so bleeds that intrusive tcmalloc hacks all over the process.
|
||||
This then causes awesome effects like crashes and memory corruption when the so is loaded dynamically.
|
||||
We uses this argument to force libcef.so be preloaded, which fixes this.
|
||||
The other solution would be to recompile CEF twice (x86/x64) for each CEF update. Which I really would like to avoid.
|
||||
*/
|
||||
Optional<std::string> preload;
|
||||
|
||||
};
|
||||
typedef LLSDParamAdapter<Params> LLSDOrParams;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
#include <chrono>
|
||||
|
||||
#include "dullahan.h"
|
||||
#include "dullahan_version.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
@ -509,7 +510,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
|
|||
settings.background_color = 0xffffffff;
|
||||
settings.cache_enabled = true;
|
||||
settings.cache_path = mCachePath;
|
||||
#if (DULLAHAN_VERSION_MAJOR*100+DULLAHAN_VERSION_MINOR) < 106
|
||||
settings.cookie_store_path = mCookiePath;
|
||||
#endif
|
||||
settings.cookies_enabled = mCookiesEnabled;
|
||||
settings.disable_gpu = mDisableGPU;
|
||||
settings.flash_enabled = mPluginsEnabled;
|
||||
|
|
@ -664,8 +667,10 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
|
|||
else if (message_name == "scroll_event")
|
||||
{
|
||||
// Mouse coordinates for cef to be able to scroll 'containers'
|
||||
//S32 x = message_in.getValueS32("x");
|
||||
//S32 y = message_in.getValueS32("y");
|
||||
#if (DULLAHAN_VERSION_MAJOR*100+DULLAHAN_VERSION_MINOR) >= 106
|
||||
S32 x = message_in.getValueS32("x");
|
||||
S32 y = message_in.getValueS32("y");
|
||||
#endif
|
||||
// Wheel's clicks
|
||||
S32 delta_x = message_in.getValueS32("clicks_x");
|
||||
S32 delta_y = message_in.getValueS32("clicks_y");
|
||||
|
|
@ -673,8 +678,11 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
|
|||
delta_x *= -scaling_factor;
|
||||
delta_y *= -scaling_factor;
|
||||
|
||||
// mCEFLib->mouseWheel(x, y, delta_x, delta_y);
|
||||
#if (DULLAHAN_VERSION_MAJOR*100+DULLAHAN_VERSION_MINOR) >= 106
|
||||
mCEFLib->mouseWheel(x, y, delta_x, delta_y);
|
||||
#else
|
||||
mCEFLib->mouseWheel(delta_x, delta_y);
|
||||
#endif
|
||||
}
|
||||
else if (message_name == "text_event")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ include(TemplateCheck)
|
|||
include(UI)
|
||||
include(UnixInstall)
|
||||
include(ViewerMiscLibs)
|
||||
include(ViewerManager)
|
||||
#include(ViewerManager) # <FS:Ansariel> Remove VMP
|
||||
include(VisualLeakDetector)
|
||||
include(URIPARSER)
|
||||
include(Growl)
|
||||
|
|
|
|||
|
|
@ -450,12 +450,17 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type)
|
|||
size_t insert_pos = is_irc_me_prefix(utf8_text) ? 4 : 0;
|
||||
|
||||
//For testing/beta groups, we display the build version since it doesn't speed by and this might change often
|
||||
if(chat_prefix_testing && FSData::getInstance()->isTestingGroup(mSessionID))
|
||||
utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getBuildVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
|
||||
|
||||
if(FSData::getInstance()->isTestingGroup(mSessionID))
|
||||
{
|
||||
if(chat_prefix_testing)
|
||||
utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getBuildVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
|
||||
}
|
||||
//For release support groups, only display the short version(Major.Minor.Patch) since chat can speed by. This makes it easier on Support's eyes.
|
||||
else if(chat_prefix_support && FSData::getInstance()->isSupportGroup(mSessionID))
|
||||
utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getShortVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
|
||||
else if(FSData::getInstance()->isSupportGroup(mSessionID))
|
||||
{
|
||||
if(chat_prefix_support)
|
||||
utf8_text.insert(insert_pos, ("(" + str_address_size_tag + str_operating_system_tag + " " + LLVersionInfo::getShortVersion() + skin_indicator + str_viewer_mode + str_rlv_enabled + str_opensim_tag + ") "));
|
||||
}
|
||||
}
|
||||
|
||||
// <FS:Techwolf Lupindo> Allow user to send system info.
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
#include "llvfile.h"
|
||||
#include "llviewercontrol.h"
|
||||
#include "llcompilequeue.h"
|
||||
#include "llnotificationsutil.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
// There is a sprintf( ... "%d", size_t_value) buried inside boost::wave. In order to not mess with system header, I rather disable that warning here.
|
||||
|
|
@ -980,7 +981,7 @@ static std::string minimalize_whitespace(std::string in)
|
|||
}
|
||||
*/
|
||||
|
||||
static std::string reformat_switch_statements(std::string script)
|
||||
static std::string reformat_switch_statements(std::string script, bool &lackDefault)
|
||||
{
|
||||
std::string buffer = script;
|
||||
{
|
||||
|
|
@ -1017,7 +1018,7 @@ static std::string reformat_switch_statements(std::string script)
|
|||
S32 cutlen = slen + arg.length() + rstate.length();
|
||||
|
||||
// Call recursively to process nested switch statements (FIRE-10517)
|
||||
rstate = reformat_switch_statements(rstate);
|
||||
rstate = reformat_switch_statements(rstate, lackDefault);
|
||||
|
||||
//rip off the scope edges
|
||||
S32 slicestart = rstate.find("{") + 1;
|
||||
|
|
@ -1075,7 +1076,7 @@ static std::string reformat_switch_statements(std::string script)
|
|||
}
|
||||
|
||||
std::string deflt = quicklabel();
|
||||
bool isdflt = false;
|
||||
bool hasdflt = false;
|
||||
std::string defstate;
|
||||
defstate = boost::regex_replace(rstate, boost::regex(rDOT_MATCHES_NEWLINE
|
||||
rCMNT_OR_STR "|" rSPC "++"
|
||||
|
|
@ -1083,7 +1084,7 @@ static std::string reformat_switch_statements(std::string script)
|
|||
, boost::regex::perl), "?1@" + deflt + ";$2:$&", boost::format_all);
|
||||
if (defstate != rstate)
|
||||
{
|
||||
isdflt = true;
|
||||
hasdflt = true;
|
||||
rstate = defstate;
|
||||
}
|
||||
std::string argl;
|
||||
|
|
@ -1094,19 +1095,22 @@ static std::string reformat_switch_statements(std::string script)
|
|||
{
|
||||
jumptable += "if(" + arg + " == (" + ifs_it->first + "))jump " + ifs_it->second + ";\n";
|
||||
}
|
||||
if (isdflt)
|
||||
std::string brk = quicklabel();
|
||||
if (!hasdflt)
|
||||
{
|
||||
jumptable += "jump " + deflt + ";\n";
|
||||
// Add jump to break position if there's no default (FIRE-17710)
|
||||
deflt = brk;
|
||||
lackDefault = true;
|
||||
}
|
||||
jumptable += "jump " + deflt + ";\n";
|
||||
|
||||
rstate = jumptable + rstate + "\n";
|
||||
|
||||
std::string brk = quicklabel();
|
||||
defstate = boost::regex_replace(rstate, boost::regex(rDOT_MATCHES_NEWLINE
|
||||
rCMNT_OR_STR "|"
|
||||
"(?<![A-Za-z0-9_])break(" rOPT_SPC ";)"
|
||||
), "?1jump " + brk + "$1:$&", boost::format_all);
|
||||
if (defstate != rstate)
|
||||
if (defstate != rstate || !hasdflt)
|
||||
{
|
||||
rstate = defstate;
|
||||
rstate += "\n@" + brk + ";\n";
|
||||
|
|
@ -1146,6 +1150,7 @@ void FSLSLPreprocessor::start_process()
|
|||
}
|
||||
|
||||
mWaving = true;
|
||||
bool lackDefault = false;
|
||||
boost::wave::util::file_position_type current_position;
|
||||
std::string input;
|
||||
if (mStandalone)
|
||||
|
|
@ -1488,7 +1493,7 @@ void FSLSLPreprocessor::start_process()
|
|||
display_message(LLTrans::getString("fs_preprocessor_switchstatement_start"));
|
||||
try
|
||||
{
|
||||
output = reformat_switch_statements(output);
|
||||
output = reformat_switch_statements(output, lackDefault);
|
||||
}
|
||||
catch (boost::regex_error& e)
|
||||
{
|
||||
|
|
@ -1577,6 +1582,10 @@ void FSLSLPreprocessor::start_process()
|
|||
mCore->doSaveComplete((void*)mCore, mClose, mSync);
|
||||
}
|
||||
}
|
||||
if (lackDefault)
|
||||
{
|
||||
LLNotificationsUtil::add("DefaultLabelMissing");
|
||||
}
|
||||
mWaving = false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -148,8 +148,6 @@ then
|
|||
export LD_PRELOAD="${LD_PRELOAD}:${FSJEMALLOC}"
|
||||
fi
|
||||
|
||||
export FS_CEF_PRELOAD="libcef.so"
|
||||
|
||||
# Copy "$@" to ARGS array specifically to delete the --skip-gridargs switch.
|
||||
# The gridargs.dat file is no more, but we still want to avoid breaking
|
||||
# scripts that invoke this one with --skip-gridargs.
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@
|
|||
#include "llexception.h"
|
||||
//#if !LL_LINUX
|
||||
#include "cef/dullahan.h"
|
||||
#include "cef/dullahan_version.h"
|
||||
#include "vlc/libvlc_version.h"
|
||||
//#endif // LL_LINUX
|
||||
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ int main( int argc, char **argv )
|
|||
// install crash handlers
|
||||
viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
|
||||
|
||||
unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins.
|
||||
exportFlashVars(); // <FS:ND/> Try to autodetect installed pepper flash.
|
||||
|
||||
bool ok = viewer_app_ptr->init();
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ void LLToastAlertPanel::setVisible( BOOL visible )
|
|||
// <FS:PP> FIRE-4322: The "bing" system sound missing
|
||||
// if( visible && !LLToastPanel::getVisible() )
|
||||
LLToastPanel::setVisible( visible );
|
||||
if( visible )
|
||||
if (visible && !LLApp::isExiting())
|
||||
// </FS:PP>
|
||||
{
|
||||
make_ui_sound("UISndAlert");
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
<menu_item_call label="Animation-Explorer" name="Animation Explorer"/>
|
||||
<menu_item_call label="Asset-Blacklist" name="asset_blacklist"/>
|
||||
<menu_item_call label="Avatar-Anzeigeeinstellungen" name="Avatar Render Settings"/>
|
||||
<menu_item_check label="Freunde immer normal anzeigen" name="Always show Friends normally"/>
|
||||
<menu_item_check label="Freunde immer komplett anzeigen" name="Always show Friends normally"/>
|
||||
<menu_item_check label="Nur Freunde anzeigen" name="Render Friends Only"/>
|
||||
</menu>
|
||||
<menu label="Bauen" name="BuildTools">
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
|
|||
<usetemplate name="okbutton" yestext="OK"/>
|
||||
</notification>
|
||||
<notification name="AllowMultipleViewers">
|
||||
Das Starten mehrerer Second Life Viewer wird nicht unterstützt. Dies kann zu Kollisionen des Textur-Caches, Fehlern sowie verschlechterter Grafik und Leistung führen.
|
||||
Das Starten mehrerer [APP_NAME] Viewer wird nicht unterstützt. Dies kann zu Kollisionen des Textur-Caches, Fehlern sowie verschlechterter Grafik und Leistung führen.
|
||||
<usetemplate name="okbutton" yestext="OK"/>
|
||||
</notification>
|
||||
<notification name="GrantModifyRights">
|
||||
|
|
@ -4998,24 +4998,30 @@ Aktueller Wert: [CURRENT_VALUE]
|
|||
</notification>
|
||||
<!-- ## Zi: Debug Settings Editor -->
|
||||
|
||||
<notification name="TeleportToAvatarNotPossible">
|
||||
Teleportieren zum Avatar nicht möglich, da die exakte Position unbekannt ist.
|
||||
</notification>
|
||||
<notification name="DefaultLabelMissing">
|
||||
<usetemplate ignoretext="Ein LSL-Skript enthält eine switch-Anweisung ohne „default“-Fall." name="notifyignore"/>
|
||||
Das Verhalten der switch-Anweisung ohne einen „default“-Fall war bislang inkorrekt und wurde korrigiert.
|
||||
Siehe FIRE-17710 für Details.
|
||||
</notification>
|
||||
|
||||
<notification name="ZoomToAvatarNotPossible">
|
||||
Zoomen auf Avatar nicht möglich, da er sich außerhalb der Reichweite befindet.
|
||||
</notification>
|
||||
<notification name="TeleportToAvatarNotPossible">
|
||||
Teleportieren zum Avatar nicht möglich, da die exakte Position unbekannt ist.
|
||||
</notification>
|
||||
|
||||
<notification name="TrackAvatarNotPossible">
|
||||
Verfolgen des Avatars nicht möglich, da er sich außerhalb der Radar-Reichweite befindet.
|
||||
</notification>
|
||||
|
||||
<notification name="CacheEmpty">
|
||||
Der Viewercache ist momentan leer. Während des Downloads von neuen Inhalten kann es daher zu niedrigeren Frameraten und langsamerem Laden des Inventars kommen.
|
||||
</notification>
|
||||
<notification name="ZoomToAvatarNotPossible">
|
||||
Zoomen auf Avatar nicht möglich, da er sich außerhalb der Reichweite befindet.
|
||||
</notification>
|
||||
|
||||
<notification name="TrackAvatarNotPossible">
|
||||
Verfolgen des Avatars nicht möglich, da er sich außerhalb der Radar-Reichweite befindet.
|
||||
</notification>
|
||||
|
||||
<notification name="CacheEmpty">
|
||||
Der Viewercache ist momentan leer. Während des Downloads von neuen Inhalten kann es daher zu niedrigeren Frameraten und langsamerem Laden des Inventars kommen.
|
||||
</notification>
|
||||
|
||||
<notification name="EnableMediaFilter">
|
||||
Das Abspielen von Medien oder Musik kann deine Identität an Webseiten außerhalb von Second Life verraten. Durch das Einschalten des Filters kann ausgewählt werden, welche Webseiten Medien abspielen dürfen, wodurch eine bessere Kontrolle über die Privatspähre ermöglicht wird.
|
||||
Das Abspielen von Medien oder Musik kann deine Identität an Webseiten außerhalb von [CURRENT_GRID] verraten. Durch das Einschalten des Filters kann ausgewählt werden, welche Webseiten Medien abspielen dürfen, wodurch eine bessere Kontrolle über die Privatspähre ermöglicht wird.
|
||||
|
||||
Medienfilter aktivieren?
|
||||
(Diese Einstellung kann später unter Einstellungen > Sound & Medien geändert werden.)
|
||||
|
|
|
|||
|
|
@ -1277,7 +1277,7 @@
|
|||
parameter="fs_avatar_render_settings" />
|
||||
</menu_item_call>
|
||||
<menu_item_check
|
||||
label="Always show Friends normally"
|
||||
label="Always show Friends fully"
|
||||
name="Always show Friends normally">
|
||||
<menu_item_check.on_click
|
||||
function="ToggleControl"
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@ Save all changes to clothing/body parts?
|
|||
icon="alertmodal.tga"
|
||||
name="AllowMultipleViewers"
|
||||
type="alertmodal">
|
||||
Running multiple Second Life viewers is not supported. It can lead to texture cache collisions, corruption and degraded visuals and performance.
|
||||
Running multiple [APP_NAME] viewers is not supported. It can lead to texture cache collisions, corruption and degraded visuals and performance.
|
||||
<usetemplate
|
||||
name="okbutton"
|
||||
yestext="OK"/>
|
||||
|
|
@ -6816,7 +6816,7 @@ The string [STRING_NAME] is missing from strings.xml.
|
|||
icon="alert.tga"
|
||||
name="EnableMediaFilter"
|
||||
type="alert">
|
||||
Playing media or music can expose your identity to sites outside Second Life. You can enable a filter that will allow you to select which sites will receive media requests, and give you better control over your privacy.
|
||||
Playing media or music can expose your identity to sites outside [CURRENT_GRID]. You can enable a filter that will allow you to select which sites will receive media requests, and give you better control over your privacy.
|
||||
|
||||
Enable the media filter?
|
||||
(You can change this option later under Preferences > Sound & Media.)
|
||||
|
|
@ -10671,6 +10671,19 @@ Current setting: [CURRENT_VALUE]
|
|||
</notification>
|
||||
<!-- ## Zi: Debug Settings Editor -->
|
||||
|
||||
<!-- <FS:Sei> LSL Default label missing FIRE-17710 -->
|
||||
<notification
|
||||
icon="alertmodal.tga"
|
||||
name="DefaultLabelMissing"
|
||||
type="alertmodal">
|
||||
<usetemplate
|
||||
ignoretext="A LSL script has switch statement without a default label"
|
||||
name="notifyignore"/>
|
||||
The behavior for switch() statements without a default case was previously incorrect and has been fixed.
|
||||
See FIRE-17710 for details.
|
||||
</notification>
|
||||
<!-- </FS:Sei> -->
|
||||
|
||||
<notification
|
||||
icon="alertmodal.tga"
|
||||
name="TeleportToAvatarNotPossible"
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@
|
|||
width="215" />
|
||||
<button
|
||||
name="open_prefs_btn"
|
||||
label="Open Camera floater"
|
||||
tool_tip="Bring up Camera floater"
|
||||
label="Open Camera Controls"
|
||||
tool_tip="Bring up Camera Controls window"
|
||||
top_delta="3"
|
||||
left="15"
|
||||
height="22"
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
<menu_item_call label="Eksplorator animacji" name="Animation Explorer"/>
|
||||
<menu_item_call label="Czarna lista zasobów danych (assetów)" name="asset_blacklist"/>
|
||||
<menu_item_call label="Ustawienia renderowania awatarów" name="Avatar Render Settings"/>
|
||||
<menu_item_check label="Zawsze renderuj znajomych normalnie" name="Always show Friends normally"/>
|
||||
<menu_item_check label="Zawsze renderuj znajomych w pełni" name="Always show Friends normally"/>
|
||||
<menu_item_check label="Renderuj tylko znajomych" name="Render Friends Only"/>
|
||||
</menu>
|
||||
<menu label="Buduj" name="BuildTools">
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
|
|||
Pamiętaj: kiedy włączysz tą opcję to każdy kto używa tego komputera będzie mógł zobaczyć Twoją listę ulubionych miejsc.
|
||||
</notification>
|
||||
<notification name="AllowMultipleViewers">
|
||||
Uruchamianie kilku przeglądarek Second Life nie podlega wsparciu. Może prowadzić do kolizji pamięci podręcznej tekstur, jej uszkodzeń, pogorszenia efektów wizualnych oraz wydajności.
|
||||
Uruchamianie kilku przeglądarek [APP_NAME] nie podlega wsparciu. Może prowadzić do kolizji pamięci podręcznej tekstur, jej uszkodzeń, pogorszenia efektów wizualnych oraz wydajności.
|
||||
</notification>
|
||||
<notification name="GrantModifyRights">
|
||||
Udzielenie praw modyfikacji innemu Rezydentowi umożliwia modyfikację, usuwanie lub wzięcie JAKIEGOKOLWIEK z Twoich obiektów. Używaj tej opcji z rozwagą!
|
||||
|
|
@ -2504,7 +2504,7 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
|
|||
Ciąg [STRING_NAME] nie został znaleziony w strings.xml
|
||||
</notification>
|
||||
<notification name="EnableMediaFilter">
|
||||
Odtwarzanie mediów lub muzyki może pozwolić na zidentyfikowanie Twojej tożsamości witrynom poza Second Life. Możesz włączyć filtr, który pozwoli określić które strony będą mogły odtwarzać media, da Ci lepszą kontrolę nad swoją prywatnością.
|
||||
Odtwarzanie mediów lub muzyki może pozwolić na zidentyfikowanie Twojej tożsamości witrynom poza [CURRENT_GRID]. Możesz włączyć filtr, który pozwoli określić które strony będą mogły odtwarzać media, da Ci lepszą kontrolę nad swoją prywatnością.
|
||||
|
||||
Włączyć filtr mediów?
|
||||
(Możesz zmienić potem tą opcję w Ustawienia > Dźwięk i Media.)
|
||||
|
|
@ -3979,6 +3979,11 @@ Obecne ustawienie: [CURRENT_VALUE]
|
|||
<ignore name="ignore" text="Jakieś ustawienie nie przeszło kontroli spójności."/>
|
||||
</form>
|
||||
</notification>
|
||||
<notification name="DefaultLabelMissing">
|
||||
<usetemplate ignoretext="Skrypt LSL ma instrukcję switch bez domyślnej etykiety" name="notifyignore" />
|
||||
Zachowanie instrukcji switch() bez domyślnej etykiety było wcześniej niepoprawne i zostało naprawione.
|
||||
Zobacz FIRE-17710 aby dowiedzieć się więcej.
|
||||
</notification>
|
||||
<notification name="TeleportToAvatarNotPossible">
|
||||
Teleportacja do tego awatara nie jest możliwa, ponieważ dokładna pozycja nie jest znana.
|
||||
</notification>
|
||||
|
|
|
|||
|
|
@ -1872,14 +1872,21 @@ class LinuxManifest(ViewerManifest):
|
|||
# CEF files
|
||||
with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
|
||||
self.path( "libcef.so" )
|
||||
self.fs_try_path( "libminigbm.so" )
|
||||
|
||||
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, 'lib', 'release', 'swiftshader'), dst=os.path.join("lib", "swiftshader") ):
|
||||
self.path( "*.so" )
|
||||
|
||||
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"):
|
||||
self.path( "chrome-sandbox" )
|
||||
self.path( "dullahan_host" )
|
||||
self.path( "natives_blob.bin" )
|
||||
self.fs_try_path( "natives_blob.bin" )
|
||||
self.path( "snapshot_blob.bin" )
|
||||
self.path( "v8_context_snapshot.bin" )
|
||||
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="lib"):
|
||||
self.fs_try_path( "natives_blob.bin" )
|
||||
self.path( "snapshot_blob.bin" )
|
||||
self.path( "v8_context_snapshot.bin" )
|
||||
|
||||
|
|
@ -1890,6 +1897,13 @@ class LinuxManifest(ViewerManifest):
|
|||
self.path( "cef_200_percent.pak" )
|
||||
self.path( "devtools_resources.pak" )
|
||||
self.path( "icudtl.dat" )
|
||||
with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="lib"):
|
||||
self.path( "cef.pak" )
|
||||
self.path( "cef_extensions.pak" )
|
||||
self.path( "cef_100_percent.pak" )
|
||||
self.path( "cef_200_percent.pak" )
|
||||
self.path( "devtools_resources.pak" )
|
||||
self.path( "icudtl.dat" )
|
||||
|
||||
with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):
|
||||
self.path("am.pak")
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ http://wiki.secondlife.com/wiki/Template_verifier.py
|
|||
""")
|
||||
parser.add_option(
|
||||
'-u', '--master_url', type='string', dest='master_url',
|
||||
default='http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg',
|
||||
default='https://bitbucket.org/lindenlab/master-message-template-git/raw/HEAD/message_template.msg',
|
||||
help="""The url of the master message template.""")
|
||||
parser.add_option(
|
||||
'-c', '--cache_master', action='store_true', dest='cache_master',
|
||||
|
|
|
|||
Loading…
Reference in New Issue