Merge branch 'FirestormViewer:master' into FIRE-34884
Angeldark Raymaker
GitHub
commit
a44969e2ad
|
|
@ -922,11 +922,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>3f66914b7931a7e45b50c9f947eed3d1</string>
|
||||
<string>ff3057e8763bdbe87a478a3d77067b5a</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/fmodstudio-2.02.20-darwin64-240390127.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/fmodstudio-2.02.26-darwin64-243641704.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
@ -936,11 +936,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>bbb978f21e690599aedcd44658dceeaf</string>
|
||||
<string>41265f539399e365601a22d108287e91</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/fmodstudio-2.02.20-linux64-240390132.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/fmodstudio-2.02.26-linux64-243641703.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
@ -950,11 +950,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>8672d21ae8382a5526f0e17358de8575</string>
|
||||
<string>595e7aa51f2161b8d11c3afcc88e2197</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.20-windows64-240381643.tar.bz2</string>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.26-windows64-243641704.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows64</string>
|
||||
|
|
@ -1817,9 +1817,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>9f70048bed4c3fc487bee9e9f4276037</string>
|
||||
<string>9520266bd701bddeaa1982c40f11220c</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/llphysicsextensions_tpv-1.0.11371371972-darwin64-11371371972.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/llphysicsextensions_tpv-1.0.12401597145-darwin64-12401597145.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
@ -1841,9 +1841,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>31daa8f133168cc9ab500aa3a235b63c</string>
|
||||
<string>ab4b9d3ff7b6b53f1ab6d9d3bef012da</string>
|
||||
<key>url</key>
|
||||
<string>file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.11371371972-windows64-11371371972.tar.bz2</string>
|
||||
<string>file:///c:/cygwin/opt/firestorm/llphysicsextensions_tpv-1.0.12401597145-windows64-12401597145.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
|
|||
|
|
@ -219,8 +219,8 @@ This will configure Firestorm to be built with all defaults and without third pa
|
|||
Available premade firestorm-specific build targets:
|
||||
|
||||
```
|
||||
ReleaseFS (includes KDU, FMOD)
|
||||
ReleaseFS_open (no KDU, no FMOD)
|
||||
ReleaseFS (includes KDU, FMOD)
|
||||
ReleaseFS_open (no KDU, no FMOD)
|
||||
RelWithDebInfoFS_open (no KDU, no FMOD)
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -7,51 +7,20 @@ if (DEFINED ENV{PYTHON})
|
|||
set(python "$ENV{PYTHON}")
|
||||
set(PYTHONINTERP_FOUND ON)
|
||||
elseif (WINDOWS)
|
||||
# On Windows, explicitly avoid Cygwin Python.
|
||||
|
||||
# if the user has their own version of Python installed, prefer that
|
||||
foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
|
||||
# prefer more recent Python versions to older ones, if multiple versions
|
||||
# are installed
|
||||
foreach(pyver 3.12 3.11 3.10 3.9 3.8 3.7)
|
||||
list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
|
||||
endforeach()
|
||||
endforeach()
|
||||
|
||||
# TODO: This logic has the disadvantage that if you have multiple versions
|
||||
# of Python installed, the selected path won't necessarily be the newest -
|
||||
# e.g. this GLOB will prefer Python310 to Python311. But since pymaybe is
|
||||
# checked AFTER the registry entries, this will only surface as a problem if
|
||||
# no installed Python appears in the registry.
|
||||
file(GLOB pymaybe
|
||||
"$ENV{PROGRAMFILES}/Python*"
|
||||
## "$ENV{PROGRAMFILES(X86)}/Python*"
|
||||
# The Windows environment variable is in fact as shown above, but CMake
|
||||
# disallows querying an environment variable containing parentheses -
|
||||
# thanks, Windows. Fudge by just appending " (x86)" to $PROGRAMFILES and
|
||||
# hoping for the best.
|
||||
"$ENV{PROGRAMFILES} (x86)/Python*"
|
||||
"c:/Python*")
|
||||
|
||||
find_program(python
|
||||
NAMES python3.exe python.exe
|
||||
NO_DEFAULT_PATH # added so that cmake does not find cygwin python
|
||||
PATHS
|
||||
${regpaths}
|
||||
${pymaybe}
|
||||
)
|
||||
if (DEFINED ENV{VIRTUAL_ENV})
|
||||
set(Python3_FIND_VIRTUALENV "ONLY")
|
||||
endif()
|
||||
find_package(Python3 COMPONENTS Interpreter)
|
||||
set(python ${Python3_EXECUTABLE})
|
||||
else()
|
||||
find_program(python python3)
|
||||
|
||||
if (python)
|
||||
set(PYTHONINTERP_FOUND ON)
|
||||
endif (python)
|
||||
endif (DEFINED ENV{PYTHON})
|
||||
|
||||
if (NOT python)
|
||||
if (python)
|
||||
set(PYTHONINTERP_FOUND ON)
|
||||
else()
|
||||
message(FATAL_ERROR "No Python interpreter found")
|
||||
endif (NOT python)
|
||||
endif (python)
|
||||
|
||||
set(PYTHON_EXECUTABLE "${python}" CACHE FILEPATH "Python interpreter for builds")
|
||||
mark_as_advanced(PYTHON_EXECUTABLE)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# other commands to guarantee full compatibility
|
||||
# with the version specified
|
||||
## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly
|
||||
cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR)
|
||||
#cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR)
|
||||
|
||||
set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
|
||||
"The root project/makefile/solution name. Defaults to SecondLife.")
|
||||
|
|
|
|||
|
|
@ -73,7 +73,10 @@ def proper_windows_path(path, current_platform = sys.platform):
|
|||
rel = None
|
||||
match = re.match("/cygdrive/([a-z])/(.*)", path)
|
||||
if not match:
|
||||
match = re.match('([a-zA-Z]):\\\(.*)', path)
|
||||
# <FS:Beq> Use raw strings to avoid python 3.6 complaints
|
||||
# match = re.match('([a-zA-Z]):\\\(.*)', path)
|
||||
match = re.match(r'([a-zA-Z]):\\(.*)', path)
|
||||
# </FS:Beq>
|
||||
if not match:
|
||||
return None # not an absolute path
|
||||
drive_letter = match.group(1)
|
||||
|
|
@ -313,7 +316,7 @@ def main(extra=[]):
|
|||
class LLManifestRegistry(type):
|
||||
def __init__(cls, name, bases, dct):
|
||||
super(LLManifestRegistry, cls).__init__(name, bases, dct)
|
||||
match = re.match("(\w+)Manifest", name)
|
||||
match = re.match(r"(\w+)Manifest", name) # <FS:Beq/> fix up for python 3.6 string behaviour
|
||||
if match:
|
||||
cls.manifests[match.group(1).lower()] = cls
|
||||
|
||||
|
|
@ -813,13 +816,22 @@ class LLManifest(object, metaclass=LLManifestRegistry):
|
|||
|
||||
|
||||
def wildcard_regex(self, src_glob, dst_glob):
|
||||
# assume src_glob of form "foo/*.bar"
|
||||
src_re = re.escape(src_glob)
|
||||
src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]*)')
|
||||
# <FS:Beq> fix up python 3.6 literal support
|
||||
# src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]*)')
|
||||
# src_re is foo/\\*\\.bar
|
||||
# replace '\\*' with ([-a-zA-Z0-9._ ]*) in the source regex
|
||||
src_re = src_re.replace(r'\*', r'([-a-zA-Z0-9._ ]*)')
|
||||
# </FS:Beq>
|
||||
dst_temp = dst_glob
|
||||
i = 1
|
||||
while dst_temp.count("*") > 0:
|
||||
dst_temp = dst_temp.replace('*', '\g<' + str(i) + '>', 1)
|
||||
i = i+1
|
||||
# <FS:Beq> fix up python 3.6 literal support
|
||||
# dst_temp = dst_temp.replace('\*', '\g<' + str(i) + '>', 1)
|
||||
dst_temp = dst_temp.replace('*', r'\g<' + str(i) + '>', 1)
|
||||
i = i + 1
|
||||
# </FS:Beq>
|
||||
return re.compile(src_re), dst_temp
|
||||
|
||||
def check_file_exists(self, path):
|
||||
|
|
|
|||
|
|
@ -2623,7 +2623,7 @@ void LLImageGLThread::run()
|
|||
// WorkQueue, likewise cleanup afterwards.
|
||||
mWindow->makeContextCurrent(mContext);
|
||||
gGL.init(false);
|
||||
LL_PROFILER_GPU_CONTEXT_NS("LLImageGL Context", 17);
|
||||
LL_PROFILER_GPU_CONTEXT_NS("LLImageGL Context", 17);
|
||||
LL::ThreadPool::run();
|
||||
gGL.shutdown();
|
||||
mWindow->destroySharedContext(mContext);
|
||||
|
|
|
|||
|
|
@ -1691,6 +1691,15 @@ set(viewer_HEADER_FILES
|
|||
list(APPEND viewer_SOURCE_FILES llperfstats.cpp)
|
||||
list(APPEND viewer_HEADER_FILES llperfstats.h)
|
||||
|
||||
if (USE_BUGSPLAT)
|
||||
list(APPEND viewer_SOURCE_FILES
|
||||
bugsplatattributes.cpp
|
||||
)
|
||||
list(APPEND viewer_HEADER_FILES
|
||||
bugsplatattributes.h
|
||||
)
|
||||
endif (USE_BUGSPLAT)
|
||||
|
||||
# <FS:Ansariel> Flickr / Discord keys and fsversionvalues headers are generated in here
|
||||
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
|
||||
|
|
|
|||
|
|
@ -8522,17 +8522,6 @@
|
|||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>MiniMapWorldMapTextures</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Use the world map texture tile on the mini-map rather than the terrain texture</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<boolean>1</boolean>
|
||||
</map>
|
||||
<key>MiniMapRotate</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -9789,7 +9778,7 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Type</key>
|
||||
<string>S32</string>
|
||||
<key>Value</key>
|
||||
<integer>1024</integer>
|
||||
<integer>2048</integer>
|
||||
</map>
|
||||
<key>PreviewAmbientColor</key>
|
||||
<map>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,131 @@
|
|||
#include "linden_common.h"
|
||||
#include "bugsplatattributes.h"
|
||||
#include <filesystem>
|
||||
|
||||
std::string BugSplatAttributes::mCrashContextFileName;
|
||||
|
||||
BugSplatAttributes& BugSplatAttributes::instance()
|
||||
{
|
||||
static BugSplatAttributes sInstance;
|
||||
return sInstance;
|
||||
}
|
||||
|
||||
|
||||
#include <string>
|
||||
#include <cctype>
|
||||
|
||||
std::string BugSplatAttributes::to_xml_token(const std::string& input)
|
||||
{
|
||||
// Example usage:
|
||||
// std::string token = to_xml_token("Bandwidth (kbit/s)");
|
||||
// The result should be: "Bandwidth_kbit_per_s"
|
||||
std::string result;
|
||||
result.reserve(input.size() * 2); // Reserve some space, since we might insert more chars for "/"
|
||||
|
||||
for (char ch : input)
|
||||
{
|
||||
if (ch == '/')
|
||||
{
|
||||
// Replace '/' with "_per_"
|
||||
result.append("_per_");
|
||||
}
|
||||
else if (std::isalnum(ch) || ch == '_' || ch == '-')
|
||||
{
|
||||
// Letters, digits, underscore, and hyphen are okay
|
||||
result.push_back(ch);
|
||||
}
|
||||
else if (ch == ' ' || ch == '(' || ch == ')')
|
||||
{
|
||||
// Replace spaces and parentheses with underscore
|
||||
result.push_back('_');
|
||||
}
|
||||
else
|
||||
{
|
||||
// Other characters map to underscore
|
||||
result.push_back('_');
|
||||
}
|
||||
}
|
||||
|
||||
// Ensure the first character is a letter or underscore:
|
||||
// If not, prepend underscore.
|
||||
if (result.empty() || !(std::isalpha(result.front()) || result.front() == '_'))
|
||||
{
|
||||
result.insert(result.begin(), '_');
|
||||
}
|
||||
// trim trailing underscores
|
||||
while (!result.empty() && result.back() == '_')
|
||||
{
|
||||
result.pop_back();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool BugSplatAttributes::writeToFile(const std::string& file_path)
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(mMutex);
|
||||
|
||||
// Write to a temporary file first
|
||||
std::string tmp_file = file_path + ".tmp";
|
||||
{
|
||||
llofstream ofs(tmp_file.c_str(), std::ios::out | std::ios::trunc);
|
||||
if (!ofs.good())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
ofs << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
|
||||
ofs << "<XmlCrashContext>\n";
|
||||
|
||||
// First, write out attributes that have an empty category (top-level)
|
||||
auto empty_category_it = mAttributes.find("");
|
||||
if (empty_category_it != mAttributes.end())
|
||||
{
|
||||
for (const auto& kv : empty_category_it->second)
|
||||
{
|
||||
const std::string& key = kv.first;
|
||||
const std::string& val = kv.second;
|
||||
ofs << " <" << key << ">" << val << "</" << key << ">\n";
|
||||
}
|
||||
}
|
||||
|
||||
// Write out all other categories
|
||||
for (const auto& cat_pair : mAttributes)
|
||||
{
|
||||
const std::string& category = cat_pair.first;
|
||||
|
||||
// Skip empty category since we already handled it above
|
||||
if (category.empty())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
ofs << " <" << category << ">\n";
|
||||
for (const auto& kv : cat_pair.second)
|
||||
{
|
||||
const std::string& key = kv.first;
|
||||
const std::string& val = kv.second;
|
||||
ofs << " <" << key << ">" << val << "</" << key << ">\n";
|
||||
}
|
||||
ofs << " </" << category << ">\n";
|
||||
}
|
||||
|
||||
ofs << "</XmlCrashContext>\n";
|
||||
|
||||
// Close the file before renaming
|
||||
ofs.close();
|
||||
}
|
||||
|
||||
// Rename the temp file to the final file. If rename fails, leave the old file intact.
|
||||
std::error_code ec;
|
||||
std::filesystem::rename(tmp_file, file_path, ec);
|
||||
if (ec)
|
||||
{
|
||||
// Rename failed, remove the temp file and return false
|
||||
std::filesystem::remove(tmp_file, ec);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
#ifndef BUGSPLATATTRIBUTES_INCLUDED
|
||||
#define BUGSPLATATTRIBUTES_INCLUDED
|
||||
#ifdef LL_BUGSPLAT
|
||||
// Currently on Windows BugSplat supports the new attributes file, but it is expected to be added to Mac and Linux soon.
|
||||
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <mutex>
|
||||
|
||||
class BugSplatAttributes
|
||||
{
|
||||
public:
|
||||
// Obtain the singleton instance
|
||||
static BugSplatAttributes& instance();
|
||||
|
||||
template<typename T>
|
||||
void setAttribute(const std::string& key, const T& value, const std::string& category = "FS")
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(mMutex);
|
||||
const auto& xml_key = to_xml_token(key);
|
||||
if constexpr (std::is_same_v<T, std::string>)
|
||||
{
|
||||
mAttributes[category][xml_key] = value;
|
||||
}
|
||||
else if constexpr (std::is_same_v<T, std::wstring>)
|
||||
{
|
||||
// Wide to narrow
|
||||
mAttributes[category][xml_key] = ll_convert_wide_to_string(value);
|
||||
}
|
||||
else if constexpr (std::is_same_v<T, const char*> || std::is_array_v<T>)
|
||||
{
|
||||
// Handle string literals and arrays (which includes string literals)
|
||||
mAttributes[category][xml_key] = std::string(value);
|
||||
}
|
||||
else if constexpr (std::is_same_v<T, bool>)
|
||||
{
|
||||
// Convert boolean to "true"/"false"
|
||||
mAttributes[category][xml_key] = value ? "true" : "false";
|
||||
}
|
||||
else if constexpr (std::is_arithmetic_v<T>)
|
||||
{
|
||||
// Convert arithmetic types (int, float, double, etc.) to wstring
|
||||
mAttributes[category][xml_key] = std::to_string(value);
|
||||
}
|
||||
else
|
||||
{
|
||||
static_assert(!sizeof(T*), "No known conversion for this type to std::string.");
|
||||
}
|
||||
}
|
||||
// Returns true on success, false on failure.
|
||||
bool writeToFile(const std::string& file_path);
|
||||
const static std::string& getCrashContextFileName() { return mCrashContextFileName; }
|
||||
static void setCrashContextFileName(const std::string& file_name) { mCrashContextFileName = file_name; }
|
||||
private:
|
||||
BugSplatAttributes() = default;
|
||||
~BugSplatAttributes() = default;
|
||||
BugSplatAttributes(const BugSplatAttributes&) = delete;
|
||||
BugSplatAttributes& operator=(const BugSplatAttributes&) = delete;
|
||||
std::string to_xml_token(const std::string& input);
|
||||
// Internal structure to hold attributes by category
|
||||
// For example:
|
||||
// mAttributes["RuntimeProperties"]["CrashGUID"] = "649F57B7EE6E92A0_0000"
|
||||
std::unordered_map<std::string, std::unordered_map<std::string, std::string>> mAttributes;
|
||||
std::mutex mMutex;
|
||||
static std::string mCrashContextFileName;
|
||||
};
|
||||
|
||||
#endif // LL_BUGSPLAT
|
||||
#endif // BUGSPLATATTRIBUTES_INCLUDED
|
||||
|
|
@ -289,7 +289,7 @@ using namespace LL;
|
|||
|
||||
#include "fsradar.h"
|
||||
#include "fsassetblacklist.h"
|
||||
|
||||
#include "bugsplatattributes.h"
|
||||
// #include "fstelemetry.h" // <FS:Beq> Tracy profiler support
|
||||
|
||||
#if LL_LINUX && LL_GTK
|
||||
|
|
@ -767,6 +767,9 @@ LLAppViewer::LLAppViewer()
|
|||
// MAINT-8917: don't create a dump directory just for the
|
||||
// static_debug_info.log file
|
||||
std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
|
||||
// <FS:Beq> Improve Bugsplat tracking by using attributes
|
||||
BugSplatAttributes::setCrashContextFileName(logdir + "crash-context.xml");
|
||||
// </FS:Beq>
|
||||
# else // ! LL_BUGSPLAT
|
||||
// write Google Breakpad minidump files to a per-run dump directory to avoid multiple viewer issues.
|
||||
std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
|
||||
|
|
@ -1670,7 +1673,7 @@ bool LLAppViewer::doFrame()
|
|||
|
||||
if (!LLApp::isExiting())
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_APP("df JoystickKeyboard");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_APP("df MainLoop"); // <FS:Beq/> More appropriate name
|
||||
pingMainloopTimeout("Main:JoystickKeyboard");
|
||||
|
||||
// Scan keyboard for movement keys. Command keys and typing
|
||||
|
|
@ -1684,6 +1687,7 @@ bool LLAppViewer::doFrame()
|
|||
&& (gHeadlessClient || !gViewerWindow->getShowProgress())
|
||||
&& !gFocusMgr.focusLocked())
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_APP("df JoystickKeyboard"); // <FS:Beq/> Move this to the right place
|
||||
LLPerfStats::RecordSceneTime T (LLPerfStats::StatType_t::RENDER_IDLE);
|
||||
joystick->scanJoystick();
|
||||
gKeyboard->scanKeyboard();
|
||||
|
|
@ -3762,6 +3766,10 @@ bool LLAppViewer::waitForUpdater()
|
|||
void LLAppViewer::writeDebugInfo(bool isStatic)
|
||||
{
|
||||
#if LL_WINDOWS && LL_BUGSPLAT
|
||||
// <FS:Beq> Improve Bugsplat tracking by using attributes for certain static data items.
|
||||
const LLSD& info = getViewerInfo();
|
||||
bugsplatAddStaticAttributes(info);
|
||||
// </FS:Beq>
|
||||
// bugsplat does not create dump folder and debug logs are written directly
|
||||
// to logs folder, so it conflicts with main instance
|
||||
if (mSecondInstance)
|
||||
|
|
@ -3970,10 +3978,17 @@ LLSD LLAppViewer::getViewerInfo() const
|
|||
info["OPENGL_VERSION"] = ll_safe_string((const char*)(glGetString(GL_VERSION)));
|
||||
info["LIBCURL_VERSION"] = LLCore::LLHttp::getCURLVersion();
|
||||
// Settings
|
||||
|
||||
LLRect window_rect = gViewerWindow->getWindowRectRaw();
|
||||
info["WINDOW_WIDTH"] = window_rect.getWidth();
|
||||
info["WINDOW_HEIGHT"] = window_rect.getHeight();
|
||||
// <FS:Beq> gViewerWindow can be null on shutdown. Crashes if bugsplatt uses the info
|
||||
// LLRect window_rect = gViewerWindow->getWindowRectRaw();
|
||||
// info["WINDOW_WIDTH"] = window_rect.getWidth();
|
||||
// info["WINDOW_HEIGHT"] = window_rect.getHeight();
|
||||
if(gViewerWindow)
|
||||
{
|
||||
LLRect window_rect = gViewerWindow->getWindowRectRaw();
|
||||
info["WINDOW_WIDTH"] = window_rect.getWidth();
|
||||
info["WINDOW_HEIGHT"] = window_rect.getHeight();
|
||||
}
|
||||
// </FS:Beq>
|
||||
|
||||
// <FS> Custom sysinfo
|
||||
//info["FONT_SIZE_ADJUSTMENT"] = gSavedSettings.getF32("FontScreenDPI");
|
||||
|
|
@ -3994,7 +4009,7 @@ LLSD LLAppViewer::getViewerInfo() const
|
|||
info["J2C_VERSION"] = LLImageJ2C::getEngineInfo();
|
||||
bool want_fullname = true;
|
||||
info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : "Undefined";
|
||||
if(LLVoiceClient::getInstance()->voiceEnabled())
|
||||
if(LLStartUp::getStartupState() == STATE_STARTED && LLVoiceClient::getInstance()->voiceEnabled()) // <FS:Beq/> Calling this too earli leads to a nasty crash loop
|
||||
{
|
||||
LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion();
|
||||
const std::string build_version = version.mBuildVersion;
|
||||
|
|
@ -4086,7 +4101,13 @@ LLSD LLAppViewer::getViewerInfo() const
|
|||
}
|
||||
|
||||
// populate field for new local disk cache with some details
|
||||
info["DISK_CACHE_INFO"] = LLDiskCache::getInstance()->getCacheInfo();
|
||||
// <FS:Beq> only populate if the cache is available
|
||||
// info["DISK_CACHE_INFO"] = LLDiskCache::getInstance()->getCacheInfo();
|
||||
if (auto cache = LLDiskCache::getInstance(); cache)
|
||||
{
|
||||
info["DISK_CACHE_INFO"] = cache->getCacheInfo();
|
||||
}
|
||||
// </FS:Beq>
|
||||
|
||||
// <FS:PP> FIRE-4785: Current render quality setting in sysinfo / about floater
|
||||
switch (gSavedSettings.getU32("RenderQualityPerformance"))
|
||||
|
|
|
|||
|
|
@ -253,6 +253,7 @@ protected:
|
|||
virtual void overrideDetectedHardware(); // <FS:Beq/> Override VRAM (and others in future?) consistently.
|
||||
virtual bool initSLURLHandler();
|
||||
virtual bool sendURLToOtherInstance(const std::string& url);
|
||||
virtual void bugsplatAddStaticAttributes(const LLSD& info) {/*empty*/}; // <FS:Beq/> create a NOOP base impl
|
||||
|
||||
virtual bool initParseCommandLine(LLCommandLineParser& clp)
|
||||
{ return true; } // Allow platforms to specify the command line args.
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@
|
|||
|
||||
// Bugsplat (http://bugsplat.com) crash reporting tool
|
||||
#ifdef LL_BUGSPLAT
|
||||
#include "bugsplatattributes.h"
|
||||
#include "BugSplat.h"
|
||||
#include "boost/json.hpp" // Boost.Json
|
||||
#include "llagent.h" // for agent location
|
||||
|
|
@ -164,6 +165,7 @@ namespace
|
|||
flavor = "oss";
|
||||
#endif
|
||||
sBugSplatSender->setDefaultUserEmail( WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " (" << ADDRESS_SIZE << "-bit, flavor " << flavor <<")")));
|
||||
BugSplatAttributes::instance().setAttribute("Flavor", flavor);
|
||||
// </FS:ND>
|
||||
|
||||
//<FS:ND/> Clear out username first, as we get some crashes that has the OS set as username, let's see if this fixes it. Use Crash.Linden as a usr can never have a "Linden"
|
||||
|
|
@ -194,27 +196,47 @@ namespace
|
|||
}
|
||||
|
||||
// LL_ERRS message, when there is one
|
||||
sBugSplatSender->setDefaultUserDescription(WCSTR(LLError::getFatalMessage()));
|
||||
|
||||
sBugSplatSender->setAttribute(WCSTR(L"OS"), WCSTR(LLOSInfo::instance().getOSStringSimple())); // In case we ever stop using email for this
|
||||
sBugSplatSender->setAttribute(WCSTR(L"AppState"), WCSTR(LLStartUp::getStartupStateString()));
|
||||
sBugSplatSender->setAttribute(WCSTR(L"GL Vendor"), WCSTR(gGLManager.mGLVendor));
|
||||
sBugSplatSender->setAttribute(WCSTR(L"GL Version"), WCSTR(gGLManager.mGLVersionString));
|
||||
sBugSplatSender->setAttribute(WCSTR(L"GPU Version"), WCSTR(gGLManager.mDriverVersionVendorString));
|
||||
sBugSplatSender->setAttribute(WCSTR(L"GL Renderer"), WCSTR(gGLManager.mGLRenderer));
|
||||
sBugSplatSender->setAttribute(WCSTR(L"VRAM"), WCSTR(STRINGIZE(gGLManager.mVRAM)));
|
||||
sBugSplatSender->setAttribute(WCSTR(L"RAM"), WCSTR(STRINGIZE(gSysMemory.getPhysicalMemoryKB().value())));
|
||||
// <FS:Beq> Improve bugsplpat reporting with attributes
|
||||
// sBugSplatSender->setDefaultUserDescription(WCSTR(LLError::getFatalMessage()));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"OS"), WCSTR(LLOSInfo::instance().getOSStringSimple())); // In case we ever stop using email for this
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"AppState"), WCSTR(LLStartUp::getStartupStateString()));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"GL Vendor"), WCSTR(gGLManager.mGLVendor));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"GL Version"), WCSTR(gGLManager.mGLVersionString));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"GPU Version"), WCSTR(gGLManager.mDriverVersionVendorString));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"GL Renderer"), WCSTR(gGLManager.mGLRenderer));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"VRAM"), WCSTR(STRINGIZE(gGLManager.mVRAM)));
|
||||
// sBugSplatSender->setAttribute(WCSTR(L"RAM"), WCSTR(STRINGIZE(gSysMemory.getPhysicalMemoryKB().value())));
|
||||
|
||||
auto fatal_message = LLError::getFatalMessage();
|
||||
sBugSplatSender->setDefaultUserDescription(WCSTR(fatal_message));
|
||||
BugSplatAttributes::instance().setAttribute("FatalMessage", fatal_message); // <FS:Beq/> Store this additionally as an attribute in case user overwrites.
|
||||
// App state
|
||||
BugSplatAttributes::instance().setAttribute("AppState", LLStartUp::getStartupStateString());
|
||||
// Location
|
||||
// </FS:Beq>
|
||||
if (gAgent.getRegion())
|
||||
{
|
||||
// region location, when we have it
|
||||
LLVector3 loc = gAgent.getPositionAgent();
|
||||
sBugSplatSender->resetAppIdentifier(
|
||||
WCSTR(STRINGIZE(gAgent.getRegion()->getName()
|
||||
// <FS:Beq> Improve bugsplat reporting with attributes
|
||||
// LLVector3 loc = gAgent.getPositionAgent();
|
||||
// sBugSplatSender->resetAppIdentifier(
|
||||
// WCSTR(STRINGIZE(gAgent.getRegion()->getName()
|
||||
// << '/' << loc.mV[0]
|
||||
// << '/' << loc.mV[1]
|
||||
// << '/' << loc.mV[2])));
|
||||
const LLVector3 loc = gAgent.getPositionAgent();
|
||||
const auto & fullLocation = STRINGIZE(gAgent.getRegion()->getName()
|
||||
<< '/' << loc.mV[0]
|
||||
<< '/' << loc.mV[1]
|
||||
<< '/' << loc.mV[2])));
|
||||
<< '/' << loc.mV[2]);
|
||||
sBugSplatSender->resetAppIdentifier(WCSTR(fullLocation));
|
||||
BugSplatAttributes::instance().setAttribute("Location", std::string(fullLocation));
|
||||
// </FS:Beq>
|
||||
}
|
||||
// <FS:Beq> Improve bugsplat reporting with attributes
|
||||
LLAppViewer::instance()->writeDebugInfo();
|
||||
sBugSplatSender->sendAdditionalFile(WCSTR(BugSplatAttributes::getCrashContextFileName())); // <FS:Beq/> Add the new attributes file
|
||||
// </FS:Beq>
|
||||
} // MDSCB_EXCEPTIONCODE
|
||||
|
||||
return false;
|
||||
|
|
@ -619,6 +641,88 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
|
|||
}
|
||||
}
|
||||
#endif
|
||||
// <FS:Beq> Use the Attributes API on Windows to enhance crash metadata
|
||||
void LLAppViewerWin32::bugsplatAddStaticAttributes(const LLSD& info)
|
||||
{
|
||||
#ifdef LL_BUGSPLAT
|
||||
auto& bugSplatMap = BugSplatAttributes::instance();
|
||||
static bool write_once_after_startup = false;
|
||||
if (!write_once_after_startup )
|
||||
{
|
||||
// Only write the attributes that are fixed once after we've started.
|
||||
// note we might update them more than once and some/many may be empty during startup as we want to catch early crashes
|
||||
// once we're started we can assume they don't change for this run.
|
||||
if( LLStartUp::getStartupState() == STATE_STARTED)
|
||||
{
|
||||
write_once_after_startup = true;
|
||||
}
|
||||
|
||||
auto multipleInstances = gDebugInfo["FoundOtherInstanceAtStartup"].asBoolean();
|
||||
bugSplatMap.setAttribute("MultipleInstance", multipleInstances);
|
||||
|
||||
bugSplatMap.setAttribute("GPU", info["GRAPHICS_CARD"].asString());
|
||||
bugSplatMap.setAttribute("GPU VRAM Detected (MB)", info["GRAPHICS_CARD_MEMORY_DETECTED"].asInteger());
|
||||
bugSplatMap.setAttribute("GPU VRAM (Budget)", info["VRAM_BUDGET_ENGLISH"].asInteger());
|
||||
|
||||
bugSplatMap.setAttribute("CPU", info["CPU"].asString());
|
||||
bugSplatMap.setAttribute("Graphics Driver", info["GRAPHICS_DRIVER_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("CPU MHz", (S32)gSysCPU.getMHz()); //
|
||||
#ifdef USE_AVX2_OPTIMIZATION
|
||||
bugSplatMap.setAttribute("SIMD", "AVX2");
|
||||
#elif USE_AVX_OPTIMIZATION
|
||||
bugSplatMap.setAttribute("SIMD", "AVX");
|
||||
#else
|
||||
bugSplatMap.setAttribute("SIMD", "SSE2");
|
||||
#endif
|
||||
// set physical ram integer as a string attribute
|
||||
bugSplatMap.setAttribute("Physical RAM (KB)", LLMemory::getMaxMemKB().value());
|
||||
bugSplatMap.setAttribute("OpenGL Version", info["OPENGL_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("libcurl Version", info["LIBCURL_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("J2C Decoder Version", info["J2C_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("Audio Driver Version", info["AUDIO_DRIVER_VERSION"].asString());
|
||||
// bugSplatMap.setAttribute("CEF Info", info["LIBCEF_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("LibVLC Version", info["LIBVLC_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("Vivox Version", info["VOICE_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("RLVa", info["RLV_VERSION"].asString());
|
||||
bugSplatMap.setAttribute("Mode", info["MODE"].asString());
|
||||
bugSplatMap.setAttribute("Skin", llformat("%s (%s)", info["SKIN"].asString().c_str(), info["THEME"].asString().c_str()));
|
||||
#if LL_DARWIN
|
||||
bugSplatMap.setAttribute("HiDPI", info["HIDPI"].asBoolean() ? "Enabled" : "Disabled");
|
||||
#endif
|
||||
|
||||
if (gSavedSettings.getBOOL("FSRestrictMaxTextureSize"))
|
||||
{
|
||||
bugSplatMap.setAttribute("Max Texture Size", gSavedSettings.getString("FSRestrictMaxTexturePixels"));
|
||||
}
|
||||
else
|
||||
{
|
||||
bugSplatMap.setAttribute("Max Texture Size", gSavedSettings.getString("Unlimited"));
|
||||
}
|
||||
}
|
||||
|
||||
// These attributes are potentially dynamic
|
||||
bugSplatMap.setAttribute("Packets Lost", llformat("%.0f/%.0f (%.1f%%)", info["PACKETS_LOST"].asReal(), info["PACKETS_IN"].asReal(), info["PACKETS_PCT"].asReal()));
|
||||
bugSplatMap.setAttribute("Window Size", llformat("%sx%s px", info["WINDOW_WIDTH"].asString().c_str(), info["WINDOW_HEIGHT"].asString().c_str()));
|
||||
bugSplatMap.setAttribute("Draw Distance (m)", info["DRAW_DISTANCE"].asInteger());
|
||||
bugSplatMap.setAttribute("Bandwidth (kbit/s)", info["BANDWIDTH"].asInteger());
|
||||
bugSplatMap.setAttribute("LOD Factor", info["LOD"].asReal());
|
||||
bugSplatMap.setAttribute("Render quality", info["RENDERQUALITY_FSDATA_ENGLISH"].asString());
|
||||
bugSplatMap.setAttribute("Disk Cache", info["DISK_CACHE_INFO"].asString());
|
||||
|
||||
bugSplatMap.setAttribute("GridName", gDebugInfo["GridName"].asString());
|
||||
LLMemory::updateMemoryInfo();
|
||||
bugSplatMap.setAttribute("Available RAM (KB)", LLMemory::getAvailableMemKB().value());
|
||||
bugSplatMap.setAttribute("Allocated RAM (KB)", LLMemory::getAllocatedMemKB().value());
|
||||
bugSplatMap.setAttribute("GPU VRAM (MB)", info["GRAPHICS_CARD_MEMORY"].asInteger());
|
||||
|
||||
|
||||
if (bugSplatMap.writeToFile(BugSplatAttributes::getCrashContextFileName()))
|
||||
{
|
||||
LL_INFOS() << "Crash context saved to " << WCSTR(BugSplatAttributes::getCrashContextFileName()) << LL_ENDL;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
// </FS:Beq>
|
||||
|
||||
void LLAppViewerWin32::disableWinErrorReporting()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ protected:
|
|||
|
||||
private:
|
||||
void disableWinErrorReporting();
|
||||
|
||||
void bugsplatAddStaticAttributes(const LLSD& info) override; // <FS:Beq> override for windows attributes
|
||||
std::string mCmdLine;
|
||||
bool mIsConsoleAllocated;
|
||||
|
||||
|
|
|
|||
|
|
@ -190,8 +190,10 @@ bool LLViewerDynamicTexture::updateAllInstances()
|
|||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
LLRenderTarget& preview_target = gPipeline.mAuxillaryRT.deferredScreen;
|
||||
// <FS:Beq> Add dedicated preview target
|
||||
// LLRenderTarget& preview_target = gPipeline.mAuxillaryRT.deferredScreen;
|
||||
LLRenderTarget& preview_target = gPipeline.mPreviewScreen;
|
||||
// </FS:Beq>
|
||||
LLRenderTarget& bake_target = gPipeline.mBakeMap;
|
||||
if (!preview_target.isComplete() || !bake_target.isComplete())
|
||||
{
|
||||
|
|
@ -199,7 +201,7 @@ bool LLViewerDynamicTexture::updateAllInstances()
|
|||
return false;
|
||||
}
|
||||
llassert(preview_target.getWidth() >= LLPipeline::MAX_PREVIEW_WIDTH);
|
||||
llassert(preview_target.getHeight() >= LLPipeline::MAX_PREVIEW_WIDTH);
|
||||
llassert(preview_target.getHeight() >= LLPipeline::MAX_PREVIEW_HEIGHT); // <FS:Beq/> make this consistent with other render targets
|
||||
llassert(bake_target.getWidth() >= (U32) LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH);
|
||||
llassert(bake_target.getHeight() >= (U32) LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT);
|
||||
|
||||
|
|
|
|||
|
|
@ -80,15 +80,17 @@ LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
|
|||
|
||||
void LLFloaterSettingsDebug::onUpdateFilter()
|
||||
{
|
||||
std::string searchTerm = mSearchSettingsInput->getValue();
|
||||
static LLCachedControl<bool> hide_default(gSavedSettings, "DebugSettingsHideDefault", false);
|
||||
static bool previous_hide_default{hide_default};
|
||||
|
||||
std::string searchTerm = mSearchSettingsInput->getValue();
|
||||
// make sure not to reselect the first item in the list on focus restore
|
||||
if (searchTerm == mOldSearchTerm)
|
||||
if (searchTerm == mOldSearchTerm && previous_hide_default == hide_default)
|
||||
{
|
||||
return;
|
||||
}
|
||||
mOldSearchTerm = searchTerm;
|
||||
|
||||
previous_hide_default = hide_default;
|
||||
mSettingsScrollList->deleteAllItems();
|
||||
|
||||
settings_map_t::iterator it;
|
||||
|
|
@ -125,7 +127,25 @@ void LLFloaterSettingsDebug::onUpdateFilter()
|
|||
if (addItem)
|
||||
{
|
||||
LLSD item;
|
||||
item["columns"][0]["value"] = it->second->getName();
|
||||
// <FS:Beq> indicate non-default settings in debug view
|
||||
// item["columns"][0]["value"] = it->second->getName();
|
||||
// Skip default settings if hide_default is enabled
|
||||
const auto& setting_name = it->second->getName();
|
||||
bool current_setting_is_default = it->second->isDefault();
|
||||
|
||||
if (hide_default && current_setting_is_default)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
item["columns"][1]["column"] = "setting";
|
||||
item["columns"][1]["value"] = setting_name;
|
||||
if (!current_setting_is_default)
|
||||
{
|
||||
item["columns"][0]["column"] = "changed_setting";
|
||||
item["columns"][0]["value"] = LLSD::String( "*"); // Indicate non-default settings
|
||||
}
|
||||
// </FS:Beq>
|
||||
mSettingsScrollList->addElement(item, ADD_BOTTOM, it->second);
|
||||
}
|
||||
}
|
||||
|
|
@ -134,7 +154,7 @@ void LLFloaterSettingsDebug::onUpdateFilter()
|
|||
// but only if actually a search term was given
|
||||
if (mSettingsScrollList->getItemCount() && !searchTerm.empty())
|
||||
{
|
||||
mSettingsScrollList->sortByColumnIndex(0, true);
|
||||
mSettingsScrollList->sortByColumnIndex(1, true);
|
||||
mSettingsScrollList->selectFirstItem();
|
||||
}
|
||||
|
||||
|
|
@ -186,8 +206,10 @@ bool LLFloaterSettingsDebug::postBuild()
|
|||
gSavedPerAccountSettings.applyToAll(&func);
|
||||
}
|
||||
|
||||
gSavedSettings.getControl("DebugSettingsHideDefault")->getCommitSignal()->connect(boost::bind(&LLFloaterSettingsDebug::onUpdateFilter, this)); // <FS:Beq/> bind the show changed settings toggle
|
||||
|
||||
onUpdateFilter();
|
||||
mSettingsScrollList->sortByColumnIndex(0,true);
|
||||
mSettingsScrollList->sortByColumnIndex(1,true); // <FS:Beq/> Sort by name (column 1)
|
||||
|
||||
LLNotificationsUtil::add("DebugSettingsWarning");
|
||||
|
||||
|
|
|
|||
|
|
@ -1501,7 +1501,10 @@ bool LLFloaterSnapshotBase::ImplBase::updatePreviewList(bool initialized)
|
|||
void LLFloaterSnapshotBase::ImplBase::updateLivePreview()
|
||||
{
|
||||
// don't update preview for hidden floater
|
||||
if (mFloater && mFloater->isInVisibleChain() && ImplBase::updatePreviewList(true))
|
||||
// <FS:Beq> FIRE-35002 - Post to flickr broken
|
||||
// if (mFloater && mFloater->isInVisibleChain() && ImplBase::updatePreviewList(true))
|
||||
if (ImplBase::updatePreviewList(true) && mFloater)
|
||||
// </FS:Beq>
|
||||
{
|
||||
LL_DEBUGS() << "changed" << LL_ENDL;
|
||||
updateControls(mFloater);
|
||||
|
|
|
|||
|
|
@ -213,7 +213,6 @@ bool LLNetMap::postBuild()
|
|||
commitRegistrar.add("Minimap.StartTracking", boost::bind(&LLNetMap::handleStartTracking, this));
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
commitRegistrar.add("Minimap.ShowProfile", boost::bind(&LLNetMap::handleShowProfile, this, _2));
|
||||
commitRegistrar.add("Minimap.TextureType", boost::bind(&LLNetMap::handleTextureType, this, _2));
|
||||
commitRegistrar.add("Minimap.ToggleOverlay", boost::bind(&LLNetMap::handleOverlayToggle, this, _2));
|
||||
|
||||
commitRegistrar.add("Minimap.AddFriend", boost::bind(&LLNetMap::handleAddFriend, this));
|
||||
|
|
@ -238,9 +237,6 @@ bool LLNetMap::postBuild()
|
|||
commitRegistrar.add("Minimap.EstateBan", boost::bind(&LLNetMap::handleEstateBan, this));
|
||||
commitRegistrar.add("Minimap.Derender", boost::bind(&LLNetMap::handleDerender, this, false));
|
||||
commitRegistrar.add("Minimap.DerenderPermanent", boost::bind(&LLNetMap::handleDerender, this, true));
|
||||
|
||||
enableRegistrar.add("Minimap.CheckTextureType", boost::bind(&LLNetMap::checkTextureType, this, _2));
|
||||
|
||||
enableRegistrar.add("Minimap.CanAddFriend", boost::bind(&LLNetMap::canAddFriend, this));
|
||||
enableRegistrar.add("Minimap.CanRemoveFriend", boost::bind(&LLNetMap::canRemoveFriend, this));
|
||||
enableRegistrar.add("Minimap.CanCall", boost::bind(&LLNetMap::canCall, this));
|
||||
|
|
@ -458,86 +454,26 @@ void LLNetMap::draw()
|
|||
gGL.color4f(1.f, 0.5f, 0.5f, 1.f);
|
||||
}
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-07-26 (Catznip-3.3)
|
||||
static LLCachedControl<bool> s_fUseWorldMapTextures(gSavedSettings, "MiniMapWorldMapTextures") ;
|
||||
bool fRenderTerrain = true;
|
||||
|
||||
if (s_fUseWorldMapTextures)
|
||||
// Draw using texture.
|
||||
gGL.getTexUnit(0)->bind(regionp->getLand().getSTexture());
|
||||
gGL.begin(LLRender::TRIANGLES);
|
||||
{
|
||||
const LLViewerRegion::tex_matrix_t& tiles(regionp->getWorldMapTiles());
|
||||
for (S32 i(0), scaled_width((S32)(real_width / region_width)), square_width(scaled_width * scaled_width);
|
||||
i < square_width; ++i)
|
||||
{
|
||||
const F32 y = (F32)(i / scaled_width);
|
||||
const F32 x = (F32)(i - y * scaled_width);
|
||||
const F32 local_left(left + x * mScale);
|
||||
const F32 local_right(local_left + mScale);
|
||||
const F32 local_bottom(bottom + y * mScale);
|
||||
const F32 local_top(local_bottom + mScale);
|
||||
LLViewerTexture* pRegionImage = tiles[(U64)(x * scaled_width + y)];
|
||||
if (pRegionImage)
|
||||
{
|
||||
// Ansariel: Map texture ends up without GLTexture after a teleport.
|
||||
// Simply calling createGLTexture() should be fine here
|
||||
// because the same method is called in getSTexture() in
|
||||
// the render terrain path if for some reason no
|
||||
// GLTexture exists.
|
||||
if (!pRegionImage->hasGLTexture() && !pRegionImage->createGLTexture())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
gGL.texCoord2f(0.f, 1.f);
|
||||
gGL.vertex2f(left, top);
|
||||
gGL.texCoord2f(0.f, 0.f);
|
||||
gGL.vertex2f(left, bottom);
|
||||
gGL.texCoord2f(1.f, 0.f);
|
||||
gGL.vertex2f(right, bottom);
|
||||
|
||||
gGL.getTexUnit(0)->bind(pRegionImage);
|
||||
gGL.begin(LLRender::TRIANGLES);
|
||||
{
|
||||
gGL.texCoord2f(0.f, 1.f);
|
||||
gGL.vertex2f(local_left, local_top);
|
||||
gGL.texCoord2f(0.f, 0.f);
|
||||
gGL.vertex2f(local_left, local_bottom);
|
||||
gGL.texCoord2f(1.f, 0.f);
|
||||
gGL.vertex2f(local_right, local_bottom);
|
||||
|
||||
gGL.texCoord2f(0.f, 1.f);
|
||||
gGL.vertex2f(local_left, local_top);
|
||||
gGL.texCoord2f(1.f, 0.f);
|
||||
gGL.vertex2f(local_right, local_bottom);
|
||||
gGL.texCoord2f(1.f, 1.f);
|
||||
gGL.vertex2f(local_right, local_top);
|
||||
}
|
||||
gGL.end();
|
||||
|
||||
pRegionImage->setBoostLevel(LLViewerTexture::BOOST_MAP_VISIBLE);
|
||||
fRenderTerrain = false;
|
||||
}
|
||||
}
|
||||
gGL.texCoord2f(0.f, 1.f);
|
||||
gGL.vertex2f(left, top);
|
||||
gGL.texCoord2f(1.f, 0.f);
|
||||
gGL.vertex2f(right, bottom);
|
||||
gGL.texCoord2f(1.f, 1.f);
|
||||
gGL.vertex2f(right, top);
|
||||
}
|
||||
// [/SL:KB]
|
||||
gGL.end();
|
||||
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-07-26 (Catznip-3.3)
|
||||
if (fRenderTerrain)
|
||||
{
|
||||
// [/SL:KB]
|
||||
// Draw using texture.
|
||||
gGL.getTexUnit(0)->bind(regionp->getLand().getSTexture());
|
||||
gGL.begin(LLRender::TRIANGLES);
|
||||
{
|
||||
gGL.texCoord2f(0.f, 1.f);
|
||||
gGL.vertex2f(left, top);
|
||||
gGL.texCoord2f(0.f, 0.f);
|
||||
gGL.vertex2f(left, bottom);
|
||||
gGL.texCoord2f(1.f, 0.f);
|
||||
gGL.vertex2f(right, bottom);
|
||||
|
||||
gGL.texCoord2f(0.f, 1.f);
|
||||
gGL.vertex2f(left, top);
|
||||
gGL.texCoord2f(1.f, 0.f);
|
||||
gGL.vertex2f(right, bottom);
|
||||
gGL.texCoord2f(1.f, 1.f);
|
||||
gGL.vertex2f(right, top);
|
||||
}
|
||||
gGL.end();
|
||||
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-07-26 (Catznip-3.3)
|
||||
}
|
||||
gGL.flush();
|
||||
}
|
||||
|
||||
|
|
@ -1741,23 +1677,6 @@ void LLNetMap::handleShowProfile(const LLSD& sdParam) const
|
|||
FSFloaterPlaceDetails::showPlaceDetails(sdParams);
|
||||
}
|
||||
}
|
||||
|
||||
bool LLNetMap::checkTextureType(const LLSD& sdParam) const
|
||||
{
|
||||
const std::string strParam = sdParam.asString();
|
||||
|
||||
bool fWorldMapTextures = gSavedSettings.getBOOL("MiniMapWorldMapTextures");
|
||||
if ("maptile" == strParam)
|
||||
return fWorldMapTextures;
|
||||
else if ("terrain" == strParam)
|
||||
return !fWorldMapTextures;
|
||||
return false;
|
||||
}
|
||||
|
||||
void LLNetMap::handleTextureType(const LLSD& sdParam) const
|
||||
{
|
||||
gSavedSettings.setBOOL("MiniMapWorldMapTextures", ("maptile" == sdParam.asString()));
|
||||
}
|
||||
// [/SL:KB]
|
||||
|
||||
bool LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
|
||||
|
|
|
|||
|
|
@ -224,8 +224,6 @@ private:
|
|||
void handleCam();
|
||||
// [SL:KB] - Patch: World-MiniMap | Checked: 2012-07-08 (Catznip-3.3)
|
||||
void handleOverlayToggle(const LLSD& sdParam);
|
||||
bool checkTextureType(const LLSD& sdParam) const;
|
||||
void handleTextureType(const LLSD& sdParam) const;
|
||||
void setAvatarProfileLabel(const LLUUID& av_id, const LLAvatarName& avName, const std::string& item_name);
|
||||
typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t;
|
||||
avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
|
||||
|
|
|
|||
|
|
@ -655,7 +655,7 @@ void LLSnapshotLivePreview::generateThumbnailImage(bool force_update)
|
|||
|
||||
LLViewerTexture* LLSnapshotLivePreview::getBigThumbnailImage()
|
||||
{
|
||||
if (mThumbnailUpdateLock) //in the process of updating
|
||||
if (mThumbnailUpdateLock | !mPreviewImage) //in the process of updating <FS:Beq/> (bugsplat avoidance) ensure mPreviewImage is valid
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -224,7 +224,10 @@ LLViewerTexture* LLSurface::getSTexture()
|
|||
|
||||
void LLSurface::createSTexture()
|
||||
{
|
||||
if (!mSTexturep)
|
||||
// <FS:Ansariel> Fix for minimap world tiles missing
|
||||
//if (!mSTexturep)
|
||||
if (mSTexturep.isNull() || !mSTexturep->hasGLTexture())
|
||||
// </FS:Ansariel>
|
||||
{
|
||||
U64 handle = mRegionp->getHandle();
|
||||
|
||||
|
|
|
|||
|
|
@ -1130,7 +1130,7 @@ void LLTextureFetchWorker::startWork(S32 param)
|
|||
// Threads: Ttf
|
||||
bool LLTextureFetchWorker::doWork(S32 param)
|
||||
{
|
||||
LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD;
|
||||
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; // <FS:Beq/> Fix wrong category
|
||||
if (gNonInteractive)
|
||||
{
|
||||
return true;
|
||||
|
|
@ -1145,7 +1145,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
{
|
||||
if (mState < DECODE_IMAGE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - state < decode");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - state < decode"); //<FS:Beq/> fix incorrect category
|
||||
return true; // abort
|
||||
}
|
||||
}
|
||||
|
|
@ -1157,7 +1157,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
if (mState == INIT || mState == LOAD_FROM_NETWORK || mState == LOAD_FROM_SIMULATOR)
|
||||
// </FS:Ansariel>
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - priority < 0");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - priority < 0"); //<FS:Beq/> fix incorrect category
|
||||
LL_DEBUGS(LOG_TXT) << mID << " abort: mImagePriority < F_ALMOST_ZERO" << LL_ENDL;
|
||||
return true; // abort
|
||||
}
|
||||
|
|
@ -1179,7 +1179,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
if(mState > CACHE_POST && !mCanUseNET && !mCanUseHTTP)
|
||||
// </FS:Ansariel>
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - state > cache_post");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - state > cache_post"); //<FS:Beq/> fix incorrect category
|
||||
//nowhere to get data, abort.
|
||||
LL_WARNS(LOG_TXT) << mID << " abort, nowhere to get data" << LL_ENDL;
|
||||
return true ;
|
||||
|
|
@ -1201,7 +1201,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == INIT)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - INIT");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - INIT"); //<FS:Beq/> fix incorrect category
|
||||
|
||||
// <FS> Asset Blacklist
|
||||
if (FSAssetBlacklist::getInstance()->isBlacklisted(mID, LLAssetType::AT_TEXTURE))
|
||||
|
|
@ -1253,7 +1253,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == LOAD_FROM_TEXTURE_CACHE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - LOAD_FROM_TEXTURE_CACHE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - LOAD_FROM_TEXTURE_CACHE"); //<FS:Beq/> fix incorrect category
|
||||
if (mCacheReadHandle == LLTextureCache::nullHandle())
|
||||
{
|
||||
S32 offset = mFormattedImage.notNull() ? mFormattedImage->getDataSize() : 0;
|
||||
|
|
@ -1325,7 +1325,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == CACHE_POST)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - CACHE_POST");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - CACHE_POST"); //<FS:Beq/> fix incorrect category
|
||||
mCachedSize = mFormattedImage.notNull() ? mFormattedImage->getDataSize() : 0;
|
||||
// Successfully loaded
|
||||
if ((mCachedSize >= mDesiredSize) || mHaveAllData)
|
||||
|
|
@ -1367,7 +1367,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == LOAD_FROM_NETWORK)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - LOAD_FROM_NETWORK");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - LOAD_FROM_NETWORK"); //<FS:Beq/> fix incorrect category
|
||||
// Check for retries to previous server failures.
|
||||
F32 wait_seconds;
|
||||
if (mFetchRetryPolicy.shouldRetry(wait_seconds))
|
||||
|
|
@ -1470,7 +1470,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
// <FS:Ansariel> OpenSim compatibility
|
||||
if (mState == LOAD_FROM_SIMULATOR)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - LOAD_FROM_SIMULATOR");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - LOAD_FROM_SIMULATOR"); //<FS:Beq/> fix incorrect category
|
||||
if (mFormattedImage.isNull())
|
||||
{
|
||||
mFormattedImage = new LLImageJ2C;
|
||||
|
|
@ -1522,7 +1522,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == WAIT_HTTP_RESOURCE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - WAIT_HTTP_RESOURCE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - WAIT_HTTP_RESOURCE"); //<FS:Beq/> fix incorrect category
|
||||
// NOTE:
|
||||
// control the number of the http requests issued for:
|
||||
// 1, not openning too many file descriptors at the same time;
|
||||
|
|
@ -1548,14 +1548,14 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == WAIT_HTTP_RESOURCE2)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - WAIT_HTTP_RESOURCE2");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - WAIT_HTTP_RESOURCE2"); //<FS:Beq/> fix incorrect category
|
||||
// Just idle it if we make it to the head...
|
||||
return false;
|
||||
}
|
||||
|
||||
if (mState == SEND_HTTP_REQ)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - SEND_HTTP_REQ");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - SEND_HTTP_REQ"); //<FS:Beq/> fix incorrect category
|
||||
// Also used in llmeshrepository
|
||||
static LLCachedControl<bool> disable_range_req(gSavedSettings, "HttpRangeRequestsDisable", false);
|
||||
|
||||
|
|
@ -1686,7 +1686,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == WAIT_HTTP_REQ)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - WAIT_HTTP_REQ");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - WAIT_HTTP_REQ"); //<FS:Beq/> fix incorrect category
|
||||
// *NOTE: As stated above, all transitions out of this state should
|
||||
// call releaseHttpSemaphore().
|
||||
if (mLoaded)
|
||||
|
|
@ -1926,7 +1926,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == DECODE_IMAGE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - DECODE_IMAGE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - DECODE_IMAGE"); //<FS:Beq/> fix incorrect category
|
||||
static LLCachedControl<bool> textures_decode_disabled(gSavedSettings, "TextureDecodeDisabled", false);
|
||||
|
||||
if (textures_decode_disabled)
|
||||
|
|
@ -1995,7 +1995,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == DECODE_IMAGE_UPDATE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - DECODE_IMAGE_UPDATE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - DECODE_IMAGE_UPDATE"); //<FS:Beq/> fix incorrect category
|
||||
if (mDecoded)
|
||||
{
|
||||
mDecodeTime = mDecodeTimer.getElapsedTimeF32();
|
||||
|
|
@ -2036,7 +2036,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == WRITE_TO_CACHE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - WRITE_TO_CACHE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - WRITE_TO_CACHE"); //<FS:Beq/> fix incorrect category
|
||||
if (mWriteToCacheState != SHOULD_WRITE || mFormattedImage.isNull())
|
||||
{
|
||||
// If we're in a local cache or we didn't actually receive any new data,
|
||||
|
|
@ -2079,7 +2079,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == WAIT_ON_WRITE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - WAIT_ON_WRITE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - WAIT_ON_WRITE"); //<FS:Beq/> fix incorrect category
|
||||
if (writeToCacheComplete())
|
||||
{
|
||||
mCacheWriteTime = mCacheWriteTimer.getElapsedTimeF32();
|
||||
|
|
@ -2101,7 +2101,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
|
|||
|
||||
if (mState == DONE)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("tfwdw - DONE");
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("tfwdw - DONE"); //<FS:Beq/> fix incorrect category
|
||||
if (mDecodedDiscard >= 0 && mDesiredDiscard < mDecodedDiscard)
|
||||
{
|
||||
// More data was requested, return to INIT
|
||||
|
|
|
|||
|
|
@ -11737,8 +11737,12 @@ class LLWorldEnvSettings : public view_listener_t
|
|||
}
|
||||
else if (event_name == "legacy noon")
|
||||
{
|
||||
LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY, LLEnvironment::TRANSITION_INSTANT);
|
||||
LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::TRANSITION_INSTANT);
|
||||
// <FS:Beq> Add legacy noon to the manually selected environments that can have a user defined transition time.
|
||||
// LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY, LLEnvironment::TRANSITION_INSTANT);
|
||||
// LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::TRANSITION_INSTANT);
|
||||
LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY);
|
||||
LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
|
||||
// </FS:Beq>
|
||||
defocusEnvFloaters();
|
||||
}
|
||||
else if (event_name == "sunset")
|
||||
|
|
|
|||
|
|
@ -1849,7 +1849,9 @@ bool LLViewerFetchedTexture::isActiveFetching()
|
|||
{
|
||||
static LLCachedControl<bool> monitor_enabled(gSavedSettings,"DebugShowTextureInfo");
|
||||
|
||||
return mFetchState > 7 && mFetchState < 10 && monitor_enabled; //in state of WAIT_HTTP_REQ or DECODE_IMAGE.
|
||||
// <FS:Ansariel> OpenSim compatibility
|
||||
//return mFetchState > 7 && mFetchState < 10 && monitor_enabled; //in state of WAIT_HTTP_REQ or DECODE_IMAGE.
|
||||
return mFetchState > 8 && mFetchState < 11 && monitor_enabled; //in state of WAIT_HTTP_REQ or DECODE_IMAGE.
|
||||
}
|
||||
|
||||
void LLViewerFetchedTexture::setBoostLevel(S32 level)
|
||||
|
|
|
|||
|
|
@ -984,8 +984,16 @@ void LLVOVolume::updateTextureVirtualSize(bool forced)
|
|||
// animated faces get moved to a smaller partition to reduce
|
||||
// side-effects of their updates (see shrinkWrap in
|
||||
// LLVOVolume::animateTextures).
|
||||
mDrawable->getSpatialGroup()->dirtyGeom();
|
||||
gPipeline.markRebuild(mDrawable->getSpatialGroup());
|
||||
// <FS:Beq> FIRE-35018 (Bugsplat) Crash due to spatial group being null
|
||||
// mDrawable->getSpatialGroup()->dirtyGeom();
|
||||
// gPipeline.markRebuild(mDrawable->getSpatialGroup());
|
||||
auto spatial_group = mDrawable->getSpatialGroup();
|
||||
if (spatial_group)
|
||||
{
|
||||
spatial_group->dirtyGeom();
|
||||
gPipeline.markRebuild(spatial_group);
|
||||
}
|
||||
// </FS:Beq>
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -235,7 +235,9 @@ S32 LLPipeline::RenderHeroProbeUpdateRate;
|
|||
S32 LLPipeline::RenderHeroProbeConservativeUpdateMultiplier;
|
||||
LLTrace::EventStatHandle<S64> LLPipeline::sStatBatchSize("renderbatchsize");
|
||||
|
||||
const U32 LLPipeline::MAX_PREVIEW_WIDTH = 512;
|
||||
// const U32 LLPipeline::MAX_PREVIEW_WIDTH = 512;
|
||||
constexpr U32 LLPipeline::MAX_PREVIEW_WIDTH = 2048;
|
||||
constexpr U32 LLPipeline::MAX_PREVIEW_HEIGHT = 2048;
|
||||
|
||||
const F32 BACKLIGHT_DAY_MAGNITUDE_OBJECT = 0.1f;
|
||||
const F32 BACKLIGHT_NIGHT_MAGNITUDE_OBJECT = 0.08f;
|
||||
|
|
@ -999,6 +1001,7 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY)
|
|||
// See LLViwerTextureList::updateImagesCreateTextures and LLImageGL::scaleDown
|
||||
mDownResMap.allocate(1024, 1024, GL_RGBA);
|
||||
|
||||
mPreviewScreen.allocate(MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, GL_RGBA); // <FS:Beq/> create an independent preview screen target
|
||||
mBakeMap.allocate(LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH, LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT, GL_RGBA);
|
||||
}
|
||||
//HACK make screenbuffer allocations start failing after 30 seconds
|
||||
|
|
@ -1326,6 +1329,8 @@ void LLPipeline::releaseScreenBuffers()
|
|||
mHeroProbeRT.screen.release();
|
||||
mHeroProbeRT.deferredScreen.release();
|
||||
mHeroProbeRT.deferredLight.release();
|
||||
|
||||
mPreviewScreen.release(); // <FS:Beq/> dedicated preview target
|
||||
}
|
||||
|
||||
void LLPipeline::releaseSunShadowTarget(U32 index)
|
||||
|
|
|
|||
|
|
@ -717,6 +717,11 @@ public:
|
|||
// auxillary 512x512 render target pack
|
||||
// used by reflection probes and dynamic texture bakes
|
||||
RenderTargetPack mAuxillaryRT;
|
||||
// <FS:Beq> Fix the build floater preview window
|
||||
// dedicated 2048x2048 render target for preview
|
||||
// used by preview window dynamic textures
|
||||
LLRenderTarget mPreviewScreen;
|
||||
// </FS:Beq>
|
||||
|
||||
// Auxillary render target pack scaled to the hero probe's per-face size.
|
||||
RenderTargetPack mHeroProbeRT;
|
||||
|
|
@ -793,6 +798,7 @@ public:
|
|||
LLRenderTarget mWaterDis;
|
||||
|
||||
static const U32 MAX_PREVIEW_WIDTH;
|
||||
static const U32 MAX_PREVIEW_HEIGHT; // <FS:Beq/> dedicated render target for previews
|
||||
|
||||
//texture for making the glow
|
||||
LLRenderTarget mGlow[3];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
<!-- Locale Information -->
|
||||
<string name="MicrosoftLocale">az-Latn-AZ</string>
|
||||
<string name="MacLocale">az-Latn.UTF-8</string>
|
||||
<string name="macOSLocale">az-Latn.UTF-8</string>
|
||||
<string name="DarwinLocale">az_AZ.UTF-8</string>
|
||||
<string name="LinuxLocale">az_AZ.UTF-8</string>
|
||||
|
||||
|
|
@ -44,7 +45,6 @@
|
|||
<string name="TimeWeek">wkday,datetime,slt</string>
|
||||
<string name="TimeAMPM">ampm,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeSec">second,datetime,slt</string>
|
||||
<string name="TimeTimezone">timezone,datetime,slt</string>
|
||||
|
||||
<string name="LTimeMthNum">mthnum,datetime,local</string>
|
||||
|
|
|
|||
|
|
@ -3947,11 +3947,6 @@ Davam edilsin?
|
|||
Seçilmiş obyekt navigasiya şəbəkəsinə təsir edir. Onu Çevik Yola dəyişdirmək onu navigasiya şəbəkəsindən siləcək.
|
||||
<usetemplate ignoretext="Seçilmiş obyekt navigasiya şəbəkəsinə təsir edir. Onu Çevik Yola dəyişdirmək onu navigasiya şəbəkəsindən siləcək." name="okcancelignore" notext="Ləğv et" yestext="Bəli"/>
|
||||
</notification>
|
||||
<global name="UnsupportedIntelDriver">
|
||||
[GPUNAME] üçün quraşdırılmış Intel qrafik drayveri, versiya [VERSION] əhəmiyyətli dərəcədə köhnəlib və proqramın həddindən artıq çökməsinə səbəb olduğu bilinir. Sizə cari Intel drayverini yeniləməyiniz tövsiyə olunur.
|
||||
|
||||
Intel drayver veb-saytını yoxlamaq istəyirsiniz?
|
||||
</global>
|
||||
<global name="UnsupportedGPU">
|
||||
- Qrafik kartınız minimum tələblərə cavab vermir.
|
||||
</global>
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
<combo_box.item label="Dansk (Daniya dili) - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch (Alman dili)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (İspan dili) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Fransız dili) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano (İtalyan dili) - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Fransız dili)" name="French"/>
|
||||
<combo_box.item label="Italiano (İtalyan dili)" name="Italian"/>
|
||||
<combo_box.item label="Polski (Polonya dili)" name="Polish"/>
|
||||
<combo_box.item label="Português (Portugal dili) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="Русский (Rus dili)" name="Russian"/>
|
||||
<combo_box.item label="Türkçe (Türkcə) - Beta" name="Turkish"/>
|
||||
<combo_box.item label="日本語 (Yapon dili) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Adəti Çin dili) - Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Adəti Çin dili)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2" width="145">
|
||||
(yenidən başlatma tələb olunur)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<combo_box.item label="Dansk - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch (Tysk)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Spansk) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Fransk) - Beta" name="French"/>
|
||||
<combo_box.item label="Français (Fransk)" name="French"/>
|
||||
<combo_box.item label="Polski (Polsk)" name="Polish"/>
|
||||
<combo_box.item label="Português (Portugisisk) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="日本語 (Japansk) - Beta" name="(Japanese)"/>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
<floater name="settings_debug" title="Debug-Einstellungen">
|
||||
<panel name="debug_settings_search_panel">
|
||||
<search_editor label="Hier suchen" name="search_settings_input" tool_tip="Den Suchbegriff hier eingeben. Es werden Treffer einer Volltextsuche im Namen und Kommentar einer Einstellung angezeigt."/>
|
||||
<scroll_list name="settings_scroll_list">
|
||||
<scroll_list.columns label="Einstellung" name="setting"/>
|
||||
</scroll_list>
|
||||
<check_box label="Nur geänderte Einst. zeigen" name="hide_default"/>
|
||||
</panel>
|
||||
|
||||
<panel name="debug_settings_values_panel">
|
||||
|
|
|
|||
|
|
@ -4175,11 +4175,6 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter [SUPPORT
|
|||
Ihr Computer entspricht nicht den Hardwareanforderungen von [APP_NAME]. [APP_NAME] setzt eine OpenGL-Grafikkarte mit Multitextur-Unterstützung voraus. Falls Ihre Grafikkarte diese Funktion unterstützt, installieren Sie die neuesten Treiber sowie die aktuellen Service Packs und Patches für Ihr Betriebssystem.
|
||||
|
||||
Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter [SUPPORT_SITE].
|
||||
</global>
|
||||
<global name="UnsupportedIntelDriver">
|
||||
Der installierte Intel-Grafikkartentreiber für [GPUNAME], Version [VERSION], ist erheblich veraltet und dafür bekannt, eine Vielzahl von Programmabstürzen zu verursachen. Es wird dringend geraten, auf eine aktuelle Treiberversion zu aktualisieren.
|
||||
|
||||
Möchten Sie die Treiber-Webseite von Intel besuchen?
|
||||
</global>
|
||||
<global name="UnsupportedCPUAmount">
|
||||
796
|
||||
|
|
|
|||
|
|
@ -240,6 +240,7 @@
|
|||
<check_box label="Immer erweiterte Informationen zu Animationen anzeigen" tool_tip="Erweiterte Informationen zu Animation im Eigentschaftsfenster anzeigen" name="FSAnimationPreviewExpanded"/>
|
||||
<check_box label="Erweiterte Skript-Informationen aktivieren" tool_tip="Falls aktiviert, werden die Skript-Informationen um weitergehende Details ergänzt." name="FSScriptInfoExtended"/>
|
||||
<check_box label="Anhänge-Punkte in „Anhängen an“-Menüs alphabetisch sortieren (Erfordert Neustart)" tool_tip="Falls aktiviert, werden die Einträge in den „Anhängen an“-Menüs alphabetisch sortiert." name="FSSortAttachmentSpotsAlphabetically"/>
|
||||
<check_box label="Neues [APP_NAME] Textur-Panel im Werkzeug-Fenster verwenden (Erforder Neustart)" tool_tip="Falls aktiviert, werden die Werkzeuge zum Bearbeiten von Texturen den von [APP_NAME] verbesserten Workflow benutzen und gleichzeitiges Bearbeiten von Blinn-Phong- und PBR-Texturen erlauben." name="FSUseNewTexturePanel"/>
|
||||
</panel>
|
||||
|
||||
<!--Uploads-->
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<combo_box.item label="Dansk (Dänisch) - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Spanisch) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Französisch) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano (Italienisch) - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Französisch)" name="French"/>
|
||||
<combo_box.item label="Italiano (Italienisch)" name="Italian"/>
|
||||
<combo_box.item label="Polski (Polnisch)" name="Polish"/>
|
||||
<combo_box.item label="Português (Portugiesisch) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="Русский (Russisch) – Beta" name="Russian"/>
|
||||
<combo_box.item label="Русский (Russisch)" name="Russian"/>
|
||||
<combo_box.item label="Türkçe (Türkisch) – Beta" name="Turkish"/>
|
||||
<combo_box.item label="日本語 (Japanisch) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Traditionelles Chinesisch) – Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Traditionelles Chinesisch)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
(Erfordert Neustart)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,9 @@
|
|||
</search_editor>
|
||||
|
||||
<scroll_list
|
||||
height="160"
|
||||
height="140"
|
||||
draw_heading="true"
|
||||
heading_height="20"
|
||||
follows="left|top|bottom"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
|
|
@ -62,7 +64,27 @@
|
|||
top_pad="4">
|
||||
<scroll_list.commit_callback
|
||||
function="SettingSelect" />
|
||||
<scroll_list.columns
|
||||
name="changed_setting"
|
||||
relative_width="0.05" />
|
||||
<scroll_list.columns
|
||||
label="Setting"
|
||||
name="setting"
|
||||
relative_width="0.95"
|
||||
/>
|
||||
</scroll_list>
|
||||
<check_box
|
||||
control_name="DebugSettingsHideDefault"
|
||||
height="16"
|
||||
initial_value="true"
|
||||
label="Show changed settings only"
|
||||
layout="topleft"
|
||||
top_pad="5"
|
||||
left="0"
|
||||
follows="left|bottom"
|
||||
name="hide_default"
|
||||
width="330">
|
||||
</check_box>
|
||||
</panel>
|
||||
|
||||
<panel
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
<string name="TimeWeek">wkday,datetime,slt</string>
|
||||
<string name="TimeAMPM">ampm,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeSec">second,datetime,slt</string>
|
||||
<string name="TimeTimezone">timezone,datetime,slt</string>
|
||||
|
||||
<string name="LTimeMthNum">mthnum,datetime,local</string>
|
||||
|
|
|
|||
|
|
@ -1658,8 +1658,8 @@
|
|||
top_pad="8"
|
||||
follows="left|top"
|
||||
height="16"
|
||||
label="Use the new Firestorm texture panel in the tools floater (requires restart)"
|
||||
tool_tip="If enabled, the texture editing tools will use the refined FS workflow and allow editing of BlinnPhong"
|
||||
label="Use the new [APP_NAME] texture panel in the tools floater (requires restart)"
|
||||
tool_tip="If enabled, the texture editing tools will use the refined [APP_NAME] workflow and allow editing of both Blinn-Phong and PBR textures."
|
||||
name="FSUseNewTexturePanel"
|
||||
control_name="FSUseNewTexturePanel"/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -60,12 +60,12 @@
|
|||
value="es" />
|
||||
<combo_box.item
|
||||
enabled="true"
|
||||
label="Français (French) - Beta"
|
||||
label="Français (French)"
|
||||
name="French"
|
||||
value="fr" />
|
||||
<combo_box.item
|
||||
enabled="true"
|
||||
label="Italiano (Italian) - Beta"
|
||||
label="Italiano (Italian)"
|
||||
name="Italian"
|
||||
value="it" />
|
||||
<combo_box.item
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
-->
|
||||
<combo_box.item
|
||||
enabled="true"
|
||||
label="Русский (Russian) - Beta"
|
||||
label="Русский (Russian)"
|
||||
name="Russian"
|
||||
value="ru" />
|
||||
<!--
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
value="ja" />
|
||||
<combo_box.item
|
||||
enabled="true"
|
||||
label="正體中文 (Traditional Chinese) - Beta"
|
||||
label="正體中文 (Traditional Chinese)"
|
||||
name="Traditional Chinese"
|
||||
value="zh" />
|
||||
</combo_box>
|
||||
|
|
|
|||
|
|
@ -1170,6 +1170,8 @@ If you do not understand the distinction then leave this control alone."
|
|||
increment="1"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
max_val="3600"
|
||||
min_val="0"
|
||||
name="TextureDiscardBackgroundedTime"
|
||||
tool_tip="Downscales textures after selected amount of seconds when not the active window."
|
||||
top_delta="-5"
|
||||
|
|
@ -1209,6 +1211,8 @@ If you do not understand the distinction then leave this control alone."
|
|||
increment="1"
|
||||
layout="topleft"
|
||||
left_pad="5"
|
||||
max_val="3600"
|
||||
min_val="0"
|
||||
name="TextureDiscardMinimizedTime"
|
||||
tool_tip="Downscales textures after selected amount of seconds when minimized."
|
||||
top_delta="-5"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
<combo_box.item label="Dansk (Danés) - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch (Alemán)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Francés) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Francés)" name="French"/>
|
||||
<combo_box.item label="Italiano" name="Italian"/>
|
||||
<combo_box.item label="Nederlands (Neerlandés) - Beta" name="Dutch"/>
|
||||
<combo_box.item label="Polski (Polaco)" name="Polish"/>
|
||||
<combo_box.item label="Português (portugués) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="日本語 (Japonés) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="Русский (Ruso) - Beta" name="(Russian)"/>
|
||||
<combo_box.item label="Русский (Ruso)" name="(Russian)"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
(requiere reiniciar)
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<check_box label="Usar nombres antiguos en vez de nombres de usuario" name="FSshow_legacyun" tool_tip="Muestra los nombres en el formato (Nombre Apellido) en vez de (nombre.apellido)"/>
|
||||
<check_box label="Destacar amigos" name="show_friends" tool_tip="Realzar las etiquetas de los nombres de tus amigos"/>
|
||||
<check_box label="Ocultar 'Resident' en los nombres clásicos" name="legacy_trim_check" tool_tip="Suprime 'Resident' de los nombres clásicos"/>
|
||||
<check_box label="Posicionamiento clásico de la etiqueta de nombre" name="FSLegacyNametagPosition" tool_tip="Si lo activas, la etiqueta de nombre permanecerá fija en la posición del avatar y no lo seguirá si se mueve a causa de sus animaciones."/>
|
||||
<check_box label="Posic. clásico de la etiq. de nom." name="FSLegacyNametagPosition" tool_tip="Si lo activas, la etiqueta de nombre permanecerá fija en la posición del avatar y no lo seguirá si se mueve a causa de sus animaciones."/>
|
||||
<text name="title_afk_text">
|
||||
Ausente tras:
|
||||
</text>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater name="gltf asset editor">
|
||||
<floater.string name="floater_title" value="Éditeur de scènes GLTF" />
|
||||
<floater.string name="scene_tittle" value="Scène" />
|
||||
<floater.string name="node_tittle" value="Nœud" />
|
||||
<floater.string name="mesh_tittle" value="Mesh" />
|
||||
<floater.string name="skin_tittle" value="Peau" />
|
||||
<floater.string name="scene_title" value="Scène" />
|
||||
<floater.string name="node_title" value="Nœud" />
|
||||
<floater.string name="mesh_title" value="Mesh" />
|
||||
<floater.string name="skin_title" value="Peau" />
|
||||
<layout_stack name="main_layout">
|
||||
<layout_panel name="transforms_panel">
|
||||
<menu_button name="clipboard_pos_btn" tool_tip="Options de collage" />
|
||||
|
|
|
|||
|
|
@ -12,10 +12,19 @@
|
|||
<text name="PostProcessText">
|
||||
Faible
|
||||
</text>
|
||||
<slider label="Max. lumières proches :" name="MaxLights"/>
|
||||
<check_box label="Activer VSync" name="vsync" tool_tip="Synchronise la fréquence d'images avec la fréquence de rafraîchissement du moniteur, ce qui peut entraîner une augmentation du lag et des images saccadées."/>
|
||||
<text name="AvatarText">
|
||||
Avatar
|
||||
</text>
|
||||
<text name="AvatarComplexityModeLabel">
|
||||
Affichage de l'avatar :
|
||||
</text>
|
||||
<combo_box name="AvatarComplexityMode">
|
||||
<combo_box.item label="Limiter par la complexité" name="0"/>
|
||||
<combo_box.item label="Toujours montrer ses amis" name="1"/>
|
||||
<combo_box.item label="Ne montrer que ses amis" name="2"/>
|
||||
</combo_box>
|
||||
<slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « JellyDoll »"/>
|
||||
<text name="IndirectMaxComplexityText">
|
||||
0
|
||||
|
|
@ -43,16 +52,23 @@
|
|||
</text>
|
||||
<check_box label="Filtre anisotrope (plus lent quand activé)" name="ani"/>
|
||||
<check_box initial_value="true" label="Activer la compression des textures (redémarrage requis)" name="texture compression" tool_tip="Comprime les textures en mémoire vidéo afin de permettre de charger des textures de résolution plus élevée au prix d’une certaine qualité de couleur."/>
|
||||
<check_box initial_value="true" label="Activer le support pour l'affichage en HiDPI (redémarrage requis)" name="use HiDPI" tool_tip="Activer OpenFL pour les dessins en haute résolution"/>
|
||||
<check_box initial_value="true" label="Activer le support pour l'affichage en HiDPI (redémarrage requis)" name="use HiDPI" tool_tip="Activer OpenGL pour les dessins en haute résolution"/>
|
||||
<text name="antialiasing label">
|
||||
Anti-aliasing :
|
||||
Anti-crénelage :
|
||||
</text>
|
||||
<combo_box label="Anti-aliasing" name="fsaa">
|
||||
<combo_box label="Anti-crénelage" name="fsaa">
|
||||
<combo_box.item label="Désactivé" name="FSAADisabled"/>
|
||||
<combo_box.item label="FXAA" name="FXAA"/>
|
||||
<combo_box.item label="4x" name="4x"/>
|
||||
<combo_box.item label="8x" name="8x"/>
|
||||
<combo_box.item label="16x" name="16x"/>
|
||||
<combo_box.item label="SMAA" name="SMAA"/>
|
||||
</combo_box>
|
||||
<text name="antialiasing quality label">
|
||||
Qualité de l'anti-crénelage :
|
||||
</text>
|
||||
<combo_box label="Anti-crénelage" name="fsaa quality">
|
||||
<combo_box.item label="Faible" name="Low"/>
|
||||
<combo_box.item label="Moyenne" name="Medium"/>
|
||||
<combo_box.item label="Élevée" name="High"/>
|
||||
<combo_box.item label="Ultra" name="Ultra"/>
|
||||
</combo_box>
|
||||
<text name="MeshText">
|
||||
Maillage
|
||||
|
|
@ -105,6 +121,7 @@
|
|||
<check_box initial_value="true" label="Modèle d’éclairage avancé" name="UseLightShaders"/>
|
||||
<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
|
||||
<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
|
||||
<check_box label="HDR et émissif" name="VintageMode"/>
|
||||
<text name="RenderShadowDetailText">
|
||||
Ombres :
|
||||
</text>
|
||||
|
|
@ -151,6 +168,15 @@
|
|||
<combo_box.item label="Toutes les 3 images" name="2"/>
|
||||
<combo_box.item label="Toutes les 4 images" name="3"/>
|
||||
</combo_box>
|
||||
<slider label="Sharpening :" name="RenderSharpness"/>
|
||||
<text name="TonemapTypeText">
|
||||
Mappage de tons :
|
||||
</text>
|
||||
<combo_box name="TonemapType">
|
||||
<combo_box.item label="Khronos Neutral" name="0"/>
|
||||
<combo_box.item label="ACES" name="1"/>
|
||||
</combo_box>
|
||||
<slider label="Mélange mappage tonal :" tool_tip="Mélange de couleurs linéaires et de couleurs à tons" name="TonemapMix"/>
|
||||
<button label="Réinitialiser les paramètres recommandés" name="Defaults"/>
|
||||
<button label="OK" label_selected="OK" name="OK"/>
|
||||
<button label="Annuler" label_selected="Annuler" name="Cancel"/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<floater name="settings_debug" title="Paramètres de débogage">
|
||||
<panel name="debug_settings_search_panel"><search_editor label="Chercher ici" name="search_settings_input" tool_tip="Saisissez ici les termes de votre recherche. Les résultats affichés contiendront votre recherche dans le nom du paramètre ou son commentaire."/></panel>
|
||||
<panel name="debug_settings_search_panel">
|
||||
<search_editor label="Chercher ici" name="search_settings_input" tool_tip="Saisissez ici les termes de votre recherche. Les résultats affichés contiendront votre recherche dans le nom du paramètre ou son commentaire."/>
|
||||
<scroll_list name="settings_scroll_list">
|
||||
<scroll_list.columns label="Paramètres" name="setting"/>
|
||||
</scroll_list>
|
||||
<check_box label="Que les paramètres modifiés" name="hide_default"/>
|
||||
</panel>
|
||||
<panel name="debug_settings_values_panel">
|
||||
<text_editor name="comment_text" tool_tip="Commentaire des paramètres de débogage. Donne des informations utiles sur le réglage que vous avez sélectionné."/>
|
||||
<radio_group name="boolean_combo">
|
||||
|
|
|
|||
|
|
@ -506,6 +506,7 @@ Bas ↔ + bas
|
|||
<button label="Droits" name="button permissions"/>
|
||||
<button label="Rafraîchir" name="button refresh"/>
|
||||
<button label="Réinit. scripts" name="btn_reset_scripts"/>
|
||||
<filter_editor label="Saisir le texte du filtre" name="contents_filter"/>
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="land info panel">
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
<string name="TimeWeek">wkday,datetime,slt</string>
|
||||
<string name="TimeAMPM">ampm,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeSec">second,datetime,slt</string>
|
||||
<string name="TimeTimezone">timezone,datetime,slt</string>
|
||||
<string name="LTimeMthNum">mthnum,datetime,local</string>
|
||||
<string name="LTimeWeek">wkday,datetime,local</string>
|
||||
|
|
|
|||
|
|
@ -500,6 +500,7 @@
|
|||
<menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/>
|
||||
<menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/>
|
||||
<menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/>
|
||||
<menu_item_check label="Collecter les buffers de vertex des polices" name="Collect Font Vertex Buffers"/>
|
||||
<menu_item_check label="Activer le cache des shaders" name="Enable Shader Cache"/>
|
||||
<menu_item_call label="Vider le cache des shaders" name="Shader Cache Clear"/>
|
||||
<menu_item_call label="Reconstruire le terrain" name="Rebuild Terrain"/>
|
||||
|
|
|
|||
|
|
@ -3649,7 +3649,9 @@ Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre
|
|||
<notification name="VoiceEffectsWillExpire">Au moins l'un de vos effets de voix expirera dans moins de [INTERVAL] jours.
|
||||
[[URL] Cliquez ici] pour renouveler votre abonnement.
|
||||
|
||||
Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.</notification>
|
||||
Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.
|
||||
<usetemplate ignoretext="M'avertir de l'expiration du morphing vocal" name="okignore" yestext="OK"/>
|
||||
</notification>
|
||||
<notification name="VoiceEffectsNew">
|
||||
De nouveaux effets de voix sont disponibles !
|
||||
</notification>
|
||||
|
|
@ -4168,11 +4170,6 @@ Si vous continuez à rencontrer des problèmes, veuillez consulter le [SUPPORT_S
|
|||
Vous semblez ne pas avoir le matériel requis pour utiliser [APP_NAME]. [APP_NAME] requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les pilotes les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d'exploitation.
|
||||
|
||||
Si vous avez toujours des problèmes, veuillez consulter la page [SUPPORT_SITE].
|
||||
</global>
|
||||
<global name="UnsupportedIntelDriver">
|
||||
Le pilote graphique Intel installé pour [GPUNAME], version [VERSION], est obsolète et connu pour provoquer un nombre excessif de plantages du programme. Il est conseillé de mettre à jour le pilote Intel.
|
||||
|
||||
Voulez-vous consulter le site web des pilotes Intel ?
|
||||
</global>
|
||||
<global name="UnsupportedGPU">
|
||||
- Votre carte graphique ne remplit pas les conditions minimum requises.
|
||||
|
|
|
|||
|
|
@ -155,7 +155,8 @@
|
|||
<check_box label="Prévisualiser les animations sur son avatar pendant le téléchargement sur le serveur" tool_tip="Si activé, vous pouvez prévisualiser les animations sur votre propre avatar pendant le téléchargement sur le serveur" name="FSUploadAnimationOnOwnAvatar"/>
|
||||
<check_box label="Toujours développer les informations détaillées de la prévisualisation de l'animation" tool_tip="Développer par défaut les informations détaillées sur l'animation dans le flotteur de l'aperçu de l'animation" name="FSAnimationPreviewExpanded"/>
|
||||
<check_box label="Active les informations détaillées pour les script" tool_tip="Activée, ajoute aux informations de base sur les scripts des détails utiles aux créateurs" name="FSScriptInfoExtended"/>
|
||||
<check_box label="Trier par ordre alphabétique les points d'attachement dans les menus "Attacher à" (redémarrage requis)" tool_tip="Si cette option est activée, la liste des points d'attachement dans les menus &Attacher à& sera triée par ordre alphabétique." name="FSSortAttachmentSpotsAlphabetically"/>
|
||||
<check_box label="Points d'attachement par ordre alphabétique les dans les menus "Attacher à" (redémarrage requis)" tool_tip="Si cette option est activée, la liste des points d'attachement dans les menus &Attacher à& sera triée par ordre alphabétique." name="FSSortAttachmentSpotsAlphabetically"/>
|
||||
<check_box label="Utiliser le nouveau module de texture Firestorm dans la fenêtre d'outils (nécessite un redémarrage)." tool_tip="Si cette option est activée, les outils d'édition de textures utiliseront le flux de travail amélioré de FS et permettront l'édition de textures Blinn-Phong et PBR." name="FSUseNewTexturePanel"/>
|
||||
</panel>
|
||||
<panel label="Chargements" name="UploadsTab">
|
||||
<text name="title">Dossiers de destination pour les chargements :</text>
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
<!-- <combo_box.item label="Dansk (Danois) - Beta" name="Danish"/> -->
|
||||
<combo_box.item label="Deutsch (Allemand)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Espagnol) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano (Italien) - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français" name="French"/>
|
||||
<combo_box.item label="Italiano (Italien)" name="Italian"/>
|
||||
<combo_box.item label="Polski (Polonais)" name="Polish"/>
|
||||
<combo_box.item label="Русский (Russe) - Beta" name="Russian"/>
|
||||
<combo_box.item label="Русский (Russe)" name="Russian"/>
|
||||
<combo_box.item label="日本語 (Japonais) - Beta" name="(Japanese)"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">(Redémarrage requis)</text>
|
||||
|
|
|
|||
|
|
@ -105,13 +105,24 @@
|
|||
<check_box label="Filtrage Anisotrope (plus lent lorsqu'il est activé)" name="ani"/>
|
||||
<check_box label="Activer la compression de textures sans pertes (Redémarrage requis)" name="texture compression" tool_tip="Activer la compression des textures dans la mémoire graphique permet de charger des textures de résolution supérieure et une prise en charge d'un nombre de textures plus élevé pour le même cout mémoire."/>
|
||||
<check_box label="Active la prise en charge des écrans HiDPI (macOS seulement; Redémarrage requis)" name="use HiDPI" tool_tip="Active OpenGL pour l'affichage haute résolution."/>
|
||||
<text width="235" name="Antialiasing:" tool_tip="La modification de ce paramètre peut nécessiter un redémarrage de certains ordinateurs.">
|
||||
<text width="235" name="antialiasing label" tool_tip="La modification de ce paramètre peut nécessiter un redémarrage de certains ordinateurs.">
|
||||
Anticrénelage (redémarrage recommandé) :
|
||||
</text>
|
||||
<text name="antialiasing quality label" tool_tip="La modification de ce paramètre peut nécessiter un redémarrage de certains ordinateurs.">
|
||||
Qualité de l'anticrénelage :
|
||||
</text>
|
||||
<combo_box label="Anticrénelage" name="fsaa">
|
||||
<combo_box.item label="Désactivé" name="FSAADisabled"/>
|
||||
<combo_box.item label="FXAA" name="FXAA"/>
|
||||
</combo_box>
|
||||
<combo_box name="fsaa quality">
|
||||
<combo_box.item label="Faible" name="Low"/>
|
||||
<combo_box.item label="Moyenne" name="Medium"/>
|
||||
<combo_box.item label="Élevée" name="High"/>
|
||||
<combo_box.item label="Ultra" name="Ultra"/>
|
||||
</combo_box>
|
||||
<check_box label="Limiter la VRAM utilisée pour les textures (Mo)" name="FSLimitTextureVRAMUsage" tool_tip="Limite la quantité de VRAM utilisée pour les textures. L'utilisation globale peut être plus élevée car d'autres éléments utilisent également de la VRAM."/>
|
||||
<slider name="RenderMaxVRAMBudget" tool_tip="Quantité maximale de VRAM en mégaoctets utilisée pour les textures."/>
|
||||
<text name="advanced_settings">
|
||||
Paramètres avancés (redémarrage requis) :
|
||||
</text>
|
||||
|
|
@ -120,6 +131,23 @@
|
|||
Ignorer la VRAM détectée sur votre GPU.
|
||||
Cela ne doit pas inclure la VRAM 'partagée' qui fait partie de la RAM du système.
|
||||
Si vous ne comprenez pas la distinction, ne vous souciez pas de ce contrôle."/>
|
||||
<text name="automatic_texture_downscale_settings">
|
||||
Réduction automatique de la taille des textures :
|
||||
</text>
|
||||
<text name="TextureDiscardBackgroundedTime_label" tool_tip="Réduit la taille des textures au bout d'un certain nombre de secondes lorsque la fenêtre n'est pas active.">
|
||||
En arrière-plan (0 pour désactiver)
|
||||
</text>
|
||||
<spinner name="TextureDiscardBackgroundedTime" tool_tip="Réduit la taille des textures au bout d'un certain nombre de secondes lorsque la fenêtre n'est pas active."/>
|
||||
<text name="TextureDiscardBackgroundedTime_seconds">
|
||||
Seconde(s)
|
||||
</text>
|
||||
<text name="TextureDiscardMinimizedTime_label" tool_tip="Réduit la taille des textures au bout d'un certain nombre de secondes lorsque l'application est réduite.">
|
||||
Réduite (0 pour désactiver)
|
||||
</text>
|
||||
<spinner name="TextureDiscardMinimizedTime" tool_tip="Réduit la taille des textures au bout d'un certain nombre de secondes lorsque l'application est réduite."/>
|
||||
<text name="TextureDiscardMinimizedTime_seconds">
|
||||
Seconde(s)
|
||||
</text>
|
||||
</panel>
|
||||
<panel label="Rendu" name="Rendering">
|
||||
<text name="World Updating">Actualisation de l'univers :</text>
|
||||
|
|
@ -150,10 +178,15 @@ Si vous ne comprenez pas la distinction, ne vous souciez pas de ce contrôle."/>
|
|||
<check_box label="Voir en mode fil de fer" name="Wireframe"/>
|
||||
<check_box label="Activer les sources lumineuses portées (Face Lights)" tool_tip="Ce paramètre activera toutes les sources de lumière que les avatars portent, comme les 'Face Lights'." name="Render Attached Lights"/>
|
||||
<check_box label="Rendu des particules portées" name="Render Attached Particles"/>
|
||||
<slider width="480" label_width="340" label="Temporisation de mise en cache de l'univers" tool_tip="Délai en secondes de temporisation nécessaire à la mise en cache de l'univers avant de vous connecter (6 secondes par défaut)" name="PrecachingDelay"/>
|
||||
<slider width="480" label_width="340" label="Temporisation de mise en cache de l'univers :" tool_tip="Délai en secondes de temporisation nécessaire à la mise en cache de l'univers avant de vous connecter (6 secondes par défaut)" name="PrecachingDelay"/>
|
||||
<text name="PrecachingDelayText" left_delta="480">sec.</text>
|
||||
<slider width="480" label_width="340" label="Qualité des ombres" tool_tip="Qualité des ombres (1 par défaut)" name="ShadowResolution"/>
|
||||
<slider width="480" label_width="340" label="Échelle de rendu des textures du terrain (Redémarrage requis)" name="RenderTerrainScale" tool_tip="Détermine l'échelle de rendu des textures du terrain - une valeur plus basse est plus compressée (nécessite un redémarrage)"/>
|
||||
<slider width="480" label_width="340" label="Qualité des ombres :" tool_tip="Qualité des ombres (1 par défaut)" name="ShadowResolution"/>
|
||||
<slider width="480" label_width="340" label="Taille de rendu des textures du terrain (Redémarrage requis) :" name="RenderTerrainScale" tool_tip="Détermine la taille de rendu des textures du terrain - une valeur plus basse est plus compressée (nécessite un redémarrage)"/>
|
||||
<slider label="Amélioration de la netteté :" name="RenderSharpness"/>
|
||||
<text name="TonemapTypeText">
|
||||
Mappage de tons :
|
||||
</text>
|
||||
<slider label="Mixage de mappage de tons :" tool_tip="Mélange de couleurs linéaires et de couleurs mappées" name="TonemapMix"/>
|
||||
</panel>
|
||||
<panel label="Profondeur de champ" name="DOF panel">
|
||||
<check_box label="Activer la profondeur de champ (Floutera la vue sauf au point de focalisation de la caméra)" name="UseDoF"/>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater name="gltf asset editor">
|
||||
<floater.string name="floater_title" value="Editor Scena GLTF" />
|
||||
<floater.string name="scene_tittle" value="Scena" />
|
||||
<floater.string name="node_tittle" value="Nodo" />
|
||||
<floater.string name="mesh_tittle" value="Mesh" />
|
||||
<floater.string name="skin_tittle" value="Skin" />
|
||||
<floater.string name="scene_title" value="Scena" />
|
||||
<floater.string name="node_title" value="Nodo" />
|
||||
<floater.string name="mesh_title" value="Mesh" />
|
||||
<floater.string name="skin_title" value="Skin" />
|
||||
<layout_stack name="main_layout">
|
||||
<layout_panel name="transforms_panel">
|
||||
<menu_button name="clipboard_pos_btn" tool_tip="Opzioni incolla" />
|
||||
|
|
|
|||
|
|
@ -41,9 +41,18 @@
|
|||
<text name="antialiasing label">
|
||||
Antialiasing:
|
||||
</text>
|
||||
<combo_box label="Antialiasing" name="fsaa">
|
||||
<combo_box name="fsaa">
|
||||
<combo_box.item label="Disabilita" name="FSAADisabled"/>
|
||||
</combo_box>
|
||||
<text name="antialiasing quality label">
|
||||
Qualità antialiasing:
|
||||
</text>
|
||||
<combo_box name="fsaa quality">
|
||||
<combo_box.item label="Bassa" name="Low" />
|
||||
<combo_box.item label="Media" name="Medium" />
|
||||
<combo_box.item label="Alta" name="High" />
|
||||
<combo_box.item label="Ultra" name="Ultra" />
|
||||
</combo_box>
|
||||
<text name="MeshText">
|
||||
Mesh
|
||||
</text>
|
||||
|
|
@ -76,6 +85,7 @@
|
|||
</text>
|
||||
<check_box label="Occlusione ambientale" name="UseSSAO"/>
|
||||
<check_box label="Profondità di campo" name="UseDoF"/>
|
||||
<check_box label="HDR e texture emissive" name="VintageMode" />
|
||||
<text name="RenderShadowDetailText">
|
||||
Ombre:
|
||||
</text>
|
||||
|
|
@ -115,6 +125,11 @@
|
|||
<combo_box.item label="Medio" name="3" />
|
||||
<combo_box.item label="Veloce" name="1" />
|
||||
</combo_box>
|
||||
<slider label="Affilatura:" name="RenderSharpness" />
|
||||
<text name="TonemapTypeText">
|
||||
Mappatura toni:
|
||||
</text>
|
||||
<slider label="Mix mappatura toni:" tool_tip="Combinazione di colori lineari e colori con mappatura dei toni" name="TonemapMix" />
|
||||
<button label="Ripristina impostazioni predefinite" name="Defaults"/>
|
||||
<button label="Annulla" label_selected="Annulla" name="Cancel"/>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
<floater name="settings_debug" title="Debug Impostazioni">
|
||||
<panel name="debug_settings_search_panel">
|
||||
<search_editor label="Cerca qui" name="search_settings_input" tool_tip="Scrivi i termini che stai cercando. Verranno mostrate anche corrispondenze parziali sul nome o sul commento dell'impostazione."/>
|
||||
<scroll_list name="settings_scroll_list">
|
||||
<scroll_list.columns label="Impostazione" name="setting" />
|
||||
</scroll_list>
|
||||
<check_box label="Solo impostazioni cambiate" name="hide_default" />
|
||||
</panel>
|
||||
<panel name="debug_settings_values_panel">
|
||||
<text_editor name="comment_text" tool_tip="Commento sull'impostazione. Spesso dà info utili sugli effetti dell'impostazione."/>
|
||||
|
|
|
|||
|
|
@ -498,6 +498,7 @@ Bas ↔ Min
|
|||
<button label="Permessi" name="button permissions"/>
|
||||
<button label="Ricarica" name="button refresh"/>
|
||||
<button label="Ripristina script" name="btn_reset_scripts"/>
|
||||
<filter_editor label="Filtro..." name="contents_filter" />
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="land info panel">
|
||||
|
|
|
|||
|
|
@ -30,13 +30,16 @@
|
|||
-->
|
||||
|
||||
<string name="TimeHour">hour,datetime,slt</string>
|
||||
<string name="TimeMin">min,datetime,slt</string>
|
||||
<string name="TimeYear">year,datetime,slt</string>
|
||||
<string name="TimeDay">day,datetime,slt</string>
|
||||
<string name="TimeMonth">mthnum,datetime,slt</string>
|
||||
<string name="TimeMin">min,datetime,slt</string>
|
||||
<string name="TimeSec">second,datetime,slt</string>
|
||||
<string name="TimeYear">year,datetime,slt</string>
|
||||
<string name="TimeDay">day,datetime,slt</string>
|
||||
<string name="TimeMonth">mthnum,datetime,slt</string>
|
||||
<string name="TimeMth">mth,datetime,slt</string>
|
||||
<string name="TimeWeek">wkday,datetime,slt</string>
|
||||
<string name="TimeAMPM">ampm,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeTimezone">timezone,datetime,slt</string>
|
||||
|
||||
<string name="LTimeMthNum">mthnum,datetime,local</string>
|
||||
<string name="LTimeWeek">wkday,datetime,local</string>
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@
|
|||
<menu_item_check label="Risoluzione massima della texture (pericoloso)" name="Full Res Textures"/>
|
||||
<menu_item_check label="Renderizza luci indossate" name="Render Attached Lights"/>
|
||||
<menu_item_check label="Renderizza particelle indossate" name="Render Attached Particles"/>
|
||||
<menu_item_check label="Raccogli buffer dei vertici del font" name="Collect Font Vertex Buffers" />
|
||||
<menu_item_check label="Abilita cache degli shader" name="Enable Shader Cache" />
|
||||
<menu_item_call label="Cancella cache degli shader" name="Shader Cache Clear" />
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -3445,7 +3445,9 @@ Se sei un utente Premium, [[PREMIUM_URL] clic qui] per ricevere la tua offerta d
|
|||
<notification name="VoiceEffectsWillExpire">Almeno una delle tue manipolazioni vocali scadrà tra meno di [INTERVAL] giorni.
|
||||
[[URL] Fai clic qui] per rinnovare l'abbonamento.
|
||||
|
||||
Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.</notification>
|
||||
Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.
|
||||
<usetemplate ignoretext="Avvisami quando scade la trasformazione vocale" name="okignore" />
|
||||
</notification>
|
||||
<notification name="VoiceEffectsNew">
|
||||
Sono disponibili nuove manipolazioni vocali.
|
||||
</notification>
|
||||
|
|
|
|||
|
|
@ -4,18 +4,19 @@
|
|||
Lingua:
|
||||
</text>
|
||||
<combo_box name="language_combobox">
|
||||
<combo_box.item label="English" name="English"/>
|
||||
<combo_box.item label="English (Inglese)" name="English"/>
|
||||
<combo_box.item label="Azərbaycanca (Azero)" name="Azerbaijani"/>
|
||||
<!--<combo_box.item label="Dansk (Danese) - Beta" name="Danish"/> -->
|
||||
<combo_box.item label="Deutsch (Tedesco)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Spagnolo) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Francese) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Francese)" name="French"/>
|
||||
<combo_box.item label="Italiano" name="Italian"/>
|
||||
<combo_box.item label="Polski (Polacco)" name="Polish"/>
|
||||
<!-- <combo_box.item label="Português (Portoghese) - Beta" name="Portugese"/> -->
|
||||
<combo_box.item label="Русский (Russo) - Beta" name="Russian"/>
|
||||
<combo_box.item label="Türkçe (Turco) - Beta" name="Turkish"/>
|
||||
<combo_box.item label="Русский (Russo)" name="Russian"/>
|
||||
<!-- <combo_box.item label="Türkçe (Turco) - Beta" name="Turkish"/> -->
|
||||
<combo_box.item label="日本語 (Giapponese) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Cinese tradizionale) - Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Cinese tradizionale)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
(richiede riavvio)
|
||||
|
|
|
|||
|
|
@ -118,17 +118,45 @@
|
|||
<check_box label="Filtro Anisotropico (rallenta se attivo)" name="ani" tool_tip="Il filtro anisotropico è un metodo per migliorare la qualità delle texture quando vengono visualizzate ad angoli relativamente ampi rispetto alla posizione della fotocamera. Di solito le rende meno sfocate a distanze maggiori."/>
|
||||
<check_box label="Abilita compressione texture (richiede riavvio)" name="texture compression" tool_tip="Le texture vengono compresse nella memoria video, questo consente per le texture con una risoluzione alta di essere caricate più rapidamente perdendo qualità nel colore."/>
|
||||
<check_box label="Abilita supporto display HiDPI (solo macOS; richiede riavvio)" name="use HiDPI" tool_tip="Abilita OpenGL per il disegno ad alta risoluzione." />
|
||||
<text name="Antialiasing:" tool_tip="Le modifiche a questa impostazione potrebbero richiedere il riavvio su alcuni dispositivi.">
|
||||
Antialiasing:
|
||||
<text name="antialiasing label" tool_tip="Le modifiche a questa impostazione potrebbero richiedere il riavvio su alcuni dispositivi.">
|
||||
Antialiasing (riavvio consigliato):
|
||||
</text>
|
||||
<combo_box label="Antialiasing" name="fsaa">
|
||||
<text name="antialiasing quality label" tool_tip="La modifica di questa impostazione potrebbe richiedere il riavvio su alcuni dispositivi.">
|
||||
Qualità antialiasing:
|
||||
</text>
|
||||
<combo_box name="fsaa">
|
||||
<combo_box.item label="Disabilita" name="FSAADisabled"/>
|
||||
</combo_box>
|
||||
<combo_box name="fsaa quality">
|
||||
<combo_box.item label="Bassa" name="Low" />
|
||||
<combo_box.item label="Media" name="Medium" />
|
||||
<combo_box.item label="Alta" name="High" />
|
||||
<combo_box.item label="Ultra" name="Ultra" />
|
||||
</combo_box>
|
||||
<check_box label="Limita utilizzo della VRAM delle texture (MB)" name="FSLimitTextureVRAMUsage" tool_tip="Limita la quantità di VRAM utilizzata per le texture. L'utilizzo totale potrebbe essere ancora più elevato perché anche altri componenti utilizzano VRAM." />
|
||||
<slider name="RenderMaxVRAMBudget" tool_tip="Quantità massima di VRAM (in megabyte) utilizzata per le texture." />
|
||||
<text name="advanced_settings">
|
||||
Impostazioni avanzate (richiede riavvio):
|
||||
</text>
|
||||
<check_box label="Disabilita rilevamento automatico della VRAM" name="FSOverrideVRAMDetection" tool_tip="Consenti la disattivazione del rilevamento automatico della VRAM (da utilizzare con estrema cautela)" />
|
||||
<slider label="Sostituisci VRAM dedicata alla GPU (GB):" name="FSForcedVideoMemory" tool_tip="Importante: usare con estrema cautela. || Sostituisci la VRAM rilevata per la tua scheda grafica. || Non può contenere VRAM 'condivisa', che fa parte della RAM di sistema. || Se non capisci la differenza, lascia stare questa opzione." />
|
||||
<text name="automatic_texture_downscale_settings">
|
||||
Riduzione automatica delle texture:
|
||||
</text>
|
||||
<text name="TextureDiscardBackgroundedTime_label" tool_tip="Riduci la scala delle texture dopo un determinato numero di secondi quando la finestra del viewer non è in primo piano.">
|
||||
In background (0 per disabilitare)
|
||||
</text>
|
||||
<spinner name="TextureDiscardBackgroundedTime" tool_tip="Riduci la scala delle texture dopo un determinato numero di secondi quando la finestra del viewer non è in primo piano." />
|
||||
<text name="TextureDiscardBackgroundedTime_seconds">
|
||||
secondi
|
||||
</text>
|
||||
<text name="TextureDiscardMinimizedTime_label" tool_tip="Riduci la scala delle texture dopo un determinato numero di secondi quando il viewer è ridotto a icona.">
|
||||
Ridotto a icona (0 per disabilitare)
|
||||
</text>
|
||||
<spinner name="TextureDiscardMinimizedTime" tool_tip="Riduci la scala delle texture dopo un determinato numero di secondi quando il viewer è ridotto a icona." />
|
||||
<text name="TextureDiscardMinimizedTime_seconds">
|
||||
secondi
|
||||
</text>
|
||||
</panel>
|
||||
<panel label="Rendering" name="Rendering">
|
||||
<text name="World Updating">
|
||||
|
|
@ -159,13 +187,11 @@
|
|||
<combo_box.item label="Qualità bassa (4)" name="4"/>
|
||||
<combo_box.item label="Nessuna texture (5)" name="5"/>
|
||||
</combo_box>
|
||||
<text name="Alpha Mask Rendering">
|
||||
Maschere alfa:
|
||||
</text>
|
||||
<check_box label="Renderizza maschere alfa" tool_tip="Se selezionato, le maschere alfa (bit trasparenti) vengono visualizzate correttamente" name="RenderAutoMaskAlphaDeferred"/>
|
||||
<text name="Miscellaneous Rendering">
|
||||
Altre impostazioni:
|
||||
</text>
|
||||
<check_box label="HDR e texture emissive" tool_tip="Abilita funzionalità di rendering aggiuntive sui computer più recenti, come HDR e texture emissive sui contenuti PBR" name="VintageMode" />
|
||||
<check_box label="Renderizza maschere alfa" tool_tip="Se selezionato, le maschere alfa (bit trasparenti) vengono visualizzate correttamente" name="RenderAutoMaskAlphaDeferred"/>
|
||||
<check_box label="Mostra bagliore" tool_tip="Mostra il bagliore (glow). Da notare che deve essere impostata a zero per disabilitare la luce quando le ombre sono attive." name="RenderGlow"/>
|
||||
<slider label="Intensità:" tool_tip="Forza del bagliore. Più alto = più ampio e uniforme (predef. 2)" name="glow_strength"/>
|
||||
<check_box label="Mostra avatar che non hanno terminato il caricamento" name="RenderUnloadedAvatars"/>
|
||||
|
|
@ -178,6 +204,11 @@
|
|||
</text>
|
||||
<slider label="Qualità ombre" tool_tip="Determina la qualità delle ombre (predefinita 1)" name="ShadowResolution"/>
|
||||
<slider label="Grandezza texture del terreno (richiede riavvio)" name="RenderTerrainScale" tool_tip="Determina la grandezza della texture del terreno valore più basso = texture più compressa (richiede riavvio viewer)."/>
|
||||
<slider label="Affilatura:" name="RenderSharpness" />
|
||||
<text name="TonemapTypeText">
|
||||
Mappatura toni:
|
||||
</text>
|
||||
<slider label="Mix mappatura toni:" tool_tip="Combinazione di colori lineari e colori con mappatura dei toni" name="TonemapMix" />
|
||||
</panel>
|
||||
<panel label="Profondità di Campo" name="DOF panel">
|
||||
<check_box label="Abilita Profondità di Campo (PdC: sfoca la vista tranne che nella direzione della camera)" name="UseDoF"/>
|
||||
|
|
|
|||
|
|
@ -4154,12 +4154,6 @@ https://wiki.firestormviewer.org/fs_voice
|
|||
この問題が何度も起きる場合は、[SUPPORT_SITE] をご確認ください。
|
||||
</global>
|
||||
|
||||
<global name="UnsupportedIntelDriver">
|
||||
インストールされている [GPUNAME] のインテル製グラフィックドライバのバージョン [VERSION] は極めて古いものとなっており、プログラムのクラッシュを高い頻度で引き起こすことが知られています。最新のインテル製ドライバにアップグレードすることを強くお勧めします。
|
||||
|
||||
インテルドライバのウェブサイトを確認しますか？
|
||||
</global>
|
||||
|
||||
<global name="UnsupportedCPUAmount">
|
||||
796
|
||||
</global>
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<combo_box.item label="Dansk （デンマーク語） – ベータ" name="Danish"/>
|
||||
<combo_box.item label="Deutsch （ドイツ語）" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español （スペイン語） – ベータ" name="Spanish"/>
|
||||
<combo_box.item label="Français （フランス語） – ベータ" name="French"/>
|
||||
<combo_box.item label="Italiano （イタリア語） - ベータ" name="Italian"/>
|
||||
<combo_box.item label="Français （フランス語）" name="French"/>
|
||||
<combo_box.item label="Italiano （イタリア語）" name="Italian"/>
|
||||
<combo_box.item label="Polski （ポーランド語）" name="Polish"/>
|
||||
<combo_box.item label="Português（ポルトガル語） - ベータ" name="Portugese"/>
|
||||
<combo_box.item label="Русский （ロシア語） - ベータ" name="Russian"/>
|
||||
<combo_box.item label="Русский （ロシア語）" name="Russian"/>
|
||||
<combo_box.item label="Türkçe （トルコ語） - ベータ" name="Turkish"/>
|
||||
<combo_box.item label="日本語 – ベータ" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文（簡体字中国語）- ベータ版" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文（簡体字中国語）" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
（再起動後に反映）
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater name="gltf asset editor">
|
||||
<floater.string name="floater_title" value="Edytor scen GLTF" />
|
||||
<floater.string name="scene_tittle" value="Scena" />
|
||||
<floater.string name="node_tittle" value="Węzeł" />
|
||||
<floater.string name="mesh_tittle" value="Mesz" />
|
||||
<floater.string name="skin_tittle" value="Skórka" />
|
||||
<floater.string name="scene_title" value="Scena" />
|
||||
<floater.string name="node_title" value="Węzeł" />
|
||||
<floater.string name="mesh_title" value="Mesz" />
|
||||
<floater.string name="skin_title" value="Skórka" />
|
||||
<layout_stack name="main_layout">
|
||||
<layout_panel name="transforms_panel">
|
||||
<menu_button name="clipboard_pos_btn" tool_tip="Opcje wklejania" />
|
||||
|
|
|
|||
|
|
@ -44,6 +44,15 @@
|
|||
<combo_box label="Antyaliasing" name="fsaa">
|
||||
<combo_box.item label="Wyłączony" name="FSAADisabled" />
|
||||
</combo_box>
|
||||
<text name="antialiasing quality label">
|
||||
Jakość antyaliasingu:
|
||||
</text>
|
||||
<combo_box name="fsaa quality">
|
||||
<combo_box.item label="Niska" name="Low" />
|
||||
<combo_box.item label="Średnia" name="Medium" />
|
||||
<combo_box.item label="Wysoka" name="High" />
|
||||
<combo_box.item label="Ultra" name="Ultra" />
|
||||
</combo_box>
|
||||
<text name="MeshText">
|
||||
Mesz
|
||||
</text>
|
||||
|
|
@ -76,6 +85,7 @@
|
|||
</text>
|
||||
<check_box label="Okluzja otoczenia (SSAO)" name="UseSSAO" />
|
||||
<check_box label="Włącz głębię ostrości" name="UseDoF" />
|
||||
<check_box label="HDR i emisyjność" name="VintageMode" />
|
||||
<text name="RenderShadowDetailText">
|
||||
Cienie:
|
||||
</text>
|
||||
|
|
@ -115,6 +125,11 @@
|
|||
<combo_box.item label="Średnio" name="3" />
|
||||
<combo_box.item label="Szybko" name="1" />
|
||||
</combo_box>
|
||||
<slider label="Wyostrzanie:" name="RenderSharpness" />
|
||||
<text name="TonemapTypeText">
|
||||
Tone mapping:
|
||||
</text>
|
||||
<slider label="Miks tone mappingu:" tool_tip="Łączenie kolorów liniowych i tonalnie odwzorowanych (mappingowanych)" name="TonemapMix" />
|
||||
<button label="Zresetuj wartości ustawień grafiki" name="Defaults" />
|
||||
<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
<floater name="settings_debug" title="Ustawienia debugowania">
|
||||
<panel name="debug_settings_search_panel">
|
||||
<search_editor label="Szukaj tutaj" name="search_settings_input" tool_tip="Wpisz tutaj interesujący Cię termin do wyszukania. Wyniki będą oparte na nazwie ustawienia oraz jego komentarzu."/>
|
||||
<scroll_list name="settings_scroll_list">
|
||||
<scroll_list.columns label="Ustawienie" name="setting" />
|
||||
</scroll_list>
|
||||
<check_box label="Pokaż tylko zmienione" name="hide_default" />
|
||||
</panel>
|
||||
<panel name="debug_settings_values_panel">
|
||||
<text_editor name="comment_text" tool_tip="Komentarz ustawienia debugowania. Często przekazuje użyteczną informację o zaznaczonym ustawieniu."/>
|
||||
|
|
|
|||
|
|
@ -493,6 +493,7 @@ Nis ↔ Najniż
|
|||
<button label="Prawa" name="button permissions"/>
|
||||
<button label="Odśwież" name="button refresh"/>
|
||||
<button label="Resetuj skrypty" name="btn_reset_scripts"/>
|
||||
<filter_editor label="Filtruj..." name="contents_filter" />
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="land info panel">
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
<string name="TimeWeek">wkday,datetime,slt</string>
|
||||
<string name="TimeAMPM">ampm,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeSec">second,datetime,slt</string>
|
||||
<string name="TimeTimezone">timezone,datetime,slt</string>
|
||||
<string name="LTimeMthNum">mthnum,datetime,local</string>
|
||||
<string name="LTimeWeek">wkday,datetime,local</string>
|
||||
|
|
|
|||
|
|
@ -533,6 +533,7 @@
|
|||
<menu_item_check label="Maksymalna rozdzielczość tekstur (niebezpieczne)" name="Full Res Textures"/>
|
||||
<menu_item_check label="Renderowania przyłączonego światła" name="Render Attached Lights"/>
|
||||
<menu_item_check label="Renderowanie przyłączonych cząsteczek" name="Render Attached Particles"/>
|
||||
<menu_item_check label="Zbierz Vertex Buffer czcionek" name="Collect Font Vertex Buffers" />
|
||||
<menu_item_check label="Pamięć podręczna modułu cieniującego" name="Enable Shader Cache" />
|
||||
<menu_item_call label="Wyczyść pamięć podręczną modułu cieniującego" name="Shader Cache Clear" />
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -3533,6 +3533,7 @@ Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrz
|
|||
Jedno lub więcej z Twoich Przekształceń Głosu wygaśnie za mniej niż [INTERVAL] dni.
|
||||
[[URL] Kliknij tutaj] aby odnowić subskrypcję.
|
||||
Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrzymać swój perk Przekształceń Głosu.
|
||||
<usetemplate ignoretext="Ostrzegaj mnie o wygasaniu Przekształcania Głosu" name="okignore" />
|
||||
</notification>
|
||||
<notification name="VoiceEffectsNew">
|
||||
Nowe Przekształcenia Głosu są dostępne!
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@
|
|||
<check_box label="Zawsze rozwijaj zaawansowane informacje o podglądzie animacji" tool_tip="Domyślnie rozwiń zaawansowane informacje o animacji w oknie podglądu animacji" name="FSAnimationPreviewExpanded" />
|
||||
<check_box label="Włącz rozszerzanie funkcjonalności informacji o skryptach" tool_tip="Gdy zaznaczysz tą opcję, to podstawowa funkcjonalność informacji o skryptach zostanie rozszerzona za pomocą różnych szczegółów przydatnych dla budowniczych" name="FSScriptInfoExtended" />
|
||||
<check_box label="Sortuj miejsca dodatków w sekcjach menu "Dołącz do" alfabetycznie (wymaga restartu)" tool_tip="Jeśli ta opcja jest włączona, to lista miejsc dla doczepienia dodatków pojawiająca się w menusach "Dołącz do" będzie posortowana alfabetycznie" name="FSSortAttachmentSpotsAlphabetically" />
|
||||
<check_box label="Nowy panel tekstur Firestorma w panelu budowania (wymaga restartu)" tool_tip="Gdy zaznaczysz tą opcję, to narzędzia do edycji tekstur będą korzystać z udoskonalonego panelu FS i pozwolą na edycję BlinnPhong" name="FSUseNewTexturePanel" />
|
||||
<check_box label="Nowy panel tekstur [APP_NAME] w panelu budowania (wymaga restartu)" tool_tip="Gdy zaznaczysz tą opcję, to narzędzia do edycji tekstur będą korzystać z udoskonalonego panelu [APP_NAME] i pozwolą na edycję tekstur BlinnPhong oraz PBR." name="FSUseNewTexturePanel" />
|
||||
</panel>
|
||||
<panel label="Nowe pliki" name="UploadsTab">
|
||||
<text name="title">
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
<!-- <combo_box.item label="Dansk (Duński) - Beta" name="Danish"/> -->
|
||||
<combo_box.item label="Deutsch (Niemiecki)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Hiszpański) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Francuski) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano (Włoski) - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Francuski)" name="French"/>
|
||||
<combo_box.item label="Italiano (Włoski)" name="Italian"/>
|
||||
<combo_box.item label="Polski" name="Polish"/>
|
||||
<!-- <combo_box.item label="Português (Portugalski) - Beta" name="Portugese"/> -->
|
||||
<combo_box.item label="Русский (Rosyjski) - Beta" name="Russian"/>
|
||||
<combo_box.item label="Русский (Rosyjski)" name="Russian"/>
|
||||
<!-- <combo_box.item label="Türkçe (Turecki) - Beta" name="Turkish"/> -->
|
||||
<combo_box.item label="日本語 (Japoński) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Tradycyjny chiński) - Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Tradycyjny chiński)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
(Restart wymagany)
|
||||
|
|
|
|||
|
|
@ -118,17 +118,45 @@
|
|||
<check_box label="Filtrowanie anizotropowe (wolniej, gdy włączone)" name="ani" tool_tip="To pole wyboru włącza filtrowanie anizotropowe, które jest metodą polepszania jakości tekstur, gdy są one oglądane pod względnie dużymi kątami w stosunku do położenia kamery. Zazwyczaj sprawia, że wydają się mniej rozmyte przy większych odległościach." />
|
||||
<check_box label="Włącz stratną kompresję tekstur (wymaga restartu)" name="texture compression" tool_tip="Kompresuje tekstury w pamięci wideo. Umożliwi to ładowanie tekstur w wyższej rozdzielczości / większej ich ilości, ale kosztem jakości obrazu."/>
|
||||
<check_box label="Włącz wsparcie dla ekranów HiDPI (tylko macOS; wymaga restartu)" name="use HiDPI" tool_tip="Włącz funkcje OpenGL dla rysowania w wysokich rozdzielczościach." />
|
||||
<text name="Antialiasing:" tool_tip="Zmiana tego ustawienia może wymagać ponownego uruchomienia na niektórych urządzeniach.">
|
||||
<text name="antialiasing label" tool_tip="Zmiana tego ustawienia może wymagać ponownego uruchomienia na niektórych urządzeniach.">
|
||||
Antyaliasing (zalecany restart):
|
||||
</text>
|
||||
<combo_box label="Antyaliasing" name="fsaa">
|
||||
<text name="antialiasing quality label" tool_tip="Zmiana tego ustawienia może wymagać ponownego uruchomienia na niektórych urządzeniach.">
|
||||
Jakość antyaliasingu:
|
||||
</text>
|
||||
<combo_box name="fsaa">
|
||||
<combo_box.item label="Wyłączony" name="FSAADisabled"/>
|
||||
</combo_box>
|
||||
<combo_box name="fsaa quality">
|
||||
<combo_box.item label="Niska" name="Low" />
|
||||
<combo_box.item label="Średnia" name="Medium" />
|
||||
<combo_box.item label="Wysoka" name="High" />
|
||||
<combo_box.item label="Ultra" name="Ultra" />
|
||||
</combo_box>
|
||||
<check_box label="Ogranicz użycie VRAM tekstur (MB)" name="FSLimitTextureVRAMUsage" tool_tip="Ogranicza ilość pamięci VRAM używanej do tekstur. Całkowite wykorzystanie może być w dalszym ciągu wyższe, ponieważ inne elementy również używają pamięci VRAM." />
|
||||
<slider name="RenderMaxVRAMBudget" tool_tip="Maksymalna ilość pamięci VRAM w megabajtach używana do tekstur." />
|
||||
<text name="advanced_settings">
|
||||
Zaawansowane (wymagany restart):
|
||||
</text>
|
||||
<check_box label="Wyłącz autodetekcję VRAM" name="FSOverrideVRAMDetection" tool_tip="Zezwól na wyłączenie automatycznego wykrywania VRAM (używaj z zachowaniem szczególnej ostrożności)" />
|
||||
<slider label="Zastąp dedykowaną VRAM dla GPU (GB):" name="FSForcedVideoMemory" tool_tip="Ważne: używaj ze szczególną ostrożnością. || Zastąp wykrytą pamięć VRAM dla karty graficznej. || Nie może zawierać 'współdzielonej' pamięci VRAM, która jest częścią systemowej pamięci RAM. || Jeśli nie rozumiesz różnicy, zostaw tę opcję w spokoju." />
|
||||
<text name="automatic_texture_downscale_settings">
|
||||
Auto-zmniejszanie tekstur:
|
||||
</text>
|
||||
<text name="TextureDiscardBackgroundedTime_label" tool_tip="Zmniejsza skalę tekstur po wybranej liczbie sekund, gdy okno nie jest aktywne.">
|
||||
Okno w tle (0 aby wyłączyć)
|
||||
</text>
|
||||
<spinner name="TextureDiscardBackgroundedTime" tool_tip="Zmniejsza skalę tekstur po wybranej liczbie sekund, gdy okno nie jest aktywne." />
|
||||
<text name="TextureDiscardBackgroundedTime_seconds">
|
||||
sekund
|
||||
</text>
|
||||
<text name="TextureDiscardMinimizedTime_label" tool_tip="Zmniejsza skalę tekstur po wybranej liczbie sekund po zminimalizowaniu.">
|
||||
Zminimalizowane (0 aby wyłączyć)
|
||||
</text>
|
||||
<spinner name="TextureDiscardMinimizedTime" tool_tip="Zmniejsza skalę tekstur po wybranej liczbie sekund po zminimalizowaniu." />
|
||||
<text name="TextureDiscardMinimizedTime_seconds">
|
||||
sekund
|
||||
</text>
|
||||
</panel>
|
||||
<panel name="Rendering">
|
||||
<text name="World Updating">
|
||||
|
|
@ -159,13 +187,11 @@
|
|||
<combo_box.item label="Niska jakość (4)" name="4"/>
|
||||
<combo_box.item label="Bez tekstur (5)" name="5"/>
|
||||
</combo_box>
|
||||
<text name="Alpha Mask Rendering">
|
||||
Maski przezroczystości (alpha):
|
||||
</text>
|
||||
<check_box label="Renderuj maski przezroczystości" tool_tip="Gdy opcja jest zaznaczona, to następuje poprawny rendering masek alpha (przezroczystych bitów)" name="RenderAutoMaskAlphaDeferred"/>
|
||||
<text name="Miscellaneous Rendering">
|
||||
Inne opcje wyświetlania:
|
||||
</text>
|
||||
<check_box label="HDR i emisyjność" tool_tip="Włącza dodatkowe funkcje renderowania na nowszych maszynach, takie jak HDR i tekstury emisyjne dla PBR." name="VintageMode" />
|
||||
<check_box label="Renderuj maski przezroczystości" tool_tip="Gdy opcja jest zaznaczona, to następuje poprawny rendering masek alpha (przezroczystych bitów)" name="RenderAutoMaskAlphaDeferred"/>
|
||||
<check_box label="Renderuj blask" tool_tip="Renderuj blask. Siła musi być ustawiona na 0, aby wyłączyć blask gdy cienie są włączone." name="RenderGlow"/>
|
||||
<slider label="Siła:" tool_tip="Siła blasku. Więcej = szerszy i gładszy (domyślnie 2) " name="glow_strength"/>
|
||||
<check_box label="Pokazuj awatary, które nie skończyły się ładować" name="RenderUnloadedAvatars"/>
|
||||
|
|
@ -178,6 +204,11 @@
|
|||
</text>
|
||||
<slider label="Jakość cieni" tool_tip="Określa jakość cieni (domyślnie 1)" name="ShadowResolution"/>
|
||||
<slider label="Wielkość tekstur terenu (wymaga restartu)" name="RenderTerrainScale" tool_tip="Określa wielkość tekstur terenu - mniej oznacza: bardziej skompresowane (wymaga restartu)."/>
|
||||
<slider label="Wyostrzanie:" name="RenderSharpness" />
|
||||
<text name="TonemapTypeText">
|
||||
Tone mapping:
|
||||
</text>
|
||||
<slider label="Miks tone mappingu:" tool_tip="Łączenie kolorów liniowych i tonalnie odwzorowanych (mappingowanych)" name="TonemapMix" />
|
||||
</panel>
|
||||
<panel label="Głębia ostrości" name="DOF panel">
|
||||
<check_box label="Włącz głębię ostrości (rozmywaj widok z wyjątkiem miejsca, gdzie skupiona jest kamera)" name="UseDoF"/>
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<combo_box.item label="Dansk (Dinamarquês) - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch (Alemão)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Espanhol) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Francês) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Francês)" name="French"/>
|
||||
<combo_box.item label="Italiano" name="Italian"/>
|
||||
<combo_box.item label="Polski (Polonês)" name="Polish"/>
|
||||
<combo_box.item label="Português (Português) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="Русский (Russo) - Beta" name="Russian"/>
|
||||
<combo_box.item label="Русский (Russo)" name="Russian"/>
|
||||
<combo_box.item label="Türkçe (Turco) - Beta" name="Turkish"/>
|
||||
<combo_box.item label="日本語 (Japonês) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Chinês tradicional) - Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Chinês tradicional)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
(Reinicie para trocar de idioma)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater name="gltf asset editor" title="[OBJECT_NAME]">
|
||||
<floater.string name="floater_title" value="GLTF Редактор сцен"/>
|
||||
<floater.string name="scene_title" value="Сцена"/>
|
||||
<floater.string name="node_title" value="Узел"/>
|
||||
<floater.string name="mesh_title" value="Меш"/>
|
||||
<floater.string name="skin_title" value="Кожа"/>
|
||||
<layout_stack name="main_layout">
|
||||
<layout_panel name="transforms_panel">
|
||||
<menu_button name="clipboard_pos_btn" tool_tip="Параметры вставки"/>
|
||||
<text name="label position" tool_tip="Позиция (метры)" width="121">
|
||||
Позиция (м)
|
||||
</text>
|
||||
<menu_button name="clipboard_size_btn" tool_tip="Параметры вставки" width="19"/>
|
||||
<text name="label size" tool_tip="Размер (метры)" width="121">
|
||||
Размер (м)
|
||||
</text>
|
||||
<menu_button name="clipboard_rot_btn" tool_tip="Параметры вставки" width="19"/>
|
||||
<text name="label rotation" tool_tip="Вращение (градусы)" width="121">
|
||||
Вращение (°)
|
||||
</text>
|
||||
</layout_panel>
|
||||
</layout_stack>
|
||||
</floater>
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater name="material editor" title="[MATERIAL_NAME]">
|
||||
<string name="no_upload_fee_string">плата за загрузку не взимается</string>
|
||||
<string name="upload_fee_string">L$[FEE] плата за загрузку</string>
|
||||
<string name="material_override_title">Редактирование материала</string>
|
||||
<panel name="button_panel">
|
||||
<text name="unsaved_changes" width="200">
|
||||
Несохраненные изменения
|
||||
</text>
|
||||
<button label="Сохранить" name="save" width="120" />
|
||||
<button label="Сохранить Как..." name="save_as" width="120" />
|
||||
<text name="total_upload_fee" width="220">
|
||||
Общая плата за загрузку: L$ [FEE]
|
||||
</text>
|
||||
<button label="Отмена" name="cancel" width="121" />
|
||||
</panel>
|
||||
</floater>
|
||||
|
|
@ -12,10 +12,19 @@
|
|||
<text name="PostProcessText">
|
||||
Низкое
|
||||
</text>
|
||||
<slider label="Макс. источн.света рядом:" label_width="185" name="MaxLights" width="336" />
|
||||
<check_box label="Включить VSync" name="vsync" tool_tip="Синхронизирует частоту кадров с частотой обновления монитора, что обеспечивает плавную работу."/>
|
||||
<text name="AvatarText">
|
||||
Аватар
|
||||
</text>
|
||||
<text name="AvatarComplexityModeLabel" width="140">
|
||||
Отображение аватара:
|
||||
</text>
|
||||
<combo_box name="AvatarComplexityMode" left_delta="140">
|
||||
<combo_box.item label="Огр. по сложности" name="0"/>
|
||||
<combo_box.item label="Всегда показ друзей" name="1"/>
|
||||
<combo_box.item label="Только показ друзей" name="2"/>
|
||||
</combo_box>
|
||||
<slider label="Максимальная сложность:" name="IndirectMaxComplexity" tool_tip="Указывает расстояние, начиная с которого визуально сложный аватар рисуется как желейная фигура"/>
|
||||
<slider label="Макс. кол-во объемных:" name="IndirectMaxNonImpostors"/>
|
||||
<slider label="Детализация:" name="AvatarMeshDetail"/>
|
||||
|
|
@ -38,6 +47,15 @@
|
|||
<combo_box label="Сглаживание" name="fsaa">
|
||||
<combo_box.item label="Выключено" name="FSAADisabled"/>
|
||||
</combo_box>
|
||||
<text name="antialiasing quality label" width="135">
|
||||
Качество сглаживания:
|
||||
</text>
|
||||
<combo_box label="Сглаживание" name="fsaa quality" left_pad="25">
|
||||
<combo_box.item label="Низкое" name="Low"/>
|
||||
<combo_box.item label="Среднее" name="Medium"/>
|
||||
<combo_box.item label="Высокое" name="High"/>
|
||||
<combo_box.item label="Ультра" name="Ultra"/>
|
||||
</combo_box>
|
||||
<text name="MeshText">
|
||||
Меш
|
||||
</text>
|
||||
|
|
@ -70,6 +88,7 @@
|
|||
</text>
|
||||
<check_box label="Экранное пространство Окружающая окклюзия" name="UseSSAO"/>
|
||||
<check_box label="Глубина резкости" name="UseDoF"/>
|
||||
<check_box label="HDR и Эмиссионные" name="VintageMode"/>
|
||||
<text name="RenderShadowDetailText">
|
||||
Тени:
|
||||
</text>
|
||||
|
|
@ -110,6 +129,15 @@
|
|||
<combo_box.item label="Каждый 4-й кадр" name="3"/>
|
||||
</combo_box>
|
||||
<!-- End of mirror settings -->
|
||||
<slider label="Заострение:" name="RenderSharpness"/>
|
||||
<text name="TonemapTypeText">
|
||||
Карты тонов:
|
||||
</text>
|
||||
<combo_box name="TonemapType">
|
||||
<combo_box.item label="Khronos Neutral" name="0"/>
|
||||
<combo_box.item label="ACES" name="1"/>
|
||||
</combo_box>
|
||||
<slider label="Смесь карт тонов:" tool_tip="Комбинируйте цвета с линейной и тональной картировкой" name="TonemapMix"/>
|
||||
<button label="Вернуть рекомендуемые настройки" name="Defaults"/>
|
||||
<button label="OK" label_selected="OK" name="OK"/>
|
||||
<button label="Отмена" label_selected="Отмена" name="Cancel"/>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
<floater name="settings_debug" title="Настройки отладки">
|
||||
<panel name="debug_settings_search_panel">
|
||||
<search_editor label="Найти" name="search_settings_input" tool_tip="Введите поисковый запрос, который вас интересует. Результаты будут отображаться для частичных полнотекстовых совпадений в названии параметра или в комментарии."/>
|
||||
<scroll_list name="settings_scroll_list">
|
||||
<scroll_list.columns label="Настройки" name="setting" />
|
||||
</scroll_list>
|
||||
<check_box label="Измененные настройки" name="hide_default" />
|
||||
</panel>
|
||||
<panel name="debug_settings_values_panel">
|
||||
<text_editor name="comment_text" tool_tip="Комментарий отладки настроек. Часто дает полезную информацию о настройках, которые вы выбрали."/>
|
||||
|
|
@ -10,6 +14,7 @@
|
|||
<radio_item label="Ложь" name="FALSE"/>
|
||||
</radio_group>
|
||||
<color_swatch label="Цвет" name="val_color_swatch"/>
|
||||
<button name="sanity_warning_btn" tool_tip="Этот параметр отладки не прошел проверку на работоспособность; его значение находится за пределами рекомендуемого диапазона."/>
|
||||
<button label="Копия" name="copy_btn" tool_tip="Копирует имя настройки в буфер обмена."/>
|
||||
<button label="По умолчанию" name="default_btn" tool_tip="Сбросить этот параметр отладки на значение по умолчанию."/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -581,6 +581,7 @@
|
|||
<button label="Разрешения" name="button permissions"/>
|
||||
<button label="Обновить" name="button refresh" width="100"/>
|
||||
<button label="Сброс скриптов" name="btn_reset_scripts" width="100"/>
|
||||
<filter_editor label="Введите текст фильтра" name="contents_filter"/>
|
||||
</panel>
|
||||
</tab_container>
|
||||
<panel name="land info panel">
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
<!-- Locale Information -->
|
||||
<string name="MicrosoftLocale">russian</string>
|
||||
<string name="MacLocale">ru_RU.UTF-8</string>
|
||||
<string name="macOSLocale">ru_RU.UTF-8</string>
|
||||
<string name="DarwinLocale">ru_RU.UTF-8</string>
|
||||
<string name="LinuxLocale">ru_RU.UTF-8</string>
|
||||
|
||||
|
|
@ -44,7 +45,6 @@
|
|||
<string name="TimeWeek">wkday,datetime,slt</string>
|
||||
<string name="TimeAMPM">ampm,datetime,slt</string>
|
||||
<string name="TimeHour12">hour12,datetime,slt</string>
|
||||
<string name="TimeSec">second,datetime,slt</string>
|
||||
<string name="TimeTimezone">timezone,datetime,slt</string>
|
||||
|
||||
<string name="LTimeMthNum">mthnum,datetime,local</string>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
<menu_item_check label="Показать меню отладки" name="Show Debug Menu"/>
|
||||
<menu label="Отладка" name="Debug">
|
||||
<menu_item_call label="Показать настройки отладки" name="Debug Settings"/>
|
||||
<menu_item_call label="Показать настройки цвета" name="Color Settings"/>
|
||||
<menu_item_call label="Инструменты просмотра XUI" name="UI Preview Tool"/>
|
||||
<menu label="Шрифты" name="Fonts">
|
||||
<menu_item_call label="Показать тест шрифта" name="Show Font Test"/>
|
||||
|
|
|
|||
|
|
@ -631,8 +631,9 @@
|
|||
<menu_item_check label="Отладка клавиш" name="Debug Keys"/>
|
||||
<menu_item_check label="Отладка окна процесса" name="Debug WindowProc"/>
|
||||
</menu>
|
||||
<menu label="XUI/XML" name="XUI">
|
||||
<menu_item_call label="Перезагрузить цветовые установки" name="Reload Color Settings"/>
|
||||
<menu label="XUI" name="XUI">
|
||||
<menu_item_call label="Показать настройки цвета" name="Color Settings"/>
|
||||
<menu_item_call label="Перезагрузить настройки цвета" name="Reload Color Settings"/>
|
||||
<menu_item_call label="Показать проверку шрифтов" name="Show Font Test"/>
|
||||
<menu_item_call label="Загрузить из XML" name="Load from XML"/>
|
||||
<menu_item_call label="Сохранить в XML" name="Save to XML"/>
|
||||
|
|
|
|||
|
|
@ -4139,11 +4139,6 @@ https://wiki.firestormviewer.org/fs_voice
|
|||
Выбранный объект влияет на навигационную сетку. Если заменить его на гибкий путь, он будет удален из навигационной сетки.
|
||||
<usetemplate ignoretext="Выбранный объект влияет на навигационную сетку. Если заменить его на гибкий путь, он будет удален из навигационной сетки." name="okcancelignore" notext="Отмена" yestext="Да"/>
|
||||
</notification>
|
||||
<global name="UnsupportedIntelDriver">
|
||||
Установленный графический драйвер Intel для [GPUNAME], версия [VERSION], значительно устарел и, как известно, вызывает чрезмерно частые сбои программы. Настоятельно рекомендуется установить последнюю версию драйвера Intel.
|
||||
|
||||
Хотите посетить сайт драйверов Intel?
|
||||
</global>
|
||||
<global name="UnsupportedGPU">
|
||||
- Графическая карта вашего компьютера не удовлетворяет минимальным требованиям.
|
||||
</global>
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@
|
|||
<check_box label="Всегда раскрывать расширенную информацию в предпросмотре анимации" tool_tip="Развернуть расширенную информацию об анимации в всплывающем окне предварительного просмотра анимации по умолчанию." name="FSAnimationPreviewExpanded"/>
|
||||
<check_box label="Включить расширенную информацию скрипта" name="FSScriptInfoExtended" tool_tip="Если включено, расширяет базовую функцию информации скрипта с различными деталями, полезными для строителей"/>
|
||||
<check_box label="Сортировка прикреплений в "Прикрепить к" меню по алфавиту (нужна перезагрузка)" tool_tip="Если этот параметр включен, список прикреплений в "Прикрепить к" меню будут отсортированы по алфавиту" name="FSSortAttachmentSpotsAlphabetically"/>
|
||||
<check_box label="Новая панель текстур FS во всплывающем меню инструментов (нужна перезагрузка)" tool_tip="Если этот параметр включен, инструменты редактирования текстур будут использовать усовершенствованный рабочий процесс FS и позволят редактировать БлиннФонг" name="FSUseNewTexturePanel"/>
|
||||
<check_box label="Новая панель текстур [APP_NAME] в Инструментах (нужна перезагрузка)" tool_tip="Если этот параметр включен, инструменты редактирования текстур будут использовать усовершенствованный рабочий процесс [APP_NAME] и позволят редактировать БлиннФонг и PBR-текстуры." name="FSUseNewTexturePanel"/>
|
||||
</panel>
|
||||
<!--Uploads-->
|
||||
<panel label="Загрузки" name="UploadsTab">
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<combo_box.item label="Dansk (Датский) - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch (Немецкий)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (Испанский) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Французский) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano (Итальянский) - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Французский)" name="French"/>
|
||||
<combo_box.item label="Italiano (Итальянский)" name="Italian"/>
|
||||
<combo_box.item label="Polski (Польский)" name="Polish"/>
|
||||
<combo_box.item label="Português (Португальский) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="Русский" name="Russian"/>
|
||||
<combo_box.item label="Türkçe (Турецкий) - Beta" name="Turkish"/>
|
||||
<combo_box.item label="日本語 (Японский) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Традиционный Китайский) - Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Традиционный Китайский)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2" width="145">
|
||||
(Необходим перезапуск)
|
||||
|
|
|
|||
|
|
@ -123,18 +123,49 @@
|
|||
<check_box label="Анизотропная фильтрация (медленнее, когда включено)" name="ani" tool_tip = "Этот флажок включает анизотропную фильтрацию, которая представляет собой метод повышения качества текстур, когда они просматриваются под относительно большими углами по отношению к положению вашей камеры. Обычно заставляет их выглядеть менее размытыми на больших расстояниях."/>
|
||||
<check_box label="Включить сжатие текстур с потерями (требуется перезапуск)" name="texture compression" tool_tip="Сжатие текстур в видеопамяти, позволяет текстурам с высоким разрешение загружаться за счет некоторого потери качества цвета."/>
|
||||
<check_box label="Включить поддержку дисплеев HiDPI (только macOS; требуется перезапуск)" name="use HiDPI" tool_tip="Включить OpenGL для отображения в высоком разрешении."/>
|
||||
<text name="Antialiasing:" tool_tip = "Изменения этого параметра может потребовать перезапуск на некотором оборудовании." width="290">
|
||||
<text name="antialiasing label" tool_tip = "Изменения этого параметра может потребовать перезапуск на некотором оборудовании." width="290">
|
||||
Сглаживание (рекомендуется перезапуск):
|
||||
</text>
|
||||
<text name="antialiasing quality label" width="220" tool_tip="Изменение этого параметра может потребовать перезагрузки некоторого оборудования.">
|
||||
Качество сглаживания:
|
||||
</text>
|
||||
<combo_box label="Сглаживание" name="fsaa">
|
||||
<combo_box.item label="Отключено" name="FSAADisabled"/>
|
||||
</combo_box>
|
||||
<combo_box name="fsaa quality">
|
||||
<combo_box.item label="Низкое" name="Low"/>
|
||||
<combo_box.item label="Среднее" name="Medium"/>
|
||||
<combo_box.item label="Высокое" name="High"/>
|
||||
<combo_box.item label="Ультра" name="Ultra"/>
|
||||
</combo_box>
|
||||
<check_box label="Ограничить видеопамять для текстур (МБ)" name="FSLimitTextureVRAMUsage" tool_tip="Ограничивает объем видеопамяти, используемой для текстур. Общее использование может быть выше, поскольку другие элементы также используют видеопамять."/>
|
||||
<slider name="RenderMaxVRAMBudget" tool_tip="Максимальный объем видеопамяти в мегабайтах, используемый для текстур."/>
|
||||
<text name="advanced_settings">
|
||||
Расширенные настройки (требуется перезагрузка):
|
||||
</text>
|
||||
<check_box label="Переопределение обнаружения видеопамяти" name="FSOverrideVRAMDetection" tool_tip="Разрешить пользователю переопределять обнаружение видеопамяти (использовать с особой осторожностью)"/>
|
||||
<slider label="Выделенная видеопамять GPU (ГБ):" name="FSForcedVideoMemory" tool_tip="Важно: используйте с особой осторожностью. Переопределите обнаруженную видеопамять в вашем графическом процессоре. Это не должно включать 'общую' видеопамять, которая является частью системной оперативной памяти. Если вы не понимаете разницы, оставьте этот элемент управления в покое."/>
|
||||
|
||||
<text name="automatic_texture_downscale_settings" width="308">
|
||||
Автоматическое уменьшение масштаба текстуры:
|
||||
</text>
|
||||
<text name="TextureDiscardBackgroundedTime_label" tool_tip="Уменьшенные текстуры через выбранное количество секунд, когда окно неактивно." width="275">
|
||||
В фоновом режиме (0 отключить)
|
||||
</text>
|
||||
<spinner name="TextureDiscardBackgroundedTime" tool_tip="Уменьшенные текстуры через выбранное количество секунд, когда окно неактивно." width="100"/>
|
||||
<text name="TextureDiscardBackgroundedTime_seconds" width="100">
|
||||
Секунд(ы)
|
||||
</text>
|
||||
<text name="TextureDiscardMinimizedTime_label" tool_tip="Уменьшенные текстуры через выбранное количество секунд при сворачивании." width="275">
|
||||
Минимизировано (0 отключить)
|
||||
</text>
|
||||
<spinner name="TextureDiscardMinimizedTime" tool_tip="Уменьшенные текстуры через выбранное количество секунд при сворачивании." width="100"/>
|
||||
<text name="TextureDiscardMinimizedTime_seconds" width="100">
|
||||
Секунд(ы)
|
||||
</text>
|
||||
|
||||
</panel>
|
||||
|
||||
<panel label="Прорисовка" name="Rendering">
|
||||
<text name="World Updating">
|
||||
Обновление мира:
|
||||
|
|
@ -173,6 +204,7 @@
|
|||
<text name="Miscellaneous Rendering">
|
||||
Разное:
|
||||
</text>
|
||||
<check_box label="HDR и Эмиссионные" tool_tip="Включает дополнительные функции конвейера рендеринга на новых компьютерах, такие как HDR и эмиссионные текстуры для PBR-контента." name="VintageMode" width="256"/>
|
||||
<check_box label="Прорисовка свечения" tool_tip="Прорисовка свечения. Обратите внимание, что сила должна быть установлена на ноль, чтобы отключить свечение, когда тени включены." name="RenderGlow"/>
|
||||
<slider label="Сила:" tool_tip="Сила. Выше = шире и размытей (по умолчанию 2) " name="glow_strength"/>
|
||||
<check_box label="Показывать не полностью загруженные аватары" name="RenderUnloadedAvatars"/>
|
||||
|
|
@ -185,6 +217,15 @@
|
|||
</text>
|
||||
<slider label="Качество теней" tool_tip="Качество теней (по умолчанию 1)" name="ShadowResolution"/>
|
||||
<slider label="Масштабирование прорисовки текстуры земли" name="RenderTerrainScale" tool_tip="Определяет масштаб текстуры местности - ниже более сжато (требуется перезапуск)"/>
|
||||
<slider label="Заострение:" name="RenderSharpness"/>
|
||||
<text name="TonemapTypeText">
|
||||
Карты тонов:
|
||||
</text>
|
||||
<combo_box name="TonemapType">
|
||||
<combo_box.item label="Khronos Neutral" name="0"/>
|
||||
<combo_box.item label="ACES" name="1"/>
|
||||
</combo_box>
|
||||
<slider label="Смесь карт тонов:" tool_tip="Комбинируйте цвета с линейной и тональной картировкой" name="TonemapMix"/>
|
||||
</panel>
|
||||
<panel label="Глубина резкости (DoF)" name="DOF panel">
|
||||
<check_box label="Включить глубину резкости (Это размоет вид за исключением фокусировки камеры.)" name="UseDoF"/>
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
<item label="Высокое" name="noise_suppression_high"/>
|
||||
<item label="Максимум" name="noise_suppression_max"/>
|
||||
</combo_box>
|
||||
<button label="Настройки звукового устройства" name="device_settings_btn"/>
|
||||
<button label="Настройки звукового устройства" name="device_settings_btn" width="210"/>
|
||||
</panel>
|
||||
<panel label="Интерфейс 1" name="UI Sounds tab 1">
|
||||
<text name="textFSExplanation_tab1">
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
<combo_box.item label="Dansk (Danca) - Beta" name="Danish"/>
|
||||
<combo_box.item label="Deutsch (Almanca)" name="Deutsch(German)"/>
|
||||
<combo_box.item label="Español (İspanyolca) - Beta" name="Spanish"/>
|
||||
<combo_box.item label="Français (Fransızca) - Beta" name="French"/>
|
||||
<combo_box.item label="Italiano (İtalyanca) - Beta" name="Italian"/>
|
||||
<combo_box.item label="Français (Fransızca)" name="French"/>
|
||||
<combo_box.item label="Italiano (İtalyanca)" name="Italian"/>
|
||||
<combo_box.item label="Polski (Lehçe)" name="Polish"/>
|
||||
<combo_box.item label="Português (Portekizce) - Beta" name="Portugese"/>
|
||||
<combo_box.item label="Русский (Rusça) - Beta" name="Russian"/>
|
||||
<combo_box.item label="Русский (Rusça)" name="Russian"/>
|
||||
<combo_box.item label="Türkçe - Beta" name="Turkish"/>
|
||||
<combo_box.item label="日本語 (Japonca) - Beta" name="(Japanese)"/>
|
||||
<combo_box.item label="正體中文 (Geleneksel Çince) - Beta" name="Traditional Chinese"/>
|
||||
<combo_box.item label="正體中文 (Geleneksel Çince)" name="Traditional Chinese"/>
|
||||
</combo_box>
|
||||
<text name="language_textbox2">
|
||||
(Yeniden başlatma gerekir)
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@
|
|||
<text name="Object Owners:">
|
||||
物件所有者：
|
||||
</text>
|
||||
<button label="重新整理清單" label_selected="重新整理清單" name="Refresh List" tool_tip="重新整理物件清單" />
|
||||
<button label="更新清單" label_selected="更新清單" name="Refresh List" tool_tip="更新物件清單" />
|
||||
<button label="退回物件" label_selected="退回物件中..." name="Return objects..." />
|
||||
<name_list name="owner list">
|
||||
<name_list.columns label="類型" name="type" />
|
||||
|
|
@ -327,7 +327,7 @@
|
|||
禁止推撞
|
||||
</panel.string>
|
||||
<panel.string name="push_restrict_region_text">
|
||||
禁止推撞（區域設定涵蓋）
|
||||
禁止推撞（區域設定覆蓋）
|
||||
</panel.string>
|
||||
<panel.string name="DirectoryFree">
|
||||
將地點刊登顯示在搜尋中
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
天空色彩:
|
||||
</text>
|
||||
<text name="blue_density_lbl">
|
||||
天空色彩飽和度:
|
||||
天空飽和度:
|
||||
</text>
|
||||
<button label="重設" name="btn_reset" tool_tip="關閉並重設為共享環境" />
|
||||
<text name="sun_color_lbl">
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
霧密度:
|
||||
</text>
|
||||
<text name="cloud_coverage_label">
|
||||
雲層涵蓋範圍:
|
||||
雲層覆蓋範圍:
|
||||
</text>
|
||||
<text name="cloud_scale_label">
|
||||
雲層尺寸:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<floater name="animation_overrider" title="動畫涵蓋器">
|
||||
<floater name="animation_overrider" title="動畫覆蓋器">
|
||||
<floater.string name="ao_no_sets_loaded">
|
||||
未載入設定
|
||||
</floater.string>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<fs_scroll_list.columns name="creator" label="創造者" width="90" />
|
||||
<fs_scroll_list.columns name="last_owner" label="前所有者" width="90" tool_tip="物件的上一個所有者。" />
|
||||
</fs_scroll_list>
|
||||
<button name="Refresh" label="重新整理" />
|
||||
<button name="Refresh" label="更新" />
|
||||
<text name="counter" left_delta="110">
|
||||
已列出 | 待處理 | 總計
|
||||
</text>
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
<column name="vram_usage" label="紋理視訊記憶體佔用KB" />
|
||||
<column name="vram_usage_vbo" label="VBO視訊記憶體佔用KB" />
|
||||
</scroll_list>
|
||||
<button label="重新整理" label_selected="重新整理" name="refresh_button" />
|
||||
<button label="更新" label_selected="更新" name="refresh_button" />
|
||||
</floater>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<floater name="gltf asset editor">
|
||||
<floater.string name="floater_title" value="GLTF 場景編輯器" />
|
||||
<floater.string name="scene_tittle" value="場景" />
|
||||
<floater.string name="node_tittle" value="節點" />
|
||||
<floater.string name="mesh_tittle" value="網格" />
|
||||
<floater.string name="skin_tittle" value="皮膚" />
|
||||
<floater.string name="scene_title" value="場景" />
|
||||
<floater.string name="node_title" value="節點" />
|
||||
<floater.string name="mesh_title" value="網格" />
|
||||
<floater.string name="skin_title" value="皮膚" />
|
||||
<layout_stack name="main_layout">
|
||||
<layout_panel name="transforms_panel">
|
||||
<menu_button name="clipboard_pos_btn" tool_tip="黏貼選項" />
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<floater name="godtools floater" title="神之工具">
|
||||
<tab_container name="GodTools Tabs">
|
||||
<panel label="類比網路" name="grid">
|
||||
<button label="重新整理這個區域的地圖可視快取" label_selected="重新整理這個區域的地圖可視快取" name="Flush This Region's Map Visibility Caches" />
|
||||
<button label="更新這個區域的地圖可視快取" label_selected="更新這個區域的地圖可視快取" name="Flush This Region's Map Visibility Caches" />
|
||||
</panel>
|
||||
<panel label="區域" name="region">
|
||||
<text name="Region Name:">
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<text name="land cost text">
|
||||
每平方公尺 L$：
|
||||
</text>
|
||||
<button label="重新整理" label_selected="重新整理" name="Refresh" tool_tip="點擊這裡重新整理上列資料" />
|
||||
<button label="更新" label_selected="更新" name="Refresh" tool_tip="點擊這裡更新上列資料" />
|
||||
<button label="應用" label_selected="應用" name="Apply" tool_tip="點擊此處以接受應用上述變更" />
|
||||
<button label="選擇區域" label_selected="選擇區域" name="Select Region" tool_tip="以土地工具選擇整個區域" />
|
||||
<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="儲存 gzip 壓縮狀態至自動儲存目錄" />
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@
|
|||
<text name="status_text">
|
||||
準備就緒...
|
||||
</text>
|
||||
<button name="btn_refresh" label="重新整理" />
|
||||
<button name="btn_refresh" label="更新" />
|
||||
<button name="btn_start" label="開始" />
|
||||
</floater>
|
||||
|
|
@ -2,9 +2,6 @@
|
|||
<floater name="material editor">
|
||||
<string name="no_upload_fee_string">無上傳費用</string>
|
||||
<string name="upload_fee_string">上傳費用[FEE]L$</string>
|
||||
<string name="material_selection_title">材質選擇</string>
|
||||
<string name="material_selection_text">選擇材質：</string>
|
||||
<string name="material_batch_import_text">--- 批次上傳全部 ---</string>
|
||||
<string name="material_override_title">編輯材質</string>
|
||||
<panel name="button_panel">
|
||||
<text name="unsaved_changes">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
錯誤：剖析 dae 時出錯，詳見記錄檔案。
|
||||
</string>
|
||||
<string name="status_bind_shape_orientation">
|
||||
警告：繫結形狀矩陣並未處於標準的「X-向前」方位。
|
||||
警告：綁定形狀矩陣並未處於標準的「X-向前」方位。
|
||||
</string>
|
||||
<string name="status_material_mismatch">
|
||||
錯誤：模型材料並非參考模型的子集合。
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
由於關節過多，蒙皮已被禁用：[JOINTS]，最大值：[MAX]
|
||||
</string>
|
||||
<string name="UnrecognizedJoint">
|
||||
繫結到一個未知的關節：[NAME]
|
||||
綁定到一個未知的關節：[NAME]
|
||||
</string>
|
||||
<string name="UnknownJoints">
|
||||
由於[COUNT]個未知關節，蒙皮已被禁用。
|
||||
|
|
@ -339,7 +339,7 @@
|
|||
</text>
|
||||
<check_box label="包含紋理" name="upload_textures" />
|
||||
</panel>
|
||||
<panel label="涵蓋" title="繫結" name="rigging_panel">
|
||||
<panel label="覆蓋" title="已綁定" name="rigging_panel">
|
||||
<text name="scale_label">
|
||||
縮放比例 (1=無):
|
||||
</text>
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
[CONFLICTS]衝突[JOINTS_COUNT]個關節
|
||||
</text>
|
||||
<text name="pos_overrides_descr">
|
||||
位置涵蓋於關節'[JOINT]':
|
||||
位置覆蓋於關節'[JOINT]':
|
||||
</text>
|
||||
<scroll_list name="pos_overrides_list">
|
||||
<scroll_list.columns label="模型" name="model_name" />
|
||||
|
|
@ -396,9 +396,9 @@
|
|||
<text name="mesh_upload_behaviour_label">
|
||||
模型上傳行為設定：
|
||||
</text>
|
||||
<check_box label="自動啟用權重" tool_tip="自動為包含繫結資訊的網格啟用權重" name="mesh_preview_auto_weights" />
|
||||
<check_box label="自動啟用權重" tool_tip="自動為包含綁定資訊的網格啟用權重" name="mesh_preview_auto_weights" />
|
||||
<check_box label="預設使用'可靠'的細節層次" tool_tip="預設使用'可靠'的方法（GLOD）" name="mesh_upload_default_to_reliable" />
|
||||
<check_box label="自動預覽權重" tool_tip="自動在預覽中顯示包含繫結資訊的網格的權重" name="mesh_preview_auto_show_weights" />
|
||||
<check_box label="自動預覽權重" tool_tip="自動在預覽中顯示包含綁定資訊的網格的權重" name="mesh_preview_auto_show_weights" />
|
||||
<text name="lod_suffix_label">
|
||||
細節層次字尾：
|
||||
</text>
|
||||
|
|
@ -526,7 +526,7 @@
|
|||
</text>
|
||||
<slider name="physics_explode" width="75" />
|
||||
<check_box label="關節位置" name="show_joint_positions" />
|
||||
<check_box label="關節位置涵蓋" name="show_joint_overrides" />
|
||||
<check_box label="關節位置覆蓋" name="show_joint_overrides" />
|
||||
<check_box label="皮膚權重" name="show_skin_weight" />
|
||||
</panel>
|
||||
<text name="warning_title" width="60">
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
<text name="messaging_status">
|
||||
角色：
|
||||
</text>
|
||||
<button label="重新整理清單" name="refresh_objects_list" />
|
||||
<button label="更新清單" name="refresh_objects_list" />
|
||||
<button label="全選" name="select_all_objects" />
|
||||
<button label="全都不選" name="select_none_objects" />
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<text name="messaging_status">
|
||||
聯結集：
|
||||
</text>
|
||||
<button label="重新整理清單" name="refresh_objects_list" />
|
||||
<button label="更新清單" name="refresh_objects_list" />
|
||||
<button label="全選" name="select_all_objects" />
|
||||
<button label="全都不選" name="select_none_objects" />
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
低
|
||||
</text>
|
||||
<slider label="最大鄰近光源數：" name="MaxLights" />
|
||||
<check_box label="啟用垂直同步" tool_tip="將影格速率與顯示器的重新整理率同步，可能會增加卡頓和輸入延遲。" name="vsync" />
|
||||
<check_box label="啟用垂直同步" tool_tip="將影格速率與顯示器的更新率同步，可能會導致更多的卡頓和輸入延遲。" name="vsync" />
|
||||
<text name="AvatarText">
|
||||
化身
|
||||
</text>
|
||||
<text name="AvatarComplexityModeLabel">
|
||||
化身示：
|
||||
化身顯示：
|
||||
</text>
|
||||
<combo_box name="AvatarComplexityMode">
|
||||
<combo_box.item label="按複雜度限制" name="0" />
|
||||
|
|
@ -54,6 +54,16 @@
|
|||
<combo_box label="反鋸齒" name="fsaa">
|
||||
<combo_box.item label="禁用" name="FSAADisabled" />
|
||||
<combo_box.item label="FXAA" name="FXAA" />
|
||||
<combo_box.item label="SMAA" name="SMAA"/>
|
||||
</combo_box>
|
||||
<text name="antialiasing quality label">
|
||||
反鋸齒品質：
|
||||
</text>
|
||||
<combo_box label="反鋸齒" name="fsaa quality">
|
||||
<combo_box.item label="低" name="Low"/>
|
||||
<combo_box.item label="中" name="Medium"/>
|
||||
<combo_box.item label="高" name="High"/>
|
||||
<combo_box.item label="超高" name="Ultra"/>
|
||||
</combo_box>
|
||||
<text name="MeshText">
|
||||
網格模型
|
||||
|
|
@ -87,6 +97,7 @@
|
|||
</text>
|
||||
<check_box label="環境光遮蔽" name="UseSSAO" />
|
||||
<check_box label="景深" name="UseDoF" />
|
||||
<check_box label="HDR和自發光" name="VintageMode"/>
|
||||
<text name="RenderShadowDetailText">
|
||||
陰影：
|
||||
</text>
|
||||
|
|
@ -105,7 +116,7 @@
|
|||
<combo_box.item label="即時" name="2" />
|
||||
</combo_box>
|
||||
<text name="ReflectionProbeText">
|
||||
反射涵蓋率:
|
||||
反射覆蓋率:
|
||||
</text>
|
||||
<combo_box name="ReflectionLevel">
|
||||
<combo_box.item label="無" name="0" />
|
||||
|
|
@ -128,6 +139,15 @@
|
|||
<combo_box.item label="高" name="1" />
|
||||
<combo_box.item label="超高" name="0" />
|
||||
</combo_box>
|
||||
<slider label="銳化：" name="RenderSharpness"/>
|
||||
<text name="TonemapTypeText">
|
||||
色調映射器：
|
||||
</text>
|
||||
<combo_box name="TonemapType">
|
||||
<combo_box.item label="Khronos 中性" name="0"/>
|
||||
<combo_box.item label="ACES" name="1"/>
|
||||
</combo_box>
|
||||
<slider label="色調映射混合：" tool_tip="在線性與色調映射顏色之間進行混合" name="TonemapMix"/>
|
||||
<!-- End of mirror settings -->
|
||||
<button label="重設為我們建議的設定" name="Defaults" />
|
||||
<button label="確定" label_selected="確定" name="OK" />
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue