diff --git a/.hgtags b/.hgtags
index 8705a4c5b85cc752c4e135f123c9b879ac81c39e..492d89261c9cc45ddbd6b922d77b4b8ded590ed4 100755
--- a/.hgtags
+++ b/.hgtags
@@ -515,3 +515,4 @@ ae3297cdd03ab14f19f3811acbc4acd3eb600336 4.0.0-release
e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release
86dfba7ec4332c323025ebeacd8bf343ed0d8cfd 4.0.3-release
0a5de9ec2cb868f367501024d8d6958c20869053 4.0.4-release
+450de775fff66a011be1a001acd117cc623c445d 4.0.5-release
diff --git a/BuildParams b/BuildParams
index 7aff447ddaec679146a99d8e76e8d8e354c7afc4..264f6f8a530663f471f148ca2ab2eebe28e26b0c 100755
--- a/BuildParams
+++ b/BuildParams
@@ -19,6 +19,8 @@ build_Linux_Debug = false
build_Darwin_Debug = false
build_Debug = false
+# enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
+build_Linux_Doxygen = true
# Update Public Inworld Build Status Indicators (setting should mirror "public_build")
email_status_this_is_os = true
@@ -60,7 +62,7 @@ viewer_channel = "Second Life Test"
# the default sourceid should always be a null string:
sourceid = ""
# the additional_packages variable is a blank separated list of package prefixes:
-additional_packages = ""
+# additional_packages = ""
# to set the special values for a package, create variables using each prefix:
# additional_packages = "Foo Bar"
# Foo_sourceid = "bingo"
@@ -71,127 +73,21 @@ additional_packages = ""
# for the package in a setting that overrides the compiled-in value
################################################################
additional_packages = "EDU"
+Linux.additional_packages = ""
# The EDU package allows us to create a separate release channel whose expirations
# are synchronized as much as possible with the academic year
EDU_sourceid = ""
EDU_viewer_channel_suffix = "edu"
-# Notifications - to configure email notices, add a setting like this:
-# <username>_<reponame>.email = <email-address>
-
-# ========================================
-# mesh-development
-# ========================================
-mesh-development.viewer_channel = "Project Viewer - Mesh"
-mesh-development.viewer_grid = aditi
-mesh-development.build_debug_release_separately = true
-mesh-development.build_CYGWIN_Debug = false
-mesh-development.build_viewer_update_version_manager = false
-
-# ========================================
-# mesh-development-release-1-candidate
-# ========================================
-mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh"
-mesh-development-release-1-candidate.viewer_grid = agni
-mesh-development-release-1-candidate.build_debug_release_separately = true
-mesh-development-release-1-candidate.build_CYGWIN_Debug = false
-mesh-development-release-1-candidate.build_viewer_update_version_manager = false
-
-# ========================================
-# mesh-development-rc
-# ========================================
-mesh-development-rc.viewer_channel = "Project Viewer - Mesh"
-mesh-development-rc.viewer_grid = agni
-mesh-development-rc.build_debug_release_separately = true
-mesh-development-rc.build_CYGWIN_Debug = false
-mesh-development-rc.build_viewer_update_version_manager = false
-
-# ========================================
-# mesh-asset-deprecation
-# ========================================
-mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation"
-mesh-asset-deprecation.viewer_grid = aditi
-mesh-asset-deprecation.build_debug_release_separately = true
-mesh-asset-deprecation.build_CYGWIN_Debug = false
-mesh-asset-deprecation.build_viewer_update_version_manager = false
-
-# ========================================
-# viewer-mesh
-# ========================================
-
-viewer-mesh.build_viewer = true
-viewer-mesh.build_server = false
-viewer-mesh.build_Linux = true
-viewer-mesh.build_hg_bundle = true
-viewer-mesh.build_viewer_update_version_manager = false
-viewer-mesh.build_Debug = false
-viewer-mesh.build_RelWithDebInfo = false
-viewer-mesh.viewer_channel = "Project Viewer - Mesh"
-viewer-mesh.viewer_grid = aditi
-viewer-mesh.email = shining@lists.lindenlab.com
-
-# =================================================================
-# asset delivery 2010 projects
-# =================================================================
-viewer-asset-delivery.viewer_channel = "Second Life Development"
-viewer-asset-delivery.build_viewer_update_version_manager = false
-viewer-asset-delivery.email = monty@lindenlab.com
-viewer-asset-delivery.build_server = false
-viewer-asset-delivery.build_server_tests = false
-
-viewer-asset-delivery-metrics.viewer_channel = "Second Life Development"
-viewer-asset-delivery-metrics.build_viewer_update_version_manager = false
-viewer-asset-delivery-metrics.email = monty@lindenlab.com
-viewer-asset-delivery-metrics.build_server = false
-viewer-asset-delivery-metrics.build_server_tests = false
-
-# ========================================
-# Simon says
-# ========================================
-simon_viewer-dev-private.public_build = false
-simon_viewer-dev-private.email_status_this_is_os = false
-
-
-# ========================================
-# Vir
-# ========================================
-vir-project-1.viewer_channel = "Second Life Release"
-
-# ========================================
-# Merov
-# ========================================
-merov-viewer-maint-2287.viewer_channel = "Second Life Project Merchant Outbox"
-merov-viewer-maint-2287.login_channel = "Second Life Project Merchant Outbox"
-merov-viewer-maint-2287.build_viewer_update_version_manager = false
-merov-viewer-maint-2287.codeticket_add_context = false
-
-# ========================================
-# THX-1138 / Runway projects
-# ========================================
-viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"
-viewer-thx1138-runway-shared.viewer_grid = uma
-viewer-thx1138-runway-shared.build_debug_release_separately = true
-viewer-thx1138-runway-shared.build_CYGWIN_Debug = false
-viewer-thx1138-runway-shared.build_viewer_update_version_manager = false
-
-viewer-thx1138.viewer_channel = "Project Viewer - THX-1138"
-viewer-thx1138.viewer_grid = uma
-viewer-thx1138.build_debug_release_separately = true
-viewer-thx1138.build_CYGWIN_Debug = false
-viewer-thx1138.build_viewer_update_version_manager = false
-
-runway-merge.viewer_channel = "Project Viewer - Runway Merge"
-runway-merge.viewer_grid = agni
-runway-merge.build_debug_release_separately = true
-runway-merge.build_CYGWIN_Debug = false
-runway-merge.build_viewer_update_version_manager = false
-
-runway.viewer_channel = "Project Viewer - Runway"
-runway.viewer_grid = agni
-runway.build_debug_release_separately = true
-runway.build_CYGWIN_Debug = false
-runway.build_viewer_update_version_manager = false
-# eof
+# The EDU package allows us to create a separate release channel whose expirations
+# are synchronized as much as possible with the academic year
+EDU_sourceid = ""
+EDU_viewer_channel_suffix = "edu"
+
+# Notifications - to configure email notices use the TeamCity parameter
+# setting screen for your project or build configuration to set the
+# environment variable 'email' to a space-separated list of email addresses
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ad040fb07792215cb595984c9775658f65450ee3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+Second Life Viewer
+====================
+
+This project manages the source code for the
+[Second Life](https://www.secondlife.com) Viewer.
+
+This source is available as open source; for details on licensing, see
+[the licensing page on the Second Life wiki](https://wiki.secondlife.com/wiki/Linden_Lab_Official:Second_Life_Viewer_Licensing_Program)
+
+For information on how to use and contribute to this, see
+[the open source portal on the wiki](https://wiki.secondlife.com/wiki/Open_Source_Portal).
+
+To download the current default version, visit
+[the download page](https://secondlife.com/support/downloads). For
+even newer versions try
+[the Alternate Viewers page](https://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers)
+
diff --git a/build.sh b/build.sh
index b66d1a070571e65df97f876f336dec19785586a3..20d3a41f83dcf50387ff9b367ea0dcab543f6559 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,13 @@
#!/bin/sh
-# This is a the master build script - it is intended to be run by the Linden
-# Lab build farm
-# It is called by a wrapper script in the shared repository which sets up
-# the environment from the various BuildParams files and does all the build
-# result post-processing.
+# This is the custom build script for the viewer
+#
+# It must be run by the Linden Lab build farm shared buildscript because
+# it relies on the environment that sets up, functions it provides, and
+# the build result post-processing it does.
+#
+# The shared buildscript build.sh invokes this because it is named 'build.sh',
+# which is the default custom build script name in buildscripts/hg/BuildParams
#
# PLEASE NOTE:
#
@@ -12,7 +15,6 @@
# Cygwin can be tricky....
# * The special style in which python is invoked is intentional to permit
# use of a native python install on windows - which requires paths in DOS form
-# * This script relies heavily on parameters defined in BuildParams
check_for()
{
@@ -94,13 +96,11 @@ installer_CYGWIN()
pre_build()
{
local variant="$1"
- begin_section "Pre$variant"
+ begin_section "Configure $variant"
[ -n "$master_message_template_checkout" ] \
&& [ -r "$master_message_template_checkout/message_template.msg" ] \
&& template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
- check_for "Confirm dictionaries are installed before 'autobuild configure'" ${build_dir}/packages/dictionaries
-
"$autobuild" configure -c $variant -- \
-DPACKAGE:BOOL=ON \
-DRELEASE_CRASH_REPORTING:BOOL=ON \
@@ -109,7 +109,7 @@ pre_build()
-DLL_TESTS:BOOL="$run_tests" \
-DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
- end_section "Pre$variant"
+ end_section "Configure $variant"
}
package_llphysicsextensions_tpv()
@@ -119,12 +119,12 @@ package_llphysicsextensions_tpv()
if [ "$variant" = "Release" ]
then
llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml
- "$autobuild" build --verbose --config-file $llpetpvcfg -c Tpv
+ "$autobuild" build --quiet --config-file $llpetpvcfg -c Tpv
# capture the package file name for use in upload later...
PKGTMP=`mktemp -t pgktpv.XXXXXX`
trap "rm $PKGTMP* 2>/dev/null" 0
- "$autobuild" package --verbose --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
+ "$autobuild" package --quiet --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
tpv_status=$?
if [ -r "${PKGTMP}" ]
then
@@ -134,7 +134,7 @@ package_llphysicsextensions_tpv()
echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package
fi
else
- echo "Do not provide llphysicsextensions_tpv for $variant"
+ record_event "Do not provide llphysicsextensions_tpv for $variant"
llphysicsextensions_package=""
fi
end_section "PhysicsExtensions_TPV"
@@ -146,16 +146,15 @@ build()
local variant="$1"
if $build_viewer
then
- begin_section "Viewer$variant"
-
"$autobuild" build --no-configure -c $variant
build_ok=$?
- end_section "Viewer$variant"
# Run build extensions
if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]; then
for extension in ${build_dir}/packages/build-extensions/*.sh; do
+ begin_section "Extension $extension"
. $extension
+ end_section "Extension $extension"
if [ $build_ok -ne 0 ]; then
break
fi
@@ -174,28 +173,6 @@ build()
fi
}
-# This is called from the branch independent script upon completion of all platform builds.
-build_docs()
-{
- begin_section "Building Documentation"
- begin_section "Autobuild metadata"
- if [ -r "$build_dir/autobuild-package.xml" ]
- then
- upload_item docs "$build_dir/autobuild-package.xml" text/xml
- else
- record_event "no metadata at '$build_dir/autobuild-package.xml'"
- fi
- end_section "Autobuild metadata"
- if [ "$arch" != "Linux" ]
- then
- record_dependencies_graph # defined in build.sh
- else
- echo "TBD - skipping linux graph (probable python version dependency)" 1>&2
- fi
- end_section "Building Documentation"
-}
-
-
# Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there
if [ "x$arch" = x ]
then
@@ -207,7 +184,7 @@ then
cat <<EOF
This script, if called in a development environment, requires that the branch
independent build script repository be checked out next to this repository.
-This repository is located at http://hg.lindenlab.com/parabuild/buildscripts
+This repository is located at http://bitbucket.org/lindenlabinternal/sl-buildscripts
EOF
exit 1
fi
@@ -229,6 +206,13 @@ fi
# load autobuild provided shell functions and variables
eval "$("$autobuild" source_environment)"
+# something about the additional_packages mechanism messes up buildscripts results.py on Linux
+# since we don't care about those packages on Linux, just zero it out, yes - a HACK
+if [ "$arch" = "Linux" ]
+then
+ export additional_packages=
+fi
+
# dump environment variables for debugging
begin_section "Environment"
env|sort
@@ -246,69 +230,68 @@ do
# Only the last built arch is available for upload
last_built_variant="$variant"
- begin_section "Do$variant"
build_dir=`build_dir_$arch $variant`
build_dir_stubs="$build_dir/win_setup/$variant"
- begin_section "PreClean"
+ begin_section "Initialize $variant Build Directory"
rm -rf "$build_dir"
- end_section "PreClean"
-
mkdir -p "$build_dir"
mkdir -p "$build_dir/tmp"
+ end_section "Initialize $variant Build Directory"
- if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
+ if pre_build "$variant" "$build_dir"
then
- if $build_link_parallel
- then
- begin_section BuildParallel
- ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) &
- build_processes="$build_processes $!"
- end_section BuildParallel
- else
- begin_section "Build$variant"
+ begin_section "Build $variant"
build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
if `cat "$build_dir/build_ok"`
then
- echo so far so good.
+ case "$variant" in
+ Release)
+ if [ -r "$build_dir/autobuild-package.xml" ]
+ then
+ begin_section "Autobuild metadata"
+ upload_item docs "$build_dir/autobuild-package.xml" text/xml
+ if [ "$arch" != "Linux" ]
+ then
+ record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
+ else
+ record_event "TBD - no dependency graph for linux (probable python version dependency)" 1>&2
+ fi
+ end_section "Autobuild metadata"
+ else
+ record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'"
+ fi
+ ;;
+ Doxygen)
+ if [ -r "$build_dir/doxygen_warnings.log" ]
+ then
+ record_event "Doxygen warnings generated; see doxygen_warnings.log"
+ upload_item log "$build_dir/doxygen_warnings.log" text/plain
+ fi
+ if [ -d "$build_dir/doxygen/html" ]
+ then
+ tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html"
+ upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
+ fi
+ ;;
+ *)
+ ;;
+ esac
+
else
- record_failure "Build of \"$variant\" failed."
+ record_failure "Build of \"$variant\" failed."
fi
- end_section "Build$variant"
- fi
+ end_section "Build $variant"
else
- record_failure "Build Prep for \"$variant\" failed."
+ record_event "configure for $variant failed: build skipped"
fi
- end_section "Do$variant"
-done
-
-build_docs
-# If we are building variants in parallel, wait, then collect results.
-# This requires that the build dirs are variant specific
-if $build_link_parallel && [ x"$build_processes" != x ]
-then
- begin_section WaitParallel
- wait $build_processes
- for variant in $variants
- do
- eval '$build_'"$variant" || continue
- eval '$build_'"$arch"_"$variant" || continue
-
- begin_section "Build$variant"
- build_dir=`build_dir_$arch $variant`
- build_dir_stubs="$build_dir/win_setup/$variant"
- tee -a $build_log < "$build_dir/build.log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
- if `cat "$build_dir/build_ok"`
- then
- echo so far so good.
- else
- record_failure "Parallel build of \"$variant\" failed."
- fi
- end_section "Build$variant"
- done
- end_section WaitParallel
-fi
+ if ! $succeeded
+ then
+ record_event "remaining variants skipped due to $variant failure"
+ break
+ fi
+done
# build debian package
if [ "$arch" == "Linux" ]
@@ -376,7 +359,7 @@ then
end_section "Upload Debian Repository"
else
- echo skipping debian build
+ echo debian build not enabled
fi
else
echo skipping debian build due to failed build.
@@ -422,41 +405,33 @@ then
upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
done
- # Upload the actual dependencies used
- if [ -r "$build_dir/packages/installed-packages.xml" ]
- then
- upload_item installer "$build_dir/packages/installed-packages.xml" text/xml
- fi
-
# Upload the llphysicsextensions_tpv package, if one was produced
# *TODO: Make this an upload-extension
if [ -r "$build_dir/llphysicsextensions_package" ]
then
llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream
- else
- echo "No llphysicsextensions_package"
fi
;;
*)
- echo "Skipping mapfile for $last_built_variant"
;;
esac
# Run upload extensions
if [ -d ${build_dir}/packages/upload-extensions ]; then
for extension in ${build_dir}/packages/upload-extensions/*.sh; do
+ begin_section "Upload Extension $extension"
. $extension
+ end_section "Upload Extension $extension"
done
fi
-
- # Upload stub installers
- upload_stub_installers "$build_dir_stubs"
fi
end_section Upload Installer
else
echo skipping upload of installer
fi
+
+
else
echo skipping upload of installer due to failed build.
fi
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000000000000000000000000000000000000..661c20b572ed88732a6d221c7f2bf980cd6146c6
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,8 @@
+# Linden packages install in opt/linden
+secondlife-viewer: dir-or-file-in-opt
+secondlife-viewer: section-is-dh_make-template
+secondlife-viewer: binary-without-manpage
+secondlife-viewer: maintainer-script-empty postrm
+secondlife-viewer: maintainer-script-empty preinst
+secondlife-viewer: maintainer-script-empty prerm
+secondlife-viewer: unstripped-binary-or-object
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt
index e63c48e5423f876925632a4e9bc45ea5e2d27bef..66f8745f4f6befe8d552c069df983a50efc3e08b 100755
--- a/doc/LICENSE-logos.txt
+++ b/doc/LICENSE-logos.txt
@@ -11,7 +11,7 @@ summary, see http://creativecommons.org/licenses/by-sa/3.0/.
Notwithstanding the foregoing, all of Linden Lab's trademarks, including
but not limited to the Second Life brand name and Second Life Eye-in-Hand
logo, are subject to our trademark policy at
-http://secondlife.com/corporate/trademark/.
+http://secondlife.com/corporate/brand/trademark/.
If you distribute any copies or adaptations of the Second Life viewer
artwork or any other works in these files, you must include this Notice
diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt
index 407402265e5b7d1c0cd9208c3178dd26c61a5769..3de5123415f940d4ec06edaff97078a19c216a8e 100755
--- a/doc/LICENSE-source.txt
+++ b/doc/LICENSE-source.txt
@@ -7,7 +7,9 @@ you under the terms of the GNU Lesser General Public License, version 2.1
("LGPL"), unless you have obtained a separate licensing agreement
("Other License"), formally executed by you and Linden Lab. Terms of
the GPL can be found in doc/LGPL-license.txt in this distribution, or
-online at http://secondlife.com/developers/opensource/lgplv2_1
+online at
+
+https://wiki.secondlife.com/wiki/Linden_Lab_Official:GNU_Lesser_General_Public_License,_version_2.1
By copying, modifying or distributing this software, you acknowledge
that you have read and understood your obligations described above,
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3d8da14029f3427ac1cdebd87996bc1fa0697a2c..9b31e5032ad73da1c285e7606c344ff3aece315e 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -185,9 +185,11 @@ Ansariel Hiller
BUG-3764
STORM-1984
STORM-1979
+ STORM-2083
MAINT-5533
+ STORM-2094
MAINT-5756
- MAINT-2199
+ MAINT-4677
Aralara Rajal
Arare Chantilly
CHUIBUG-191
@@ -319,6 +321,8 @@ Cinder Roxley
BUG-8786
OPEN-185
OPEN-282
+ OPEN-292
+ OPEN-297
STORM-1703
STORM-1948
STORM-1831
@@ -726,6 +730,12 @@ Jonathan Yap
STORM-2030
STORM-2034
STORM-2018
+ STORM-2082
+ STORM-2086
+ STORM-2085
+ STORM-2088
+ STORM-2094
+ STORM-2099
Kadah Coba
STORM-1060
STORM-1843
@@ -1007,6 +1017,7 @@ Nicky Dasmijn
STORM-1937
OPEN-187
STORM-2010
+ STORM-2082
Nicky Perian
OPEN-1
STORM-1087
@@ -1249,6 +1260,8 @@ Sovereign Engineer
OPEN-217
OPEN-295
MAINT-6107
+ STORM-2107
+ MAINT-6218
SpacedOut Frye
VWR-34
VWR-45
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
old mode 100755
new mode 100644
index 133c5ee265c6855bf0281c1bb9c47961cfa46f15..1afcb118bcfca0af01c37e394c21a01b88df929d
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -39,8 +39,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
-add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
-
if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts)
endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
@@ -85,8 +83,11 @@ endif (LINUX)
add_subdirectory(${VIEWER_PREFIX}newview)
add_dependencies(viewer secondlife-bin)
+add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL)
+
if (LL_TESTS)
# Define after the custom targets are created so
# individual apps can add themselves as dependencies
add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
endif (LL_TESTS)
+
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
old mode 100755
new mode 100644
index e618a988b831e3cdf818bdcc43964a74f4b5acba..195d6e705e020b8ff4d9e85bce1b5ebc4865059d
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -15,27 +15,33 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
message("Revision (from environment): ${VIEWER_VERSION_REVISION}")
else (DEFINED ENV{revision})
- find_program(MERCURIAL hg)
- find_program(WORDCOUNT wc)
- find_program(SED sed)
- if (DEFINED MERCURIAL AND DEFINED WORDCOUNT AND DEFINED SED)
- execute_process(
- COMMAND ${MERCURIAL} log -r tip:0 --template '\\n'
- COMMAND ${WORDCOUNT} -l
- COMMAND ${SED} "s/ //g"
- OUTPUT_VARIABLE VIEWER_VERSION_REVISION
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- if ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
- message("Revision (from hg) ${VIEWER_VERSION_REVISION}")
- else ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
- message("Revision not set (repository not found?); using 0")
- set(VIEWER_VERSION_REVISION 0 )
- endif ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
- else (DEFINED MERCURIAL AND DEFINED WORDCOUNT AND DEFINED SED)
- message("Revision not set: 'hg', 'wc' or 'sed' not found; using 0")
+ find_program(MERCURIAL
+ NAMES hg
+ PATHS [HKEY_LOCAL_MACHINE\\Software\\TortoiseHG]
+ PATH_SUFFIXES Mercurial)
+ mark_as_advanced(MERCURIAL)
+ if (MERCURIAL)
+ execute_process(COMMAND ${MERCURIAL} identify --num --rev tip
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ RESULT_VARIABLE hg_id_result
+ ERROR_VARIABLE hg_id_error
+ OUTPUT_VARIABLE VIEWER_VERSION_REVISION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if (NOT ${hg_id_result} EQUAL 0)
+ message(SEND_ERROR "Revision number generation failed with output:\n${hg_id_error}")
+ else (NOT ${hg_id_result} EQUAL 0)
+ string(REGEX REPLACE "[^0-9a-f]" "" VIEWER_VERSION_REVISION ${VIEWER_VERSION_REVISION})
+ endif (NOT ${hg_id_result} EQUAL 0)
+ if ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
+ message("Revision (from hg) ${VIEWER_VERSION_REVISION}")
+ else ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
+ message("Revision not set (repository not found?); using 0")
+ set(VIEWER_VERSION_REVISION 0 )
+ endif ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
+ else (MERCURIAL)
+ message("Revision not set: mercurial not found; using 0")
set(VIEWER_VERSION_REVISION 0)
- endif (DEFINED MERCURIAL AND DEFINED WORDCOUNT AND DEFINED SED)
+ endif (MERCURIAL)
endif (DEFINED ENV{revision})
message("Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
@@ -53,5 +59,6 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
"LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
"LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"
"LL_VIEWER_VERSION_BUILD=${VIEWER_VERSION_REVISION}"
+ "LLBUILD_CONFIG=\"${CMAKE_BUILD_TYPE}\""
)
endif (NOT DEFINED VIEWER_SHORT_VERSION)
diff --git a/indra/cmake/CMakeCopyIfDifferent.cmake b/indra/cmake/CMakeCopyIfDifferent.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
old mode 100755
new mode 100644
index 8d3eb4832e924f453074acbc3c99d819d3a67b9c..9e445a78252c7e3f485cf59fb0ad412528478853
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -14,6 +14,7 @@ set(cmake_SOURCE_FILES
Boost.cmake
BuildVersion.cmake
CEFPlugin.cmake
+ CEFPlugin.cmake
CMakeCopyIfDifferent.cmake
ConfigurePkgConfig.cmake
CURL.cmake
@@ -73,7 +74,6 @@ set(cmake_SOURCE_FILES
LLVFS.cmake
LLWindow.cmake
LLXML.cmake
- LScript.cmake
Linking.cmake
MediaPluginBase.cmake
NDOF.cmake
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/DragDrop.cmake b/indra/cmake/DragDrop.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/ExamplePlugin.cmake b/indra/cmake/ExamplePlugin.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindAPR.cmake b/indra/cmake/FindAPR.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindBerkeleyDB.cmake b/indra/cmake/FindBerkeleyDB.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindGLH.cmake b/indra/cmake/FindGLH.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindGoogleBreakpad.cmake b/indra/cmake/FindGoogleBreakpad.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindHUNSPELL.cmake b/indra/cmake/FindHUNSPELL.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindNDOF.cmake b/indra/cmake/FindNDOF.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindOpenJPEG.cmake b/indra/cmake/FindOpenJPEG.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindSCP.cmake b/indra/cmake/FindSCP.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindXmlRpcEpi.cmake b/indra/cmake/FindXmlRpcEpi.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FindZLIB.cmake b/indra/cmake/FindZLIB.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/GetPrerequisites_2_8.cmake b/indra/cmake/GetPrerequisites_2_8.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLCharacter.cmake b/indra/cmake/LLCharacter.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLCrashLogger.cmake b/indra/cmake/LLCrashLogger.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLImage.cmake b/indra/cmake/LLImage.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLImageJ2COJ.cmake b/indra/cmake/LLImageJ2COJ.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLInventory.cmake b/indra/cmake/LLInventory.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLLogin.cmake b/indra/cmake/LLLogin.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLMessage.cmake b/indra/cmake/LLMessage.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLUI.cmake b/indra/cmake/LLUI.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LLXML.cmake b/indra/cmake/LLXML.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/LScript.cmake b/indra/cmake/LScript.cmake
deleted file mode 100755
index 21e78fc2c0482b83d1d63f172e78a16611242e60..0000000000000000000000000000000000000000
--- a/indra/cmake/LScript.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- cmake -*-
-
-set(LSCRIPT_INCLUDE_DIRS
- ${LIBS_OPEN_DIR}/lscript
- ${LIBS_OPEN_DIR}/lscript/lscript_compile
- ${LIBS_OPEN_DIR}/lscript/lscript_execute
- ${LIBS_OPEN_DIR}/lscript/lscript_execute_mono
- )
-
-set(LSCRIPT_LIBRARIES
- lscript_compile
- lscript_execute
- lscript_library
- )
-
-set(LSCRIPT_EXECUTE_MONO_LIBRARIES lscript_execute_mono)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/MediaPluginBase.cmake b/indra/cmake/MediaPluginBase.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/NVAPI.cmake b/indra/cmake/NVAPI.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/PluginAPI.cmake b/indra/cmake/PluginAPI.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/VisualLeakDetector.cmake b/indra/cmake/VisualLeakDetector.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake
old mode 100755
new mode 100644
diff --git a/indra/cmake/cmake_dummy.cpp b/indra/cmake/cmake_dummy.cpp
old mode 100755
new mode 100644
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 582185e5ab62c7a0bee19d0f532014f309ff36d4..fdbb0a75f7128fcb33c3a7e12bbf43460f7fe336 100755
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -47,6 +47,8 @@
import os
import sys
import errno
+import HTMLParser
+import re
import signal
import subprocess
@@ -76,7 +78,7 @@ def main(command, libpath=[], vars={}):
# No idea what the right pathname might be! But only crump if this
# feature is requested.
if libpath:
- raise NotImplemented("run_build_test: unknown platform %s" % sys.platform)
+ raise RuntimeError("run_build_test: unknown platform %s" % sys.platform)
lpvars = []
for var in lpvars:
# Split the existing path. Bear in mind that the variable in question
@@ -148,15 +150,158 @@ def translate_rc(rc):
if rc >= 0:
return "terminated with rc %s" % rc
- # Negative rc means the child was terminated by signal -rc.
- rc = -rc
- for attr in dir(signal):
- if attr.startswith('SIG') and getattr(signal, attr) == rc:
- strc = attr
- break
+ if sys.platform.startswith("win"):
+ # From http://stackoverflow.com/questions/20629027/process-finished-with-exit-code-1073741571
+ # [-1073741571] is the signed integer representation of Microsoft's
+ # "stack overflow/stack exhaustion" error code 0xC00000FD.
+ # Anytime you see strange, large negative exit codes in windows, convert
+ # them to hex and then look them up in the ntstatus error codes
+ # http://msdn.microsoft.com/en-us/library/cc704588.aspx
+
+ # Python bends over backwards to give you all the integer precision
+ # you need, avoiding truncation. But only with 32-bit signed ints is
+ # -1073741571 equivalent to 0xC00000FD! Explicitly truncate before
+ # converting.
+ hexrc = "0x%X" % (rc & 0xFFFFFFFF)
+ # At this point, we're only trying to format the rc to make it easier
+ # for a human being to understand. Any exception here -- file doesn't
+ # exist, HTML parsing error, unrecognized table structure, unknown key
+ # -- should NOT kill the script! It should only cause us to shrug and
+ # present our caller with the best information available.
+ try:
+ table = get_windows_table()
+ symbol, desc = table[hexrc]
+ except Exception, err:
+ print >>sys.stderr, "(%s -- carrying on)" % err
+ return "terminated with rc %s (%s)" % (rc, hexrc)
+ else:
+ return "terminated with rc %s: %s: %s" % (hexrc, symbol, desc)
+
else:
- strc = str(rc)
- return "terminated by signal %s" % strc
+ # On Posix, negative rc means the child was terminated by signal -rc.
+ rc = -rc
+ for attr in dir(signal):
+ if attr.startswith('SIG') and getattr(signal, attr) == rc:
+ strc = attr
+ break
+ else:
+ strc = str(rc)
+ return "terminated by signal %s" % strc
+
+class TableParser(HTMLParser.HTMLParser):
+ """
+ This HTMLParser subclass is designed to parse the table we know exists
+ in windows-rcs.html, hopefully without building in too much knowledge of
+ the specific way that table is currently formatted.
+ """
+ # regular expression matching any string containing only whitespace
+ whitespace = re.compile(r'\s*$')
+
+ def __init__(self):
+ # Because Python 2.x's HTMLParser is an old-style class, we must use
+ # old-style syntax to forward the __init__() call -- not super().
+ HTMLParser.HTMLParser.__init__(self)
+ # this will collect all the data, eventually
+ self.table = []
+ # Stack whose top (last item) indicates where to append current
+ # element data. When empty, don't collect data at all.
+ self.dest = []
+
+ def handle_starttag(self, tag, attrs):
+ if tag == "table":
+ # This is the outermost tag we recognize. Collect nested elements
+ # within self.table.
+ self.dest.append(self.table)
+ elif tag in ("tr", "td"):
+ # Nested elements whose contents we want to capture as sublists.
+ # To the list currently designated by the top of the dest stack,
+ # append a new empty sublist.
+ self.dest[-1].append([])
+ # Now push THAT new, empty list as the new top of the dest stack.
+ self.dest.append(self.dest[-1][-1])
+ elif tag == "p":
+ # We could handle <p> ... </p> just like <tr> or <td>, but that
+ # introduces an unnecessary extra level of nesting. Just skip.
+ pass
+ else:
+ # For any tag we don't recognize (notably <th>), push a new, empty
+ # list to the top of the dest stack. This new list is NOT
+ # referenced by anything in self.table; thus, when we pop it, any
+ # data we've collected inside that list will be discarded.
+ self.dest.append([])
+
+ def handle_endtag(self, tag):
+ # Because we avoid pushing self.dest for <p> in handle_starttag(), we
+ # must refrain from popping it for </p> here.
+ if tag != "p":
+ # For everything else, including unrecognized tags, pop the dest
+ # stack, reverting to outer collection.
+ self.dest.pop()
+
+ def handle_startendtag(self, tag, attrs):
+ # The table of interest contains <td> entries of the form:
+ # <p>0x00000000<br />STATUS_SUCCESS</p>
+ # The <br/> is very useful -- we definitely want two different data
+ # items for "0x00000000" and "STATUS_SUCCESS" -- but we don't need or
+ # want it to push, then discard, an empty list as it would if we let
+ # the default HTMLParser.handle_startendtag() call handle_starttag()
+ # followed by handle_endtag(). Just ignore <br/> or any other
+ # singleton tag.
+ pass
+
+ def handle_data(self, data):
+ # Outside the <table> of interest, self.dest is empty. Do not bother
+ # collecting data when self.dest is empty.
+ # HTMLParser calls handle_data() with every chunk of whitespace
+ # between tags. That would be lovely if our eventual goal was to
+ # reconstitute the original input stream with its existing formatting,
+ # but for us, whitespace only clutters the table. Ignore it.
+ if self.dest and not self.whitespace.match(data):
+ # Here we're within our <table> and we have non-whitespace data.
+ # Append it to the list designated by the top of the dest stack.
+ self.dest[-1].append(data)
+
+# cache for get_windows_table()
+_windows_table = None
+
+def get_windows_table():
+ global _windows_table
+ # If we already loaded _windows_table, no need to load it all over again.
+ if _windows_table:
+ return _windows_table
+
+ # windows-rcs.html was fetched on 2015-03-24 with the following command:
+ # curl -o windows-rcs.html \
+ # https://msdn.microsoft.com/en-us/library/cc704588.aspx
+ parser = TableParser()
+ with open(os.path.join(os.path.dirname(__file__), "windows-rcs.html")) as hf:
+ # We tried feeding the file data to TableParser in chunks, to avoid
+ # buffering the entire file as a single string. Unfortunately its
+ # handle_data() cannot tell the difference between distinct calls
+ # separated by HTML tags, and distinct calls necessitated by a chunk
+ # boundary. Sigh! Read in the whole file. At the time this was
+ # written, it was only 500KB anyway.
+ parser.feed(hf.read())
+ parser.close()
+ table = parser.table
+
+ # With our parser, any <tr><th>...</th></tr> row leaves a table entry
+ # consisting only of an empty list. Remove any such.
+ while table and not table[0]:
+ table.pop(0)
+
+ # We expect rows of the form:
+ # [['0x00000000', 'STATUS_SUCCESS'],
+ # ['The operation completed successfully.']]
+ # The latter list will have multiple entries if Microsoft embedded <br/>
+ # or <p> ... </p> in the text, in which case joining with '\n' is
+ # appropriate.
+ # Turn that into a dict whose key is the hex string, and whose value is
+ # the pair (symbol, desc).
+ _windows_table = dict((key, (symbol, '\n'.join(desc)))
+ for (key, symbol), desc in table)
+
+ return _windows_table
if __name__ == "__main__":
from optparse import OptionParser
diff --git a/indra/cmake/windows-rcs.html b/indra/cmake/windows-rcs.html
new file mode 100644
index 0000000000000000000000000000000000000000..da2fbcdaef90264a0158fe119ffd4de36efa1ea9
--- /dev/null
+++ b/indra/cmake/windows-rcs.html
@@ -0,0 +1,15157 @@
+<!DOCTYPE html>
+
+<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml" lang="en">
+ <head><meta name="Search.MSHKeywordA" content="596a1078-e883-4972-9bbc-49e60bebca55" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSHAttr.DCSext.appliesToProduct" content="Windows" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSHAttr.DCSext.MSDNLibOpenProtocol" content="WINDOWS" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSHAttr.Locale" content="en-us" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSHAttr.AssetID" content="596a1078-e883-4972-9bbc-49e60bebca55" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSHAttr.TopicType" content="kbRef" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.Microsoft.Help.Id" content="596a1078-e883-4972-9bbc-49e60bebca55" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="ms310241" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="ms310241MSDN10" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="cc203350" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="cc203350PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="ee815853" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="ee815853PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="ee939280" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="ee939280PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="dn781106" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="dn781106PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="ee914698" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="ee914698PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="ee914688" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="ee914688PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="ee914687" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="ee914687PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategory" content="cc704588" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.MSCategoryV" content="cc704588PROT20" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.TocNodeId" content="cc704588" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHKeywordA" content="596a1078-e883-4972-9bbc-49e60bebca55" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHAttr" content="DCSext.appliesToProduct:Windows" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHAttr" content="DCSext.MSDNLibOpenProtocol:WINDOWS" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHAttr" content="Locale:en-us" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHAttr" content="AssetID:596a1078-e883-4972-9bbc-49e60bebca55" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHAttr" content="TopicType:kbRef" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Microsoft.Help.Id" content="596a1078-e883-4972-9bbc-49e60bebca55" xmlns:c="urn:msdn-com:mtps/2004/1/common" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSHAttr" content="Rating:58.871" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.Rating" content="58.870967" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.Rating.FiveStarScale" content="2.94354835" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="MSMETANRatingMSMETAV" content="58.870967" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="TotalHelpfulVotes" content="17" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="TotalVotes" content="31" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="HasCodeSamples" content="false" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.RootTocId" content="ms310241" xmlns="http://www.w3.org/1999/xhtml" />
+<meta name="Search.library.Url" content="https://msdn.microsoft.com/en-us/library/cc704588.aspx" xmlns="http://www.w3.org/1999/xhtml" /><link rel="canonical" href="https://msdn.microsoft.com/en-us/library/cc704588.aspx" />
+ <title>2.3.1 NTSTATUS values</title>
+
+
+
+
+
+<meta name="DCS.dcsuri" content="/en-us/library/cc704588(d=default,l=en-us,v=prot.20).aspx" />
+
+<meta name="NormalizedUrl" content="https://msdn.microsoft.com/en-us/library/cc704588(d=default,l=en-us,v=prot.20).aspx" />
+
+<meta name="ms.normalizedurl" content="https://msdn.microsoft.com/en-us/library/cc704588(d=default,l=en-us,v=prot.20).aspx" />
+
+<meta name="DCSext.appliesToProduct" content="Windows" />
+
+<meta name="DCSext.MSDNLibOpenProtocol" content="WINDOWS" />
+
+<meta name="VotingContextUrl" content="https://msdn.microsoft.com/en-us/library/cc704588(d=default,l=en-us,v=prot.20).aspx" />
+
+<meta name="MN" content="FB361394-9:41:50 AM" />
+
+<meta name="Search.ShortId" content="cc704588" />
+
+<meta name="ms.shortidmsdn" content="cc704588" />
+
+<meta name="Ms.Locale" content="en-us" />
+
+<meta name="ms.prodver" content="PROT.20" />
+
+<meta name="ms.contentlang" content="EN" />
+
+<meta name="ms.lang" content="EN" />
+
+<meta name="ms.loc" content="US" />
+
+<meta name="ms.sitever" content="2015.02.26.3" />
+
+<meta name="ms.assetid" content="596a1078-e883-4972-9bbc-49e60bebca55" />
+
+<meta name="ms.auth" content="0" />
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" type="text/css" href="https://i-msdn.sec.s-msft.com/Combined.css?resources=0:Topic,0:CodeSnippet,0:ProgrammingSelector,0:ExpandableCollapsibleArea,1:CommunityContent,0:TopicNotInScope,0:FeedViewerBasic,0:ImageSprite,2:Header,2:HeaderFooterSprite,3:LinkList,4:PrintExportButton,1:Toc,1:NavigationResize,1:LibraryMemberFilter,2:Footer,3:FooterSock,3:Base,5:Msdn;/Areas/Epx/Content/Css:0,/Areas/Library/Content:1,/Areas/Centers/Themes/StandardDevCenter/Content:2,/Areas/Epx/Themes/Base/Content:3,/Areas/Library/Themes/Base/Content:4,/Areas/Library/Themes/Msdn/Content:5&amp;v=AA60BEA00AEACA3B8F447C4DD8D8022E" /></head>
+ <body class="library ">
+ <div id="page">
+
+
+
+
+
+
+
+
+ <link type="text/css" rel="stylesheet" />
+
+ <input type="hidden" id="isHeaderBleeding" value="true" />
+ <div id="ux-header" dir="ltr" class="ltr msdn">
+
+
+ <header>
+ <span id="moveDrawer"></span>
+ <span id="singleCol"></span>
+ <span id="doubleCol"></span>
+
+ <div class="row">
+ <div class="top">
+ <div class="left">
+
+ <a class="msdnLogoImg" href="https://msdn.microsoft.com/en-us">
+ <img src="https://i-msdn.sec.s-msft.com/Areas/Centers/Themes/StandardDevCenter/Content/Images/microsoftLogoForHeader.png?v=635605659908771441" />
+ </a>
+ </div>
+
+ <div class="right">
+ <div id="signIn">
+
+<a class="scarabLink" href="https://login.live.com/login.srf?wa=wsignin1.0&rpsnv=12&ct=1427215310&rver=6.0.5276.0&wp=MCMBI&wlcxt=MSDN%24MSDN%24MSDN&wreply=https%3a%2f%2fmsdn.microsoft.com%2fen-us%2flibrary%2fcc704588.aspx&lc=1033&id=254354&mkt=en-US" title="Sign in">Sign in</a></div>
+
+
+
+ <div class="auxNav">
+ <div data-fragmentName="Subscriptions" id="Fragment_Subscriptions" xmlns="http://www.w3.org/1999/xhtml">
+ <a href="https://msdn.microsoft.com/subscriptions/manage/hh442900" id="Subscriptions_2153_1" xmlns="http://www.w3.org/1999/xhtml">MSDN subscriptions</a>
+</div>
+ <div data-fragmentName="GetTools" id="Fragment_GetTools" xmlns="http://www.w3.org/1999/xhtml">
+ <a href="http://go.microsoft.com/fwlink/?LinkId=309297&clcid=0x409&slcid=0x409&campaign=o~msft~msdn~gettools-header~dn308572" id="GetTools_2153_3" xmlns="http://www.w3.org/1999/xhtml">Get tools</a>
+</div>
+ <div data-fragmentName="SocialLinks" id="Fragment_SocialLinks" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <ul class="links horizontal">
+ <li>
+ <a href="http://www.facebook.com/microsoftdeveloper" target="_blank" id="SocialLinks_2152_4" class="facebook" xmlns="http://www.w3.org/1999/xhtml">http://www.facebook.com/microsoftdeveloper</a>
+ </li>
+ <li>
+ <a href="https://twitter.com/msdev" target="_blank" id="SocialLinks_2152_5" class="twitter" xmlns="http://www.w3.org/1999/xhtml">https://twitter.com/msdev</a>
+ </li>
+ <li>
+ <a href="http://plus.google.com/111221966647232053570/" target="_blank" id="SocialLinks_2152_6" class="googlePlus" xmlns="http://www.w3.org/1999/xhtml">http://plus.google.com/111221966647232053570/</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ </div>
+ </div>
+ </div>
+
+ <div class="bottom">
+ <div class="left">
+ <div data-fragmentName="SiteLogo" id="Fragment_SiteLogo" xmlns="http://www.w3.org/1999/xhtml">
+ <div class="LinkWithImage topImage">
+ <a id="SiteLogo_2152_1" href="https://msdn.microsoft.com">
+ <img id="msdnLogo-black" src="https://i-msdn.sec.s-msft.com/en-us/msdn/ux/library/dn610975.msdnLogo-black.jpg?Segments=%2flibrary&isLibrary=true&isMtpsRequest=true&HideProfileLink=true" xmlns="" />
+ <span></span>
+ </a>
+ </div>
+</div>
+ <div id="drawer">
+ <div class="toc">
+
+ <nav>
+ <ul class="navL1">
+ <li class="inactive toggle">
+ <a href="javascript:void(0)" title="Technologies">Technologies</a>
+ <ul class="navL2">
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/cloud-app-development-msdn" title="Cloud">Cloud</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/mobile-app-development-msdn" title="Mobile">Mobile</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/web-app-development-msdn" title="Web">Web</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/business-and-productivity-app-development-msdn" title="Business">Business</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/big-data-development-msdn" title="Data">Data</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/games-development-msdn" title="Gaming">Gaming</a>
+
+
+ </li>
+ </ul>
+ </li>
+ <li class="inactive toggle">
+ <a href="javascript:void(0)" title="Downloads">Downloads</a>
+ <ul class="navL2">
+ <li class="inactive">
+ <a href="https://www.visualstudio.com/downloads/download-visual-studio-vs" title="Visual Studio">Visual Studio</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/subscriptions" title="MSDN subscriptions">MSDN subscriptions</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/microsoft-sdks-msdn" title="SDKs">SDKs</a>
+
+
+ </li>
+ </ul>
+ </li>
+ <li class="inactive toggle">
+ <a href="javascript:void(0)" title="Programs">Programs</a>
+ <ul class="navL2">
+ <li class="inactive">
+ <a href="https://www.microsoft.com/bizspark" title="BizSpark">BizSpark</a>
+
+
+ </li>
+ <li class="inactive toggle">
+ <a href="javascript:void(0)" title="Students">Students</a>
+
+ <ul class="navL3">
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/student-developer-program" title="Develop apps">Develop apps</a>
+ </li>
+ <li class="inactive">
+ <a href="http://blogs.msdn.com/b/microsoft_student_developer_blog" title="Blog">Blog</a>
+ </li>
+ </ul>
+
+ </li>
+ <li class="inactive toggle">
+ <a href="javascript:void(0)" title="Architects">Architects</a>
+
+ <ul class="navL3">
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/architects-overview-msdn" title="Overview">Overview</a>
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/architects-case-studies-msdn" title="Case studies">Case studies</a>
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/architects-blueprints-msdn" title="Blueprints">Blueprints</a>
+ </li>
+ <li class="inactive">
+ <a href="http://blogs.msdn.com/b/msarchitecture/" title="Blog">Blog</a>
+ </li>
+ <li class="inactive">
+ <a href="http://social.msdn.microsoft.com/forums/en-us/home?brandignore=true&sort=relevancedesc&searchterm=architecture+or+architect" title="Forums">Forums</a>
+ </li>
+ </ul>
+
+ </li>
+ <li class="inactive">
+ <a href="http://events.msdn.microsoft.com/" title="Events">Events</a>
+
+
+ </li>
+ </ul>
+ </li>
+ <li class="inactive toggle">
+ <a href="javascript:void(0)" title="Community">Community</a>
+ <ul class="navL2">
+ <li class="inactive">
+ <a href="https://social.msdn.microsoft.com/forums/" title="Forums">Forums</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="http://blogs.msdn.com/b/developer-tools/" title="Blogs">Blogs</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="http://tech-advisors.msdn.microsoft.com/en-us" title="Tech Advisors">Tech Advisors</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="http://channel9.msdn.com/" title="Channel 9">Channel 9</a>
+
+
+ </li>
+ </ul>
+ </li>
+ <li class="inactive current toggle">
+ <a href="javascript:void(0)" title="Documentation">Documentation</a>
+ <ul class="navL2">
+ <li class="inactive current">
+ <a href="https://msdn.microsoft.com/library" title="APIs and reference">APIs and reference</a>
+
+
+ </li>
+ <li class="inactive">
+ <a href="https://msdn.microsoft.com/developer-centers-msdn" title="Dev centers">Dev centers</a>
+
+
+ </li>
+ </ul>
+ </li>
+ <li class="inactive">
+ <a href="https://code.msdn.microsoft.com/" title="Samples">Samples</a>
+ </li>
+ </ul>
+ </nav>
+
+ </div>
+ </div>
+ </div>
+
+ <div class="right">
+ <div data-fragmentName="SearchBox" id="Fragment_SearchBox" xmlns="http://www.w3.org/1999/xhtml">
+ <div class="SearchBox">
+ <form id="HeaderSearchForm" name="HeaderSearchForm" method="get" onsubmit="return Epx.Controls.SearchBox.searchBoxOnSubmit(this);">
+ <input id="HeaderSearchTextBox" name="query" type="text" maxlength="200" onfocus="Epx.Controls.SearchBox.watermarkFocus(event, this.title)" onblur="Epx.Controls.SearchBox.watermarkBlur(event, this.title)" />
+ <button id="HeaderSearchButton" value="" type="submit" class="header-search-button"></button>
+ </form>
+
+
+ </div>
+</div>
+ <a id="grip" href="javascript:void(0)"></a>
+ </div>
+ </div>
+ </div>
+ </header>
+ </div>
+
+
+
+
+ <div class="printExportMenus ltr">
+ <a id="isd_printABook" href="/en-us/library/export/help/?returnUrl=%2fen-us%2flibrary%2fcc704588.aspx">
+ Export (<span class="count">0</span>)
+ </a>
+ <a id="isd_print" href="https://msdn.microsoft.com/en-us/library/cc704588(d=printer).aspx" rel="nofollow">
+ Print
+ </a>
+ </div>
+
+
+ <div class="printExportMenus ltr">
+ <a id="expandCollapseAll" accesskey="e" href="javascript:void(0)" title="Expand/Collapse all sections by pressing Ctrl + Shift + e">Expand All</a>
+ </div>
+
+
+
+
+ <div id="body">
+
+
+
+
+
+
+
+
+
+ <div id="leftNav">
+
+
+
+<div id="tocnav">
+
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/ms123401.aspx" id="ms310241_MSDN.10_en-us" mtpsaliasid="" mtpsassetid="5DDC0A78-6B2C-43E3-9C56-55F45C0DFFA5_MSDN.10_en-us" mtpsshortid="ms123401_MSDN.10_en-us" title="MSDN Library">MSDN Library</a> </div>
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/dd208104(v=prot.10).aspx" id="cc203350_PROT.20_en-us" mtpsaliasid="" mtpsassetid="3589baea-5b22-48f2-9d43-f5bea4960ddb_PROT.20_en-us" mtpsshortid="dd208104_PROT.10_en-us" title="Open Specifications">Open Specifications</a> </div>
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/gg685446.aspx" id="ee815853_PROT.20_en-us" mtpsaliasid="" mtpsassetid="9a3ae8a2-02e5-4d05-874a-b3551405d8f9_PROT.20_en-us" mtpsshortid="gg685446_MSDN.10_en-us" title="Protocols">Protocols</a> </div>
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/cc216517.aspx" id="ee939280_PROT.20_en-us" mtpsaliasid="" mtpsassetid="92b33e19-6fff-496b-86c3-d168206f9845_PROT.20_en-us" mtpsshortid="cc216517_PROT.20_en-us" title="Windows Protocols">Windows Protocols</a> </div>
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/cc216516.aspx" id="dn781106_PROT.20_en-us" mtpsaliasid="" mtpsassetid="1593dc07-6116-4e9e-8aeb-85c7438fab0a_PROT.20_en-us" mtpsshortid="cc216516_PROT.20_en-us" title="References">References</a> </div>
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/cc231196.aspx" id="ee914698_PROT.20_en-us" mtpsaliasid="" mtpsassetid="1bc92ddf-b79e-413c-bbaa-99a5281a6c90_PROT.20_en-us" mtpsshortid="cc231196_PROT.20_en-us" title="[MS-ERREF]: Windows Error Codes">[MS-ERREF]: Windows Error Codes</a> </div>
+ <div class="toclevel0" data-toclevel="0">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/cc231210.aspx" id="ee914688_PROT.20_en-us" mtpsaliasid="" mtpsassetid="32cce05d-3a39-4c7e-8f66-5e788e1107cf_PROT.20_en-us" mtpsshortid="cc231210_PROT.20_en-us" title="2 Structures">2 Structures</a> </div>
+ <div class="toclevel1" data-toclevel="1">
+<a data-tochassubtree="true" href="https://msdn.microsoft.com/en-us/library/cc231200.aspx" id="ee914687_PROT.20_en-us" mtpsaliasid="" mtpsassetid="87fba13e-bf06-450e-83b1-9241dc81e781_PROT.20_en-us" mtpsshortid="cc231200_PROT.20_en-us" title="2.3 NTSTATUS">2.3 NTSTATUS</a> </div>
+ <div class="toclevel2 current" data-toclevel="2">
+<a href="https://msdn.microsoft.com/en-us/library/cc704588.aspx" mtpsaliasid="" mtpsassetid="" mtpsshortid="" title="2.3.1 NTSTATUS values">2.3.1 NTSTATUS values</a> </div>
+</div>
+
+
+
+
+
+
+ <div id="toc-resizable-ew" class="toc-resizable-ew"></div>
+
+
+<a id="NavigationResize" href="javascript:void(0)">
+ <img class="cl_nav_resize_open" src="https://i-msdn.sec.s-msft.com/Areas/Epx/Content/Images/ImageSprite.png?v=635605659960334597" title="Expand" alt="Expand" />
+ <img class="cl_nav_resize_close" src="https://i-msdn.sec.s-msft.com/Areas/Epx/Content/Images/ImageSprite.png?v=635605659960334597" title="Minimize" alt="Minimize" />
+</a>
+
+
+
+ </div>
+<div id="content" class="content">
+
+
+
+
+
+
+
+
+<div xmlns="http://www.w3.org/1999/xhtml">
+<div class="topic" xmlns="http://www.w3.org/1999/xhtml" xmlns:mtps="http://msdn2.microsoft.com/mtps">
+ <h1 class="title">2.3.1 NTSTATUS values</h1>
+
+ <div id="mainSection">
+ <div id="mainBody">
+ <div id="sectionSection0" class="section">
+ <p>By combining the NTSTATUS into a single 32-bit numbering space, the following NTSTATUS values are defined. Most values also have a defined default message that can be used to map the value to a human-readable text message. When this is done, the NTSTATUS value is also known as a <a href="https://msdn.microsoft.com/en-us/library/2ac5d774-07c9-4de4-a2a8-6baa333455fa#message_identifier">message identifier</a>. </p>
+ <p>This document provides the common usage details of the NTSTATUS values; individual protocol specifications may provide expanded or modified definitions.</p>
+ <p>In the following descriptions, a percentage sign that is followed by one or more alphanumeric characters (for example, "%1" or "%hs") indicates a variable that is replaced by text at the time the value is returned. </p>
+ <p />
+ <table class="FixedWidth-40-60">
+ <tr>
+ <th id="ShadedCell">
+ Return value/code
+ </th>
+ <th id="ShadedCell1">
+ Description
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000000<br />STATUS_SUCCESS</p>
+ </td>
+ <td>
+ <p>The operation completed successfully. </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000000<br />STATUS_WAIT_0</p>
+ </td>
+ <td>
+ <p>The caller specified WaitAny for WaitType and one of the dispatcher objects in the Object array has been set to the signaled state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000001<br />STATUS_WAIT_1</p>
+ </td>
+ <td>
+ <p>The caller specified WaitAny for WaitType and one of the dispatcher objects in the Object array has been set to the signaled state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000002<br />STATUS_WAIT_2</p>
+ </td>
+ <td>
+ <p>The caller specified WaitAny for WaitType and one of the dispatcher objects in the Object array has been set to the signaled state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000003<br />STATUS_WAIT_3</p>
+ </td>
+ <td>
+ <p>The caller specified WaitAny for WaitType and one of the dispatcher objects in the Object array has been set to the signaled state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000003F<br />STATUS_WAIT_63</p>
+ </td>
+ <td>
+ <p>The caller specified WaitAny for WaitType and one of the dispatcher objects in the Object array has been set to the signaled state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000080<br />STATUS_ABANDONED</p>
+ </td>
+ <td>
+ <p>The caller attempted to wait for a mutex that has been abandoned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000080<br />STATUS_ABANDONED_WAIT_0</p>
+ </td>
+ <td>
+ <p>The caller attempted to wait for a mutex that has been abandoned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x000000BF<br />STATUS_ABANDONED_WAIT_63</p>
+ </td>
+ <td>
+ <p>The caller attempted to wait for a mutex that has been abandoned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x000000C0<br />STATUS_USER_APC</p>
+ </td>
+ <td>
+ <p>A user-mode APC was delivered before the given Interval expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000101<br />STATUS_ALERTED</p>
+ </td>
+ <td>
+ <p>The delay completed because the thread was alerted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000102<br />STATUS_TIMEOUT</p>
+ </td>
+ <td>
+ <p>The given Timeout interval expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000103<br />STATUS_PENDING</p>
+ </td>
+ <td>
+ <p>The operation that was requested is pending completion.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000104<br />STATUS_REPARSE</p>
+ </td>
+ <td>
+ <p>A reparse should be performed by the Object Manager because the name of the file resulted in a symbolic link.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000105<br />STATUS_MORE_ENTRIES</p>
+ </td>
+ <td>
+ <p>Returned by enumeration APIs to indicate more information is available to successive calls.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000106<br />STATUS_NOT_ALL_ASSIGNED</p>
+ </td>
+ <td>
+ <p>Indicates not all privileges or groups that are referenced are assigned to the caller. This allows, for example, all privileges to be disabled without having to know exactly which privileges are assigned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000107<br />STATUS_SOME_NOT_MAPPED</p>
+ </td>
+ <td>
+ <p>Some of the information to be translated has not been translated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000108<br />STATUS_OPLOCK_BREAK_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>An open/create operation completed while an opportunistic lock (oplock) break is underway.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000109<br />STATUS_VOLUME_MOUNTED</p>
+ </td>
+ <td>
+ <p>A new volume has been mounted by a file system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000010A<br />STATUS_RXACT_COMMITTED</p>
+ </td>
+ <td>
+ <p>This success level status indicates that the transaction state already exists for the registry subtree but that a transaction commit was previously aborted. The commit has now been completed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000010B<br />STATUS_NOTIFY_CLEANUP</p>
+ </td>
+ <td>
+ <p>Indicates that a notify change request has been completed due to closing the handle that made the notify change request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000010C<br />STATUS_NOTIFY_ENUM_DIR</p>
+ </td>
+ <td>
+ <p>Indicates that a notify change request is being completed and that the information is not being returned in the caller's buffer. The caller now needs to enumerate the files to find the changes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000010D<br />STATUS_NO_QUOTAS_FOR_ACCOUNT</p>
+ </td>
+ <td>
+ <p>{No Quotas} No system quota limits are specifically set for this account.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000010E<br />STATUS_PRIMARY_TRANSPORT_CONNECT_FAILED</p>
+ </td>
+ <td>
+ <p>{Connect Failure on Primary Transport} An attempt was made to connect to the remote server %hs on the primary transport, but the connection failed. The computer WAS able to connect on a secondary transport.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000110<br />STATUS_PAGE_FAULT_TRANSITION</p>
+ </td>
+ <td>
+ <p>The page fault was a transition fault.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000111<br />STATUS_PAGE_FAULT_DEMAND_ZERO</p>
+ </td>
+ <td>
+ <p>The page fault was a demand zero fault.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000112<br />STATUS_PAGE_FAULT_COPY_ON_WRITE</p>
+ </td>
+ <td>
+ <p>The page fault was a demand zero fault.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000113<br />STATUS_PAGE_FAULT_GUARD_PAGE</p>
+ </td>
+ <td>
+ <p>The page fault was a demand zero fault.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000114<br />STATUS_PAGE_FAULT_PAGING_FILE</p>
+ </td>
+ <td>
+ <p>The page fault was satisfied by reading from a secondary storage device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000115<br />STATUS_CACHE_PAGE_LOCKED</p>
+ </td>
+ <td>
+ <p>The cached page was locked during operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000116<br />STATUS_CRASH_DUMP</p>
+ </td>
+ <td>
+ <p>The crash dump exists in a paging file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000117<br />STATUS_BUFFER_ALL_ZEROS</p>
+ </td>
+ <td>
+ <p>The specified buffer contains all zeros.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000118<br />STATUS_REPARSE_OBJECT</p>
+ </td>
+ <td>
+ <p>A reparse should be performed by the Object Manager because the name of the file resulted in a symbolic link.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000119<br />STATUS_RESOURCE_REQUIREMENTS_CHANGED</p>
+ </td>
+ <td>
+ <p>The device has succeeded a query-stop and its resource requirements have changed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000120<br />STATUS_TRANSLATION_COMPLETE</p>
+ </td>
+ <td>
+ <p>The translator has translated these resources into the global space and no additional translations should be performed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000121<br />STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY</p>
+ </td>
+ <td>
+ <p>The directory service evaluated group memberships locally, because it was unable to contact a global catalog server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000122<br />STATUS_NOTHING_TO_TERMINATE</p>
+ </td>
+ <td>
+ <p>A process being terminated has no threads to terminate.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000123<br />STATUS_PROCESS_NOT_IN_JOB</p>
+ </td>
+ <td>
+ <p>The specified process is not part of a job.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000124<br />STATUS_PROCESS_IN_JOB</p>
+ </td>
+ <td>
+ <p>The specified process is part of a job.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000125<br />STATUS_VOLSNAP_HIBERNATE_READY</p>
+ </td>
+ <td>
+ <p>{Volume Shadow Copy Service} The system is now ready for hibernation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000126<br />STATUS_FSFILTER_OP_COMPLETED_SUCCESSFULLY</p>
+ </td>
+ <td>
+ <p>A file system or file system filter driver has successfully completed an FsFilter operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000127<br />STATUS_INTERRUPT_VECTOR_ALREADY_CONNECTED</p>
+ </td>
+ <td>
+ <p>The specified interrupt vector was already connected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000128<br />STATUS_INTERRUPT_STILL_CONNECTED</p>
+ </td>
+ <td>
+ <p>The specified interrupt vector is still connected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000129<br />STATUS_PROCESS_CLONED</p>
+ </td>
+ <td>
+ <p>The current process is a cloned process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000012A<br />STATUS_FILE_LOCKED_WITH_ONLY_READERS</p>
+ </td>
+ <td>
+ <p>The file was locked and all users of the file can only read.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x0000012B<br />STATUS_FILE_LOCKED_WITH_WRITERS</p>
+ </td>
+ <td>
+ <p>The file was locked and at least one user of the file can write.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000202<br />STATUS_RESOURCEMANAGER_READ_ONLY</p>
+ </td>
+ <td>
+ <p>The specified ResourceManager made no changes or updates to the resource under this transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00000367<br />STATUS_WAIT_FOR_OPLOCK</p>
+ </td>
+ <td>
+ <p>An operation is blocked and waiting for an oplock.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00010001<br />DBG_EXCEPTION_HANDLED</p>
+ </td>
+ <td>
+ <p>Debugger handled the exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x00010002<br />DBG_CONTINUE</p>
+ </td>
+ <td>
+ <p>The debugger continued.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x001C0001<br />STATUS_FLT_IO_COMPLETE</p>
+ </td>
+ <td>
+ <p>The IO was completed by a filter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000467<br />STATUS_FILE_NOT_AVAILABLE</p>
+ </td>
+ <td>
+ <p>The file is temporarily unavailable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000721<br />STATUS_CALLBACK_RETURNED_THREAD_AFFINITY</p>
+ </td>
+ <td>
+ <p>A threadpool worker thread entered a callback at thread affinity %p and exited at affinity %p.</p>
+ <p>This is unexpected, indicating that the callback missed restoring the priority.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000000<br />STATUS_OBJECT_NAME_EXISTS</p>
+ </td>
+ <td>
+ <p>{Object Exists} An attempt was made to create an object but the object name already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000001<br />STATUS_THREAD_WAS_SUSPENDED</p>
+ </td>
+ <td>
+ <p>{Thread Suspended} A thread termination occurred while the thread was suspended. The thread resumed, and termination proceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000002<br />STATUS_WORKING_SET_LIMIT_RANGE</p>
+ </td>
+ <td>
+ <p>{Working Set Range Error} An attempt was made to set the working set minimum or maximum to values that are outside the allowable range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000003<br />STATUS_IMAGE_NOT_AT_BASE</p>
+ </td>
+ <td>
+ <p>{Image Relocated} An image file could not be mapped at the address that is specified in the image file. Local fixes must be performed on this image.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000004<br />STATUS_RXACT_STATE_CREATED</p>
+ </td>
+ <td>
+ <p>This informational level status indicates that a specified registry subtree transaction state did not yet exist and had to be created.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000005<br />STATUS_SEGMENT_NOTIFICATION</p>
+ </td>
+ <td>
+ <p>{Segment Load} A virtual DOS machine (VDM) is loading, unloading, or moving an MS-DOS or Win16 program segment image. An exception is raised so that a debugger can load, unload, or track symbols and breakpoints within these 16-bit segments.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000006<br />STATUS_LOCAL_USER_SESSION_KEY</p>
+ </td>
+ <td>
+ <p>{Local Session Key} A user session key was requested for a local remote procedure call (RPC) connection. The session key that is returned is a constant value and not unique to this connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000007<br />STATUS_BAD_CURRENT_DIRECTORY</p>
+ </td>
+ <td>
+ <p>{Invalid Current Directory} The process cannot switch to the startup current directory %hs. Select OK to set the current directory to %hs, or select CANCEL to exit.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000008<br />STATUS_SERIAL_MORE_WRITES</p>
+ </td>
+ <td>
+ <p>{Serial IOCTL Complete} A serial I/O operation was completed by another write to a serial port. (The IOCTL_SERIAL_XOFF_COUNTER reached zero.)</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000009<br />STATUS_REGISTRY_RECOVERED</p>
+ </td>
+ <td>
+ <p>{Registry Recovery} One of the files that contains the system registry data had to be recovered by using a log or alternate copy. The recovery was successful.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000000A<br />STATUS_FT_READ_RECOVERY_FROM_BACKUP</p>
+ </td>
+ <td>
+ <p>{Redundant Read} To satisfy a read request, the Windows NT fault-tolerant file system successfully read the requested data from a redundant copy. This was done because the file system encountered a failure on a member of the fault-tolerant volume but was unable to reassign the failing area of the device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000000B<br />STATUS_FT_WRITE_RECOVERY</p>
+ </td>
+ <td>
+ <p>{Redundant Write} To satisfy a write request, the Windows NT fault-tolerant file system successfully wrote a redundant copy of the information. This was done because the file system encountered a failure on a member of the fault-tolerant volume but was unable to reassign the failing area of the device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000000C<br />STATUS_SERIAL_COUNTER_TIMEOUT</p>
+ </td>
+ <td>
+ <p>{Serial IOCTL Timeout} A serial I/O operation completed because the time-out period expired. (The IOCTL_SERIAL_XOFF_COUNTER had not reached zero.)</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000000D<br />STATUS_NULL_LM_PASSWORD</p>
+ </td>
+ <td>
+ <p>{Password Too Complex} The Windows password is too complex to be converted to a LAN Manager password. The LAN Manager password that returned is a NULL string.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000000E<br />STATUS_IMAGE_MACHINE_TYPE_MISMATCH</p>
+ </td>
+ <td>
+ <p>{Machine Type Mismatch} The image file %hs is valid but is for a machine type other than the current machine. Select OK to continue, or CANCEL to fail the DLL load.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000000F<br />STATUS_RECEIVE_PARTIAL</p>
+ </td>
+ <td>
+ <p>{Partial Data Received} The network transport returned partial data to its client. The remaining data will be sent later.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000010<br />STATUS_RECEIVE_EXPEDITED</p>
+ </td>
+ <td>
+ <p>{Expedited Data Received} The network transport returned data to its client that was marked as expedited by the remote system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000011<br />STATUS_RECEIVE_PARTIAL_EXPEDITED</p>
+ </td>
+ <td>
+ <p>{Partial Expedited Data Received} The network transport returned partial data to its client and this data was marked as expedited by the remote system. The remaining data will be sent later.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000012<br />STATUS_EVENT_DONE</p>
+ </td>
+ <td>
+ <p>{TDI Event Done} The TDI indication has completed successfully.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000013<br />STATUS_EVENT_PENDING</p>
+ </td>
+ <td>
+ <p>{TDI Event Pending} The TDI indication has entered the pending state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000014<br />STATUS_CHECKING_FILE_SYSTEM</p>
+ </td>
+ <td>
+ <p>Checking file system on %wZ.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000015<br />STATUS_FATAL_APP_EXIT</p>
+ </td>
+ <td>
+ <p>{Fatal Application Exit} %hs</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000016<br />STATUS_PREDEFINED_HANDLE</p>
+ </td>
+ <td>
+ <p>The specified registry key is referenced by a predefined handle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000017<br />STATUS_WAS_UNLOCKED</p>
+ </td>
+ <td>
+ <p>{Page Unlocked} The page protection of a locked page was changed to 'No Access' and the page was unlocked from memory and from the process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000018<br />STATUS_SERVICE_NOTIFICATION</p>
+ </td>
+ <td>
+ <p>%hs</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000019<br />STATUS_WAS_LOCKED</p>
+ </td>
+ <td>
+ <p>{Page Locked} One of the pages to lock was already locked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000001A<br />STATUS_LOG_HARD_ERROR</p>
+ </td>
+ <td>
+ <p>Application popup: %1 : %2</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000001B<br />STATUS_ALREADY_WIN32</p>
+ </td>
+ <td>
+ <p>A Win32 process already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000001C<br />STATUS_WX86_UNSIMULATE</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000001D<br />STATUS_WX86_CONTINUE</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000001E<br />STATUS_WX86_SINGLE_STEP</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000001F<br />STATUS_WX86_BREAKPOINT</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000020<br />STATUS_WX86_EXCEPTION_CONTINUE</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000021<br />STATUS_WX86_EXCEPTION_LASTCHANCE</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000022<br />STATUS_WX86_EXCEPTION_CHAIN</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000023<br />STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE</p>
+ </td>
+ <td>
+ <p>{Machine Type Mismatch} The image file %hs is valid but is for a machine type other than the current machine.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000024<br />STATUS_NO_YIELD_PERFORMED</p>
+ </td>
+ <td>
+ <p>A yield execution was performed and no thread was available to run.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000025<br />STATUS_TIMER_RESUME_IGNORED</p>
+ </td>
+ <td>
+ <p>The resume flag to a timer API was ignored.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000026<br />STATUS_ARBITRATION_UNHANDLED</p>
+ </td>
+ <td>
+ <p>The arbiter has deferred arbitration of these resources to its parent.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000027<br />STATUS_CARDBUS_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The device has detected a CardBus card in its slot.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000028<br />STATUS_WX86_CREATEWX86TIB</p>
+ </td>
+ <td>
+ <p>An exception status code that is used by the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000029<br />STATUS_MP_PROCESSOR_MISMATCH</p>
+ </td>
+ <td>
+ <p>The CPUs in this multiprocessor system are not all the same revision level. To use all processors, the operating system restricts itself to the features of the least capable processor in the system. If problems occur with this system, contact the CPU manufacturer to see if this mix of processors is supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000002A<br />STATUS_HIBERNATED</p>
+ </td>
+ <td>
+ <p>The system was put into hibernation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000002B<br />STATUS_RESUME_HIBERNATION</p>
+ </td>
+ <td>
+ <p>The system was resumed from hibernation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000002C<br />STATUS_FIRMWARE_UPDATED</p>
+ </td>
+ <td>
+ <p>
+ Windows has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3].</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000002D<br />STATUS_DRIVERS_LEAKING_LOCKED_PAGES</p>
+ </td>
+ <td>
+ <p>A device driver is leaking locked I/O pages and is causing system degradation. The system has automatically enabled the tracking code to try and catch the culprit.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000002E<br />STATUS_MESSAGE_RETRIEVED</p>
+ </td>
+ <td>
+ <p>The ALPC message being canceled has already been retrieved from the queue on the other side.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4000002F<br />STATUS_SYSTEM_POWERSTATE_TRANSITION</p>
+ </td>
+ <td>
+ <p>The system power state is transitioning from %2 to %3.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000030<br />STATUS_ALPC_CHECK_COMPLETION_LIST</p>
+ </td>
+ <td>
+ <p>The receive operation was successful. Check the ALPC completion list for the received message.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000031<br />STATUS_SYSTEM_POWERSTATE_COMPLEX_TRANSITION</p>
+ </td>
+ <td>
+ <p>The system power state is transitioning from %2 to %3 but could enter %4.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000032<br />STATUS_ACCESS_AUDIT_BY_POLICY</p>
+ </td>
+ <td>
+ <p>Access to %1 is monitored by policy rule %2.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000033<br />STATUS_ABANDON_HIBERFILE</p>
+ </td>
+ <td>
+ <p>A valid hibernation file has been invalidated and should be abandoned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000034<br />STATUS_BIZRULES_NOT_ENABLED</p>
+ </td>
+ <td>
+ <p>Business rule scripts are disabled for the calling application.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000294<br />STATUS_WAKE_SYSTEM</p>
+ </td>
+ <td>
+ <p>The system has awoken.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40000370<br />STATUS_DS_SHUTTING_DOWN</p>
+ </td>
+ <td>
+ <p>The directory service is shutting down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010001<br />DBG_REPLY_LATER</p>
+ </td>
+ <td>
+ <p>Debugger will reply later.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010002<br />DBG_UNABLE_TO_PROVIDE_HANDLE</p>
+ </td>
+ <td>
+ <p>Debugger cannot provide a handle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010003<br />DBG_TERMINATE_THREAD</p>
+ </td>
+ <td>
+ <p>Debugger terminated the thread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010004<br />DBG_TERMINATE_PROCESS</p>
+ </td>
+ <td>
+ <p>Debugger terminated the process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010005<br />DBG_CONTROL_C</p>
+ </td>
+ <td>
+ <p>Debugger obtained control of C.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010006<br />DBG_PRINTEXCEPTION_C</p>
+ </td>
+ <td>
+ <p>Debugger printed an exception on control C.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010007<br />DBG_RIPEXCEPTION</p>
+ </td>
+ <td>
+ <p>Debugger received a RIP exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010008<br />DBG_CONTROL_BREAK</p>
+ </td>
+ <td>
+ <p>Debugger received a control break.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40010009<br />DBG_COMMAND_EXCEPTION</p>
+ </td>
+ <td>
+ <p>Debugger command communication exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40020056<br />RPC_NT_UUID_LOCAL_ONLY</p>
+ </td>
+ <td>
+ <p>A <a href="https://msdn.microsoft.com/en-us/library/513bb0aa-c8d8-456f-8a31-4e200ca7970c#uuid">UUID</a> that is valid only on this computer has been allocated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x400200AF<br />RPC_NT_SEND_INCOMPLETE</p>
+ </td>
+ <td>
+ <p>Some data remains to be sent in the request buffer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x400A0004<br />STATUS_CTX_CDM_CONNECT</p>
+ </td>
+ <td>
+ <p>The Client Drive Mapping Service has connected on Terminal Connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x400A0005<br />STATUS_CTX_CDM_DISCONNECT</p>
+ </td>
+ <td>
+ <p>The Client Drive Mapping Service has disconnected on Terminal Connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x4015000D<br />STATUS_SXS_RELEASE_ACTIVATION_CONTEXT</p>
+ </td>
+ <td>
+ <p>A kernel mode component is releasing a reference on an activation context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40190034<br />STATUS_RECOVERY_NOT_NEEDED</p>
+ </td>
+ <td>
+ <p>The transactional resource manager is already consistent. Recovery is not needed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40190035<br />STATUS_RM_ALREADY_STARTED</p>
+ </td>
+ <td>
+ <p>The transactional resource manager has already been started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401A000C<br />STATUS_LOG_NO_RESTART</p>
+ </td>
+ <td>
+ <p>The log service encountered a log stream with no restart area.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401B00EC<br />STATUS_VIDEO_DRIVER_DEBUG_REPORT_REQUEST</p>
+ </td>
+ <td>
+ <p>{Display Driver Recovered From Failure} The %hs display driver has detected a failure and recovered from it. Some graphical operations may have failed. The next time you restart the machine, a dialog box appears, giving you an opportunity to upload data about this failure to Microsoft.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E000A<br />STATUS_GRAPHICS_PARTIAL_DATA_POPULATED</p>
+ </td>
+ <td>
+ <p>The specified buffer is not big enough to contain the entire requested dataset. Partial data is populated up to the size of the buffer.</p>
+ <p>The caller needs to provide a buffer of the size as specified in the partially populated buffer's content (interface specific).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E0117<br />STATUS_GRAPHICS_DRIVER_MISMATCH</p>
+ </td>
+ <td>
+ <p>The kernel driver detected a version mismatch between it and the user mode driver.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E0307<br />STATUS_GRAPHICS_MODE_NOT_PINNED</p>
+ </td>
+ <td>
+ <p>No mode is pinned on the specified VidPN source/target.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E031E<br />STATUS_GRAPHICS_NO_PREFERRED_MODE</p>
+ </td>
+ <td>
+ <p>The specified mode set does not specify a preference for one of its modes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E034B<br />STATUS_GRAPHICS_DATASET_IS_EMPTY</p>
+ </td>
+ <td>
+ <p>The specified dataset (for example, mode set, frequency range set, descriptor set, or topology) is empty.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E034C<br />STATUS_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET</p>
+ </td>
+ <td>
+ <p>The specified dataset (for example, mode set, frequency range set, descriptor set, or topology) does not contain any more elements.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E0351<br />STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED</p>
+ </td>
+ <td>
+ <p>The specified content transformation is not pinned on the specified VidPN present path.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E042F<br />STATUS_GRAPHICS_UNKNOWN_CHILD_STATUS</p>
+ </td>
+ <td>
+ <p>The child device presence was not reliably detected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E0437<br />STATUS_GRAPHICS_LEADLINK_START_DEFERRED</p>
+ </td>
+ <td>
+ <p>Starting the lead adapter in a linked configuration has been temporarily deferred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E0439<br />STATUS_GRAPHICS_POLLING_TOO_FREQUENTLY</p>
+ </td>
+ <td>
+ <p>The display adapter is being polled for children too frequently at the same polling level.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x401E043A<br />STATUS_GRAPHICS_START_DEFERRED</p>
+ </td>
+ <td>
+ <p>Starting the adapter has been temporarily deferred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x40230001<br />STATUS_NDIS_INDICATION_REQUIRED</p>
+ </td>
+ <td>
+ <p>The request will be completed later by an NDIS status indication.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000001<br />STATUS_GUARD_PAGE_VIOLATION</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Guard Page Exception A page of memory that marks the end of a data structure, such as a stack or an array, has been accessed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000002<br />STATUS_DATATYPE_MISALIGNMENT</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Alignment Fault A data type misalignment was detected in a load or store instruction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000003<br />STATUS_BREAKPOINT</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Breakpoint A breakpoint has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000004<br />STATUS_SINGLE_STEP</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Single Step A single step or trace operation has just been completed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000005<br />STATUS_BUFFER_OVERFLOW</p>
+ </td>
+ <td>
+ <p>{Buffer Overflow} The data was too large to fit into the specified buffer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000006<br />STATUS_NO_MORE_FILES</p>
+ </td>
+ <td>
+ <p>{No More Files} No more files were found which match the file specification.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000007<br />STATUS_WAKE_SYSTEM_DEBUGGER</p>
+ </td>
+ <td>
+ <p>{Kernel Debugger Awakened} The system debugger was awakened by an interrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000000A<br />STATUS_HANDLES_CLOSED</p>
+ </td>
+ <td>
+ <p>{Handles Closed} Handles to objects have been automatically closed because of the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000000B<br />STATUS_NO_INHERITANCE</p>
+ </td>
+ <td>
+ <p>{Non-Inheritable ACL} An access control list (ACL) contains no components that can be inherited.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000000C<br />STATUS_GUID_SUBSTITUTION_MADE</p>
+ </td>
+ <td>
+ <p>{GUID Substitution} During the translation of a globally unique identifier (GUID) to a Windows security ID (SID), no administratively defined GUID prefix was found. A substitute prefix was used, which will not compromise system security. However, this may provide a more restrictive access than intended.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000000D<br />STATUS_PARTIAL_COPY</p>
+ </td>
+ <td>
+ <p>Because of protection conflicts, not all the requested bytes could be copied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000000E<br />STATUS_DEVICE_PAPER_EMPTY</p>
+ </td>
+ <td>
+ <p>{Out of Paper} The printer is out of paper.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000000F<br />STATUS_DEVICE_POWERED_OFF</p>
+ </td>
+ <td>
+ <p>{Device Power Is Off} The printer power has been turned off.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000010<br />STATUS_DEVICE_OFF_LINE</p>
+ </td>
+ <td>
+ <p>{Device Offline} The printer has been taken offline.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000011<br />STATUS_DEVICE_BUSY</p>
+ </td>
+ <td>
+ <p>{Device Busy} The device is currently busy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000012<br />STATUS_NO_MORE_EAS</p>
+ </td>
+ <td>
+ <p>{No More EAs} No more extended attributes (EAs) were found for the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000013<br />STATUS_INVALID_EA_NAME</p>
+ </td>
+ <td>
+ <p>{Illegal EA} The specified extended attribute (EA) name contains at least one illegal character.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000014<br />STATUS_EA_LIST_INCONSISTENT</p>
+ </td>
+ <td>
+ <p>{Inconsistent EA List} The extended attribute (EA) list is inconsistent.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000015<br />STATUS_INVALID_EA_FLAG</p>
+ </td>
+ <td>
+ <p>{Invalid EA Flag} An invalid extended attribute (EA) flag was set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000016<br />STATUS_VERIFY_REQUIRED</p>
+ </td>
+ <td>
+ <p>{Verifying Disk} The media has changed and a verify operation is in progress; therefore, no reads or writes may be performed to the device, except those that are used in the verify operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000017<br />STATUS_EXTRANEOUS_INFORMATION</p>
+ </td>
+ <td>
+ <p>{Too Much Information} The specified access control list (ACL) contained more information than was expected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000018<br />STATUS_RXACT_COMMIT_NECESSARY</p>
+ </td>
+ <td>
+ <p>This warning level status indicates that the transaction state already exists for the registry subtree, but that a transaction commit was previously aborted. The commit has NOT been completed but has not been rolled back either; therefore, it may still be committed, if needed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000001A<br />STATUS_NO_MORE_ENTRIES</p>
+ </td>
+ <td>
+ <p>{No More Entries} No more entries are available from an enumeration operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000001B<br />STATUS_FILEMARK_DETECTED</p>
+ </td>
+ <td>
+ <p>{Filemark Found} A filemark was detected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000001C<br />STATUS_MEDIA_CHANGED</p>
+ </td>
+ <td>
+ <p>{Media Changed} The media may have changed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000001D<br />STATUS_BUS_RESET</p>
+ </td>
+ <td>
+ <p>{I/O Bus Reset} An I/O bus reset was detected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000001E<br />STATUS_END_OF_MEDIA</p>
+ </td>
+ <td>
+ <p>{End of Media} The end of the media was encountered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000001F<br />STATUS_BEGINNING_OF_MEDIA</p>
+ </td>
+ <td>
+ <p>The beginning of a tape or partition has been detected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000020<br />STATUS_MEDIA_CHECK</p>
+ </td>
+ <td>
+ <p>{Media Changed} The media may have changed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000021<br />STATUS_SETMARK_DETECTED</p>
+ </td>
+ <td>
+ <p>A tape access reached a set mark.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000022<br />STATUS_NO_DATA_DETECTED</p>
+ </td>
+ <td>
+ <p>During a tape access, the end of the data written is reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000023<br />STATUS_REDIRECTOR_HAS_OPEN_HANDLES</p>
+ </td>
+ <td>
+ <p>The redirector is in use and cannot be unloaded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000024<br />STATUS_SERVER_HAS_OPEN_HANDLES</p>
+ </td>
+ <td>
+ <p>The server is in use and cannot be unloaded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000025<br />STATUS_ALREADY_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>The specified connection has already been disconnected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000026<br />STATUS_LONGJUMP</p>
+ </td>
+ <td>
+ <p>A long jump has been executed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000027<br />STATUS_CLEANER_CARTRIDGE_INSTALLED</p>
+ </td>
+ <td>
+ <p>A cleaner cartridge is present in the tape library.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000028<br />STATUS_PLUGPLAY_QUERY_VETOED</p>
+ </td>
+ <td>
+ <p>The Plug and Play query operation was not successful.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000029<br />STATUS_UNWIND_CONSOLIDATE</p>
+ </td>
+ <td>
+ <p>A frame consolidation has been executed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000002A<br />STATUS_REGISTRY_HIVE_RECOVERED</p>
+ </td>
+ <td>
+ <p>{Registry Hive Recovered} The registry hive (file): %hs was corrupted and it has been recovered. Some data might have been lost.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000002B<br />STATUS_DLL_MIGHT_BE_INSECURE</p>
+ </td>
+ <td>
+ <p>The application is attempting to run executable code from the module %hs. This may be insecure. An alternative, %hs, is available. Should the application use the secure module %hs?</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000002C<br />STATUS_DLL_MIGHT_BE_INCOMPATIBLE</p>
+ </td>
+ <td>
+ <p>The application is loading executable code from the module %hs. This is secure but may be incompatible with previous releases of the operating system. An alternative, %hs, is available. Should the application use the secure module %hs?</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x8000002D<br />STATUS_STOPPED_ON_SYMLINK</p>
+ </td>
+ <td>
+ <p>The create operation stopped after reaching a symbolic link.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000288<br />STATUS_DEVICE_REQUIRES_CLEANING</p>
+ </td>
+ <td>
+ <p>The device has indicated that cleaning is necessary.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000289<br />STATUS_DEVICE_DOOR_OPEN</p>
+ </td>
+ <td>
+ <p>The device has indicated that its door is open. Further operations require it closed and secured.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80000803<br />STATUS_DATA_LOST_REPAIR</p>
+ </td>
+ <td>
+ <p>
+ Windows discovered a corruption in the file %hs. This file has now been repaired. Check if any data in the file was lost because of the corruption.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80010001<br />DBG_EXCEPTION_NOT_HANDLED</p>
+ </td>
+ <td>
+ <p>Debugger did not handle the exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80130001<br />STATUS_CLUSTER_NODE_ALREADY_UP</p>
+ </td>
+ <td>
+ <p>The cluster node is already up.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80130002<br />STATUS_CLUSTER_NODE_ALREADY_DOWN</p>
+ </td>
+ <td>
+ <p>The cluster node is already down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80130003<br />STATUS_CLUSTER_NETWORK_ALREADY_ONLINE</p>
+ </td>
+ <td>
+ <p>The cluster network is already online.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80130004<br />STATUS_CLUSTER_NETWORK_ALREADY_OFFLINE</p>
+ </td>
+ <td>
+ <p>The cluster network is already offline.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80130005<br />STATUS_CLUSTER_NODE_ALREADY_MEMBER</p>
+ </td>
+ <td>
+ <p>The cluster node is already a member of the cluster.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80190009<br />STATUS_COULD_NOT_RESIZE_LOG</p>
+ </td>
+ <td>
+ <p>The log could not be set to the requested size.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80190029<br />STATUS_NO_TXF_METADATA</p>
+ </td>
+ <td>
+ <p>There is no transaction metadata on the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80190031<br />STATUS_CANT_RECOVER_WITH_HANDLE_OPEN</p>
+ </td>
+ <td>
+ <p>The file cannot be recovered because there is a handle still open on it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80190041<br />STATUS_TXF_METADATA_ALREADY_PRESENT</p>
+ </td>
+ <td>
+ <p>Transaction metadata is already present on this file and cannot be superseded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80190042<br />STATUS_TRANSACTION_SCOPE_CALLBACKS_NOT_SET</p>
+ </td>
+ <td>
+ <p>A transaction scope could not be entered because the scope handler has not been initialized.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x801B00EB<br />STATUS_VIDEO_HUNG_DISPLAY_DRIVER_THREAD_RECOVERED</p>
+ </td>
+ <td>
+ <p>{Display Driver Stopped Responding and recovered} The %hs display driver has stopped working normally. The recovery had been performed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x801C0001<br />STATUS_FLT_BUFFER_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>{Buffer too small} The buffer is too small to contain the entry. No information has been written to the buffer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80210001<br />STATUS_FVE_PARTIAL_METADATA</p>
+ </td>
+ <td>
+ <p>Volume metadata read or write is incomplete.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0x80210002<br />STATUS_FVE_TRANSIENT_STATE</p>
+ </td>
+ <td>
+ <p>BitLocker encryption keys were ignored because the volume was in a transient state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000001<br />STATUS_UNSUCCESSFUL</p>
+ </td>
+ <td>
+ <p>{Operation Failed} The requested operation was unsuccessful.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000002<br />STATUS_NOT_IMPLEMENTED</p>
+ </td>
+ <td>
+ <p>{Not Implemented} The requested operation is not implemented.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000003<br />STATUS_INVALID_INFO_CLASS</p>
+ </td>
+ <td>
+ <p>{Invalid Parameter} The specified information class is not a valid information class for the specified object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000004<br />STATUS_INFO_LENGTH_MISMATCH</p>
+ </td>
+ <td>
+ <p>The specified information record length does not match the length that is required for the specified information class.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000005<br />STATUS_ACCESS_VIOLATION</p>
+ </td>
+ <td>
+ <p>The instruction at 0x%08lx referenced memory at 0x%08lx. The memory could not be %s.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000006<br />STATUS_IN_PAGE_ERROR</p>
+ </td>
+ <td>
+ <p>The instruction at 0x%08lx referenced memory at 0x%08lx. The required data was not placed into memory because of an I/O error status of 0x%08lx.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000007<br />STATUS_PAGEFILE_QUOTA</p>
+ </td>
+ <td>
+ <p>The page file quota for the process has been exhausted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000008<br />STATUS_INVALID_HANDLE</p>
+ </td>
+ <td>
+ <p>An invalid HANDLE was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000009<br />STATUS_BAD_INITIAL_STACK</p>
+ </td>
+ <td>
+ <p>An invalid initial stack was specified in a call to NtCreateThread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000000A<br />STATUS_BAD_INITIAL_PC</p>
+ </td>
+ <td>
+ <p>An invalid initial start address was specified in a call to NtCreateThread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000000B<br />STATUS_INVALID_CID</p>
+ </td>
+ <td>
+ <p>An invalid client ID was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000000C<br />STATUS_TIMER_NOT_CANCELED</p>
+ </td>
+ <td>
+ <p>An attempt was made to cancel or set a timer that has an associated APC and the specified thread is not the thread that originally set the timer with an associated APC routine.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000000D<br />STATUS_INVALID_PARAMETER</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000000E<br />STATUS_NO_SUCH_DEVICE</p>
+ </td>
+ <td>
+ <p>A device that does not exist was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000000F<br />STATUS_NO_SUCH_FILE</p>
+ </td>
+ <td>
+ <p>{File Not Found} The file %hs does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000010<br />STATUS_INVALID_DEVICE_REQUEST</p>
+ </td>
+ <td>
+ <p>The specified request is not a valid operation for the target device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000011<br />STATUS_END_OF_FILE</p>
+ </td>
+ <td>
+ <p>The end-of-file marker has been reached. There is no valid data in the file beyond this marker.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000012<br />STATUS_WRONG_VOLUME</p>
+ </td>
+ <td>
+ <p>{Wrong Volume} The wrong volume is in the drive. Insert volume %hs into drive %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000013<br />STATUS_NO_MEDIA_IN_DEVICE</p>
+ </td>
+ <td>
+ <p>{No Disk} There is no disk in the drive. Insert a disk into drive %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000014<br />STATUS_UNRECOGNIZED_MEDIA</p>
+ </td>
+ <td>
+ <p>{Unknown Disk Format} The disk in drive %hs is not formatted properly. Check the disk, and reformat it, if needed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000015<br />STATUS_NONEXISTENT_SECTOR</p>
+ </td>
+ <td>
+ <p>{Sector Not Found} The specified sector does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000016<br />STATUS_MORE_PROCESSING_REQUIRED</p>
+ </td>
+ <td>
+ <p>{Still Busy} The specified I/O request packet (IRP) cannot be disposed of because the I/O operation is not complete.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000017<br />STATUS_NO_MEMORY</p>
+ </td>
+ <td>
+ <p>{Not Enough Quota} Not enough virtual memory or paging file quota is available to complete the specified operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000018<br />STATUS_CONFLICTING_ADDRESSES</p>
+ </td>
+ <td>
+ <p>{Conflicting Address Range} The specified address range conflicts with the address space.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000019<br />STATUS_NOT_MAPPED_VIEW</p>
+ </td>
+ <td>
+ <p>The address range to unmap is not a mapped view.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000001A<br />STATUS_UNABLE_TO_FREE_VM</p>
+ </td>
+ <td>
+ <p>The virtual memory cannot be freed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000001B<br />STATUS_UNABLE_TO_DELETE_SECTION</p>
+ </td>
+ <td>
+ <p>The specified section cannot be deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000001C<br />STATUS_INVALID_SYSTEM_SERVICE</p>
+ </td>
+ <td>
+ <p>An invalid system service was specified in a system service call.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000001D<br />STATUS_ILLEGAL_INSTRUCTION</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Illegal Instruction An attempt was made to execute an illegal instruction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000001E<br />STATUS_INVALID_LOCK_SEQUENCE</p>
+ </td>
+ <td>
+ <p>{Invalid Lock Sequence} An attempt was made to execute an invalid lock sequence.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000001F<br />STATUS_INVALID_VIEW_SIZE</p>
+ </td>
+ <td>
+ <p>{Invalid Mapping} An attempt was made to create a view for a section that is bigger than the section.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000020<br />STATUS_INVALID_FILE_FOR_SECTION</p>
+ </td>
+ <td>
+ <p>{Bad File} The attributes of the specified mapping file for a section of memory cannot be read.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000021<br />STATUS_ALREADY_COMMITTED</p>
+ </td>
+ <td>
+ <p>{Already Committed} The specified address range is already committed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000022<br />STATUS_ACCESS_DENIED</p>
+ </td>
+ <td>
+ <p>{Access Denied} A process has requested access to an object but has not been granted those access rights.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000023<br />STATUS_BUFFER_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>{Buffer Too Small} The buffer is too small to contain the entry. No information has been written to the buffer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000024<br />STATUS_OBJECT_TYPE_MISMATCH</p>
+ </td>
+ <td>
+ <p>{Wrong Type} There is a mismatch between the type of object that is required by the requested operation and the type of object that is specified in the request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000025<br />STATUS_NONCONTINUABLE_EXCEPTION</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Cannot Continue Windows cannot continue from this exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000026<br />STATUS_INVALID_DISPOSITION</p>
+ </td>
+ <td>
+ <p>An invalid exception disposition was returned by an exception handler.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000027<br />STATUS_UNWIND</p>
+ </td>
+ <td>
+ <p>Unwind exception code.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000028<br />STATUS_BAD_STACK</p>
+ </td>
+ <td>
+ <p>An invalid or unaligned stack was encountered during an unwind operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000029<br />STATUS_INVALID_UNWIND_TARGET</p>
+ </td>
+ <td>
+ <p>An invalid unwind target was encountered during an unwind operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000002A<br />STATUS_NOT_LOCKED</p>
+ </td>
+ <td>
+ <p>An attempt was made to unlock a page of memory that was not locked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000002B<br />STATUS_PARITY_ERROR</p>
+ </td>
+ <td>
+ <p>A device parity error on an I/O operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000002C<br />STATUS_UNABLE_TO_DECOMMIT_VM</p>
+ </td>
+ <td>
+ <p>An attempt was made to decommit uncommitted virtual memory.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000002D<br />STATUS_NOT_COMMITTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to change the attributes on memory that has not been committed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000002E<br />STATUS_INVALID_PORT_ATTRIBUTES</p>
+ </td>
+ <td>
+ <p>Invalid object attributes specified to NtCreatePort or invalid port attributes specified to NtConnectPort.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000002F<br />STATUS_PORT_MESSAGE_TOO_LONG</p>
+ </td>
+ <td>
+ <p>The length of the message that was passed to NtRequestPort or NtRequestWaitReplyPort is longer than the maximum message that is allowed by the port.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000030<br />STATUS_INVALID_PARAMETER_MIX</p>
+ </td>
+ <td>
+ <p>An invalid combination of parameters was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000031<br />STATUS_INVALID_QUOTA_LOWER</p>
+ </td>
+ <td>
+ <p>An attempt was made to lower a quota limit below the current usage.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000032<br />STATUS_DISK_CORRUPT_ERROR</p>
+ </td>
+ <td>
+ <p>{Corrupt Disk} The file system structure on the disk is corrupt and unusable. Run the Chkdsk utility on the volume %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000033<br />STATUS_OBJECT_NAME_INVALID</p>
+ </td>
+ <td>
+ <p>The object name is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000034<br />STATUS_OBJECT_NAME_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The object name is not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000035<br />STATUS_OBJECT_NAME_COLLISION</p>
+ </td>
+ <td>
+ <p>The object name already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000037<br />STATUS_PORT_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to send a message to a disconnected communication port.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000038<br />STATUS_DEVICE_ALREADY_ATTACHED</p>
+ </td>
+ <td>
+ <p>An attempt was made to attach to a device that was already attached to another device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000039<br />STATUS_OBJECT_PATH_INVALID</p>
+ </td>
+ <td>
+ <p>The object path component was not a directory object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000003A<br />STATUS_OBJECT_PATH_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Path Not Found} The path %hs does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000003B<br />STATUS_OBJECT_PATH_SYNTAX_BAD</p>
+ </td>
+ <td>
+ <p>The object path component was not a directory object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000003C<br />STATUS_DATA_OVERRUN</p>
+ </td>
+ <td>
+ <p>{Data Overrun} A data overrun error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000003D<br />STATUS_DATA_LATE_ERROR</p>
+ </td>
+ <td>
+ <p>{Data Late} A data late error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000003E<br />STATUS_DATA_ERROR</p>
+ </td>
+ <td>
+ <p>{Data Error} An error occurred in reading or writing data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000003F<br />STATUS_CRC_ERROR</p>
+ </td>
+ <td>
+ <p>{Bad CRC} A cyclic redundancy check (CRC) checksum error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000040<br />STATUS_SECTION_TOO_BIG</p>
+ </td>
+ <td>
+ <p>{Section Too Large} The specified section is too big to map the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000041<br />STATUS_PORT_CONNECTION_REFUSED</p>
+ </td>
+ <td>
+ <p>The NtConnectPort request is refused.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000042<br />STATUS_INVALID_PORT_HANDLE</p>
+ </td>
+ <td>
+ <p>The type of port handle is invalid for the operation that is requested.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000043<br />STATUS_SHARING_VIOLATION</p>
+ </td>
+ <td>
+ <p>A file cannot be opened because the share access flags are incompatible.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000044<br />STATUS_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>Insufficient quota exists to complete the operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000045<br />STATUS_INVALID_PAGE_PROTECTION</p>
+ </td>
+ <td>
+ <p>The specified page protection was not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000046<br />STATUS_MUTANT_NOT_OWNED</p>
+ </td>
+ <td>
+ <p>An attempt to release a mutant object was made by a thread that was not the owner of the mutant object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000047<br />STATUS_SEMAPHORE_LIMIT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>An attempt was made to release a semaphore such that its maximum count would have been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000048<br />STATUS_PORT_ALREADY_SET</p>
+ </td>
+ <td>
+ <p>An attempt was made to set the DebugPort or ExceptionPort of a process, but a port already exists in the process, or an attempt was made to set the CompletionPort of a file but a port was already set in the file, or an attempt was made to set the associated completion port of an ALPC port but it is already set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000049<br />STATUS_SECTION_NOT_IMAGE</p>
+ </td>
+ <td>
+ <p>An attempt was made to query image information on a section that does not map an image.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000004A<br />STATUS_SUSPEND_COUNT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>An attempt was made to suspend a thread whose suspend count was at its maximum.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000004B<br />STATUS_THREAD_IS_TERMINATING</p>
+ </td>
+ <td>
+ <p>An attempt was made to suspend a thread that has begun termination.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000004C<br />STATUS_BAD_WORKING_SET_LIMIT</p>
+ </td>
+ <td>
+ <p>An attempt was made to set the working set limit to an invalid value (for example, the minimum greater than maximum).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000004D<br />STATUS_INCOMPATIBLE_FILE_MAP</p>
+ </td>
+ <td>
+ <p>A section was created to map a file that is not compatible with an already existing section that maps the same file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000004E<br />STATUS_SECTION_PROTECTION</p>
+ </td>
+ <td>
+ <p>A view to a section specifies a protection that is incompatible with the protection of the initial view.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000004F<br />STATUS_EAS_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>An operation involving EAs failed because the file system does not support EAs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000050<br />STATUS_EA_TOO_LARGE</p>
+ </td>
+ <td>
+ <p>An EA operation failed because the EA set is too large.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000051<br />STATUS_NONEXISTENT_EA_ENTRY</p>
+ </td>
+ <td>
+ <p>An EA operation failed because the name or EA index is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000052<br />STATUS_NO_EAS_ON_FILE</p>
+ </td>
+ <td>
+ <p>The file for which EAs were requested has no EAs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000053<br />STATUS_EA_CORRUPT_ERROR</p>
+ </td>
+ <td>
+ <p>The EA is corrupt and cannot be read.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000054<br />STATUS_FILE_LOCK_CONFLICT</p>
+ </td>
+ <td>
+ <p>A requested read/write cannot be granted due to a conflicting file lock.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000055<br />STATUS_LOCK_NOT_GRANTED</p>
+ </td>
+ <td>
+ <p>A requested file lock cannot be granted due to other existing locks.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000056<br />STATUS_DELETE_PENDING</p>
+ </td>
+ <td>
+ <p>A non-close operation has been requested of a file object that has a delete pending.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000057<br />STATUS_CTL_FILE_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to set the control attribute on a file. This attribute is not supported in the destination file system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000058<br />STATUS_UNKNOWN_REVISION</p>
+ </td>
+ <td>
+ <p>Indicates a revision number that was encountered or specified is not one that is known by the service. It may be a more recent revision than the service is aware of.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000059<br />STATUS_REVISION_MISMATCH</p>
+ </td>
+ <td>
+ <p>Indicates that two revision levels are incompatible.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000005A<br />STATUS_INVALID_OWNER</p>
+ </td>
+ <td>
+ <p>Indicates a particular security ID may not be assigned as the owner of an object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000005B<br />STATUS_INVALID_PRIMARY_GROUP</p>
+ </td>
+ <td>
+ <p>Indicates a particular security ID may not be assigned as the primary group of an object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000005C<br />STATUS_NO_IMPERSONATION_TOKEN</p>
+ </td>
+ <td>
+ <p>An attempt has been made to operate on an impersonation token by a thread that is not currently impersonating a client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000005D<br />STATUS_CANT_DISABLE_MANDATORY</p>
+ </td>
+ <td>
+ <p>A mandatory group may not be disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000005E<br />STATUS_NO_LOGON_SERVERS</p>
+ </td>
+ <td>
+ <p>No logon servers are currently available to service the logon request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000005F<br />STATUS_NO_SUCH_LOGON_SESSION</p>
+ </td>
+ <td>
+ <p>A specified logon session does not exist. It may already have been terminated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000060<br />STATUS_NO_SUCH_PRIVILEGE</p>
+ </td>
+ <td>
+ <p>A specified privilege does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000061<br />STATUS_PRIVILEGE_NOT_HELD</p>
+ </td>
+ <td>
+ <p>A required privilege is not held by the client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000062<br />STATUS_INVALID_ACCOUNT_NAME</p>
+ </td>
+ <td>
+ <p>The name provided is not a properly formed account name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000063<br />STATUS_USER_EXISTS</p>
+ </td>
+ <td>
+ <p>The specified account already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000064<br />STATUS_NO_SUCH_USER</p>
+ </td>
+ <td>
+ <p>The specified account does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000065<br />STATUS_GROUP_EXISTS</p>
+ </td>
+ <td>
+ <p>The specified group already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000066<br />STATUS_NO_SUCH_GROUP</p>
+ </td>
+ <td>
+ <p>The specified group does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000067<br />STATUS_MEMBER_IN_GROUP</p>
+ </td>
+ <td>
+ <p>The specified user account is already in the specified group account. Also used to indicate a group cannot be deleted because it contains a member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000068<br />STATUS_MEMBER_NOT_IN_GROUP</p>
+ </td>
+ <td>
+ <p>The specified user account is not a member of the specified group account.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000069<br />STATUS_LAST_ADMIN</p>
+ </td>
+ <td>
+ <p>Indicates the requested operation would disable or delete the last remaining administration account. This is not allowed to prevent creating a situation in which the system cannot be administrated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000006A<br />STATUS_WRONG_PASSWORD</p>
+ </td>
+ <td>
+ <p>When trying to update a password, this return status indicates that the value provided as the current password is not correct.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000006B<br />STATUS_ILL_FORMED_PASSWORD</p>
+ </td>
+ <td>
+ <p>When trying to update a password, this return status indicates that the value provided for the new password contains values that are not allowed in passwords.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000006C<br />STATUS_PASSWORD_RESTRICTION</p>
+ </td>
+ <td>
+ <p>When trying to update a password, this status indicates that some password update rule has been violated. For example, the password may not meet length criteria.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000006D<br />STATUS_LOGON_FAILURE</p>
+ </td>
+ <td>
+ <p>The attempted logon is invalid. This is either due to a bad username or authentication information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000006E<br />STATUS_ACCOUNT_RESTRICTION</p>
+ </td>
+ <td>
+ <p>Indicates a referenced user name and authentication information are valid, but some user account restriction has prevented successful authentication (such as time-of-day restrictions).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000006F<br />STATUS_INVALID_LOGON_HOURS</p>
+ </td>
+ <td>
+ <p>The user account has time restrictions and may not be logged onto at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000070<br />STATUS_INVALID_WORKSTATION</p>
+ </td>
+ <td>
+ <p>The user account is restricted so that it may not be used to log on from the source workstation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000071<br />STATUS_PASSWORD_EXPIRED</p>
+ </td>
+ <td>
+ <p>The user account password has expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000072<br />STATUS_ACCOUNT_DISABLED</p>
+ </td>
+ <td>
+ <p>The referenced account is currently disabled and may not be logged on to.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000073<br />STATUS_NONE_MAPPED</p>
+ </td>
+ <td>
+ <p>None of the information to be translated has been translated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000074<br />STATUS_TOO_MANY_LUIDS_REQUESTED</p>
+ </td>
+ <td>
+ <p>The number of LUIDs requested may not be allocated with a single allocation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000075<br />STATUS_LUIDS_EXHAUSTED</p>
+ </td>
+ <td>
+ <p>Indicates there are no more LUIDs to allocate.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000076<br />STATUS_INVALID_SUB_AUTHORITY</p>
+ </td>
+ <td>
+ <p>Indicates the sub-authority value is invalid for the particular use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000077<br />STATUS_INVALID_ACL</p>
+ </td>
+ <td>
+ <p>Indicates the ACL structure is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000078<br />STATUS_INVALID_SID</p>
+ </td>
+ <td>
+ <p>Indicates the SID structure is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000079<br />STATUS_INVALID_SECURITY_DESCR</p>
+ </td>
+ <td>
+ <p>Indicates the SECURITY_DESCRIPTOR structure is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000007A<br />STATUS_PROCEDURE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Indicates the specified procedure address cannot be found in the DLL.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000007B<br />STATUS_INVALID_IMAGE_FORMAT</p>
+ </td>
+ <td>
+ <p>{Bad Image} %hs is either not designed to run on Windows or it contains an error. Try installing the program again using the original installation media or contact your system administrator or the software vendor for support.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000007C<br />STATUS_NO_TOKEN</p>
+ </td>
+ <td>
+ <p>An attempt was made to reference a token that does not exist. This is typically done by referencing the token that is associated with a thread when the thread is not impersonating a client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000007D<br />STATUS_BAD_INHERITANCE_ACL</p>
+ </td>
+ <td>
+ <p>Indicates that an attempt to build either an inherited ACL or ACE was not successful. This can be caused by a number of things. One of the more probable causes is the replacement of a CreatorId with a SID that did not fit into the ACE or ACL.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000007E<br />STATUS_RANGE_NOT_LOCKED</p>
+ </td>
+ <td>
+ <p>The range specified in NtUnlockFile was not locked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000007F<br />STATUS_DISK_FULL</p>
+ </td>
+ <td>
+ <p>An operation failed because the disk was full.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000080<br />STATUS_SERVER_DISABLED</p>
+ </td>
+ <td>
+ <p>The GUID allocation server is disabled at the moment.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000081<br />STATUS_SERVER_NOT_DISABLED</p>
+ </td>
+ <td>
+ <p>The GUID allocation server is enabled at the moment.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000082<br />STATUS_TOO_MANY_GUIDS_REQUESTED</p>
+ </td>
+ <td>
+ <p>Too many GUIDs were requested from the allocation server at once.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000083<br />STATUS_GUIDS_EXHAUSTED</p>
+ </td>
+ <td>
+ <p>The GUIDs could not be allocated because the Authority Agent was exhausted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000084<br />STATUS_INVALID_ID_AUTHORITY</p>
+ </td>
+ <td>
+ <p>The value provided was an invalid value for an identifier authority.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000085<br />STATUS_AGENTS_EXHAUSTED</p>
+ </td>
+ <td>
+ <p>No more authority agent values are available for the particular identifier authority value.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000086<br />STATUS_INVALID_VOLUME_LABEL</p>
+ </td>
+ <td>
+ <p>An invalid volume label has been specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000087<br />STATUS_SECTION_NOT_EXTENDED</p>
+ </td>
+ <td>
+ <p>A mapped section could not be extended.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000088<br />STATUS_NOT_MAPPED_DATA</p>
+ </td>
+ <td>
+ <p>Specified section to flush does not map a data file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000089<br />STATUS_RESOURCE_DATA_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Indicates the specified image file did not contain a resource section.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000008A<br />STATUS_RESOURCE_TYPE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Indicates the specified resource type cannot be found in the image file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000008B<br />STATUS_RESOURCE_NAME_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Indicates the specified resource name cannot be found in the image file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000008C<br />STATUS_ARRAY_BOUNDS_EXCEEDED</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Array bounds exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000008D<br />STATUS_FLOAT_DENORMAL_OPERAND</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point denormal operand.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000008E<br />STATUS_FLOAT_DIVIDE_BY_ZERO</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point division by zero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000008F<br />STATUS_FLOAT_INEXACT_RESULT</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point inexact result.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000090<br />STATUS_FLOAT_INVALID_OPERATION</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point invalid operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000091<br />STATUS_FLOAT_OVERFLOW</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point overflow.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000092<br />STATUS_FLOAT_STACK_CHECK</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point stack check.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000093<br />STATUS_FLOAT_UNDERFLOW</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Floating-point underflow.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000094<br />STATUS_INTEGER_DIVIDE_BY_ZERO</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Integer division by zero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000095<br />STATUS_INTEGER_OVERFLOW</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Integer overflow.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000096<br />STATUS_PRIVILEGED_INSTRUCTION</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Privileged instruction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000097<br />STATUS_TOO_MANY_PAGING_FILES</p>
+ </td>
+ <td>
+ <p>An attempt was made to install more paging files than the system supports.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000098<br />STATUS_FILE_INVALID</p>
+ </td>
+ <td>
+ <p>The volume for a file has been externally altered such that the opened file is no longer valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000099<br />STATUS_ALLOTTED_SPACE_EXCEEDED</p>
+ </td>
+ <td>
+ <p>When a block of memory is allotted for future updates, such as the memory allocated to hold discretionary access control and primary group information, successive updates may exceed the amount of memory originally allotted. Because a quota may already have been charged to several processes that have handles to the object, it is not reasonable to alter the size of the allocated memory. Instead, a request that requires more memory than has been allotted must fail and the STATUS_ALLOTTED_SPACE_EXCEEDED error returned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000009A<br />STATUS_INSUFFICIENT_RESOURCES</p>
+ </td>
+ <td>
+ <p>Insufficient system resources exist to complete the API.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000009B<br />STATUS_DFS_EXIT_PATH_FOUND</p>
+ </td>
+ <td>
+ <p>An attempt has been made to open a DFS exit path control file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000009C<br />STATUS_DEVICE_DATA_ERROR</p>
+ </td>
+ <td>
+ <p>There are bad blocks (sectors) on the hard disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000009D<br />STATUS_DEVICE_NOT_CONNECTED</p>
+ </td>
+ <td>
+ <p>There is bad cabling, non-termination, or the controller is not able to obtain access to the hard disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000009F<br />STATUS_FREE_VM_NOT_AT_BASE</p>
+ </td>
+ <td>
+ <p>Virtual memory cannot be freed because the base address is not the base of the region and a region size of zero was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A0<br />STATUS_MEMORY_NOT_ALLOCATED</p>
+ </td>
+ <td>
+ <p>An attempt was made to free virtual memory that is not allocated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A1<br />STATUS_WORKING_SET_QUOTA</p>
+ </td>
+ <td>
+ <p>The working set is not big enough to allow the requested pages to be locked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A2<br />STATUS_MEDIA_WRITE_PROTECTED</p>
+ </td>
+ <td>
+ <p>{Write Protect Error} The disk cannot be written to because it is write-protected. Remove the write protection from the volume %hs in drive %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A3<br />STATUS_DEVICE_NOT_READY</p>
+ </td>
+ <td>
+ <p>{Drive Not Ready} The drive is not ready for use; its door may be open. Check drive %hs and make sure that a disk is inserted and that the drive door is closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A4<br />STATUS_INVALID_GROUP_ATTRIBUTES</p>
+ </td>
+ <td>
+ <p>The specified attributes are invalid or are incompatible with the attributes for the group as a whole.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A5<br />STATUS_BAD_IMPERSONATION_LEVEL</p>
+ </td>
+ <td>
+ <p>A specified impersonation level is invalid. Also used to indicate that a required impersonation level was not provided.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A6<br />STATUS_CANT_OPEN_ANONYMOUS</p>
+ </td>
+ <td>
+ <p>An attempt was made to open an anonymous-level token. Anonymous tokens may not be opened.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A7<br />STATUS_BAD_VALIDATION_CLASS</p>
+ </td>
+ <td>
+ <p>The validation information class requested was invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A8<br />STATUS_BAD_TOKEN_TYPE</p>
+ </td>
+ <td>
+ <p>The type of a token object is inappropriate for its attempted use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000A9<br />STATUS_BAD_MASTER_BOOT_RECORD</p>
+ </td>
+ <td>
+ <p>The type of a token object is inappropriate for its attempted use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000AA<br />STATUS_INSTRUCTION_MISALIGNMENT</p>
+ </td>
+ <td>
+ <p>An attempt was made to execute an instruction at an unaligned address and the host system does not support unaligned instruction references.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000AB<br />STATUS_INSTANCE_NOT_AVAILABLE</p>
+ </td>
+ <td>
+ <p>The maximum named pipe instance count has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000AC<br />STATUS_PIPE_NOT_AVAILABLE</p>
+ </td>
+ <td>
+ <p>An instance of a named pipe cannot be found in the listening state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000AD<br />STATUS_INVALID_PIPE_STATE</p>
+ </td>
+ <td>
+ <p>The named pipe is not in the connected or closing state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000AE<br />STATUS_PIPE_BUSY</p>
+ </td>
+ <td>
+ <p>The specified pipe is set to complete operations and there are current I/O operations queued so that it cannot be changed to queue operations.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000AF<br />STATUS_ILLEGAL_FUNCTION</p>
+ </td>
+ <td>
+ <p>The specified handle is not open to the server end of the named pipe.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B0<br />STATUS_PIPE_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>The specified named pipe is in the disconnected state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B1<br />STATUS_PIPE_CLOSING</p>
+ </td>
+ <td>
+ <p>The specified named pipe is in the closing state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B2<br />STATUS_PIPE_CONNECTED</p>
+ </td>
+ <td>
+ <p>The specified named pipe is in the connected state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B3<br />STATUS_PIPE_LISTENING</p>
+ </td>
+ <td>
+ <p>The specified named pipe is in the listening state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B4<br />STATUS_INVALID_READ_MODE</p>
+ </td>
+ <td>
+ <p>The specified named pipe is not in message mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B5<br />STATUS_IO_TIMEOUT</p>
+ </td>
+ <td>
+ <p>{Device Timeout} The specified I/O operation on %hs was not completed before the time-out period expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B6<br />STATUS_FILE_FORCED_CLOSED</p>
+ </td>
+ <td>
+ <p>The specified file has been closed by another process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B7<br />STATUS_PROFILING_NOT_STARTED</p>
+ </td>
+ <td>
+ <p>Profiling is not started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B8<br />STATUS_PROFILING_NOT_STOPPED</p>
+ </td>
+ <td>
+ <p>Profiling is not stopped.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000B9<br />STATUS_COULD_NOT_INTERPRET</p>
+ </td>
+ <td>
+ <p>The passed ACL did not contain the minimum required information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000BA<br />STATUS_FILE_IS_A_DIRECTORY</p>
+ </td>
+ <td>
+ <p>The file that was specified as a target is a directory, and the caller specified that it could be anything but a directory.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000BB<br />STATUS_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The request is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000BC<br />STATUS_REMOTE_NOT_LISTENING</p>
+ </td>
+ <td>
+ <p>This remote computer is not listening.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000BD<br />STATUS_DUPLICATE_NAME</p>
+ </td>
+ <td>
+ <p>A duplicate name exists on the network.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000BE<br />STATUS_BAD_NETWORK_PATH</p>
+ </td>
+ <td>
+ <p>The network path cannot be located.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000BF<br />STATUS_NETWORK_BUSY</p>
+ </td>
+ <td>
+ <p>The network is busy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C0<br />STATUS_DEVICE_DOES_NOT_EXIST</p>
+ </td>
+ <td>
+ <p>This device does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C1<br />STATUS_TOO_MANY_COMMANDS</p>
+ </td>
+ <td>
+ <p>The network BIOS command limit has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C2<br />STATUS_ADAPTER_HARDWARE_ERROR</p>
+ </td>
+ <td>
+ <p>An I/O adapter hardware error has occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C3<br />STATUS_INVALID_NETWORK_RESPONSE</p>
+ </td>
+ <td>
+ <p>The network responded incorrectly.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C4<br />STATUS_UNEXPECTED_NETWORK_ERROR</p>
+ </td>
+ <td>
+ <p>An unexpected network error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C5<br />STATUS_BAD_REMOTE_ADAPTER</p>
+ </td>
+ <td>
+ <p>The remote adapter is not compatible.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C6<br />STATUS_PRINT_QUEUE_FULL</p>
+ </td>
+ <td>
+ <p>The print queue is full.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C7<br />STATUS_NO_SPOOL_SPACE</p>
+ </td>
+ <td>
+ <p>Space to store the file that is waiting to be printed is not available on the server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C8<br />STATUS_PRINT_CANCELLED</p>
+ </td>
+ <td>
+ <p>The requested print file has been canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000C9<br />STATUS_NETWORK_NAME_DELETED</p>
+ </td>
+ <td>
+ <p>The network name was deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000CA<br />STATUS_NETWORK_ACCESS_DENIED</p>
+ </td>
+ <td>
+ <p>Network access is denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000CB<br />STATUS_BAD_DEVICE_TYPE</p>
+ </td>
+ <td>
+ <p>{Incorrect Network Resource Type} The specified device type (LPT, for example) conflicts with the actual device type on the remote resource.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000CC<br />STATUS_BAD_NETWORK_NAME</p>
+ </td>
+ <td>
+ <p>{Network Name Not Found} The specified share name cannot be found on the remote server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000CD<br />STATUS_TOO_MANY_NAMES</p>
+ </td>
+ <td>
+ <p>The name limit for the network adapter card of the local computer was exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000CE<br />STATUS_TOO_MANY_SESSIONS</p>
+ </td>
+ <td>
+ <p>The network BIOS session limit was exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000CF<br />STATUS_SHARING_PAUSED</p>
+ </td>
+ <td>
+ <p>File sharing has been temporarily paused.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D0<br />STATUS_REQUEST_NOT_ACCEPTED</p>
+ </td>
+ <td>
+ <p>No more connections can be made to this remote computer at this time because the computer has already accepted the maximum number of connections.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D1<br />STATUS_REDIRECTOR_PAUSED</p>
+ </td>
+ <td>
+ <p>Print or disk redirection is temporarily paused.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D2<br />STATUS_NET_WRITE_FAULT</p>
+ </td>
+ <td>
+ <p>A network data fault occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D3<br />STATUS_PROFILING_AT_LIMIT</p>
+ </td>
+ <td>
+ <p>The number of active profiling objects is at the maximum and no more may be started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D4<br />STATUS_NOT_SAME_DEVICE</p>
+ </td>
+ <td>
+ <p>{Incorrect Volume} The destination file of a rename request is located on a different device than the source of the rename request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D5<br />STATUS_FILE_RENAMED</p>
+ </td>
+ <td>
+ <p>The specified file has been renamed and thus cannot be modified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D6<br />STATUS_VIRTUAL_CIRCUIT_CLOSED</p>
+ </td>
+ <td>
+ <p>{Network Request Timeout} The session with a remote server has been disconnected because the time-out interval for a request has expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D7<br />STATUS_NO_SECURITY_ON_OBJECT</p>
+ </td>
+ <td>
+ <p>Indicates an attempt was made to operate on the security of an object that does not have security associated with it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D8<br />STATUS_CANT_WAIT</p>
+ </td>
+ <td>
+ <p>Used to indicate that an operation cannot continue without blocking for I/O.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000D9<br />STATUS_PIPE_EMPTY</p>
+ </td>
+ <td>
+ <p>Used to indicate that a read operation was done on an empty pipe.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000DA<br />STATUS_CANT_ACCESS_DOMAIN_INFO</p>
+ </td>
+ <td>
+ <p>Configuration information could not be read from the domain controller, either because the machine is unavailable or access has been denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000DB<br />STATUS_CANT_TERMINATE_SELF</p>
+ </td>
+ <td>
+ <p>Indicates that a thread attempted to terminate itself by default (called NtTerminateThread with NULL) and it was the last thread in the current process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000DC<br />STATUS_INVALID_SERVER_STATE</p>
+ </td>
+ <td>
+ <p>Indicates the Sam Server was in the wrong state to perform the desired operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000DD<br />STATUS_INVALID_DOMAIN_STATE</p>
+ </td>
+ <td>
+ <p>Indicates the domain was in the wrong state to perform the desired operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000DE<br />STATUS_INVALID_DOMAIN_ROLE</p>
+ </td>
+ <td>
+ <p>This operation is only allowed for the primary domain controller of the domain.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000DF<br />STATUS_NO_SUCH_DOMAIN</p>
+ </td>
+ <td>
+ <p>The specified domain did not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E0<br />STATUS_DOMAIN_EXISTS</p>
+ </td>
+ <td>
+ <p>The specified domain already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E1<br />STATUS_DOMAIN_LIMIT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>An attempt was made to exceed the limit on the number of domains per server for this release.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E2<br />STATUS_OPLOCK_NOT_GRANTED</p>
+ </td>
+ <td>
+ <p>An error status returned when the opportunistic lock (oplock) request is denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E3<br />STATUS_INVALID_OPLOCK_PROTOCOL</p>
+ </td>
+ <td>
+ <p>An error status returned when an invalid opportunistic lock (oplock) acknowledgment is received by a file system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E4<br />STATUS_INTERNAL_DB_CORRUPTION</p>
+ </td>
+ <td>
+ <p>This error indicates that the requested operation cannot be completed due to a catastrophic media failure or an on-disk data structure corruption.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E5<br />STATUS_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An internal error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E6<br />STATUS_GENERIC_NOT_MAPPED</p>
+ </td>
+ <td>
+ <p>Indicates generic access types were contained in an access mask which should already be mapped to non-generic access types.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E7<br />STATUS_BAD_DESCRIPTOR_FORMAT</p>
+ </td>
+ <td>
+ <p>Indicates a security descriptor is not in the necessary format (absolute or self-relative).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E8<br />STATUS_INVALID_USER_BUFFER</p>
+ </td>
+ <td>
+ <p>An access to a user buffer failed at an expected point in time. This code is defined because the caller does not want to accept STATUS_ACCESS_VIOLATION in its filter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000E9<br />STATUS_UNEXPECTED_IO_ERROR</p>
+ </td>
+ <td>
+ <p>If an I/O error that is not defined in the standard FsRtl filter is returned, it is converted to the following error, which is guaranteed to be in the filter. In this case, information is lost; however, the filter correctly handles the exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000EA<br />STATUS_UNEXPECTED_MM_CREATE_ERR</p>
+ </td>
+ <td>
+ <p>If an MM error that is not defined in the standard FsRtl filter is returned, it is converted to one of the following errors, which are guaranteed to be in the filter. In this case, information is lost; however, the filter correctly handles the exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000EB<br />STATUS_UNEXPECTED_MM_MAP_ERROR</p>
+ </td>
+ <td>
+ <p>If an MM error that is not defined in the standard FsRtl filter is returned, it is converted to one of the following errors, which are guaranteed to be in the filter. In this case, information is lost; however, the filter correctly handles the exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000EC<br />STATUS_UNEXPECTED_MM_EXTEND_ERR</p>
+ </td>
+ <td>
+ <p>If an MM error that is not defined in the standard FsRtl filter is returned, it is converted to one of the following errors, which are guaranteed to be in the filter. In this case, information is lost; however, the filter correctly handles the exception.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000ED<br />STATUS_NOT_LOGON_PROCESS</p>
+ </td>
+ <td>
+ <p>The requested action is restricted for use by logon processes only. The calling process has not registered as a logon process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000EE<br />STATUS_LOGON_SESSION_EXISTS</p>
+ </td>
+ <td>
+ <p>An attempt has been made to start a new session manager or LSA logon session by using an ID that is already in use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000EF<br />STATUS_INVALID_PARAMETER_1</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the first argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F0<br />STATUS_INVALID_PARAMETER_2</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the second argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F1<br />STATUS_INVALID_PARAMETER_3</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the third argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F2<br />STATUS_INVALID_PARAMETER_4</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the fourth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F3<br />STATUS_INVALID_PARAMETER_5</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the fifth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F4<br />STATUS_INVALID_PARAMETER_6</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the sixth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F5<br />STATUS_INVALID_PARAMETER_7</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the seventh argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F6<br />STATUS_INVALID_PARAMETER_8</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the eighth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F7<br />STATUS_INVALID_PARAMETER_9</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the ninth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F8<br />STATUS_INVALID_PARAMETER_10</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the tenth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000F9<br />STATUS_INVALID_PARAMETER_11</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the eleventh argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000FA<br />STATUS_INVALID_PARAMETER_12</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a service or function as the twelfth argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000FB<br />STATUS_REDIRECTOR_NOT_STARTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to access a network file, but the network software was not yet started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000FC<br />STATUS_REDIRECTOR_STARTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to start the redirector, but the redirector has already been started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000FD<br />STATUS_STACK_OVERFLOW</p>
+ </td>
+ <td>
+ <p>A new guard page for the stack cannot be created.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000FE<br />STATUS_NO_SUCH_PACKAGE</p>
+ </td>
+ <td>
+ <p>A specified authentication package is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00000FF<br />STATUS_BAD_FUNCTION_TABLE</p>
+ </td>
+ <td>
+ <p>A malformed function table was encountered during an unwind operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000100<br />STATUS_VARIABLE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Indicates the specified environment variable name was not found in the specified environment block.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000101<br />STATUS_DIRECTORY_NOT_EMPTY</p>
+ </td>
+ <td>
+ <p>Indicates that the directory trying to be deleted is not empty.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000102<br />STATUS_FILE_CORRUPT_ERROR</p>
+ </td>
+ <td>
+ <p>{Corrupt File} The file or directory %hs is corrupt and unreadable. Run the Chkdsk utility.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000103<br />STATUS_NOT_A_DIRECTORY</p>
+ </td>
+ <td>
+ <p>A requested opened file is not a directory.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000104<br />STATUS_BAD_LOGON_SESSION_STATE</p>
+ </td>
+ <td>
+ <p>The logon session is not in a state that is consistent with the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000105<br />STATUS_LOGON_SESSION_COLLISION</p>
+ </td>
+ <td>
+ <p>An internal LSA error has occurred. An authentication package has requested the creation of a logon session but the ID of an already existing logon session has been specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000106<br />STATUS_NAME_TOO_LONG</p>
+ </td>
+ <td>
+ <p>A specified name string is too long for its intended use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000107<br />STATUS_FILES_OPEN</p>
+ </td>
+ <td>
+ <p>The user attempted to force close the files on a redirected drive, but there were opened files on the drive, and the user did not specify a sufficient level of force.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000108<br />STATUS_CONNECTION_IN_USE</p>
+ </td>
+ <td>
+ <p>The user attempted to force close the files on a redirected drive, but there were opened directories on the drive, and the user did not specify a sufficient level of force.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000109<br />STATUS_MESSAGE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>RtlFindMessage could not locate the requested message ID in the message table resource.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000010A<br />STATUS_PROCESS_IS_TERMINATING</p>
+ </td>
+ <td>
+ <p>An attempt was made to duplicate an object handle into or out of an exiting process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000010B<br />STATUS_INVALID_LOGON_TYPE</p>
+ </td>
+ <td>
+ <p>Indicates an invalid value has been provided for the LogonType requested.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000010C<br />STATUS_NO_GUID_TRANSLATION</p>
+ </td>
+ <td>
+ <p>Indicates that an attempt was made to assign protection to a file system file or directory and one of the SIDs in the security descriptor could not be translated into a GUID that could be stored by the file system. This causes the protection attempt to fail, which may cause a file creation attempt to fail.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000010D<br />STATUS_CANNOT_IMPERSONATE</p>
+ </td>
+ <td>
+ <p>Indicates that an attempt has been made to impersonate via a named pipe that has not yet been read from.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000010E<br />STATUS_IMAGE_ALREADY_LOADED</p>
+ </td>
+ <td>
+ <p>Indicates that the specified image is already loaded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000117<br />STATUS_NO_LDT</p>
+ </td>
+ <td>
+ <p>Indicates that an attempt was made to change the size of the LDT for a process that has no LDT.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000118<br />STATUS_INVALID_LDT_SIZE</p>
+ </td>
+ <td>
+ <p>Indicates that an attempt was made to grow an LDT by setting its size, or that the size was not an even number of selectors.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000119<br />STATUS_INVALID_LDT_OFFSET</p>
+ </td>
+ <td>
+ <p>Indicates that the starting value for the LDT information was not an integral multiple of the selector size.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000011A<br />STATUS_INVALID_LDT_DESCRIPTOR</p>
+ </td>
+ <td>
+ <p>Indicates that the user supplied an invalid descriptor when trying to set up LDT descriptors.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000011B<br />STATUS_INVALID_IMAGE_NE_FORMAT</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format. It appears to be NE format.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000011C<br />STATUS_RXACT_INVALID_STATE</p>
+ </td>
+ <td>
+ <p>Indicates that the transaction state of a registry subtree is incompatible with the requested operation. For example, a request has been made to start a new transaction with one already in progress, or a request has been made to apply a transaction when one is not currently in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000011D<br />STATUS_RXACT_COMMIT_FAILURE</p>
+ </td>
+ <td>
+ <p>Indicates an error has occurred during a registry transaction commit. The database has been left in an unknown, but probably inconsistent, state. The state of the registry transaction is left as COMMITTING.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000011E<br />STATUS_MAPPED_FILE_SIZE_ZERO</p>
+ </td>
+ <td>
+ <p>An attempt was made to map a file of size zero with the maximum size specified as zero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000011F<br />STATUS_TOO_MANY_OPENED_FILES</p>
+ </td>
+ <td>
+ <p>Too many files are opened on a remote server. This error should only be returned by the Windows redirector on a remote drive.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000120<br />STATUS_CANCELLED</p>
+ </td>
+ <td>
+ <p>The I/O request was canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000121<br />STATUS_CANNOT_DELETE</p>
+ </td>
+ <td>
+ <p>An attempt has been made to remove a file or directory that cannot be deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000122<br />STATUS_INVALID_COMPUTER_NAME</p>
+ </td>
+ <td>
+ <p>Indicates a name that was specified as a remote computer name is syntactically invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000123<br />STATUS_FILE_DELETED</p>
+ </td>
+ <td>
+ <p>An I/O request other than close was performed on a file after it was deleted, which can only happen to a request that did not complete before the last handle was closed via NtClose.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000124<br />STATUS_SPECIAL_ACCOUNT</p>
+ </td>
+ <td>
+ <p>Indicates an operation that is incompatible with built-in accounts has been attempted on a built-in (special) SAM account. For example, built-in accounts cannot be deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000125<br />STATUS_SPECIAL_GROUP</p>
+ </td>
+ <td>
+ <p>The operation requested may not be performed on the specified group because it is a built-in special group.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000126<br />STATUS_SPECIAL_USER</p>
+ </td>
+ <td>
+ <p>The operation requested may not be performed on the specified user because it is a built-in special user.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000127<br />STATUS_MEMBERS_PRIMARY_GROUP</p>
+ </td>
+ <td>
+ <p>Indicates a member cannot be removed from a group because the group is currently the member's primary group.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000128<br />STATUS_FILE_CLOSED</p>
+ </td>
+ <td>
+ <p>An I/O request other than close and several other special case operations was attempted using a file object that had already been closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000129<br />STATUS_TOO_MANY_THREADS</p>
+ </td>
+ <td>
+ <p>Indicates a process has too many threads to perform the requested action. For example, assignment of a primary token may only be performed when a process has zero or one threads.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000012A<br />STATUS_THREAD_NOT_IN_PROCESS</p>
+ </td>
+ <td>
+ <p>An attempt was made to operate on a thread within a specific process, but the specified thread is not in the specified process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000012B<br />STATUS_TOKEN_ALREADY_IN_USE</p>
+ </td>
+ <td>
+ <p>An attempt was made to establish a token for use as a primary token but the token is already in use. A token can only be the primary token of one process at a time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000012C<br />STATUS_PAGEFILE_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The page file quota was exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000012D<br />STATUS_COMMITMENT_LIMIT</p>
+ </td>
+ <td>
+ <p>{Out of Virtual Memory} Your system is low on virtual memory. To ensure that Windows runs correctly, increase the size of your virtual memory paging file. For more information, see Help.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000012E<br />STATUS_INVALID_IMAGE_LE_FORMAT</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format: it appears to be LE format.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000012F<br />STATUS_INVALID_IMAGE_NOT_MZ</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format: it did not have an initial MZ.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000130<br />STATUS_INVALID_IMAGE_PROTECT</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format: it did not have a proper e_lfarlc in the MZ header.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000131<br />STATUS_INVALID_IMAGE_WIN_16</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format: it appears to be a 16-bit Windows image.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000132<br />STATUS_LOGON_SERVER_CONFLICT</p>
+ </td>
+ <td>
+ <p>The Netlogon service cannot start because another Netlogon service running in the domain conflicts with the specified role.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000133<br />STATUS_TIME_DIFFERENCE_AT_DC</p>
+ </td>
+ <td>
+ <p>The time at the primary domain controller is different from the time at the backup domain controller or member server by too large an amount.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000134<br />STATUS_SYNCHRONIZATION_REQUIRED</p>
+ </td>
+ <td>
+ <p>The SAM database on a Windows Server is significantly out of synchronization with the copy on the domain controller. A complete synchronization is required.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000135<br />STATUS_DLL_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Unable To Locate Component} This application has failed to start because %hs was not found. Reinstalling the application may fix this problem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000136<br />STATUS_OPEN_FAILED</p>
+ </td>
+ <td>
+ <p>The NtCreateFile API failed. This error should never be returned to an application; it is a place holder for the Windows LAN Manager Redirector to use in its internal error-mapping routines.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000137<br />STATUS_IO_PRIVILEGE_FAILED</p>
+ </td>
+ <td>
+ <p>{Privilege Failed} The I/O permissions for the process could not be changed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000138<br />STATUS_ORDINAL_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Ordinal Not Found} The ordinal %ld could not be located in the dynamic link library %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000139<br />STATUS_ENTRYPOINT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Entry Point Not Found} The procedure entry point %hs could not be located in the dynamic link library %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000013A<br />STATUS_CONTROL_C_EXIT</p>
+ </td>
+ <td>
+ <p>{Application Exit by CTRL+C} The application terminated as a result of a CTRL+C.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000013B<br />STATUS_LOCAL_DISCONNECT</p>
+ </td>
+ <td>
+ <p>{Virtual Circuit Closed} The network transport on your computer has closed a network connection. There may or may not be I/O requests outstanding.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000013C<br />STATUS_REMOTE_DISCONNECT</p>
+ </td>
+ <td>
+ <p>{Virtual Circuit Closed} The network transport on a remote computer has closed a network connection. There may or may not be I/O requests outstanding.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000013D<br />STATUS_REMOTE_RESOURCES</p>
+ </td>
+ <td>
+ <p>{Insufficient Resources on Remote Computer} The remote computer has insufficient resources to complete the network request. For example, the remote computer may not have enough available memory to carry out the request at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000013E<br />STATUS_LINK_FAILED</p>
+ </td>
+ <td>
+ <p>{Virtual Circuit Closed} An existing connection (virtual circuit) has been broken at the remote computer. There is probably something wrong with the network software protocol or the network hardware on the remote computer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000013F<br />STATUS_LINK_TIMEOUT</p>
+ </td>
+ <td>
+ <p>{Virtual Circuit Closed} The network transport on your computer has closed a network connection because it had to wait too long for a response from the remote computer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000140<br />STATUS_INVALID_CONNECTION</p>
+ </td>
+ <td>
+ <p>The connection handle that was given to the transport was invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000141<br />STATUS_INVALID_ADDRESS</p>
+ </td>
+ <td>
+ <p>The address handle that was given to the transport was invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000142<br />STATUS_DLL_INIT_FAILED</p>
+ </td>
+ <td>
+ <p>{DLL Initialization Failed} Initialization of the dynamic link library %hs failed. The process is terminating abnormally.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000143<br />STATUS_MISSING_SYSTEMFILE</p>
+ </td>
+ <td>
+ <p>{Missing System File} The required system file %hs is bad or missing.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000144<br />STATUS_UNHANDLED_EXCEPTION</p>
+ </td>
+ <td>
+ <p>{Application Error} The exception %s (0x%08lx) occurred in the application at location 0x%08lx.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000145<br />STATUS_APP_INIT_FAILURE</p>
+ </td>
+ <td>
+ <p>{Application Error} The application failed to initialize properly (0x%lx). Click OK to terminate the application.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000146<br />STATUS_PAGEFILE_CREATE_FAILED</p>
+ </td>
+ <td>
+ <p>{Unable to Create Paging File} The creation of the paging file %hs failed (%lx). The requested size was %ld.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000147<br />STATUS_NO_PAGEFILE</p>
+ </td>
+ <td>
+ <p>{No Paging File Specified} No paging file was specified in the system configuration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000148<br />STATUS_INVALID_LEVEL</p>
+ </td>
+ <td>
+ <p>{Incorrect System Call Level} An invalid level was passed into the specified system call.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000149<br />STATUS_WRONG_PASSWORD_CORE</p>
+ </td>
+ <td>
+ <p>{Incorrect Password to LAN Manager Server} You specified an incorrect password to a LAN Manager 2.x or MS-NET server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000014A<br />STATUS_ILLEGAL_FLOAT_CONTEXT</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} A real-mode application issued a floating-point instruction and floating-point hardware is not present.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000014B<br />STATUS_PIPE_BROKEN</p>
+ </td>
+ <td>
+ <p>The pipe operation has failed because the other end of the pipe has been closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000014C<br />STATUS_REGISTRY_CORRUPT</p>
+ </td>
+ <td>
+ <p>{The Registry Is Corrupt} The structure of one of the files that contains registry data is corrupt; the image of the file in memory is corrupt; or the file could not be recovered because the alternate copy or log was absent or corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000014D<br />STATUS_REGISTRY_IO_FAILED</p>
+ </td>
+ <td>
+ <p>An I/O operation initiated by the Registry failed and cannot be recovered. The registry could not read in, write out, or flush one of the files that contain the system's image of the registry.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000014E<br />STATUS_NO_EVENT_PAIR</p>
+ </td>
+ <td>
+ <p>An event pair synchronization operation was performed using the thread-specific client/server event pair object, but no event pair object was associated with the thread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000014F<br />STATUS_UNRECOGNIZED_VOLUME</p>
+ </td>
+ <td>
+ <p>The volume does not contain a recognized file system. Be sure that all required file system drivers are loaded and that the volume is not corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000150<br />STATUS_SERIAL_NO_DEVICE_INITED</p>
+ </td>
+ <td>
+ <p>No serial device was successfully initialized. The serial driver will unload.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000151<br />STATUS_NO_SUCH_ALIAS</p>
+ </td>
+ <td>
+ <p>The specified local group does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000152<br />STATUS_MEMBER_NOT_IN_ALIAS</p>
+ </td>
+ <td>
+ <p>The specified account name is not a member of the group.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000153<br />STATUS_MEMBER_IN_ALIAS</p>
+ </td>
+ <td>
+ <p>The specified account name is already a member of the group.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000154<br />STATUS_ALIAS_EXISTS</p>
+ </td>
+ <td>
+ <p>The specified local group already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000155<br />STATUS_LOGON_NOT_GRANTED</p>
+ </td>
+ <td>
+ <p>A requested type of logon (for example, interactive, network, and service) is not granted by the local security policy of the target system. Ask the system administrator to grant the necessary form of logon.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000156<br />STATUS_TOO_MANY_SECRETS</p>
+ </td>
+ <td>
+ <p>The maximum number of secrets that may be stored in a single system was exceeded. The length and number of secrets is limited to satisfy U.S. State Department export restrictions.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000157<br />STATUS_SECRET_TOO_LONG</p>
+ </td>
+ <td>
+ <p>The length of a secret exceeds the maximum allowable length. The length and number of secrets is limited to satisfy U.S. State Department export restrictions.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000158<br />STATUS_INTERNAL_DB_ERROR</p>
+ </td>
+ <td>
+ <p>The local security authority (LSA) database contains an internal inconsistency.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000159<br />STATUS_FULLSCREEN_MODE</p>
+ </td>
+ <td>
+ <p>The requested operation cannot be performed in full-screen mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000015A<br />STATUS_TOO_MANY_CONTEXT_IDS</p>
+ </td>
+ <td>
+ <p>During a logon attempt, the user's security context accumulated too many security IDs. This is a very unusual situation. Remove the user from some global or local groups to reduce the number of security IDs to incorporate into the security context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000015B<br />STATUS_LOGON_TYPE_NOT_GRANTED</p>
+ </td>
+ <td>
+ <p>A user has requested a type of logon (for example, interactive or network) that has not been granted. An administrator has control over who may logon interactively and through the network.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000015C<br />STATUS_NOT_REGISTRY_FILE</p>
+ </td>
+ <td>
+ <p>The system has attempted to load or restore a file into the registry, and the specified file is not in the format of a registry file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000015D<br />STATUS_NT_CROSS_ENCRYPTION_REQUIRED</p>
+ </td>
+ <td>
+ <p>An attempt was made to change a user password in the security account manager without providing the necessary Windows cross-encrypted password.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000015E<br />STATUS_DOMAIN_CTRLR_CONFIG_ERROR</p>
+ </td>
+ <td>
+ <p>A Windows Server has an incorrect configuration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000015F<br />STATUS_FT_MISSING_MEMBER</p>
+ </td>
+ <td>
+ <p>An attempt was made to explicitly access the secondary copy of information via a device control to the fault tolerance driver and the secondary copy is not present in the system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000160<br />STATUS_ILL_FORMED_SERVICE_ENTRY</p>
+ </td>
+ <td>
+ <p>A configuration registry node that represents a driver service entry was ill-formed and did not contain the required value entries.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000161<br />STATUS_ILLEGAL_CHARACTER</p>
+ </td>
+ <td>
+ <p>An illegal character was encountered. For a multibyte character set, this includes a lead byte without a succeeding trail byte. For the Unicode character set this includes the characters 0xFFFF and 0xFFFE.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000162<br />STATUS_UNMAPPABLE_CHARACTER</p>
+ </td>
+ <td>
+ <p>No mapping for the Unicode character exists in the target multibyte code page.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000163<br />STATUS_UNDEFINED_CHARACTER</p>
+ </td>
+ <td>
+ <p>The Unicode character is not defined in the Unicode character set that is installed on the system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000164<br />STATUS_FLOPPY_VOLUME</p>
+ </td>
+ <td>
+ <p>The paging file cannot be created on a floppy disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000165<br />STATUS_FLOPPY_ID_MARK_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Floppy Disk Error} While accessing a floppy disk, an ID address mark was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000166<br />STATUS_FLOPPY_WRONG_CYLINDER</p>
+ </td>
+ <td>
+ <p>{Floppy Disk Error} While accessing a floppy disk, the track address from the sector ID field was found to be different from the track address that is maintained by the controller.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000167<br />STATUS_FLOPPY_UNKNOWN_ERROR</p>
+ </td>
+ <td>
+ <p>{Floppy Disk Error} The floppy disk controller reported an error that is not recognized by the floppy disk driver.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000168<br />STATUS_FLOPPY_BAD_REGISTERS</p>
+ </td>
+ <td>
+ <p>{Floppy Disk Error} While accessing a floppy-disk, the controller returned inconsistent results via its registers.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000169<br />STATUS_DISK_RECALIBRATE_FAILED</p>
+ </td>
+ <td>
+ <p>{Hard Disk Error} While accessing the hard disk, a recalibrate operation failed, even after retries.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000016A<br />STATUS_DISK_OPERATION_FAILED</p>
+ </td>
+ <td>
+ <p>{Hard Disk Error} While accessing the hard disk, a disk operation failed even after retries.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000016B<br />STATUS_DISK_RESET_FAILED</p>
+ </td>
+ <td>
+ <p>{Hard Disk Error} While accessing the hard disk, a disk controller reset was needed, but even that failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000016C<br />STATUS_SHARED_IRQ_BUSY</p>
+ </td>
+ <td>
+ <p>An attempt was made to open a device that was sharing an interrupt request (IRQ) with other devices. At least one other device that uses that IRQ was already opened. Two concurrent opens of devices that share an IRQ and only work via interrupts is not supported for the particular bus type that the devices use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000016D<br />STATUS_FT_ORPHANING</p>
+ </td>
+ <td>
+ <p>{FT Orphaning} A disk that is part of a fault-tolerant volume can no longer be accessed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000016E<br />STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT</p>
+ </td>
+ <td>
+ <p>The basic input/output system (BIOS) failed to connect a system interrupt to the device or bus for which the device is connected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000172<br />STATUS_PARTITION_FAILURE</p>
+ </td>
+ <td>
+ <p>The tape could not be partitioned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000173<br />STATUS_INVALID_BLOCK_LENGTH</p>
+ </td>
+ <td>
+ <p>When accessing a new tape of a multi-volume partition, the current blocksize is incorrect.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000174<br />STATUS_DEVICE_NOT_PARTITIONED</p>
+ </td>
+ <td>
+ <p>The tape partition information could not be found when loading a tape.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000175<br />STATUS_UNABLE_TO_LOCK_MEDIA</p>
+ </td>
+ <td>
+ <p>An attempt to lock the eject media mechanism failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000176<br />STATUS_UNABLE_TO_UNLOAD_MEDIA</p>
+ </td>
+ <td>
+ <p>An attempt to unload media failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000177<br />STATUS_EOM_OVERFLOW</p>
+ </td>
+ <td>
+ <p>The physical end of tape was detected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000178<br />STATUS_NO_MEDIA</p>
+ </td>
+ <td>
+ <p>{No Media} There is no media in the drive. Insert media into drive %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000017A<br />STATUS_NO_SUCH_MEMBER</p>
+ </td>
+ <td>
+ <p>A member could not be added to or removed from the local group because the member does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000017B<br />STATUS_INVALID_MEMBER</p>
+ </td>
+ <td>
+ <p>A new member could not be added to a local group because the member has the wrong account type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000017C<br />STATUS_KEY_DELETED</p>
+ </td>
+ <td>
+ <p>An illegal operation was attempted on a registry key that has been marked for deletion.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000017D<br />STATUS_NO_LOG_SPACE</p>
+ </td>
+ <td>
+ <p>The system could not allocate the required space in a registry log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000017E<br />STATUS_TOO_MANY_SIDS</p>
+ </td>
+ <td>
+ <p>Too many SIDs have been specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000017F<br />STATUS_LM_CROSS_ENCRYPTION_REQUIRED</p>
+ </td>
+ <td>
+ <p>An attempt was made to change a user password in the security account manager without providing the necessary LM cross-encrypted password.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000180<br />STATUS_KEY_HAS_CHILDREN</p>
+ </td>
+ <td>
+ <p>An attempt was made to create a symbolic link in a registry key that already has subkeys or values.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000181<br />STATUS_CHILD_MUST_BE_VOLATILE</p>
+ </td>
+ <td>
+ <p>An attempt was made to create a stable subkey under a volatile parent key.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000182<br />STATUS_DEVICE_CONFIGURATION_ERROR</p>
+ </td>
+ <td>
+ <p>The I/O device is configured incorrectly or the configuration parameters to the driver are incorrect.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000183<br />STATUS_DRIVER_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An error was detected between two drivers or within an I/O driver.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000184<br />STATUS_INVALID_DEVICE_STATE</p>
+ </td>
+ <td>
+ <p>The device is not in a valid state to perform this request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000185<br />STATUS_IO_DEVICE_ERROR</p>
+ </td>
+ <td>
+ <p>The I/O device reported an I/O error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000186<br />STATUS_DEVICE_PROTOCOL_ERROR</p>
+ </td>
+ <td>
+ <p>A protocol error was detected between the driver and the device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000187<br />STATUS_BACKUP_CONTROLLER</p>
+ </td>
+ <td>
+ <p>This operation is only allowed for the primary domain controller of the domain.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000188<br />STATUS_LOG_FILE_FULL</p>
+ </td>
+ <td>
+ <p>The log file space is insufficient to support this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000189<br />STATUS_TOO_LATE</p>
+ </td>
+ <td>
+ <p>A write operation was attempted to a volume after it was dismounted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000018A<br />STATUS_NO_TRUST_LSA_SECRET</p>
+ </td>
+ <td>
+ <p>The workstation does not have a trust secret for the primary domain in the local LSA database.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000018B<br />STATUS_NO_TRUST_SAM_ACCOUNT</p>
+ </td>
+ <td>
+ <p>The SAM database on the Windows Server does not have a computer account for this workstation trust relationship.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000018C<br />STATUS_TRUSTED_DOMAIN_FAILURE</p>
+ </td>
+ <td>
+ <p>The logon request failed because the trust relationship between the primary domain and the trusted domain failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000018D<br />STATUS_TRUSTED_RELATIONSHIP_FAILURE</p>
+ </td>
+ <td>
+ <p>The logon request failed because the trust relationship between this workstation and the primary domain failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000018E<br />STATUS_EVENTLOG_FILE_CORRUPT</p>
+ </td>
+ <td>
+ <p>The Eventlog log file is corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000018F<br />STATUS_EVENTLOG_CANT_START</p>
+ </td>
+ <td>
+ <p>No Eventlog log file could be opened. The Eventlog service did not start.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000190<br />STATUS_TRUST_FAILURE</p>
+ </td>
+ <td>
+ <p>The network logon failed. This may be because the validation authority cannot be reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000191<br />STATUS_MUTANT_LIMIT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>An attempt was made to acquire a mutant such that its maximum count would have been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000192<br />STATUS_NETLOGON_NOT_STARTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to logon, but the NetLogon service was not started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000193<br />STATUS_ACCOUNT_EXPIRED</p>
+ </td>
+ <td>
+ <p>The user account has expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000194<br />STATUS_POSSIBLE_DEADLOCK</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Possible deadlock condition.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000195<br />STATUS_NETWORK_CREDENTIAL_CONFLICT</p>
+ </td>
+ <td>
+ <p>Multiple connections to a server or shared resource by the same user, using more than one user name, are not allowed. Disconnect all previous connections to the server or shared resource and try again.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000196<br />STATUS_REMOTE_SESSION_LIMIT</p>
+ </td>
+ <td>
+ <p>An attempt was made to establish a session to a network server, but there are already too many sessions established to that server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000197<br />STATUS_EVENTLOG_FILE_CHANGED</p>
+ </td>
+ <td>
+ <p>The log file has changed between reads.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000198<br />STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT</p>
+ </td>
+ <td>
+ <p>The account used is an interdomain trust account. Use your global user account or local user account to access this server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000199<br />STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT</p>
+ </td>
+ <td>
+ <p>The account used is a computer account. Use your global user account or local user account to access this server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000019A<br />STATUS_NOLOGON_SERVER_TRUST_ACCOUNT</p>
+ </td>
+ <td>
+ <p>The account used is a server trust account. Use your global user account or local user account to access this server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000019B<br />STATUS_DOMAIN_TRUST_INCONSISTENT</p>
+ </td>
+ <td>
+ <p>The name or SID of the specified domain is inconsistent with the trust information for that domain.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000019C<br />STATUS_FS_DRIVER_REQUIRED</p>
+ </td>
+ <td>
+ <p>A volume has been accessed for which a file system driver is required that has not yet been loaded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000019D<br />STATUS_IMAGE_ALREADY_LOADED_AS_DLL</p>
+ </td>
+ <td>
+ <p>Indicates that the specified image is already loaded as a DLL.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000019E<br />STATUS_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING</p>
+ </td>
+ <td>
+ <p>Short name settings may not be changed on this volume due to the global registry setting.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000019F<br />STATUS_SHORT_NAMES_NOT_ENABLED_ON_VOLUME</p>
+ </td>
+ <td>
+ <p>Short names are not enabled on this volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00001A0<br />STATUS_SECURITY_STREAM_IS_INCONSISTENT</p>
+ </td>
+ <td>
+ <p>The security stream for the given volume is in an inconsistent state. Please run CHKDSK on the volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00001A1<br />STATUS_INVALID_LOCK_RANGE</p>
+ </td>
+ <td>
+ <p>A requested file lock operation cannot be processed due to an invalid byte range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00001A2<br />STATUS_INVALID_ACE_CONDITION</p>
+ </td>
+ <td>
+ <p>The specified access control entry (ACE) contains an invalid condition.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00001A3<br />STATUS_IMAGE_SUBSYSTEM_NOT_PRESENT</p>
+ </td>
+ <td>
+ <p>The subsystem needed to support the image type is not present.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00001A4<br />STATUS_NOTIFICATION_GUID_ALREADY_DEFINED</p>
+ </td>
+ <td>
+ <p>The specified file already has a notification GUID associated with it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000201<br />STATUS_NETWORK_OPEN_RESTRICTION</p>
+ </td>
+ <td>
+ <p>A remote open failed because the network open restrictions were not satisfied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000202<br />STATUS_NO_USER_SESSION_KEY</p>
+ </td>
+ <td>
+ <p>There is no user session key for the specified logon session.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000203<br />STATUS_USER_SESSION_DELETED</p>
+ </td>
+ <td>
+ <p>The remote user session has been deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000204<br />STATUS_RESOURCE_LANG_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Indicates the specified resource language ID cannot be found in the image file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000205<br />STATUS_INSUFF_SERVER_RESOURCES</p>
+ </td>
+ <td>
+ <p>Insufficient server resources exist to complete the request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000206<br />STATUS_INVALID_BUFFER_SIZE</p>
+ </td>
+ <td>
+ <p>The size of the buffer is invalid for the specified operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000207<br />STATUS_INVALID_ADDRESS_COMPONENT</p>
+ </td>
+ <td>
+ <p>The transport rejected the specified network address as invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000208<br />STATUS_INVALID_ADDRESS_WILDCARD</p>
+ </td>
+ <td>
+ <p>The transport rejected the specified network address due to invalid use of a wildcard.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000209<br />STATUS_TOO_MANY_ADDRESSES</p>
+ </td>
+ <td>
+ <p>The transport address could not be opened because all the available addresses are in use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000020A<br />STATUS_ADDRESS_ALREADY_EXISTS</p>
+ </td>
+ <td>
+ <p>The transport address could not be opened because it already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000020B<br />STATUS_ADDRESS_CLOSED</p>
+ </td>
+ <td>
+ <p>The transport address is now closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000020C<br />STATUS_CONNECTION_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>The transport connection is now disconnected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000020D<br />STATUS_CONNECTION_RESET</p>
+ </td>
+ <td>
+ <p>The transport connection has been reset.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000020E<br />STATUS_TOO_MANY_NODES</p>
+ </td>
+ <td>
+ <p>The transport cannot dynamically acquire any more nodes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000020F<br />STATUS_TRANSACTION_ABORTED</p>
+ </td>
+ <td>
+ <p>The transport aborted a pending transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000210<br />STATUS_TRANSACTION_TIMED_OUT</p>
+ </td>
+ <td>
+ <p>The transport timed out a request that is waiting for a response.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000211<br />STATUS_TRANSACTION_NO_RELEASE</p>
+ </td>
+ <td>
+ <p>The transport did not receive a release for a pending response.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000212<br />STATUS_TRANSACTION_NO_MATCH</p>
+ </td>
+ <td>
+ <p>The transport did not find a transaction that matches the specific token.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000213<br />STATUS_TRANSACTION_RESPONDED</p>
+ </td>
+ <td>
+ <p>The transport had previously responded to a transaction request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000214<br />STATUS_TRANSACTION_INVALID_ID</p>
+ </td>
+ <td>
+ <p>The transport does not recognize the specified transaction request ID.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000215<br />STATUS_TRANSACTION_INVALID_TYPE</p>
+ </td>
+ <td>
+ <p>The transport does not recognize the specified transaction request type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000216<br />STATUS_NOT_SERVER_SESSION</p>
+ </td>
+ <td>
+ <p>The transport can only process the specified request on the server side of a session.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000217<br />STATUS_NOT_CLIENT_SESSION</p>
+ </td>
+ <td>
+ <p>The transport can only process the specified request on the client side of a session.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000218<br />STATUS_CANNOT_LOAD_REGISTRY_FILE</p>
+ </td>
+ <td>
+ <p>{Registry File Failure} The registry cannot load the hive (file): %hs or its log or alternate. It is corrupt, absent, or not writable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000219<br />STATUS_DEBUG_ATTACH_FAILED</p>
+ </td>
+ <td>
+ <p>{Unexpected Failure in DebugActiveProcess} An unexpected failure occurred while processing a DebugActiveProcess API request. You may choose OK to terminate the process, or Cancel to ignore the error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000021A<br />STATUS_SYSTEM_PROCESS_TERMINATED</p>
+ </td>
+ <td>
+ <p>{Fatal System Error} The %hs system process terminated unexpectedly with a status of 0x%08x (0x%08x 0x%08x). The system has been shut down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000021B<br />STATUS_DATA_NOT_ACCEPTED</p>
+ </td>
+ <td>
+ <p>{Data Not Accepted} The TDI client could not handle the data received during an indication.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000021C<br />STATUS_NO_BROWSER_SERVERS_FOUND</p>
+ </td>
+ <td>
+ <p>{Unable to Retrieve Browser Server List} The list of servers for this workgroup is not currently available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000021D<br />STATUS_VDM_HARD_ERROR</p>
+ </td>
+ <td>
+ <p>NTVDM encountered a hard error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000021E<br />STATUS_DRIVER_CANCEL_TIMEOUT</p>
+ </td>
+ <td>
+ <p>{Cancel Timeout} The driver %hs failed to complete a canceled I/O request in the allotted time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000021F<br />STATUS_REPLY_MESSAGE_MISMATCH</p>
+ </td>
+ <td>
+ <p>{Reply Message Mismatch} An attempt was made to reply to an LPC message, but the thread specified by the client ID in the message was not waiting on that message.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000220<br />STATUS_MAPPED_ALIGNMENT</p>
+ </td>
+ <td>
+ <p>{Mapped View Alignment Incorrect} An attempt was made to map a view of a file, but either the specified base address or the offset into the file were not aligned on the proper allocation granularity.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000221<br />STATUS_IMAGE_CHECKSUM_MISMATCH</p>
+ </td>
+ <td>
+ <p>{Bad Image Checksum} The image %hs is possibly corrupt. The header checksum does not match the computed checksum.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000222<br />STATUS_LOST_WRITEBEHIND_DATA</p>
+ </td>
+ <td>
+ <p>{Delayed Write Failed} Windows was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Try to save this file elsewhere.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000223<br />STATUS_CLIENT_SERVER_PARAMETERS_INVALID</p>
+ </td>
+ <td>
+ <p>The parameters passed to the server in the client/server shared memory window were invalid. Too much data may have been put in the shared memory window.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000224<br />STATUS_PASSWORD_MUST_CHANGE</p>
+ </td>
+ <td>
+ <p>The user password must be changed before logging on the first time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000225<br />STATUS_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The object was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000226<br />STATUS_NOT_TINY_STREAM</p>
+ </td>
+ <td>
+ <p>The stream is not a tiny stream.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000227<br />STATUS_RECOVERY_FAILURE</p>
+ </td>
+ <td>
+ <p>A transaction recovery failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000228<br />STATUS_STACK_OVERFLOW_READ</p>
+ </td>
+ <td>
+ <p>The request must be handled by the stack overflow code.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000229<br />STATUS_FAIL_CHECK</p>
+ </td>
+ <td>
+ <p>A consistency check failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000022A<br />STATUS_DUPLICATE_OBJECTID</p>
+ </td>
+ <td>
+ <p>The attempt to insert the ID in the index failed because the ID is already in the index.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000022B<br />STATUS_OBJECTID_EXISTS</p>
+ </td>
+ <td>
+ <p>The attempt to set the object ID failed because the object already has an ID.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000022C<br />STATUS_CONVERT_TO_LARGE</p>
+ </td>
+ <td>
+ <p>Internal OFS status codes indicating how an allocation operation is handled. Either it is retried after the containing oNode is moved or the extent stream is converted to a large stream.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000022D<br />STATUS_RETRY</p>
+ </td>
+ <td>
+ <p>The request needs to be retried.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000022E<br />STATUS_FOUND_OUT_OF_SCOPE</p>
+ </td>
+ <td>
+ <p>The attempt to find the object found an object on the volume that matches by ID; however, it is out of the scope of the handle that is used for the operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000022F<br />STATUS_ALLOCATE_BUCKET</p>
+ </td>
+ <td>
+ <p>The bucket array must be grown. Retry the transaction after doing so.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000230<br />STATUS_PROPSET_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified property set does not exist on the object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000231<br />STATUS_MARSHALL_OVERFLOW</p>
+ </td>
+ <td>
+ <p>The user/kernel marshaling buffer has overflowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000232<br />STATUS_INVALID_VARIANT</p>
+ </td>
+ <td>
+ <p>The supplied variant structure contains invalid data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000233<br />STATUS_DOMAIN_CONTROLLER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>A domain controller for this domain was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000234<br />STATUS_ACCOUNT_LOCKED_OUT</p>
+ </td>
+ <td>
+ <p>The user account has been automatically locked because too many invalid logon attempts or password change attempts have been requested.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000235<br />STATUS_HANDLE_NOT_CLOSABLE</p>
+ </td>
+ <td>
+ <p>NtClose was called on a handle that was protected from close via NtSetInformationObject.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000236<br />STATUS_CONNECTION_REFUSED</p>
+ </td>
+ <td>
+ <p>The transport-connection attempt was refused by the remote system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000237<br />STATUS_GRACEFUL_DISCONNECT</p>
+ </td>
+ <td>
+ <p>The transport connection was gracefully closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000238<br />STATUS_ADDRESS_ALREADY_ASSOCIATED</p>
+ </td>
+ <td>
+ <p>The transport endpoint already has an address associated with it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000239<br />STATUS_ADDRESS_NOT_ASSOCIATED</p>
+ </td>
+ <td>
+ <p>An address has not yet been associated with the transport endpoint.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000023A<br />STATUS_CONNECTION_INVALID</p>
+ </td>
+ <td>
+ <p>An operation was attempted on a nonexistent transport connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000023B<br />STATUS_CONNECTION_ACTIVE</p>
+ </td>
+ <td>
+ <p>An invalid operation was attempted on an active transport connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000023C<br />STATUS_NETWORK_UNREACHABLE</p>
+ </td>
+ <td>
+ <p>The remote network is not reachable by the transport.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000023D<br />STATUS_HOST_UNREACHABLE</p>
+ </td>
+ <td>
+ <p>The remote system is not reachable by the transport.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000023E<br />STATUS_PROTOCOL_UNREACHABLE</p>
+ </td>
+ <td>
+ <p>The remote system does not support the transport protocol.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000023F<br />STATUS_PORT_UNREACHABLE</p>
+ </td>
+ <td>
+ <p>No service is operating at the destination port of the transport on the remote system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000240<br />STATUS_REQUEST_ABORTED</p>
+ </td>
+ <td>
+ <p>The request was aborted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000241<br />STATUS_CONNECTION_ABORTED</p>
+ </td>
+ <td>
+ <p>The transport connection was aborted by the local system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000242<br />STATUS_BAD_COMPRESSION_BUFFER</p>
+ </td>
+ <td>
+ <p>The specified buffer contains ill-formed data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000243<br />STATUS_USER_MAPPED_FILE</p>
+ </td>
+ <td>
+ <p>The requested operation cannot be performed on a file with a user mapped section open.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000244<br />STATUS_AUDIT_FAILED</p>
+ </td>
+ <td>
+ <p>{Audit Failed} An attempt to generate a security audit failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000245<br />STATUS_TIMER_RESOLUTION_NOT_SET</p>
+ </td>
+ <td>
+ <p>The timer resolution was not previously set by the current process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000246<br />STATUS_CONNECTION_COUNT_LIMIT</p>
+ </td>
+ <td>
+ <p>A connection to the server could not be made because the limit on the number of concurrent connections for this account has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000247<br />STATUS_LOGIN_TIME_RESTRICTION</p>
+ </td>
+ <td>
+ <p>Attempting to log on during an unauthorized time of day for this account.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000248<br />STATUS_LOGIN_WKSTA_RESTRICTION</p>
+ </td>
+ <td>
+ <p>The account is not authorized to log on from this station.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000249<br />STATUS_IMAGE_MP_UP_MISMATCH</p>
+ </td>
+ <td>
+ <p>{UP/MP Image Mismatch} The image %hs has been modified for use on a uniprocessor system, but you are running it on a multiprocessor machine. Reinstall the image file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000250<br />STATUS_INSUFFICIENT_LOGON_INFO</p>
+ </td>
+ <td>
+ <p>There is insufficient account information to log you on.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000251<br />STATUS_BAD_DLL_ENTRYPOINT</p>
+ </td>
+ <td>
+ <p>{Invalid DLL Entrypoint} The dynamic link library %hs is not written correctly. The stack pointer has been left in an inconsistent state. The entry point should be declared as WINAPI or STDCALL. Select YES to fail the DLL load. Select NO to continue execution. Selecting NO may cause the application to operate incorrectly.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000252<br />STATUS_BAD_SERVICE_ENTRYPOINT</p>
+ </td>
+ <td>
+ <p>{Invalid Service Callback Entrypoint} The %hs service is not written correctly. The stack pointer has been left in an inconsistent state. The callback entry point should be declared as WINAPI or STDCALL. Selecting OK will cause the service to continue operation. However, the service process may operate incorrectly.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000253<br />STATUS_LPC_REPLY_LOST</p>
+ </td>
+ <td>
+ <p>The server received the messages but did not send a reply.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000254<br />STATUS_IP_ADDRESS_CONFLICT1</p>
+ </td>
+ <td>
+ <p>There is an IP address conflict with another system on the network.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000255<br />STATUS_IP_ADDRESS_CONFLICT2</p>
+ </td>
+ <td>
+ <p>There is an IP address conflict with another system on the network.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000256<br />STATUS_REGISTRY_QUOTA_LIMIT</p>
+ </td>
+ <td>
+ <p>{Low On Registry Space} The system has reached the maximum size that is allowed for the system part of the registry. Additional storage requests will be ignored.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000257<br />STATUS_PATH_NOT_COVERED</p>
+ </td>
+ <td>
+ <p>The contacted server does not support the indicated part of the DFS namespace.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000258<br />STATUS_NO_CALLBACK_ACTIVE</p>
+ </td>
+ <td>
+ <p>A callback return system service cannot be executed when no callback is active.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000259<br />STATUS_LICENSE_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The service being accessed is licensed for a particular number of connections. No more connections can be made to the service at this time because the service has already accepted the maximum number of connections.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000025A<br />STATUS_PWD_TOO_SHORT</p>
+ </td>
+ <td>
+ <p>The password provided is too short to meet the policy of your user account. Choose a longer password.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000025B<br />STATUS_PWD_TOO_RECENT</p>
+ </td>
+ <td>
+ <p>The policy of your user account does not allow you to change passwords too frequently. This is done to prevent users from changing back to a familiar, but potentially discovered, password. If you feel your password has been compromised, contact your administrator immediately to have a new one assigned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000025C<br />STATUS_PWD_HISTORY_CONFLICT</p>
+ </td>
+ <td>
+ <p>You have attempted to change your password to one that you have used in the past. The policy of your user account does not allow this. Select a password that you have not previously used.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000025E<br />STATUS_PLUGPLAY_NO_DEVICE</p>
+ </td>
+ <td>
+ <p>You have attempted to load a legacy device driver while its device instance had been disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000025F<br />STATUS_UNSUPPORTED_COMPRESSION</p>
+ </td>
+ <td>
+ <p>The specified compression format is unsupported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000260<br />STATUS_INVALID_HW_PROFILE</p>
+ </td>
+ <td>
+ <p>The specified hardware profile configuration is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000261<br />STATUS_INVALID_PLUGPLAY_DEVICE_PATH</p>
+ </td>
+ <td>
+ <p>The specified Plug and Play registry device path is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000262<br />STATUS_DRIVER_ORDINAL_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Driver Entry Point Not Found} The %hs device driver could not locate the ordinal %ld in driver %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000263<br />STATUS_DRIVER_ENTRYPOINT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>{Driver Entry Point Not Found} The %hs device driver could not locate the entry point %hs in driver %hs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000264<br />STATUS_RESOURCE_NOT_OWNED</p>
+ </td>
+ <td>
+ <p>{Application Error} The application attempted to release a resource it did not own. Click OK to terminate the application.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000265<br />STATUS_TOO_MANY_LINKS</p>
+ </td>
+ <td>
+ <p>An attempt was made to create more links on a file than the file system supports.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000266<br />STATUS_QUOTA_LIST_INCONSISTENT</p>
+ </td>
+ <td>
+ <p>The specified quota list is internally inconsistent with its descriptor.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000267<br />STATUS_FILE_IS_OFFLINE</p>
+ </td>
+ <td>
+ <p>The specified file has been relocated to offline storage.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000268<br />STATUS_EVALUATION_EXPIRATION</p>
+ </td>
+ <td>
+ <p>{Windows Evaluation Notification} The evaluation period for this installation of Windows has expired. This system will shutdown in 1 hour. To restore access to this installation of Windows, upgrade this installation by using a licensed distribution of this product.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000269<br />STATUS_ILLEGAL_DLL_RELOCATION</p>
+ </td>
+ <td>
+ <p>{Illegal System DLL Relocation} The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range that is reserved for Windows system DLLs. The vendor supplying the DLL should be contacted for a new DLL.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000026A<br />STATUS_LICENSE_VIOLATION</p>
+ </td>
+ <td>
+ <p>{License Violation} The system has detected tampering with your registered product type. This is a violation of your software license. Tampering with the product type is not permitted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000026B<br />STATUS_DLL_INIT_FAILED_LOGOFF</p>
+ </td>
+ <td>
+ <p>{DLL Initialization Failed} The application failed to initialize because the window station is shutting down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000026C<br />STATUS_DRIVER_UNABLE_TO_LOAD</p>
+ </td>
+ <td>
+ <p>{Unable to Load Device Driver} %hs device driver could not be loaded. Error Status was 0x%x.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000026D<br />STATUS_DFS_UNAVAILABLE</p>
+ </td>
+ <td>
+ <p>DFS is unavailable on the contacted server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000026E<br />STATUS_VOLUME_DISMOUNTED</p>
+ </td>
+ <td>
+ <p>An operation was attempted to a volume after it was dismounted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000026F<br />STATUS_WX86_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An internal error occurred in the Win32 x86 emulation subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000270<br />STATUS_WX86_FLOAT_STACK_CHECK</p>
+ </td>
+ <td>
+ <p>Win32 x86 emulation subsystem floating-point stack check.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000271<br />STATUS_VALIDATE_CONTINUE</p>
+ </td>
+ <td>
+ <p>The validation process needs to continue on to the next step.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000272<br />STATUS_NO_MATCH</p>
+ </td>
+ <td>
+ <p>There was no match for the specified key in the index.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000273<br />STATUS_NO_MORE_MATCHES</p>
+ </td>
+ <td>
+ <p>There are no more matches for the current index enumeration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000275<br />STATUS_NOT_A_REPARSE_POINT</p>
+ </td>
+ <td>
+ <p>The NTFS file or directory is not a reparse point.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000276<br />STATUS_IO_REPARSE_TAG_INVALID</p>
+ </td>
+ <td>
+ <p>The Windows I/O reparse tag passed for the NTFS reparse point is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000277<br />STATUS_IO_REPARSE_TAG_MISMATCH</p>
+ </td>
+ <td>
+ <p>The Windows I/O reparse tag does not match the one that is in the NTFS reparse point.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000278<br />STATUS_IO_REPARSE_DATA_INVALID</p>
+ </td>
+ <td>
+ <p>The user data passed for the NTFS reparse point is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000279<br />STATUS_IO_REPARSE_TAG_NOT_HANDLED</p>
+ </td>
+ <td>
+ <p>The layered file system driver for this I/O tag did not handle it when needed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000280<br />STATUS_REPARSE_POINT_NOT_RESOLVED</p>
+ </td>
+ <td>
+ <p>The NTFS symbolic link could not be resolved even though the initial file name is valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000281<br />STATUS_DIRECTORY_IS_A_REPARSE_POINT</p>
+ </td>
+ <td>
+ <p>The NTFS directory is a reparse point.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000282<br />STATUS_RANGE_LIST_CONFLICT</p>
+ </td>
+ <td>
+ <p>The range could not be added to the range list because of a conflict.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000283<br />STATUS_SOURCE_ELEMENT_EMPTY</p>
+ </td>
+ <td>
+ <p>The specified medium changer source element contains no media.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000284<br />STATUS_DESTINATION_ELEMENT_FULL</p>
+ </td>
+ <td>
+ <p>The specified medium changer destination element already contains media.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000285<br />STATUS_ILLEGAL_ELEMENT_ADDRESS</p>
+ </td>
+ <td>
+ <p>The specified medium changer element does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000286<br />STATUS_MAGAZINE_NOT_PRESENT</p>
+ </td>
+ <td>
+ <p>The specified element is contained in a magazine that is no longer present.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000287<br />STATUS_REINITIALIZATION_NEEDED</p>
+ </td>
+ <td>
+ <p>The device requires re-initialization due to hardware errors.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000028A<br />STATUS_ENCRYPTION_FAILED</p>
+ </td>
+ <td>
+ <p>The file encryption attempt failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000028B<br />STATUS_DECRYPTION_FAILED</p>
+ </td>
+ <td>
+ <p>The file decryption attempt failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000028C<br />STATUS_RANGE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified range could not be found in the range list.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000028D<br />STATUS_NO_RECOVERY_POLICY</p>
+ </td>
+ <td>
+ <p>There is no encryption recovery policy configured for this system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000028E<br />STATUS_NO_EFS</p>
+ </td>
+ <td>
+ <p>The required encryption driver is not loaded for this system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000028F<br />STATUS_WRONG_EFS</p>
+ </td>
+ <td>
+ <p>The file was encrypted with a different encryption driver than is currently loaded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000290<br />STATUS_NO_USER_KEYS</p>
+ </td>
+ <td>
+ <p>There are no EFS keys defined for the user.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000291<br />STATUS_FILE_NOT_ENCRYPTED</p>
+ </td>
+ <td>
+ <p>The specified file is not encrypted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000292<br />STATUS_NOT_EXPORT_FORMAT</p>
+ </td>
+ <td>
+ <p>The specified file is not in the defined EFS export format.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000293<br />STATUS_FILE_ENCRYPTED</p>
+ </td>
+ <td>
+ <p>The specified file is encrypted and the user does not have the ability to decrypt it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000295<br />STATUS_WMI_GUID_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The GUID passed was not recognized as valid by a WMI data provider.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000296<br />STATUS_WMI_INSTANCE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The instance name passed was not recognized as valid by a WMI data provider.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000297<br />STATUS_WMI_ITEMID_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The data item ID passed was not recognized as valid by a WMI data provider.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000298<br />STATUS_WMI_TRY_AGAIN</p>
+ </td>
+ <td>
+ <p>The WMI request could not be completed and should be retried.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000299<br />STATUS_SHARED_POLICY</p>
+ </td>
+ <td>
+ <p>The policy object is shared and can only be modified at the root.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000029A<br />STATUS_POLICY_OBJECT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The policy object does not exist when it should.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000029B<br />STATUS_POLICY_ONLY_IN_DS</p>
+ </td>
+ <td>
+ <p>The requested policy information only lives in the Ds.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000029C<br />STATUS_VOLUME_NOT_UPGRADED</p>
+ </td>
+ <td>
+ <p>The volume must be upgraded to enable this feature.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000029D<br />STATUS_REMOTE_STORAGE_NOT_ACTIVE</p>
+ </td>
+ <td>
+ <p>The remote storage service is not operational at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000029E<br />STATUS_REMOTE_STORAGE_MEDIA_ERROR</p>
+ </td>
+ <td>
+ <p>The remote storage service encountered a media error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000029F<br />STATUS_NO_TRACKING_SERVICE</p>
+ </td>
+ <td>
+ <p>The tracking (workstation) service is not running.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A0<br />STATUS_SERVER_SID_MISMATCH</p>
+ </td>
+ <td>
+ <p>The server process is running under a SID that is different from the SID that is required by client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A1<br />STATUS_DS_NO_ATTRIBUTE_OR_VALUE</p>
+ </td>
+ <td>
+ <p>The specified directory service attribute or value does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A2<br />STATUS_DS_INVALID_ATTRIBUTE_SYNTAX</p>
+ </td>
+ <td>
+ <p>The attribute syntax specified to the directory service is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A3<br />STATUS_DS_ATTRIBUTE_TYPE_UNDEFINED</p>
+ </td>
+ <td>
+ <p>The attribute type specified to the directory service is not defined.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A4<br />STATUS_DS_ATTRIBUTE_OR_VALUE_EXISTS</p>
+ </td>
+ <td>
+ <p>The specified directory service attribute or value already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A5<br />STATUS_DS_BUSY</p>
+ </td>
+ <td>
+ <p>The directory service is busy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A6<br />STATUS_DS_UNAVAILABLE</p>
+ </td>
+ <td>
+ <p>The directory service is unavailable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A7<br />STATUS_DS_NO_RIDS_ALLOCATED</p>
+ </td>
+ <td>
+ <p>The directory service was unable to allocate a relative identifier.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A8<br />STATUS_DS_NO_MORE_RIDS</p>
+ </td>
+ <td>
+ <p>The directory service has exhausted the pool of relative identifiers.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002A9<br />STATUS_DS_INCORRECT_ROLE_OWNER</p>
+ </td>
+ <td>
+ <p>The requested operation could not be performed because the directory service is not the master for that type of operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002AA<br />STATUS_DS_RIDMGR_INIT_ERROR</p>
+ </td>
+ <td>
+ <p>The directory service was unable to initialize the subsystem that allocates relative identifiers.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002AB<br />STATUS_DS_OBJ_CLASS_VIOLATION</p>
+ </td>
+ <td>
+ <p>The requested operation did not satisfy one or more constraints that are associated with the class of the object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002AC<br />STATUS_DS_CANT_ON_NON_LEAF</p>
+ </td>
+ <td>
+ <p>The directory service can perform the requested operation only on a leaf object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002AD<br />STATUS_DS_CANT_ON_RDN</p>
+ </td>
+ <td>
+ <p>The directory service cannot perform the requested operation on the Relatively Defined Name (RDN) attribute of an object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002AE<br />STATUS_DS_CANT_MOD_OBJ_CLASS</p>
+ </td>
+ <td>
+ <p>The directory service detected an attempt to modify the object class of an object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002AF<br />STATUS_DS_CROSS_DOM_MOVE_FAILED</p>
+ </td>
+ <td>
+ <p>An error occurred while performing a cross domain move operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B0<br />STATUS_DS_GC_NOT_AVAILABLE</p>
+ </td>
+ <td>
+ <p>Unable to contact the global catalog server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B1<br />STATUS_DIRECTORY_SERVICE_REQUIRED</p>
+ </td>
+ <td>
+ <p>The requested operation requires a directory service, and none was available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B2<br />STATUS_REPARSE_ATTRIBUTE_CONFLICT</p>
+ </td>
+ <td>
+ <p>The reparse attribute cannot be set because it is incompatible with an existing attribute.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B3<br />STATUS_CANT_ENABLE_DENY_ONLY</p>
+ </td>
+ <td>
+ <p>A group marked "use for deny only" cannot be enabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B4<br />STATUS_FLOAT_MULTIPLE_FAULTS</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Multiple floating-point faults.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B5<br />STATUS_FLOAT_MULTIPLE_TRAPS</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Multiple floating-point traps.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B6<br />STATUS_DEVICE_REMOVED</p>
+ </td>
+ <td>
+ <p>The device has been removed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B7<br />STATUS_JOURNAL_DELETE_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The volume change journal is being deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B8<br />STATUS_JOURNAL_NOT_ACTIVE</p>
+ </td>
+ <td>
+ <p>The volume change journal is not active.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002B9<br />STATUS_NOINTERFACE</p>
+ </td>
+ <td>
+ <p>The requested interface is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C1<br />STATUS_DS_ADMIN_LIMIT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>A directory service resource limit has been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C2<br />STATUS_DRIVER_FAILED_SLEEP</p>
+ </td>
+ <td>
+ <p>{System Standby Failed} The driver %hs does not support standby mode. Updating this driver may allow the system to go to standby mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C3<br />STATUS_MUTUAL_AUTHENTICATION_FAILED</p>
+ </td>
+ <td>
+ <p>Mutual Authentication failed. The server password is out of date at the domain controller.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C4<br />STATUS_CORRUPT_SYSTEM_FILE</p>
+ </td>
+ <td>
+ <p>The system file %1 has become corrupt and has been replaced.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C5<br />STATUS_DATATYPE_MISALIGNMENT_ERROR</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Alignment Error A data type misalignment error was detected in a load or store instruction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C6<br />STATUS_WMI_READ_ONLY</p>
+ </td>
+ <td>
+ <p>The WMI data item or data block is read-only.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C7<br />STATUS_WMI_SET_FAILURE</p>
+ </td>
+ <td>
+ <p>The WMI data item or data block could not be changed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C8<br />STATUS_COMMITMENT_MINIMUM</p>
+ </td>
+ <td>
+ <p>{Virtual Memory Minimum Too Low} Your system is low on virtual memory. Windows is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002C9<br />STATUS_REG_NAT_CONSUMPTION</p>
+ </td>
+ <td>
+ <p>{EXCEPTION} Register NaT consumption faults. A NaT value is consumed on a non-speculative instruction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002CA<br />STATUS_TRANSPORT_FULL</p>
+ </td>
+ <td>
+ <p>The transport element of the medium changer contains media, which is causing the operation to fail.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002CB<br />STATUS_DS_SAM_INIT_FAILURE</p>
+ </td>
+ <td>
+ <p>Security Accounts Manager initialization failed because of the following error: %hs Error Status: 0x%x. Click OK to shut down this system and restart in Directory Services Restore Mode. Check the event log for more detailed information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002CC<br />STATUS_ONLY_IF_CONNECTED</p>
+ </td>
+ <td>
+ <p>This operation is supported only when you are connected to the server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002CD<br />STATUS_DS_SENSITIVE_GROUP_VIOLATION</p>
+ </td>
+ <td>
+ <p>Only an administrator can modify the membership list of an administrative group.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002CE<br />STATUS_PNP_RESTART_ENUMERATION</p>
+ </td>
+ <td>
+ <p>A device was removed so enumeration must be restarted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002CF<br />STATUS_JOURNAL_ENTRY_DELETED</p>
+ </td>
+ <td>
+ <p>The journal entry has been deleted from the journal.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D0<br />STATUS_DS_CANT_MOD_PRIMARYGROUPID</p>
+ </td>
+ <td>
+ <p>Cannot change the primary group ID of a domain controller account.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D1<br />STATUS_SYSTEM_IMAGE_BAD_SIGNATURE</p>
+ </td>
+ <td>
+ <p>{Fatal System Error} The system image %s is not properly signed. The file has been replaced with the signed file. The system has been shut down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D2<br />STATUS_PNP_REBOOT_REQUIRED</p>
+ </td>
+ <td>
+ <p>The device will not start without a reboot.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D3<br />STATUS_POWER_STATE_INVALID</p>
+ </td>
+ <td>
+ <p>The power state of the current device cannot support this request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D4<br />STATUS_DS_INVALID_GROUP_TYPE</p>
+ </td>
+ <td>
+ <p>The specified group type is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D5<br />STATUS_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN</p>
+ </td>
+ <td>
+ <p>In a mixed domain, no nesting of a global group if the group is security enabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D6<br />STATUS_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN</p>
+ </td>
+ <td>
+ <p>In a mixed domain, cannot nest local groups with other local groups, if the group is security enabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D7<br />STATUS_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER</p>
+ </td>
+ <td>
+ <p>A global group cannot have a local group as a member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D8<br />STATUS_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER</p>
+ </td>
+ <td>
+ <p>A global group cannot have a universal group as a member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002D9<br />STATUS_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER</p>
+ </td>
+ <td>
+ <p>A universal group cannot have a local group as a member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002DA<br />STATUS_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER</p>
+ </td>
+ <td>
+ <p>A global group cannot have a cross-domain member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002DB<br />STATUS_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER</p>
+ </td>
+ <td>
+ <p>A local group cannot have another cross-domain local group as a member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002DC<br />STATUS_DS_HAVE_PRIMARY_MEMBERS</p>
+ </td>
+ <td>
+ <p>Cannot change to a security-disabled group because primary members are in this group.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002DD<br />STATUS_WMI_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The WMI operation is not supported by the data block or method.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002DE<br />STATUS_INSUFFICIENT_POWER</p>
+ </td>
+ <td>
+ <p>There is not enough power to complete the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002DF<br />STATUS_SAM_NEED_BOOTKEY_PASSWORD</p>
+ </td>
+ <td>
+ <p>The Security Accounts Manager needs to get the boot password.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E0<br />STATUS_SAM_NEED_BOOTKEY_FLOPPY</p>
+ </td>
+ <td>
+ <p>The Security Accounts Manager needs to get the boot key from the floppy disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E1<br />STATUS_DS_CANT_START</p>
+ </td>
+ <td>
+ <p>The directory service cannot start.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E2<br />STATUS_DS_INIT_FAILURE</p>
+ </td>
+ <td>
+ <p>The directory service could not start because of the following error: %hs Error Status: 0x%x. Click OK to shut down this system and restart in Directory Services Restore Mode. Check the event log for more detailed information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E3<br />STATUS_SAM_INIT_FAILURE</p>
+ </td>
+ <td>
+ <p>The Security Accounts Manager initialization failed because of the following error: %hs Error Status: 0x%x. Click OK to shut down this system and restart in Safe Mode. Check the event log for more detailed information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E4<br />STATUS_DS_GC_REQUIRED</p>
+ </td>
+ <td>
+ <p>The requested operation can be performed only on a global catalog server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E5<br />STATUS_DS_LOCAL_MEMBER_OF_LOCAL_ONLY</p>
+ </td>
+ <td>
+ <p>A local group can only be a member of other local groups in the same domain.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E6<br />STATUS_DS_NO_FPO_IN_UNIVERSAL_GROUPS</p>
+ </td>
+ <td>
+ <p>Foreign security principals cannot be members of universal groups.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E7<br />STATUS_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>Your computer could not be joined to the domain. You have exceeded the maximum number of computer accounts you are allowed to create in this domain. Contact your system administrator to have this limit reset or increased.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002E9<br />STATUS_CURRENT_DOMAIN_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>This operation cannot be performed on the current domain.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002EA<br />STATUS_CANNOT_MAKE</p>
+ </td>
+ <td>
+ <p>The directory or file cannot be created.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002EB<br />STATUS_SYSTEM_SHUTDOWN</p>
+ </td>
+ <td>
+ <p>The system is in the process of shutting down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002EC<br />STATUS_DS_INIT_FAILURE_CONSOLE</p>
+ </td>
+ <td>
+ <p>Directory Services could not start because of the following error: %hs Error Status: 0x%x. Click OK to shut down the system. You can use the recovery console to diagnose the system further.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002ED<br />STATUS_DS_SAM_INIT_FAILURE_CONSOLE</p>
+ </td>
+ <td>
+ <p>Security Accounts Manager initialization failed because of the following error: %hs Error Status: 0x%x. Click OK to shut down the system. You can use the recovery console to diagnose the system further.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002EE<br />STATUS_UNFINISHED_CONTEXT_DELETED</p>
+ </td>
+ <td>
+ <p>A security context was deleted before the context was completed. This is considered a logon failure.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002EF<br />STATUS_NO_TGT_REPLY</p>
+ </td>
+ <td>
+ <p>The client is trying to negotiate a context and the server requires user-to-user but did not send a TGT reply.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F0<br />STATUS_OBJECTID_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>An object ID was not found in the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F1<br />STATUS_NO_IP_ADDRESSES</p>
+ </td>
+ <td>
+ <p>Unable to accomplish the requested task because the local machine does not have any IP addresses.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F2<br />STATUS_WRONG_CREDENTIAL_HANDLE</p>
+ </td>
+ <td>
+ <p>The supplied credential handle does not match the credential that is associated with the security context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F3<br />STATUS_CRYPTO_SYSTEM_INVALID</p>
+ </td>
+ <td>
+ <p>The crypto system or checksum function is invalid because a required function is unavailable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F4<br />STATUS_MAX_REFERRALS_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The number of maximum ticket referrals has been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F5<br />STATUS_MUST_BE_KDC</p>
+ </td>
+ <td>
+ <p>The local machine must be a Kerberos KDC (domain controller) and it is not.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F6<br />STATUS_STRONG_CRYPTO_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The other end of the security negotiation requires strong crypto but it is not supported on the local machine.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F7<br />STATUS_TOO_MANY_PRINCIPALS</p>
+ </td>
+ <td>
+ <p>The KDC reply contained more than one principal name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F8<br />STATUS_NO_PA_DATA</p>
+ </td>
+ <td>
+ <p>Expected to find PA data for a hint of what etype to use, but it was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002F9<br />STATUS_PKINIT_NAME_MISMATCH</p>
+ </td>
+ <td>
+ <p>The client certificate does not contain a valid UPN, or does not match the client name in the logon request. Contact your administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002FA<br />STATUS_SMARTCARD_LOGON_REQUIRED</p>
+ </td>
+ <td>
+ <p>Smart card logon is required and was not used.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002FB<br />STATUS_KDC_INVALID_REQUEST</p>
+ </td>
+ <td>
+ <p>An invalid request was sent to the KDC.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002FC<br />STATUS_KDC_UNABLE_TO_REFER</p>
+ </td>
+ <td>
+ <p>The KDC was unable to generate a referral for the service requested.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002FD<br />STATUS_KDC_UNKNOWN_ETYPE</p>
+ </td>
+ <td>
+ <p>The encryption type requested is not supported by the KDC.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002FE<br />STATUS_SHUTDOWN_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>A system shutdown is in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00002FF<br />STATUS_SERVER_SHUTDOWN_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The server machine is shutting down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000300<br />STATUS_NOT_SUPPORTED_ON_SBS</p>
+ </td>
+ <td>
+ <p>This operation is not supported on a computer running Windows Server 2003 for Small Business Server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000301<br />STATUS_WMI_GUID_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>The WMI GUID is no longer available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000302<br />STATUS_WMI_ALREADY_DISABLED</p>
+ </td>
+ <td>
+ <p>Collection or events for the WMI GUID is already disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000303<br />STATUS_WMI_ALREADY_ENABLED</p>
+ </td>
+ <td>
+ <p>Collection or events for the WMI GUID is already enabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000304<br />STATUS_MFT_TOO_FRAGMENTED</p>
+ </td>
+ <td>
+ <p>The master file table on the volume is too fragmented to complete this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000305<br />STATUS_COPY_PROTECTION_FAILURE</p>
+ </td>
+ <td>
+ <p>Copy protection failure.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000306<br />STATUS_CSS_AUTHENTICATION_FAILURE</p>
+ </td>
+ <td>
+ <p>Copy protection error—DVD CSS Authentication failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000307<br />STATUS_CSS_KEY_NOT_PRESENT</p>
+ </td>
+ <td>
+ <p>Copy protection error—The specified sector does not contain a valid key.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000308<br />STATUS_CSS_KEY_NOT_ESTABLISHED</p>
+ </td>
+ <td>
+ <p>Copy protection error—DVD session key not established.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000309<br />STATUS_CSS_SCRAMBLED_SECTOR</p>
+ </td>
+ <td>
+ <p>Copy protection error—The read failed because the sector is encrypted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000030A<br />STATUS_CSS_REGION_MISMATCH</p>
+ </td>
+ <td>
+ <p>Copy protection error—The region of the specified DVD does not correspond to the region setting of the drive.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000030B<br />STATUS_CSS_RESETS_EXHAUSTED</p>
+ </td>
+ <td>
+ <p>Copy protection error—The region setting of the drive may be permanent.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000320<br />STATUS_PKINIT_FAILURE</p>
+ </td>
+ <td>
+ <p>The Kerberos protocol encountered an error while validating the KDC certificate during smart card logon. There is more information in the system event log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000321<br />STATUS_SMARTCARD_SUBSYSTEM_FAILURE</p>
+ </td>
+ <td>
+ <p>The Kerberos protocol encountered an error while attempting to use the smart card subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000322<br />STATUS_NO_KERB_KEY</p>
+ </td>
+ <td>
+ <p>The target server does not have acceptable Kerberos credentials.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000350<br />STATUS_HOST_DOWN</p>
+ </td>
+ <td>
+ <p>The transport determined that the remote system is down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000351<br />STATUS_UNSUPPORTED_PREAUTH</p>
+ </td>
+ <td>
+ <p>An unsupported pre-authentication mechanism was presented to the Kerberos package.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000352<br />STATUS_EFS_ALG_BLOB_TOO_BIG</p>
+ </td>
+ <td>
+ <p>The encryption algorithm that is used on the source file needs a bigger key buffer than the one that is used on the destination file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000353<br />STATUS_PORT_NOT_SET</p>
+ </td>
+ <td>
+ <p>An attempt to remove a processes DebugPort was made, but a port was not already associated with the process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000354<br />STATUS_DEBUGGER_INACTIVE</p>
+ </td>
+ <td>
+ <p>An attempt to do an operation on a debug port failed because the port is in the process of being deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000355<br />STATUS_DS_VERSION_CHECK_FAILURE</p>
+ </td>
+ <td>
+ <p>This version of Windows is not compatible with the behavior version of the directory forest, domain, or domain controller.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000356<br />STATUS_AUDITING_DISABLED</p>
+ </td>
+ <td>
+ <p>The specified event is currently not being audited.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000357<br />STATUS_PRENT4_MACHINE_ACCOUNT</p>
+ </td>
+ <td>
+ <p>The machine account was created prior to Windows NT 4.0. The account needs to be recreated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000358<br />STATUS_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER</p>
+ </td>
+ <td>
+ <p>An account group cannot have a universal group as a member.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000359<br />STATUS_INVALID_IMAGE_WIN_32</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format; it appears to be a 32-bit Windows image.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000035A<br />STATUS_INVALID_IMAGE_WIN_64</p>
+ </td>
+ <td>
+ <p>The specified image file did not have the correct format; it appears to be a 64-bit Windows image.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000035B<br />STATUS_BAD_BINDINGS</p>
+ </td>
+ <td>
+ <p>The client's supplied SSPI channel bindings were incorrect.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000035C<br />STATUS_NETWORK_SESSION_EXPIRED</p>
+ </td>
+ <td>
+ <p>The client session has expired; so the client must re-authenticate to continue accessing the remote resources.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000035D<br />STATUS_APPHELP_BLOCK</p>
+ </td>
+ <td>
+ <p>The AppHelp dialog box canceled; thus preventing the application from starting.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000035E<br />STATUS_ALL_SIDS_FILTERED</p>
+ </td>
+ <td>
+ <p>The SID filtering operation removed all SIDs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000035F<br />STATUS_NOT_SAFE_MODE_DRIVER</p>
+ </td>
+ <td>
+ <p>The driver was not loaded because the system is starting in safe mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000361<br />STATUS_ACCESS_DISABLED_BY_POLICY_DEFAULT</p>
+ </td>
+ <td>
+ <p>Access to %1 has been restricted by your Administrator by the default software restriction policy level.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000362<br />STATUS_ACCESS_DISABLED_BY_POLICY_PATH</p>
+ </td>
+ <td>
+ <p>Access to %1 has been restricted by your Administrator by location with policy rule %2 placed on path %3.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000363<br />STATUS_ACCESS_DISABLED_BY_POLICY_PUBLISHER</p>
+ </td>
+ <td>
+ <p>Access to %1 has been restricted by your Administrator by software publisher policy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000364<br />STATUS_ACCESS_DISABLED_BY_POLICY_OTHER</p>
+ </td>
+ <td>
+ <p>Access to %1 has been restricted by your Administrator by policy rule %2.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000365<br />STATUS_FAILED_DRIVER_ENTRY</p>
+ </td>
+ <td>
+ <p>The driver was not loaded because it failed its initialization call.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000366<br />STATUS_DEVICE_ENUMERATION_ERROR</p>
+ </td>
+ <td>
+ <p>The device encountered an error while applying power or reading the device configuration. This may be caused by a failure of your hardware or by a poor connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000368<br />STATUS_MOUNT_POINT_NOT_RESOLVED</p>
+ </td>
+ <td>
+ <p>The create operation failed because the name contained at least one mount point that resolves to a volume to which the specified device object is not attached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000369<br />STATUS_INVALID_DEVICE_OBJECT_PARAMETER</p>
+ </td>
+ <td>
+ <p>The device object parameter is either not a valid device object or is not attached to the volume that is specified by the file name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000036A<br />STATUS_MCA_OCCURED</p>
+ </td>
+ <td>
+ <p>A machine check error has occurred. Check the system event log for additional information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000036B<br />STATUS_DRIVER_BLOCKED_CRITICAL</p>
+ </td>
+ <td>
+ <p>Driver %2 has been blocked from loading.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000036C<br />STATUS_DRIVER_BLOCKED</p>
+ </td>
+ <td>
+ <p>Driver %2 has been blocked from loading.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000036D<br />STATUS_DRIVER_DATABASE_ERROR</p>
+ </td>
+ <td>
+ <p>There was error [%2] processing the driver database.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000036E<br />STATUS_SYSTEM_HIVE_TOO_LARGE</p>
+ </td>
+ <td>
+ <p>System hive size has exceeded its limit.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000036F<br />STATUS_INVALID_IMPORT_OF_NON_DLL</p>
+ </td>
+ <td>
+ <p>A dynamic link library (DLL) referenced a module that was neither a DLL nor the process's executable image.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000371<br />STATUS_NO_SECRETS</p>
+ </td>
+ <td>
+ <p>The local account store does not contain secret material for the specified account.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000372<br />STATUS_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY</p>
+ </td>
+ <td>
+ <p>Access to %1 has been restricted by your Administrator by policy rule %2.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000373<br />STATUS_FAILED_STACK_SWITCH</p>
+ </td>
+ <td>
+ <p>The system was not able to allocate enough memory to perform a stack switch.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000374<br />STATUS_HEAP_CORRUPTION</p>
+ </td>
+ <td>
+ <p>A heap has been corrupted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000380<br />STATUS_SMARTCARD_WRONG_PIN</p>
+ </td>
+ <td>
+ <p>An incorrect PIN was presented to the smart card.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000381<br />STATUS_SMARTCARD_CARD_BLOCKED</p>
+ </td>
+ <td>
+ <p>The smart card is blocked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000382<br />STATUS_SMARTCARD_CARD_NOT_AUTHENTICATED</p>
+ </td>
+ <td>
+ <p>No PIN was presented to the smart card.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000383<br />STATUS_SMARTCARD_NO_CARD</p>
+ </td>
+ <td>
+ <p>No smart card is available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000384<br />STATUS_SMARTCARD_NO_KEY_CONTAINER</p>
+ </td>
+ <td>
+ <p>The requested key container does not exist on the smart card.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000385<br />STATUS_SMARTCARD_NO_CERTIFICATE</p>
+ </td>
+ <td>
+ <p>The requested certificate does not exist on the smart card.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000386<br />STATUS_SMARTCARD_NO_KEYSET</p>
+ </td>
+ <td>
+ <p>The requested keyset does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000387<br />STATUS_SMARTCARD_IO_ERROR</p>
+ </td>
+ <td>
+ <p>A communication error with the smart card has been detected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000388<br />STATUS_DOWNGRADE_DETECTED</p>
+ </td>
+ <td>
+ <p>The system detected a possible attempt to compromise security. Ensure that you can contact the server that authenticated you.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000389<br />STATUS_SMARTCARD_CERT_REVOKED</p>
+ </td>
+ <td>
+ <p>The smart card certificate used for authentication has been revoked. Contact your system administrator. There may be additional information in the event log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000038A<br />STATUS_ISSUING_CA_UNTRUSTED</p>
+ </td>
+ <td>
+ <p>An untrusted certificate authority was detected while processing the smart card certificate that is used for authentication. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000038B<br />STATUS_REVOCATION_OFFLINE_C</p>
+ </td>
+ <td>
+ <p>The revocation status of the smart card certificate that is used for authentication could not be determined. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000038C<br />STATUS_PKINIT_CLIENT_FAILURE</p>
+ </td>
+ <td>
+ <p>The smart card certificate used for authentication was not trusted. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000038D<br />STATUS_SMARTCARD_CERT_EXPIRED</p>
+ </td>
+ <td>
+ <p>The smart card certificate used for authentication has expired. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000038E<br />STATUS_DRIVER_FAILED_PRIOR_UNLOAD</p>
+ </td>
+ <td>
+ <p>The driver could not be loaded because a previous version of the driver is still in memory.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000038F<br />STATUS_SMARTCARD_SILENT_CONTEXT</p>
+ </td>
+ <td>
+ <p>The smart card provider could not perform the action because the context was acquired as silent.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000401<br />STATUS_PER_USER_TRUST_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The delegated trust creation quota of the current user has been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000402<br />STATUS_ALL_USER_TRUST_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The total delegated trust creation quota has been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000403<br />STATUS_USER_DELETE_TRUST_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The delegated trust deletion quota of the current user has been exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000404<br />STATUS_DS_NAME_NOT_UNIQUE</p>
+ </td>
+ <td>
+ <p>The requested name already exists as a unique identifier.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000405<br />STATUS_DS_DUPLICATE_ID_FOUND</p>
+ </td>
+ <td>
+ <p>The requested object has a non-unique identifier and cannot be retrieved.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000406<br />STATUS_DS_GROUP_CONVERSION_ERROR</p>
+ </td>
+ <td>
+ <p>The group cannot be converted due to attribute restrictions on the requested group type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000407<br />STATUS_VOLSNAP_PREPARE_HIBERNATE</p>
+ </td>
+ <td>
+ <p>{Volume Shadow Copy Service} Wait while the Volume Shadow Copy Service prepares volume %hs for hibernation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000408<br />STATUS_USER2USER_REQUIRED</p>
+ </td>
+ <td>
+ <p>Kerberos sub-protocol User2User is required.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000409<br />STATUS_STACK_BUFFER_OVERRUN</p>
+ </td>
+ <td>
+ <p>The system detected an overrun of a stack-based buffer in this application. This overrun could potentially allow a malicious user to gain control of this application.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000040A<br />STATUS_NO_S4U_PROT_SUPPORT</p>
+ </td>
+ <td>
+ <p>The Kerberos subsystem encountered an error. A service for user protocol request was made against a domain controller which does not support service for user.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000040B<br />STATUS_CROSSREALM_DELEGATION_FAILURE</p>
+ </td>
+ <td>
+ <p>An attempt was made by this server to make a Kerberos constrained delegation request for a target that is outside the server realm. This action is not supported and the resulting error indicates a misconfiguration on the allowed-to-delegate-to list for this server. Contact your administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000040C<br />STATUS_REVOCATION_OFFLINE_KDC</p>
+ </td>
+ <td>
+ <p>The revocation status of the domain controller certificate used for smart card authentication could not be determined. There is additional information in the system event log. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000040D<br />STATUS_ISSUING_CA_UNTRUSTED_KDC</p>
+ </td>
+ <td>
+ <p>An untrusted certificate authority was detected while processing the domain controller certificate used for authentication. There is additional information in the system event log. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000040E<br />STATUS_KDC_CERT_EXPIRED</p>
+ </td>
+ <td>
+ <p>The domain controller certificate used for smart card logon has expired. Contact your system administrator with the contents of your system event log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000040F<br />STATUS_KDC_CERT_REVOKED</p>
+ </td>
+ <td>
+ <p>The domain controller certificate used for smart card logon has been revoked. Contact your system administrator with the contents of your system event log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000410<br />STATUS_PARAMETER_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>Data present in one of the parameters is more than the function can operate on.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000411<br />STATUS_HIBERNATION_FAILURE</p>
+ </td>
+ <td>
+ <p>The system has failed to hibernate (The error code is %hs). Hibernation will be disabled until the system is restarted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000412<br />STATUS_DELAY_LOAD_FAILED</p>
+ </td>
+ <td>
+ <p>An attempt to delay-load a .dll or get a function address in a delay-loaded .dll failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000413<br />STATUS_AUTHENTICATION_FIREWALL_FAILED</p>
+ </td>
+ <td>
+ <p>Logon Failure: The machine you are logging onto is protected by an authentication firewall. The specified account is not allowed to authenticate to the machine.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000414<br />STATUS_VDM_DISALLOWED</p>
+ </td>
+ <td>
+ <p>%hs is a 16-bit application. You do not have permissions to execute 16-bit applications. Check your permissions with your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000415<br />STATUS_HUNG_DISPLAY_DRIVER_THREAD</p>
+ </td>
+ <td>
+ <p>{Display Driver Stopped Responding} The %hs display driver has stopped working normally. Save your work and reboot the system to restore full display functionality. The next time you reboot the machine a dialog will be displayed giving you a chance to report this failure to Microsoft.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000416<br />STATUS_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE</p>
+ </td>
+ <td>
+ <p>The Desktop heap encountered an error while allocating session memory. There is more information in the system event log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000417<br />STATUS_INVALID_CRUNTIME_PARAMETER</p>
+ </td>
+ <td>
+ <p>An invalid parameter was passed to a C runtime function.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000418<br />STATUS_NTLM_BLOCKED</p>
+ </td>
+ <td>
+ <p>The authentication failed because NTLM was blocked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000419<br />STATUS_DS_SRC_SID_EXISTS_IN_FOREST</p>
+ </td>
+ <td>
+ <p>The source object's SID already exists in destination forest.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000041A<br />STATUS_DS_DOMAIN_NAME_EXISTS_IN_FOREST</p>
+ </td>
+ <td>
+ <p>The domain name of the trusted domain already exists in the forest.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000041B<br />STATUS_DS_FLAT_NAME_EXISTS_IN_FOREST</p>
+ </td>
+ <td>
+ <p>The flat name of the trusted domain already exists in the forest.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000041C<br />STATUS_INVALID_USER_PRINCIPAL_NAME</p>
+ </td>
+ <td>
+ <p>The User Principal Name (UPN) is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000420<br />STATUS_ASSERTION_FAILURE</p>
+ </td>
+ <td>
+ <p>There has been an assertion failure.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000421<br />STATUS_VERIFIER_STOP</p>
+ </td>
+ <td>
+ <p>Application verifier has found an error in the current process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000423<br />STATUS_CALLBACK_POP_STACK</p>
+ </td>
+ <td>
+ <p>A user mode unwind is in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000424<br />STATUS_INCOMPATIBLE_DRIVER_BLOCKED</p>
+ </td>
+ <td>
+ <p>%2 has been blocked from loading due to incompatibility with this system. Contact your software vendor for a compatible version of the driver.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000425<br />STATUS_HIVE_UNLOADED</p>
+ </td>
+ <td>
+ <p>Illegal operation attempted on a registry key which has already been unloaded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000426<br />STATUS_COMPRESSION_DISABLED</p>
+ </td>
+ <td>
+ <p>Compression is disabled for this volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000427<br />STATUS_FILE_SYSTEM_LIMITATION</p>
+ </td>
+ <td>
+ <p>The requested operation could not be completed due to a file system limitation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000428<br />STATUS_INVALID_IMAGE_HASH</p>
+ </td>
+ <td>
+ <p>The hash for image %hs cannot be found in the system catalogs. The image is likely corrupt or the victim of tampering.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000429<br />STATUS_NOT_CAPABLE</p>
+ </td>
+ <td>
+ <p>The implementation is not capable of performing the request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000042A<br />STATUS_REQUEST_OUT_OF_SEQUENCE</p>
+ </td>
+ <td>
+ <p>The requested operation is out of order with respect to other operations.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000042B<br />STATUS_IMPLEMENTATION_LIMIT</p>
+ </td>
+ <td>
+ <p>An operation attempted to exceed an implementation-defined limit.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000042C<br />STATUS_ELEVATION_REQUIRED</p>
+ </td>
+ <td>
+ <p>The requested operation requires elevation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000042D<br />STATUS_NO_SECURITY_CONTEXT</p>
+ </td>
+ <td>
+ <p>The required security context does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000042E<br />STATUS_PKU2U_CERT_FAILURE</p>
+ </td>
+ <td>
+ <p>The PKU2U protocol encountered an error while attempting to utilize the associated certificates.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000432<br />STATUS_BEYOND_VDL</p>
+ </td>
+ <td>
+ <p>The operation was attempted beyond the valid data length of the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000433<br />STATUS_ENCOUNTERED_WRITE_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The attempted write operation encountered a write already in progress for some portion of the range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000434<br />STATUS_PTE_CHANGED</p>
+ </td>
+ <td>
+ <p>The page fault mappings changed in the middle of processing a fault so the operation must be retried.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000435<br />STATUS_PURGE_FAILED</p>
+ </td>
+ <td>
+ <p>The attempt to purge this file from memory failed to purge some or all the data from memory.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000440<br />STATUS_CRED_REQUIRES_CONFIRMATION</p>
+ </td>
+ <td>
+ <p>The requested credential requires confirmation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000441<br />STATUS_CS_ENCRYPTION_INVALID_SERVER_RESPONSE</p>
+ </td>
+ <td>
+ <p>The remote server sent an invalid response for a file being opened with Client Side Encryption.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000442<br />STATUS_CS_ENCRYPTION_UNSUPPORTED_SERVER</p>
+ </td>
+ <td>
+ <p>Client Side Encryption is not supported by the remote server even though it claims to support it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000443<br />STATUS_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE</p>
+ </td>
+ <td>
+ <p>File is encrypted and should be opened in Client Side Encryption mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000444<br />STATUS_CS_ENCRYPTION_NEW_ENCRYPTED_FILE</p>
+ </td>
+ <td>
+ <p>A new encrypted file is being created and a $EFS needs to be provided.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000445<br />STATUS_CS_ENCRYPTION_FILE_NOT_CSE</p>
+ </td>
+ <td>
+ <p>The SMB client requested a CSE FSCTL on a non-CSE file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000446<br />STATUS_INVALID_LABEL</p>
+ </td>
+ <td>
+ <p>Indicates a particular Security ID may not be assigned as the label of an object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000450<br />STATUS_DRIVER_PROCESS_TERMINATED</p>
+ </td>
+ <td>
+ <p>The process hosting the driver for this device has terminated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000451<br />STATUS_AMBIGUOUS_SYSTEM_DEVICE</p>
+ </td>
+ <td>
+ <p>The requested system device cannot be identified due to multiple indistinguishable devices potentially matching the identification criteria.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000452<br />STATUS_SYSTEM_DEVICE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The requested system device cannot be found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000453<br />STATUS_RESTART_BOOT_APPLICATION</p>
+ </td>
+ <td>
+ <p>This boot application must be restarted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000454<br />STATUS_INSUFFICIENT_NVRAM_RESOURCES</p>
+ </td>
+ <td>
+ <p>Insufficient NVRAM resources exist to complete the API. A reboot might be required.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000460<br />STATUS_NO_RANGES_PROCESSED</p>
+ </td>
+ <td>
+ <p>No ranges for the specified operation were able to be processed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000463<br />STATUS_DEVICE_FEATURE_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The storage device does not support Offload Write.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000464<br />STATUS_DEVICE_UNREACHABLE</p>
+ </td>
+ <td>
+ <p>Data cannot be moved because the source device cannot communicate with the destination device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000465<br />STATUS_INVALID_TOKEN</p>
+ </td>
+ <td>
+ <p>The token representing the data is invalid or expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000500<br />STATUS_INVALID_TASK_NAME</p>
+ </td>
+ <td>
+ <p>The specified task name is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000501<br />STATUS_INVALID_TASK_INDEX</p>
+ </td>
+ <td>
+ <p>The specified task index is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000502<br />STATUS_THREAD_ALREADY_IN_TASK</p>
+ </td>
+ <td>
+ <p>The specified thread is already joining a task.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000503<br />STATUS_CALLBACK_BYPASS</p>
+ </td>
+ <td>
+ <p>A callback has requested to bypass native code.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000602<br />STATUS_FAIL_FAST_EXCEPTION</p>
+ </td>
+ <td>
+ <p>A fail fast exception occurred. Exception handlers will not be invoked and the process will be terminated immediately.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000603<br />STATUS_IMAGE_CERT_REVOKED</p>
+ </td>
+ <td>
+ <p>Windows cannot verify the digital signature for this file. The signing certificate for this file has been revoked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000700<br />STATUS_PORT_CLOSED</p>
+ </td>
+ <td>
+ <p>The ALPC port is closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000701<br />STATUS_MESSAGE_LOST</p>
+ </td>
+ <td>
+ <p>The ALPC message requested is no longer available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000702<br />STATUS_INVALID_MESSAGE</p>
+ </td>
+ <td>
+ <p>The ALPC message supplied is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000703<br />STATUS_REQUEST_CANCELED</p>
+ </td>
+ <td>
+ <p>The ALPC message has been canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000704<br />STATUS_RECURSIVE_DISPATCH</p>
+ </td>
+ <td>
+ <p>Invalid recursive dispatch attempt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000705<br />STATUS_LPC_RECEIVE_BUFFER_EXPECTED</p>
+ </td>
+ <td>
+ <p>No receive buffer has been supplied in a synchronous request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000706<br />STATUS_LPC_INVALID_CONNECTION_USAGE</p>
+ </td>
+ <td>
+ <p>The connection port is used in an invalid context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000707<br />STATUS_LPC_REQUESTS_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>The ALPC port does not accept new request messages.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000708<br />STATUS_RESOURCE_IN_USE</p>
+ </td>
+ <td>
+ <p>The resource requested is already in use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000709<br />STATUS_HARDWARE_MEMORY_ERROR</p>
+ </td>
+ <td>
+ <p>The hardware has reported an uncorrectable memory error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000070A<br />STATUS_THREADPOOL_HANDLE_EXCEPTION</p>
+ </td>
+ <td>
+ <p>Status 0x%08x was returned, waiting on handle 0x%x for wait 0x%p, in waiter 0x%p.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000070B<br />STATUS_THREADPOOL_SET_EVENT_ON_COMPLETION_FAILED</p>
+ </td>
+ <td>
+ <p>After a callback to 0x%p(0x%p), a completion call to Set event(0x%p) failed with status 0x%08x.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000070C<br />STATUS_THREADPOOL_RELEASE_SEMAPHORE_ON_COMPLETION_FAILED</p>
+ </td>
+ <td>
+ <p>After a callback to 0x%p(0x%p), a completion call to ReleaseSemaphore(0x%p, %d) failed with status 0x%08x.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000070D<br />STATUS_THREADPOOL_RELEASE_MUTEX_ON_COMPLETION_FAILED</p>
+ </td>
+ <td>
+ <p>After a callback to 0x%p(0x%p), a completion call to ReleaseMutex(%p) failed with status 0x%08x.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000070E<br />STATUS_THREADPOOL_FREE_LIBRARY_ON_COMPLETION_FAILED</p>
+ </td>
+ <td>
+ <p>After a callback to 0x%p(0x%p), a completion call to FreeLibrary(%p) failed with status 0x%08x.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000070F<br />STATUS_THREADPOOL_RELEASED_DURING_OPERATION</p>
+ </td>
+ <td>
+ <p>The thread pool 0x%p was released while a thread was posting a callback to 0x%p(0x%p) to it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000710<br />STATUS_CALLBACK_RETURNED_WHILE_IMPERSONATING</p>
+ </td>
+ <td>
+ <p>A thread pool worker thread is impersonating a client, after a callback to 0x%p(0x%p). This is unexpected, indicating that the callback is missing a call to revert the impersonation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000711<br />STATUS_APC_RETURNED_WHILE_IMPERSONATING</p>
+ </td>
+ <td>
+ <p>A thread pool worker thread is impersonating a client, after executing an APC. This is unexpected, indicating that the APC is missing a call to revert the impersonation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000712<br />STATUS_PROCESS_IS_PROTECTED</p>
+ </td>
+ <td>
+ <p>Either the target process, or the target thread's containing process, is a protected process.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000713<br />STATUS_MCA_EXCEPTION</p>
+ </td>
+ <td>
+ <p>A thread is getting dispatched with MCA EXCEPTION because of MCA.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000714<br />STATUS_CERTIFICATE_MAPPING_NOT_UNIQUE</p>
+ </td>
+ <td>
+ <p>The client certificate account mapping is not unique.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000715<br />STATUS_SYMLINK_CLASS_DISABLED</p>
+ </td>
+ <td>
+ <p>The symbolic link cannot be followed because its type is disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000716<br />STATUS_INVALID_IDN_NORMALIZATION</p>
+ </td>
+ <td>
+ <p>Indicates that the specified string is not valid for IDN normalization.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000717<br />STATUS_NO_UNICODE_TRANSLATION</p>
+ </td>
+ <td>
+ <p>No mapping for the Unicode character exists in the target multi-byte code page.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000718<br />STATUS_ALREADY_REGISTERED</p>
+ </td>
+ <td>
+ <p>The provided callback is already registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000719<br />STATUS_CONTEXT_MISMATCH</p>
+ </td>
+ <td>
+ <p>The provided context did not match the target.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000071A<br />STATUS_PORT_ALREADY_HAS_COMPLETION_LIST</p>
+ </td>
+ <td>
+ <p>The specified port already has a completion list.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000071B<br />STATUS_CALLBACK_RETURNED_THREAD_PRIORITY</p>
+ </td>
+ <td>
+ <p>A threadpool worker thread entered a callback at thread base priority 0x%x and exited at priority 0x%x.</p>
+ <p>This is unexpected, indicating that the callback missed restoring the priority.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000071C<br />STATUS_INVALID_THREAD</p>
+ </td>
+ <td>
+ <p>An invalid thread, handle %p, is specified for this operation. Possibly, a threadpool worker thread was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000071D<br />STATUS_CALLBACK_RETURNED_TRANSACTION</p>
+ </td>
+ <td>
+ <p>A threadpool worker thread entered a callback, which left transaction state.</p>
+ <p>This is unexpected, indicating that the callback missed clearing the transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000071E<br />STATUS_CALLBACK_RETURNED_LDR_LOCK</p>
+ </td>
+ <td>
+ <p>A threadpool worker thread entered a callback, which left the loader lock held.</p>
+ <p>This is unexpected, indicating that the callback missed releasing the lock.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000071F<br />STATUS_CALLBACK_RETURNED_LANG</p>
+ </td>
+ <td>
+ <p>A threadpool worker thread entered a callback, which left with preferred languages set.</p>
+ <p>This is unexpected, indicating that the callback missed clearing them.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000720<br />STATUS_CALLBACK_RETURNED_PRI_BACK</p>
+ </td>
+ <td>
+ <p>A threadpool worker thread entered a callback, which left with background priorities set.</p>
+ <p>This is unexpected, indicating that the callback missed restoring the original priorities.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000800<br />STATUS_DISK_REPAIR_DISABLED</p>
+ </td>
+ <td>
+ <p>The attempted operation required self healing to be enabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000801<br />STATUS_DS_DOMAIN_RENAME_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The directory service cannot perform the requested operation because a domain rename operation is in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000802<br />STATUS_DISK_QUOTA_EXCEEDED</p>
+ </td>
+ <td>
+ <p>An operation failed because the storage quota was exceeded.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000804<br />STATUS_CONTENT_BLOCKED</p>
+ </td>
+ <td>
+ <p>An operation failed because the content was blocked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000805<br />STATUS_BAD_CLUSTERS</p>
+ </td>
+ <td>
+ <p>The operation could not be completed due to bad clusters on disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000806<br />STATUS_VOLUME_DIRTY</p>
+ </td>
+ <td>
+ <p>The operation could not be completed because the volume is dirty. Please run the Chkdsk utility and try again. </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000901<br />STATUS_FILE_CHECKED_OUT</p>
+ </td>
+ <td>
+ <p>This file is checked out or locked for editing by another user.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000902<br />STATUS_CHECKOUT_REQUIRED</p>
+ </td>
+ <td>
+ <p>The file must be checked out before saving changes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000903<br />STATUS_BAD_FILE_TYPE</p>
+ </td>
+ <td>
+ <p>The file type being saved or retrieved has been blocked.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000904<br />STATUS_FILE_TOO_LARGE</p>
+ </td>
+ <td>
+ <p>The file size exceeds the limit allowed and cannot be saved.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000905<br />STATUS_FORMS_AUTH_REQUIRED</p>
+ </td>
+ <td>
+ <p>Access Denied. Before opening files in this location, you must first browse to the e.g. site and select the option to log on automatically.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000906<br />STATUS_VIRUS_INFECTED</p>
+ </td>
+ <td>
+ <p>The operation did not complete successfully because the file contains a virus.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000907<br />STATUS_VIRUS_DELETED</p>
+ </td>
+ <td>
+ <p>This file contains a virus and cannot be opened. Due to the nature of this virus, the file has been removed from this location.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000908<br />STATUS_BAD_MCFG_TABLE</p>
+ </td>
+ <td>
+ <p>The resources required for this device conflict with the MCFG table.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0000909<br />STATUS_CANNOT_BREAK_OPLOCK</p>
+ </td>
+ <td>
+ <p>The operation did not complete successfully because it would cause an oplock to be broken. The caller has requested that existing oplocks not be broken.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0009898<br />STATUS_WOW_ASSERTION</p>
+ </td>
+ <td>
+ <p>WOW Assertion Error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A000<br />STATUS_INVALID_SIGNATURE</p>
+ </td>
+ <td>
+ <p>The cryptographic signature is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A001<br />STATUS_HMAC_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The cryptographic provider does not support HMAC.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A010<br />STATUS_IPSEC_QUEUE_OVERFLOW</p>
+ </td>
+ <td>
+ <p>The IPsec queue overflowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A011<br />STATUS_ND_QUEUE_OVERFLOW</p>
+ </td>
+ <td>
+ <p>The neighbor discovery queue overflowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A012<br />STATUS_HOPLIMIT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>An Internet Control Message Protocol (ICMP) hop limit exceeded error was received.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A013<br />STATUS_PROTOCOL_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The protocol is not installed on the local machine.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A080<br />STATUS_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>{Delayed Write Failed} Windows was unable to save all the data for the file %hs; the data has been lost. This error may be caused by network connectivity issues. Try to save this file elsewhere.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A081<br />STATUS_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR</p>
+ </td>
+ <td>
+ <p>{Delayed Write Failed} Windows was unable to save all the data for the file %hs; the data has been lost. This error was returned by the server on which the file exists. Try to save this file elsewhere.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A082<br />STATUS_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR</p>
+ </td>
+ <td>
+ <p>{Delayed Write Failed} Windows was unable to save all the data for the file %hs; the data has been lost. This error may be caused if the device has been removed or the media is write-protected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A083<br />STATUS_XML_PARSE_ERROR</p>
+ </td>
+ <td>
+ <p>Windows was unable to parse the requested XML data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A084<br />STATUS_XMLDSIG_ERROR</p>
+ </td>
+ <td>
+ <p>An error was encountered while processing an XML digital signature.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A085<br />STATUS_WRONG_COMPARTMENT</p>
+ </td>
+ <td>
+ <p>This indicates that the caller made the connection request in the wrong routing compartment.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A086<br />STATUS_AUTHIP_FAILURE</p>
+ </td>
+ <td>
+ <p>This indicates that there was an AuthIP failure when attempting to connect to the remote host.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A087<br />STATUS_DS_OID_MAPPED_GROUP_CANT_HAVE_MEMBERS</p>
+ </td>
+ <td>
+ <p>OID mapped groups cannot have members.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A088<br />STATUS_DS_OID_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified OID cannot be found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A100<br />STATUS_HASH_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>Hash generation for the specified version and hash type is not enabled on server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A101<br />STATUS_HASH_NOT_PRESENT</p>
+ </td>
+ <td>
+ <p>The hash requests is not present or not up to date with the current file contents.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A2A1<br />STATUS_OFFLOAD_READ_FLT_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>A file system filter on the server has not opted in for Offload Read support.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A2A2<br />STATUS_OFFLOAD_WRITE_FLT_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>A file system filter on the server has not opted in for Offload Write support.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A2A3<br />STATUS_OFFLOAD_READ_FILE_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>Offload read operations cannot be performed on:</p>
+ <ul>
+ <li class="unordered">
+ <p class="BulletedList">Compressed files</p>
+ </li>
+ <li class="unordered">
+ <p class="BulletedList">Sparse files</p>
+ </li>
+ <li class="unordered">
+ <p class="BulletedList">Encrypted files</p>
+ </li>
+ <li class="unordered">
+ <p class="BulletedList">File system metadata files</p>
+ </li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC000A2A4<br />STATUS_OFFLOAD_WRITE_FILE_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>Offload write operations cannot be performed on:</p>
+ <ul>
+ <li class="unordered">
+ <p class="BulletedList">Compressed files</p>
+ </li>
+ <li class="unordered">
+ <p class="BulletedList">Sparse files</p>
+ </li>
+ <li class="unordered">
+ <p class="BulletedList">Encrypted files</p>
+ </li>
+ <li class="unordered">
+ <p class="BulletedList">File system metadata files</p>
+ </li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0010001<br />DBG_NO_STATE_CHANGE</p>
+ </td>
+ <td>
+ <p>The debugger did not perform a state change.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0010002<br />DBG_APP_NOT_IDLE</p>
+ </td>
+ <td>
+ <p>The debugger found that the application is not idle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020001<br />RPC_NT_INVALID_STRING_BINDING</p>
+ </td>
+ <td>
+ <p>The string binding is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020002<br />RPC_NT_WRONG_KIND_OF_BINDING</p>
+ </td>
+ <td>
+ <p>The binding handle is not the correct type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020003<br />RPC_NT_INVALID_BINDING</p>
+ </td>
+ <td>
+ <p>The binding handle is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020004<br />RPC_NT_PROTSEQ_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The RPC protocol sequence is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020005<br />RPC_NT_INVALID_RPC_PROTSEQ</p>
+ </td>
+ <td>
+ <p>The RPC protocol sequence is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020006<br />RPC_NT_INVALID_STRING_UUID</p>
+ </td>
+ <td>
+ <p>The string UUID is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020007<br />RPC_NT_INVALID_ENDPOINT_FORMAT</p>
+ </td>
+ <td>
+ <p>The endpoint format is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020008<br />RPC_NT_INVALID_NET_ADDR</p>
+ </td>
+ <td>
+ <p>The network address is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020009<br />RPC_NT_NO_ENDPOINT_FOUND</p>
+ </td>
+ <td>
+ <p>No endpoint was found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002000A<br />RPC_NT_INVALID_TIMEOUT</p>
+ </td>
+ <td>
+ <p>The time-out value is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002000B<br />RPC_NT_OBJECT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The object UUID was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002000C<br />RPC_NT_ALREADY_REGISTERED</p>
+ </td>
+ <td>
+ <p>The object UUID has already been registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002000D<br />RPC_NT_TYPE_ALREADY_REGISTERED</p>
+ </td>
+ <td>
+ <p>The type UUID has already been registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002000E<br />RPC_NT_ALREADY_LISTENING</p>
+ </td>
+ <td>
+ <p>The RPC server is already listening.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002000F<br />RPC_NT_NO_PROTSEQS_REGISTERED</p>
+ </td>
+ <td>
+ <p>No protocol sequences have been registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020010<br />RPC_NT_NOT_LISTENING</p>
+ </td>
+ <td>
+ <p>The RPC server is not listening.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020011<br />RPC_NT_UNKNOWN_MGR_TYPE</p>
+ </td>
+ <td>
+ <p>The manager type is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020012<br />RPC_NT_UNKNOWN_IF</p>
+ </td>
+ <td>
+ <p>The interface is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020013<br />RPC_NT_NO_BINDINGS</p>
+ </td>
+ <td>
+ <p>There are no bindings.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020014<br />RPC_NT_NO_PROTSEQS</p>
+ </td>
+ <td>
+ <p>There are no protocol sequences.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020015<br />RPC_NT_CANT_CREATE_ENDPOINT</p>
+ </td>
+ <td>
+ <p>The endpoint cannot be created.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020016<br />RPC_NT_OUT_OF_RESOURCES</p>
+ </td>
+ <td>
+ <p>Insufficient resources are available to complete this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020017<br />RPC_NT_SERVER_UNAVAILABLE</p>
+ </td>
+ <td>
+ <p>The RPC server is unavailable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020018<br />RPC_NT_SERVER_TOO_BUSY</p>
+ </td>
+ <td>
+ <p>The RPC server is too busy to complete this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020019<br />RPC_NT_INVALID_NETWORK_OPTIONS</p>
+ </td>
+ <td>
+ <p>The network options are invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002001A<br />RPC_NT_NO_CALL_ACTIVE</p>
+ </td>
+ <td>
+ <p>No RPCs are active on this thread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002001B<br />RPC_NT_CALL_FAILED</p>
+ </td>
+ <td>
+ <p>The RPC failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002001C<br />RPC_NT_CALL_FAILED_DNE</p>
+ </td>
+ <td>
+ <p>The RPC failed and did not execute.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002001D<br />RPC_NT_PROTOCOL_ERROR</p>
+ </td>
+ <td>
+ <p>An RPC protocol error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002001F<br />RPC_NT_UNSUPPORTED_TRANS_SYN</p>
+ </td>
+ <td>
+ <p>The RPC server does not support the transfer syntax.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020021<br />RPC_NT_UNSUPPORTED_TYPE</p>
+ </td>
+ <td>
+ <p>The type UUID is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020022<br />RPC_NT_INVALID_TAG</p>
+ </td>
+ <td>
+ <p>The tag is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020023<br />RPC_NT_INVALID_BOUND</p>
+ </td>
+ <td>
+ <p>The array bounds are invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020024<br />RPC_NT_NO_ENTRY_NAME</p>
+ </td>
+ <td>
+ <p>The binding does not contain an entry name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020025<br />RPC_NT_INVALID_NAME_SYNTAX</p>
+ </td>
+ <td>
+ <p>The name syntax is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020026<br />RPC_NT_UNSUPPORTED_NAME_SYNTAX</p>
+ </td>
+ <td>
+ <p>The name syntax is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020028<br />RPC_NT_UUID_NO_ADDRESS</p>
+ </td>
+ <td>
+ <p>No network address is available to construct a UUID.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020029<br />RPC_NT_DUPLICATE_ENDPOINT</p>
+ </td>
+ <td>
+ <p>The endpoint is a duplicate.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002002A<br />RPC_NT_UNKNOWN_AUTHN_TYPE</p>
+ </td>
+ <td>
+ <p>The authentication type is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002002B<br />RPC_NT_MAX_CALLS_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>The maximum number of calls is too small.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002002C<br />RPC_NT_STRING_TOO_LONG</p>
+ </td>
+ <td>
+ <p>The string is too long.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002002D<br />RPC_NT_PROTSEQ_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The RPC protocol sequence was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002002E<br />RPC_NT_PROCNUM_OUT_OF_RANGE</p>
+ </td>
+ <td>
+ <p>The procedure number is out of range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002002F<br />RPC_NT_BINDING_HAS_NO_AUTH</p>
+ </td>
+ <td>
+ <p>The binding does not contain any authentication information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020030<br />RPC_NT_UNKNOWN_AUTHN_SERVICE</p>
+ </td>
+ <td>
+ <p>The authentication service is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020031<br />RPC_NT_UNKNOWN_AUTHN_LEVEL</p>
+ </td>
+ <td>
+ <p>The authentication level is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020032<br />RPC_NT_INVALID_AUTH_IDENTITY</p>
+ </td>
+ <td>
+ <p>The security context is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020033<br />RPC_NT_UNKNOWN_AUTHZ_SERVICE</p>
+ </td>
+ <td>
+ <p>The authorization service is unknown.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020034<br />EPT_NT_INVALID_ENTRY</p>
+ </td>
+ <td>
+ <p>The entry is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020035<br />EPT_NT_CANT_PERFORM_OP</p>
+ </td>
+ <td>
+ <p>The operation cannot be performed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020036<br />EPT_NT_NOT_REGISTERED</p>
+ </td>
+ <td>
+ <p>No more endpoints are available from the endpoint mapper.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020037<br />RPC_NT_NOTHING_TO_EXPORT</p>
+ </td>
+ <td>
+ <p>No interfaces have been exported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020038<br />RPC_NT_INCOMPLETE_NAME</p>
+ </td>
+ <td>
+ <p>The entry name is incomplete.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020039<br />RPC_NT_INVALID_VERS_OPTION</p>
+ </td>
+ <td>
+ <p>The version option is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002003A<br />RPC_NT_NO_MORE_MEMBERS</p>
+ </td>
+ <td>
+ <p>There are no more members.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002003B<br />RPC_NT_NOT_ALL_OBJS_UNEXPORTED</p>
+ </td>
+ <td>
+ <p>There is nothing to unexport.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002003C<br />RPC_NT_INTERFACE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The interface was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002003D<br />RPC_NT_ENTRY_ALREADY_EXISTS</p>
+ </td>
+ <td>
+ <p>The entry already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002003E<br />RPC_NT_ENTRY_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The entry was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002003F<br />RPC_NT_NAME_SERVICE_UNAVAILABLE</p>
+ </td>
+ <td>
+ <p>The name service is unavailable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020040<br />RPC_NT_INVALID_NAF_ID</p>
+ </td>
+ <td>
+ <p>The network address family is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020041<br />RPC_NT_CANNOT_SUPPORT</p>
+ </td>
+ <td>
+ <p>The requested operation is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020042<br />RPC_NT_NO_CONTEXT_AVAILABLE</p>
+ </td>
+ <td>
+ <p>No security context is available to allow impersonation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020043<br />RPC_NT_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An internal error occurred in the RPC.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020044<br />RPC_NT_ZERO_DIVIDE</p>
+ </td>
+ <td>
+ <p>The RPC server attempted to divide an integer by zero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020045<br />RPC_NT_ADDRESS_ERROR</p>
+ </td>
+ <td>
+ <p>An addressing error occurred in the RPC server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020046<br />RPC_NT_FP_DIV_ZERO</p>
+ </td>
+ <td>
+ <p>A floating point operation at the RPC server caused a divide by zero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020047<br />RPC_NT_FP_UNDERFLOW</p>
+ </td>
+ <td>
+ <p>A floating point underflow occurred at the RPC server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020048<br />RPC_NT_FP_OVERFLOW</p>
+ </td>
+ <td>
+ <p>A floating point overflow occurred at the RPC server.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020049<br />RPC_NT_CALL_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>An RPC is already in progress for this thread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002004A<br />RPC_NT_NO_MORE_BINDINGS</p>
+ </td>
+ <td>
+ <p>There are no more bindings.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002004B<br />RPC_NT_GROUP_MEMBER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The group member was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002004C<br />EPT_NT_CANT_CREATE</p>
+ </td>
+ <td>
+ <p>The endpoint mapper database entry could not be created.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002004D<br />RPC_NT_INVALID_OBJECT</p>
+ </td>
+ <td>
+ <p>The object UUID is the nil UUID.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC002004F<br />RPC_NT_NO_INTERFACES</p>
+ </td>
+ <td>
+ <p>No interfaces have been registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020050<br />RPC_NT_CALL_CANCELLED</p>
+ </td>
+ <td>
+ <p>The RPC was canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020051<br />RPC_NT_BINDING_INCOMPLETE</p>
+ </td>
+ <td>
+ <p>The binding handle does not contain all the required information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020052<br />RPC_NT_COMM_FAILURE</p>
+ </td>
+ <td>
+ <p>A communications failure occurred during an RPC.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020053<br />RPC_NT_UNSUPPORTED_AUTHN_LEVEL</p>
+ </td>
+ <td>
+ <p>The requested authentication level is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020054<br />RPC_NT_NO_PRINC_NAME</p>
+ </td>
+ <td>
+ <p>No principal name was registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020055<br />RPC_NT_NOT_RPC_ERROR</p>
+ </td>
+ <td>
+ <p>The error specified is not a valid Windows RPC error code.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020057<br />RPC_NT_SEC_PKG_ERROR</p>
+ </td>
+ <td>
+ <p>A security package-specific error occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020058<br />RPC_NT_NOT_CANCELLED</p>
+ </td>
+ <td>
+ <p>The thread was not canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020062<br />RPC_NT_INVALID_ASYNC_HANDLE</p>
+ </td>
+ <td>
+ <p>Invalid asynchronous RPC handle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020063<br />RPC_NT_INVALID_ASYNC_CALL</p>
+ </td>
+ <td>
+ <p>Invalid asynchronous RPC call handle for this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0020064<br />RPC_NT_PROXY_ACCESS_DENIED</p>
+ </td>
+ <td>
+ <p>Access to the HTTP proxy is denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030001<br />RPC_NT_NO_MORE_ENTRIES</p>
+ </td>
+ <td>
+ <p>The list of RPC servers available for auto-handle binding has been exhausted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030002<br />RPC_NT_SS_CHAR_TRANS_OPEN_FAIL</p>
+ </td>
+ <td>
+ <p>The file designated by DCERPCCHARTRANS cannot be opened.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030003<br />RPC_NT_SS_CHAR_TRANS_SHORT_FILE</p>
+ </td>
+ <td>
+ <p>The file containing the character translation table has fewer than 512 bytes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030004<br />RPC_NT_SS_IN_NULL_CONTEXT</p>
+ </td>
+ <td>
+ <p>A null context handle is passed as an [in] parameter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030005<br />RPC_NT_SS_CONTEXT_MISMATCH</p>
+ </td>
+ <td>
+ <p>The context handle does not match any known context handles.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030006<br />RPC_NT_SS_CONTEXT_DAMAGED</p>
+ </td>
+ <td>
+ <p>The context handle changed during a call.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030007<br />RPC_NT_SS_HANDLES_MISMATCH</p>
+ </td>
+ <td>
+ <p>The binding handles passed to an RPC do not match.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030008<br />RPC_NT_SS_CANNOT_GET_CALL_HANDLE</p>
+ </td>
+ <td>
+ <p>The stub is unable to get the call handle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030009<br />RPC_NT_NULL_REF_POINTER</p>
+ </td>
+ <td>
+ <p>A null reference pointer was passed to the stub.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003000A<br />RPC_NT_ENUM_VALUE_OUT_OF_RANGE</p>
+ </td>
+ <td>
+ <p>The enumeration value is out of range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003000B<br />RPC_NT_BYTE_COUNT_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>The byte count is too small.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003000C<br />RPC_NT_BAD_STUB_DATA</p>
+ </td>
+ <td>
+ <p>The stub received bad data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030059<br />RPC_NT_INVALID_ES_ACTION</p>
+ </td>
+ <td>
+ <p>Invalid operation on the encoding/decoding handle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003005A<br />RPC_NT_WRONG_ES_VERSION</p>
+ </td>
+ <td>
+ <p>Incompatible version of the serializing package.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003005B<br />RPC_NT_WRONG_STUB_VERSION</p>
+ </td>
+ <td>
+ <p>Incompatible version of the RPC stub.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003005C<br />RPC_NT_INVALID_PIPE_OBJECT</p>
+ </td>
+ <td>
+ <p>The RPC pipe object is invalid or corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003005D<br />RPC_NT_INVALID_PIPE_OPERATION</p>
+ </td>
+ <td>
+ <p>An invalid operation was attempted on an RPC pipe object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003005E<br />RPC_NT_WRONG_PIPE_VERSION</p>
+ </td>
+ <td>
+ <p>Unsupported RPC pipe version.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC003005F<br />RPC_NT_PIPE_CLOSED</p>
+ </td>
+ <td>
+ <p>The RPC pipe object has already been closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030060<br />RPC_NT_PIPE_DISCIPLINE_ERROR</p>
+ </td>
+ <td>
+ <p>The RPC call completed before all pipes were processed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0030061<br />RPC_NT_PIPE_EMPTY</p>
+ </td>
+ <td>
+ <p>No more data is available from the RPC pipe.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0040035<br />STATUS_PNP_BAD_MPS_TABLE</p>
+ </td>
+ <td>
+ <p>A device is missing in the system BIOS MPS table. This device will not be used. Contact your system vendor for a system BIOS update.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0040036<br />STATUS_PNP_TRANSLATION_FAILED</p>
+ </td>
+ <td>
+ <p>A translator failed to translate resources.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0040037<br />STATUS_PNP_IRQ_TRANSLATION_FAILED</p>
+ </td>
+ <td>
+ <p>An IRQ translator failed to translate resources.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0040038<br />STATUS_PNP_INVALID_ID</p>
+ </td>
+ <td>
+ <p>Driver %2 returned an invalid ID for a child device (%3).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0040039<br />STATUS_IO_REISSUE_AS_CACHED</p>
+ </td>
+ <td>
+ <p>Reissue the given operation as a cached I/O operation</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0001<br />STATUS_CTX_WINSTATION_NAME_INVALID</p>
+ </td>
+ <td>
+ <p>Session name %1 is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0002<br />STATUS_CTX_INVALID_PD</p>
+ </td>
+ <td>
+ <p>The protocol driver %1 is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0003<br />STATUS_CTX_PD_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The protocol driver %1 was not found in the system path.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0006<br />STATUS_CTX_CLOSE_PENDING</p>
+ </td>
+ <td>
+ <p>A close operation is pending on the terminal connection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0007<br />STATUS_CTX_NO_OUTBUF</p>
+ </td>
+ <td>
+ <p>No free output buffers are available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0008<br />STATUS_CTX_MODEM_INF_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The MODEM.INF file was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0009<br />STATUS_CTX_INVALID_MODEMNAME</p>
+ </td>
+ <td>
+ <p>The modem (%1) was not found in the MODEM.INF file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A000A<br />STATUS_CTX_RESPONSE_ERROR</p>
+ </td>
+ <td>
+ <p>The modem did not accept the command sent to it. Verify that the configured modem name matches the attached modem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A000B<br />STATUS_CTX_MODEM_RESPONSE_TIMEOUT</p>
+ </td>
+ <td>
+ <p>The modem did not respond to the command sent to it. Verify that the modem cable is properly attached and the modem is turned on.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A000C<br />STATUS_CTX_MODEM_RESPONSE_NO_CARRIER</p>
+ </td>
+ <td>
+ <p>Carrier detection has failed or the carrier has been dropped due to disconnection.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A000D<br />STATUS_CTX_MODEM_RESPONSE_NO_DIALTONE</p>
+ </td>
+ <td>
+ <p>A dial tone was not detected within the required time. Verify that the phone cable is properly attached and functional.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A000E<br />STATUS_CTX_MODEM_RESPONSE_BUSY</p>
+ </td>
+ <td>
+ <p>A busy signal was detected at a remote site on callback.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A000F<br />STATUS_CTX_MODEM_RESPONSE_VOICE</p>
+ </td>
+ <td>
+ <p>A voice was detected at a remote site on callback.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0010<br />STATUS_CTX_TD_ERROR</p>
+ </td>
+ <td>
+ <p>Transport driver error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0012<br />STATUS_CTX_LICENSE_CLIENT_INVALID</p>
+ </td>
+ <td>
+ <p>The client you are using is not licensed to use this system. Your logon request is denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0013<br />STATUS_CTX_LICENSE_NOT_AVAILABLE</p>
+ </td>
+ <td>
+ <p>The system has reached its licensed logon limit. Try again later.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0014<br />STATUS_CTX_LICENSE_EXPIRED</p>
+ </td>
+ <td>
+ <p>The system license has expired. Your logon request is denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0015<br />STATUS_CTX_WINSTATION_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified session cannot be found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0016<br />STATUS_CTX_WINSTATION_NAME_COLLISION</p>
+ </td>
+ <td>
+ <p>The specified session name is already in use.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0017<br />STATUS_CTX_WINSTATION_BUSY</p>
+ </td>
+ <td>
+ <p>The requested operation cannot be completed because the terminal connection is currently processing a connect, disconnect, reset, or delete operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0018<br />STATUS_CTX_BAD_VIDEO_MODE</p>
+ </td>
+ <td>
+ <p>An attempt has been made to connect to a session whose video mode is not supported by the current client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0022<br />STATUS_CTX_GRAPHICS_INVALID</p>
+ </td>
+ <td>
+ <p>The application attempted to enable DOS graphics mode. DOS graphics mode is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0024<br />STATUS_CTX_NOT_CONSOLE</p>
+ </td>
+ <td>
+ <p>The requested operation can be performed only on the system console. This is most often the result of a driver or system DLL requiring direct console access.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0026<br />STATUS_CTX_CLIENT_QUERY_TIMEOUT</p>
+ </td>
+ <td>
+ <p>The client failed to respond to the server connect message.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0027<br />STATUS_CTX_CONSOLE_DISCONNECT</p>
+ </td>
+ <td>
+ <p>Disconnecting the console session is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0028<br />STATUS_CTX_CONSOLE_CONNECT</p>
+ </td>
+ <td>
+ <p>Reconnecting a disconnected session to the console is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A002A<br />STATUS_CTX_SHADOW_DENIED</p>
+ </td>
+ <td>
+ <p>The request to control another session remotely was denied.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A002B<br />STATUS_CTX_WINSTATION_ACCESS_DENIED</p>
+ </td>
+ <td>
+ <p>A process has requested access to a session, but has not been granted those access rights.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A002E<br />STATUS_CTX_INVALID_WD</p>
+ </td>
+ <td>
+ <p>The terminal connection driver %1 is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A002F<br />STATUS_CTX_WD_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The terminal connection driver %1 was not found in the system path.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0030<br />STATUS_CTX_SHADOW_INVALID</p>
+ </td>
+ <td>
+ <p>The requested session cannot be controlled remotely. You cannot control your own session, a session that is trying to control your session, a session that has no user logged on, or other sessions from the console.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0031<br />STATUS_CTX_SHADOW_DISABLED</p>
+ </td>
+ <td>
+ <p>The requested session is not configured to allow remote control.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0032<br />STATUS_RDP_PROTOCOL_ERROR</p>
+ </td>
+ <td>
+ <p>The RDP protocol component %2 detected an error in the protocol stream and has disconnected the client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0033<br />STATUS_CTX_CLIENT_LICENSE_NOT_SET</p>
+ </td>
+ <td>
+ <p>Your request to connect to this <a href="https://msdn.microsoft.com/en-us/library/43f5bde9-36cf-4d5a-af80-8c687cce8b60#terminal_server">terminal server</a> has been rejected. Your terminal server client license number has not been entered for this copy of the terminal client. Contact your system administrator for help in entering a valid, unique license number for this terminal server client. Click OK to continue.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0034<br />STATUS_CTX_CLIENT_LICENSE_IN_USE</p>
+ </td>
+ <td>
+ <p>Your request to connect to this terminal server has been rejected. Your terminal server client license number is currently being used by another user. Contact your system administrator to obtain a new copy of the terminal server client with a valid, unique license number. Click OK to continue.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0035<br />STATUS_CTX_SHADOW_ENDED_BY_MODE_CHANGE</p>
+ </td>
+ <td>
+ <p>The remote control of the console was terminated because the display mode was changed. Changing the display mode in a remote control session is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0036<br />STATUS_CTX_SHADOW_NOT_RUNNING</p>
+ </td>
+ <td>
+ <p>Remote control could not be terminated because the specified session is not currently being remotely controlled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0037<br />STATUS_CTX_LOGON_DISABLED</p>
+ </td>
+ <td>
+ <p>Your interactive logon privilege has been disabled. Contact your system administrator.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0038<br />STATUS_CTX_SECURITY_LAYER_ERROR</p>
+ </td>
+ <td>
+ <p>The terminal server security layer detected an error in the protocol stream and has disconnected the client.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00A0039<br />STATUS_TS_INCOMPATIBLE_SESSIONS</p>
+ </td>
+ <td>
+ <p>The target session is incompatible with the current session.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0001<br />STATUS_MUI_FILE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The resource loader failed to find an MUI file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0002<br />STATUS_MUI_INVALID_FILE</p>
+ </td>
+ <td>
+ <p>The resource loader failed to load an MUI file because the file failed to pass validation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0003<br />STATUS_MUI_INVALID_RC_CONFIG</p>
+ </td>
+ <td>
+ <p>The RC manifest is corrupted with garbage data, is an unsupported version, or is missing a required item.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0004<br />STATUS_MUI_INVALID_LOCALE_NAME</p>
+ </td>
+ <td>
+ <p>The RC manifest has an invalid culture name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0005<br />STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME</p>
+ </td>
+ <td>
+ <p>The RC manifest has and invalid ultimate fallback name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0006<br />STATUS_MUI_FILE_NOT_LOADED</p>
+ </td>
+ <td>
+ <p>The resource loader cache does not have a loaded MUI entry.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC00B0007<br />STATUS_RESOURCE_ENUM_USER_STOP</p>
+ </td>
+ <td>
+ <p>The user stopped resource enumeration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130001<br />STATUS_CLUSTER_INVALID_NODE</p>
+ </td>
+ <td>
+ <p>The cluster node is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130002<br />STATUS_CLUSTER_NODE_EXISTS</p>
+ </td>
+ <td>
+ <p>The cluster node already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130003<br />STATUS_CLUSTER_JOIN_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>A node is in the process of joining the cluster.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130004<br />STATUS_CLUSTER_NODE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The cluster node was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130005<br />STATUS_CLUSTER_LOCAL_NODE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The cluster local node information was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130006<br />STATUS_CLUSTER_NETWORK_EXISTS</p>
+ </td>
+ <td>
+ <p>The cluster network already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130007<br />STATUS_CLUSTER_NETWORK_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The cluster network was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130008<br />STATUS_CLUSTER_NETINTERFACE_EXISTS</p>
+ </td>
+ <td>
+ <p>The cluster network interface already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130009<br />STATUS_CLUSTER_NETINTERFACE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The cluster network interface was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC013000A<br />STATUS_CLUSTER_INVALID_REQUEST</p>
+ </td>
+ <td>
+ <p>The cluster request is not valid for this object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC013000B<br />STATUS_CLUSTER_INVALID_NETWORK_PROVIDER</p>
+ </td>
+ <td>
+ <p>The cluster network provider is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC013000C<br />STATUS_CLUSTER_NODE_DOWN</p>
+ </td>
+ <td>
+ <p>The cluster node is down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC013000D<br />STATUS_CLUSTER_NODE_UNREACHABLE</p>
+ </td>
+ <td>
+ <p>The cluster node is not reachable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC013000E<br />STATUS_CLUSTER_NODE_NOT_MEMBER</p>
+ </td>
+ <td>
+ <p>The cluster node is not a member of the cluster.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC013000F<br />STATUS_CLUSTER_JOIN_NOT_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>A cluster join operation is not in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130010<br />STATUS_CLUSTER_INVALID_NETWORK</p>
+ </td>
+ <td>
+ <p>The cluster network is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130011<br />STATUS_CLUSTER_NO_NET_ADAPTERS</p>
+ </td>
+ <td>
+ <p>No network adapters are available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130012<br />STATUS_CLUSTER_NODE_UP</p>
+ </td>
+ <td>
+ <p>The cluster node is up.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130013<br />STATUS_CLUSTER_NODE_PAUSED</p>
+ </td>
+ <td>
+ <p>The cluster node is paused.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130014<br />STATUS_CLUSTER_NODE_NOT_PAUSED</p>
+ </td>
+ <td>
+ <p>The cluster node is not paused.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130015<br />STATUS_CLUSTER_NO_SECURITY_CONTEXT</p>
+ </td>
+ <td>
+ <p>No cluster security context is available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130016<br />STATUS_CLUSTER_NETWORK_NOT_INTERNAL</p>
+ </td>
+ <td>
+ <p>The cluster network is not configured for internal cluster communication.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0130017<br />STATUS_CLUSTER_POISONED</p>
+ </td>
+ <td>
+ <p>The cluster node has been poisoned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140001<br />STATUS_ACPI_INVALID_OPCODE</p>
+ </td>
+ <td>
+ <p>An attempt was made to run an invalid AML opcode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140002<br />STATUS_ACPI_STACK_OVERFLOW</p>
+ </td>
+ <td>
+ <p>The AML interpreter stack has overflowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140003<br />STATUS_ACPI_ASSERT_FAILED</p>
+ </td>
+ <td>
+ <p>An inconsistent state has occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140004<br />STATUS_ACPI_INVALID_INDEX</p>
+ </td>
+ <td>
+ <p>An attempt was made to access an array outside its bounds.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140005<br />STATUS_ACPI_INVALID_ARGUMENT</p>
+ </td>
+ <td>
+ <p>A required argument was not specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140006<br />STATUS_ACPI_FATAL</p>
+ </td>
+ <td>
+ <p>A fatal error has occurred.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140007<br />STATUS_ACPI_INVALID_SUPERNAME</p>
+ </td>
+ <td>
+ <p>An invalid SuperName was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140008<br />STATUS_ACPI_INVALID_ARGTYPE</p>
+ </td>
+ <td>
+ <p>An argument with an incorrect type was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140009<br />STATUS_ACPI_INVALID_OBJTYPE</p>
+ </td>
+ <td>
+ <p>An object with an incorrect type was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC014000A<br />STATUS_ACPI_INVALID_TARGETTYPE</p>
+ </td>
+ <td>
+ <p>A target with an incorrect type was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC014000B<br />STATUS_ACPI_INCORRECT_ARGUMENT_COUNT</p>
+ </td>
+ <td>
+ <p>An incorrect number of arguments was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC014000C<br />STATUS_ACPI_ADDRESS_NOT_MAPPED</p>
+ </td>
+ <td>
+ <p>An address failed to translate.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC014000D<br />STATUS_ACPI_INVALID_EVENTTYPE</p>
+ </td>
+ <td>
+ <p>An incorrect event type was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC014000E<br />STATUS_ACPI_HANDLER_COLLISION</p>
+ </td>
+ <td>
+ <p>A handler for the target already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC014000F<br />STATUS_ACPI_INVALID_DATA</p>
+ </td>
+ <td>
+ <p>Invalid data for the target was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140010<br />STATUS_ACPI_INVALID_REGION</p>
+ </td>
+ <td>
+ <p>An invalid region for the target was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140011<br />STATUS_ACPI_INVALID_ACCESS_SIZE</p>
+ </td>
+ <td>
+ <p>An attempt was made to access a field outside the defined range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140012<br />STATUS_ACPI_ACQUIRE_GLOBAL_LOCK</p>
+ </td>
+ <td>
+ <p>The global system lock could not be acquired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140013<br />STATUS_ACPI_ALREADY_INITIALIZED</p>
+ </td>
+ <td>
+ <p>An attempt was made to reinitialize the ACPI subsystem.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140014<br />STATUS_ACPI_NOT_INITIALIZED</p>
+ </td>
+ <td>
+ <p>The ACPI subsystem has not been initialized.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140015<br />STATUS_ACPI_INVALID_MUTEX_LEVEL</p>
+ </td>
+ <td>
+ <p>An incorrect mutex was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140016<br />STATUS_ACPI_MUTEX_NOT_OWNED</p>
+ </td>
+ <td>
+ <p>The mutex is not currently owned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140017<br />STATUS_ACPI_MUTEX_NOT_OWNER</p>
+ </td>
+ <td>
+ <p>An attempt was made to access the mutex by a process that was not the owner.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140018<br />STATUS_ACPI_RS_ACCESS</p>
+ </td>
+ <td>
+ <p>An error occurred during an access to region space.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140019<br />STATUS_ACPI_INVALID_TABLE</p>
+ </td>
+ <td>
+ <p>An attempt was made to use an incorrect table.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140020<br />STATUS_ACPI_REG_HANDLER_FAILED</p>
+ </td>
+ <td>
+ <p>The registration of an ACPI event failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0140021<br />STATUS_ACPI_POWER_REQUEST_FAILED</p>
+ </td>
+ <td>
+ <p>An ACPI power object failed to transition state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150001<br />STATUS_SXS_SECTION_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The requested section is not present in the activation context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150002<br />STATUS_SXS_CANT_GEN_ACTCTX</p>
+ </td>
+ <td>
+ <p>
+ Windows was unble to process the application binding information. Refer to the system event log for further information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150003<br />STATUS_SXS_INVALID_ACTCTXDATA_FORMAT</p>
+ </td>
+ <td>
+ <p>The application binding data format is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150004<br />STATUS_SXS_ASSEMBLY_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The referenced assembly is not installed on the system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150005<br />STATUS_SXS_MANIFEST_FORMAT_ERROR</p>
+ </td>
+ <td>
+ <p>The manifest file does not begin with the required tag and format information.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150006<br />STATUS_SXS_MANIFEST_PARSE_ERROR</p>
+ </td>
+ <td>
+ <p>The manifest file contains one or more syntax errors.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150007<br />STATUS_SXS_ACTIVATION_CONTEXT_DISABLED</p>
+ </td>
+ <td>
+ <p>The application attempted to activate a disabled activation context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150008<br />STATUS_SXS_KEY_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The requested lookup key was not found in any active activation context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150009<br />STATUS_SXS_VERSION_CONFLICT</p>
+ </td>
+ <td>
+ <p>A component version required by the application conflicts with another component version that is already active.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015000A<br />STATUS_SXS_WRONG_SECTION_TYPE</p>
+ </td>
+ <td>
+ <p>The type requested activation context section does not match the query API used.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015000B<br />STATUS_SXS_THREAD_QUERIES_DISABLED</p>
+ </td>
+ <td>
+ <p>Lack of system resources has required isolated activation to be disabled for the current thread of execution.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015000C<br />STATUS_SXS_ASSEMBLY_MISSING</p>
+ </td>
+ <td>
+ <p>The referenced assembly could not be found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015000E<br />STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET</p>
+ </td>
+ <td>
+ <p>An attempt to set the process default activation context failed because the process default activation context was already set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015000F<br />STATUS_SXS_EARLY_DEACTIVATION</p>
+ </td>
+ <td>
+ <p>The activation context being deactivated is not the most recently activated one.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150010<br />STATUS_SXS_INVALID_DEACTIVATION</p>
+ </td>
+ <td>
+ <p>The activation context being deactivated is not active for the current thread of execution.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150011<br />STATUS_SXS_MULTIPLE_DEACTIVATION</p>
+ </td>
+ <td>
+ <p>The activation context being deactivated has already been deactivated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150012<br />STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY</p>
+ </td>
+ <td>
+ <p>The activation context of the system default assembly could not be generated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150013<br />STATUS_SXS_PROCESS_TERMINATION_REQUESTED</p>
+ </td>
+ <td>
+ <p>A component used by the isolation facility has requested that the process be terminated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150014<br />STATUS_SXS_CORRUPT_ACTIVATION_STACK</p>
+ </td>
+ <td>
+ <p>The activation context activation stack for the running thread of execution is corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150015<br />STATUS_SXS_CORRUPTION</p>
+ </td>
+ <td>
+ <p>The application isolation metadata for this process or thread has become corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150016<br />STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE</p>
+ </td>
+ <td>
+ <p>The value of an attribute in an identity is not within the legal range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150017<br />STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME</p>
+ </td>
+ <td>
+ <p>The name of an attribute in an identity is not within the legal range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150018<br />STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE</p>
+ </td>
+ <td>
+ <p>An identity contains two definitions for the same attribute.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150019<br />STATUS_SXS_IDENTITY_PARSE_ERROR</p>
+ </td>
+ <td>
+ <p>The identity string is malformed. This may be due to a trailing comma, more than two unnamed attributes, a missing attribute name, or a missing attribute value.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015001A<br />STATUS_SXS_COMPONENT_STORE_CORRUPT</p>
+ </td>
+ <td>
+ <p>The component store has become corrupted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015001B<br />STATUS_SXS_FILE_HASH_MISMATCH</p>
+ </td>
+ <td>
+ <p>A component's file does not match the verification information present in the component manifest.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015001C<br />STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT</p>
+ </td>
+ <td>
+ <p>The identities of the manifests are identical, but their contents are different.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015001D<br />STATUS_SXS_IDENTITIES_DIFFERENT</p>
+ </td>
+ <td>
+ <p>The component identities are different.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015001E<br />STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT</p>
+ </td>
+ <td>
+ <p>The assembly is not a deployment.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC015001F<br />STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY</p>
+ </td>
+ <td>
+ <p>The file is not a part of the assembly.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150020<br />STATUS_ADVANCED_INSTALLER_FAILED</p>
+ </td>
+ <td>
+ <p>An advanced installer failed during setup or servicing.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150021<br />STATUS_XML_ENCODING_MISMATCH</p>
+ </td>
+ <td>
+ <p>The character encoding in the XML declaration did not match the encoding used in the document.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150022<br />STATUS_SXS_MANIFEST_TOO_BIG</p>
+ </td>
+ <td>
+ <p>The size of the manifest exceeds the maximum allowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150023<br />STATUS_SXS_SETTING_NOT_REGISTERED</p>
+ </td>
+ <td>
+ <p>The setting is not registered.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150024<br />STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE</p>
+ </td>
+ <td>
+ <p>One or more required transaction members are not present.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150025<br />STATUS_SMI_PRIMITIVE_INSTALLER_FAILED</p>
+ </td>
+ <td>
+ <p>The SMI primitive installer failed during setup or servicing.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150026<br />STATUS_GENERIC_COMMAND_FAILED</p>
+ </td>
+ <td>
+ <p>A generic command executable returned a result that indicates failure.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0150027<br />STATUS_SXS_FILE_HASH_MISSING</p>
+ </td>
+ <td>
+ <p>A component is missing file verification information in its manifest.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190001<br />STATUS_TRANSACTIONAL_CONFLICT</p>
+ </td>
+ <td>
+ <p>The function attempted to use a name that is reserved for use by another transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190002<br />STATUS_INVALID_TRANSACTION</p>
+ </td>
+ <td>
+ <p>The transaction handle associated with this operation is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190003<br />STATUS_TRANSACTION_NOT_ACTIVE</p>
+ </td>
+ <td>
+ <p>The requested operation was made in the context of a transaction that is no longer active.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190004<br />STATUS_TM_INITIALIZATION_FAILED</p>
+ </td>
+ <td>
+ <p>The transaction manager was unable to be successfully initialized. Transacted operations are not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190005<br />STATUS_RM_NOT_ACTIVE</p>
+ </td>
+ <td>
+ <p>Transaction support within the specified file system resource manager was not started or was shut down due to an error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190006<br />STATUS_RM_METADATA_CORRUPT</p>
+ </td>
+ <td>
+ <p>The metadata of the resource manager has been corrupted. The resource manager will not function.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190007<br />STATUS_TRANSACTION_NOT_JOINED</p>
+ </td>
+ <td>
+ <p>The resource manager attempted to prepare a transaction that it has not successfully joined.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190008<br />STATUS_DIRECTORY_NOT_RM</p>
+ </td>
+ <td>
+ <p>The specified directory does not contain a file system resource manager.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019000A<br />STATUS_TRANSACTIONS_UNSUPPORTED_REMOTE</p>
+ </td>
+ <td>
+ <p>The remote server or share does not support transacted file operations.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019000B<br />STATUS_LOG_RESIZE_INVALID_SIZE</p>
+ </td>
+ <td>
+ <p>The requested log size for the file system resource manager is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019000C<br />STATUS_REMOTE_FILE_VERSION_MISMATCH</p>
+ </td>
+ <td>
+ <p>The remote server sent mismatching version number or Fid for a file opened with transactions.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019000F<br />STATUS_CRM_PROTOCOL_ALREADY_EXISTS</p>
+ </td>
+ <td>
+ <p>The resource manager tried to register a protocol that already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190010<br />STATUS_TRANSACTION_PROPAGATION_FAILED</p>
+ </td>
+ <td>
+ <p>The attempt to propagate the transaction failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190011<br />STATUS_CRM_PROTOCOL_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The requested propagation protocol was not registered as a CRM.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190012<br />STATUS_TRANSACTION_SUPERIOR_EXISTS</p>
+ </td>
+ <td>
+ <p>The transaction object already has a superior enlistment, and the caller attempted an operation that would have created a new superior. Only a single superior enlistment is allowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190013<br />STATUS_TRANSACTION_REQUEST_NOT_VALID</p>
+ </td>
+ <td>
+ <p>The requested operation is not valid on the transaction object in its current state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190014<br />STATUS_TRANSACTION_NOT_REQUESTED</p>
+ </td>
+ <td>
+ <p>The caller has called a response API, but the response is not expected because the transaction manager did not issue the corresponding request to the caller.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190015<br />STATUS_TRANSACTION_ALREADY_ABORTED</p>
+ </td>
+ <td>
+ <p>It is too late to perform the requested operation, because the transaction has already been aborted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190016<br />STATUS_TRANSACTION_ALREADY_COMMITTED</p>
+ </td>
+ <td>
+ <p>It is too late to perform the requested operation, because the transaction has already been committed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190017<br />STATUS_TRANSACTION_INVALID_MARSHALL_BUFFER</p>
+ </td>
+ <td>
+ <p>The buffer passed in to NtPushTransaction or NtPullTransaction is not in a valid format.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190018<br />STATUS_CURRENT_TRANSACTION_NOT_VALID</p>
+ </td>
+ <td>
+ <p>The current transaction context associated with the thread is not a valid handle to a transaction object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190019<br />STATUS_LOG_GROWTH_FAILED</p>
+ </td>
+ <td>
+ <p>An attempt to create space in the transactional resource manager's log failed. The failure status has been recorded in the event log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190021<br />STATUS_OBJECT_NO_LONGER_EXISTS</p>
+ </td>
+ <td>
+ <p>The object (file, stream, or link) that corresponds to the handle has been deleted by a transaction savepoint rollback.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190022<br />STATUS_STREAM_MINIVERSION_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified file miniversion was not found for this transacted file open.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190023<br />STATUS_STREAM_MINIVERSION_NOT_VALID</p>
+ </td>
+ <td>
+ <p>The specified file miniversion was found but has been invalidated. The most likely cause is a transaction savepoint rollback.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190024<br />STATUS_MINIVERSION_INACCESSIBLE_FROM_SPECIFIED_TRANSACTION</p>
+ </td>
+ <td>
+ <p>A miniversion may be opened only in the context of the transaction that created it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190025<br />STATUS_CANT_OPEN_MINIVERSION_WITH_MODIFY_INTENT</p>
+ </td>
+ <td>
+ <p>It is not possible to open a miniversion with modify access.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190026<br />STATUS_CANT_CREATE_MORE_STREAM_MINIVERSIONS</p>
+ </td>
+ <td>
+ <p>It is not possible to create any more miniversions for this stream.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190028<br />STATUS_HANDLE_NO_LONGER_VALID</p>
+ </td>
+ <td>
+ <p>The handle has been invalidated by a transaction. The most likely cause is the presence of memory mapping on a file or an open handle when the transaction ended or rolled back to savepoint.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190030<br />STATUS_LOG_CORRUPTION_DETECTED</p>
+ </td>
+ <td>
+ <p>The log data is corrupt.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190032<br />STATUS_RM_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>The transaction outcome is unavailable because the resource manager responsible for it is disconnected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190033<br />STATUS_ENLISTMENT_NOT_SUPERIOR</p>
+ </td>
+ <td>
+ <p>The request was rejected because the enlistment in question is not a superior enlistment.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190036<br />STATUS_FILE_IDENTITY_NOT_PERSISTENT</p>
+ </td>
+ <td>
+ <p>The file cannot be opened in a transaction because its identity depends on the outcome of an unresolved transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190037<br />STATUS_CANT_BREAK_TRANSACTIONAL_DEPENDENCY</p>
+ </td>
+ <td>
+ <p>The operation cannot be performed because another transaction is depending on this property not changing.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190038<br />STATUS_CANT_CROSS_RM_BOUNDARY</p>
+ </td>
+ <td>
+ <p>The operation would involve a single file with two transactional resource managers and is, therefore, not allowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190039<br />STATUS_TXF_DIR_NOT_EMPTY</p>
+ </td>
+ <td>
+ <p>The $Txf directory must be empty for this operation to succeed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019003A<br />STATUS_INDOUBT_TRANSACTIONS_EXIST</p>
+ </td>
+ <td>
+ <p>The operation would leave a transactional resource manager in an inconsistent state and is therefore not allowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019003B<br />STATUS_TM_VOLATILE</p>
+ </td>
+ <td>
+ <p>The operation could not be completed because the transaction manager does not have a log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019003C<br />STATUS_ROLLBACK_TIMER_EXPIRED</p>
+ </td>
+ <td>
+ <p>A rollback could not be scheduled because a previously scheduled rollback has already executed or been queued for execution.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019003D<br />STATUS_TXF_ATTRIBUTE_CORRUPT</p>
+ </td>
+ <td>
+ <p>The transactional metadata attribute on the file or directory %hs is corrupt and unreadable.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019003E<br />STATUS_EFS_NOT_ALLOWED_IN_TRANSACTION</p>
+ </td>
+ <td>
+ <p>The encryption operation could not be completed because a transaction is active.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019003F<br />STATUS_TRANSACTIONAL_OPEN_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>This object is not allowed to be opened in a transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190040<br />STATUS_TRANSACTED_MAPPING_UNSUPPORTED_REMOTE</p>
+ </td>
+ <td>
+ <p>Memory mapping (creating a mapped section) a remote file under a transaction is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190043<br />STATUS_TRANSACTION_REQUIRED_PROMOTION</p>
+ </td>
+ <td>
+ <p>Promotion was required to allow the resource manager to enlist, but the transaction was set to disallow it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190044<br />STATUS_CANNOT_EXECUTE_FILE_IN_TRANSACTION</p>
+ </td>
+ <td>
+ <p>This file is open for modification in an unresolved transaction and may be opened for execute only by a transacted reader.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190045<br />STATUS_TRANSACTIONS_NOT_FROZEN</p>
+ </td>
+ <td>
+ <p>The request to thaw frozen transactions was ignored because transactions were not previously frozen.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190046<br />STATUS_TRANSACTION_FREEZE_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>Transactions cannot be frozen because a freeze is already in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190047<br />STATUS_NOT_SNAPSHOT_VOLUME</p>
+ </td>
+ <td>
+ <p>The target volume is not a snapshot volume. This operation is valid only on a volume mounted as a snapshot.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190048<br />STATUS_NO_SAVEPOINT_WITH_OPEN_FILES</p>
+ </td>
+ <td>
+ <p>The savepoint operation failed because files are open on the transaction, which is not permitted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190049<br />STATUS_SPARSE_NOT_ALLOWED_IN_TRANSACTION</p>
+ </td>
+ <td>
+ <p>The sparse operation could not be completed because a transaction is active on the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019004A<br />STATUS_TM_IDENTITY_MISMATCH</p>
+ </td>
+ <td>
+ <p>The call to create a transaction manager object failed because the Tm Identity that is stored in the log file does not match the Tm Identity that was passed in as an argument.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019004B<br />STATUS_FLOATED_SECTION</p>
+ </td>
+ <td>
+ <p>I/O was attempted on a section object that has been floated as a result of a transaction ending. There is no valid data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019004C<br />STATUS_CANNOT_ACCEPT_TRANSACTED_WORK</p>
+ </td>
+ <td>
+ <p>The transactional resource manager cannot currently accept transacted work due to a transient condition, such as low resources.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019004D<br />STATUS_CANNOT_ABORT_TRANSACTIONS</p>
+ </td>
+ <td>
+ <p>The transactional resource manager had too many transactions outstanding that could not be aborted. The transactional resource manager has been shut down.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019004E<br />STATUS_TRANSACTION_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified transaction was unable to be opened because it was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019004F<br />STATUS_RESOURCEMANAGER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified resource manager was unable to be opened because it was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190050<br />STATUS_ENLISTMENT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified enlistment was unable to be opened because it was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190051<br />STATUS_TRANSACTIONMANAGER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The specified transaction manager was unable to be opened because it was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190052<br />STATUS_TRANSACTIONMANAGER_NOT_ONLINE</p>
+ </td>
+ <td>
+ <p>The specified resource manager was unable to create an enlistment because its associated transaction manager is not online.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190053<br />STATUS_TRANSACTIONMANAGER_RECOVERY_NAME_COLLISION</p>
+ </td>
+ <td>
+ <p>The specified transaction manager was unable to create the objects contained in its log file in the Ob namespace. Therefore, the transaction manager was unable to recover.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190054<br />STATUS_TRANSACTION_NOT_ROOT</p>
+ </td>
+ <td>
+ <p>The call to create a superior enlistment on this transaction object could not be completed because the transaction object specified for the enlistment is a subordinate branch of the transaction. Only the root of the transaction can be enlisted as a superior.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190055<br />STATUS_TRANSACTION_OBJECT_EXPIRED</p>
+ </td>
+ <td>
+ <p>Because the associated transaction manager or resource manager has been closed, the handle is no longer valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190056<br />STATUS_COMPRESSION_NOT_ALLOWED_IN_TRANSACTION</p>
+ </td>
+ <td>
+ <p>The compression operation could not be completed because a transaction is active on the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190057<br />STATUS_TRANSACTION_RESPONSE_NOT_ENLISTED</p>
+ </td>
+ <td>
+ <p>The specified operation could not be performed on this superior enlistment because the enlistment was not created with the corresponding completion response in the NotificationMask.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190058<br />STATUS_TRANSACTION_RECORD_TOO_LONG</p>
+ </td>
+ <td>
+ <p>The specified operation could not be performed because the record to be logged was too long. This can occur because either there are too many enlistments on this transaction or the combined RecoveryInformation being logged on behalf of those enlistments is too long.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190059<br />STATUS_NO_LINK_TRACKING_IN_TRANSACTION</p>
+ </td>
+ <td>
+ <p>The link-tracking operation could not be completed because a transaction is active.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019005A<br />STATUS_OPERATION_NOT_SUPPORTED_IN_TRANSACTION</p>
+ </td>
+ <td>
+ <p>This operation cannot be performed in a transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC019005B<br />STATUS_TRANSACTION_INTEGRITY_VIOLATED</p>
+ </td>
+ <td>
+ <p>The kernel transaction manager had to abort or forget the transaction because it blocked forward progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190060<br />STATUS_EXPIRED_HANDLE</p>
+ </td>
+ <td>
+ <p>The handle is no longer properly associated with its transaction. It may have been opened in a transactional resource manager that was subsequently forced to restart. Please close the handle and open a new one.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0190061<br />STATUS_TRANSACTION_NOT_ENLISTED</p>
+ </td>
+ <td>
+ <p>The specified operation could not be performed because the resource manager is not enlisted in the transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0001<br />STATUS_LOG_SECTOR_INVALID</p>
+ </td>
+ <td>
+ <p>The log service found an invalid log sector.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0002<br />STATUS_LOG_SECTOR_PARITY_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered a log sector with invalid block parity.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0003<br />STATUS_LOG_SECTOR_REMAPPED</p>
+ </td>
+ <td>
+ <p>The log service encountered a remapped log sector.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0004<br />STATUS_LOG_BLOCK_INCOMPLETE</p>
+ </td>
+ <td>
+ <p>The log service encountered a partial or incomplete log block.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0005<br />STATUS_LOG_INVALID_RANGE</p>
+ </td>
+ <td>
+ <p>The log service encountered an attempt to access data outside the active log range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0006<br />STATUS_LOG_BLOCKS_EXHAUSTED</p>
+ </td>
+ <td>
+ <p>The log service user-log marshaling buffers are exhausted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0007<br />STATUS_LOG_READ_CONTEXT_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered an attempt to read from a marshaling area with an invalid read context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0008<br />STATUS_LOG_RESTART_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered an invalid log restart area.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0009<br />STATUS_LOG_BLOCK_VERSION</p>
+ </td>
+ <td>
+ <p>The log service encountered an invalid log block version.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A000A<br />STATUS_LOG_BLOCK_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered an invalid log block.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A000B<br />STATUS_LOG_READ_MODE_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered an attempt to read the log with an invalid read mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A000D<br />STATUS_LOG_METADATA_CORRUPT</p>
+ </td>
+ <td>
+ <p>The log service encountered a corrupted metadata file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A000E<br />STATUS_LOG_METADATA_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered a metadata file that could not be created by the log file system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A000F<br />STATUS_LOG_METADATA_INCONSISTENT</p>
+ </td>
+ <td>
+ <p>The log service encountered a metadata file with inconsistent data.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0010<br />STATUS_LOG_RESERVATION_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered an attempt to erroneously allocate or dispose reservation space.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0011<br />STATUS_LOG_CANT_DELETE</p>
+ </td>
+ <td>
+ <p>The log service cannot delete the log file or the file system container.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0012<br />STATUS_LOG_CONTAINER_LIMIT_EXCEEDED</p>
+ </td>
+ <td>
+ <p>The log service has reached the maximum allowable containers allocated to a log file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0013<br />STATUS_LOG_START_OF_LOG</p>
+ </td>
+ <td>
+ <p>The log service has attempted to read or write backward past the start of the log.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0014<br />STATUS_LOG_POLICY_ALREADY_INSTALLED</p>
+ </td>
+ <td>
+ <p>The log policy could not be installed because a policy of the same type is already present.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0015<br />STATUS_LOG_POLICY_NOT_INSTALLED</p>
+ </td>
+ <td>
+ <p>The log policy in question was not installed at the time of the request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0016<br />STATUS_LOG_POLICY_INVALID</p>
+ </td>
+ <td>
+ <p>The installed set of policies on the log is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0017<br />STATUS_LOG_POLICY_CONFLICT</p>
+ </td>
+ <td>
+ <p>A policy on the log in question prevented the operation from completing.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0018<br />STATUS_LOG_PINNED_ARCHIVE_TAIL</p>
+ </td>
+ <td>
+ <p>The log space cannot be reclaimed because the log is pinned by the archive tail.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0019<br />STATUS_LOG_RECORD_NONEXISTENT</p>
+ </td>
+ <td>
+ <p>The log record is not a record in the log file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A001A<br />STATUS_LOG_RECORDS_RESERVED_INVALID</p>
+ </td>
+ <td>
+ <p>The number of reserved log records or the adjustment of the number of reserved log records is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A001B<br />STATUS_LOG_SPACE_RESERVED_INVALID</p>
+ </td>
+ <td>
+ <p>The reserved log space or the adjustment of the log space is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A001C<br />STATUS_LOG_TAIL_INVALID</p>
+ </td>
+ <td>
+ <p>A new or existing archive tail or the base of the active log is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A001D<br />STATUS_LOG_FULL</p>
+ </td>
+ <td>
+ <p>The log space is exhausted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A001E<br />STATUS_LOG_MULTIPLEXED</p>
+ </td>
+ <td>
+ <p>The log is multiplexed; no direct writes to the physical log are allowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A001F<br />STATUS_LOG_DEDICATED</p>
+ </td>
+ <td>
+ <p>The operation failed because the log is dedicated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0020<br />STATUS_LOG_ARCHIVE_NOT_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The operation requires an archive context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0021<br />STATUS_LOG_ARCHIVE_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>Log archival is in progress.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0022<br />STATUS_LOG_EPHEMERAL</p>
+ </td>
+ <td>
+ <p>The operation requires a nonephemeral log, but the log is ephemeral.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0023<br />STATUS_LOG_NOT_ENOUGH_CONTAINERS</p>
+ </td>
+ <td>
+ <p>The log must have at least two containers before it can be read from or written to.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0024<br />STATUS_LOG_CLIENT_ALREADY_REGISTERED</p>
+ </td>
+ <td>
+ <p>A log client has already registered on the stream.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0025<br />STATUS_LOG_CLIENT_NOT_REGISTERED</p>
+ </td>
+ <td>
+ <p>A log client has not been registered on the stream.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0026<br />STATUS_LOG_FULL_HANDLER_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>A request has already been made to handle the log full condition.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0027<br />STATUS_LOG_CONTAINER_READ_FAILED</p>
+ </td>
+ <td>
+ <p>The log service encountered an error when attempting to read from a log container.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0028<br />STATUS_LOG_CONTAINER_WRITE_FAILED</p>
+ </td>
+ <td>
+ <p>The log service encountered an error when attempting to write to a log container.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0029<br />STATUS_LOG_CONTAINER_OPEN_FAILED</p>
+ </td>
+ <td>
+ <p>The log service encountered an error when attempting to open a log container.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A002A<br />STATUS_LOG_CONTAINER_STATE_INVALID</p>
+ </td>
+ <td>
+ <p>The log service encountered an invalid container state when attempting a requested action.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A002B<br />STATUS_LOG_STATE_INVALID</p>
+ </td>
+ <td>
+ <p>The log service is not in the correct state to perform a requested action.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A002C<br />STATUS_LOG_PINNED</p>
+ </td>
+ <td>
+ <p>The log space cannot be reclaimed because the log is pinned.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A002D<br />STATUS_LOG_METADATA_FLUSH_FAILED</p>
+ </td>
+ <td>
+ <p>The log metadata flush failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A002E<br />STATUS_LOG_INCONSISTENT_SECURITY</p>
+ </td>
+ <td>
+ <p>Security on the log and its containers is inconsistent.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A002F<br />STATUS_LOG_APPENDED_FLUSH_FAILED</p>
+ </td>
+ <td>
+ <p>Records were appended to the log or reservation changes were made, but the log could not be flushed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01A0030<br />STATUS_LOG_PINNED_RESERVATION</p>
+ </td>
+ <td>
+ <p>The log is pinned due to reservation consuming most of the log space. Free some reserved records to make space available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01B00EA<br />STATUS_VIDEO_HUNG_DISPLAY_DRIVER_THREAD</p>
+ </td>
+ <td>
+ <p>{Display Driver Stopped Responding} The %hs display driver has stopped working normally. Save your work and reboot the system to restore full display functionality. The next time you reboot the computer, a dialog box will allow you to upload data about this failure to Microsoft.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0001<br />STATUS_FLT_NO_HANDLER_DEFINED</p>
+ </td>
+ <td>
+ <p>A handler was not defined by the filter for this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0002<br />STATUS_FLT_CONTEXT_ALREADY_DEFINED</p>
+ </td>
+ <td>
+ <p>A context is already defined for this object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0003<br />STATUS_FLT_INVALID_ASYNCHRONOUS_REQUEST</p>
+ </td>
+ <td>
+ <p>Asynchronous requests are not valid for this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0004<br />STATUS_FLT_DISALLOW_FAST_IO</p>
+ </td>
+ <td>
+ <p>This is an internal error code used by the filter manager to determine if a fast I/O operation should be forced down the input/output request packet (IRP) path. Minifilters should never return this value.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0005<br />STATUS_FLT_INVALID_NAME_REQUEST</p>
+ </td>
+ <td>
+ <p>An invalid name request was made. The name requested cannot be retrieved at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0006<br />STATUS_FLT_NOT_SAFE_TO_POST_OPERATION</p>
+ </td>
+ <td>
+ <p>Posting this operation to a worker thread for further processing is not safe at this time because it could lead to a system deadlock.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0007<br />STATUS_FLT_NOT_INITIALIZED</p>
+ </td>
+ <td>
+ <p>The Filter Manager was not initialized when a filter tried to register. Make sure that the Filter Manager is loaded as a driver.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0008<br />STATUS_FLT_FILTER_NOT_READY</p>
+ </td>
+ <td>
+ <p>The filter is not ready for attachment to volumes because it has not finished initializing (FltStartFiltering has not been called).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0009<br />STATUS_FLT_POST_OPERATION_CLEANUP</p>
+ </td>
+ <td>
+ <p>The filter must clean up any operation-specific context at this time because it is being removed from the system before the operation is completed by the lower drivers.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C000A<br />STATUS_FLT_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>The Filter Manager had an internal error from which it cannot recover; therefore, the operation has failed. This is usually the result of a filter returning an invalid value from a pre-operation callback.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C000B<br />STATUS_FLT_DELETING_OBJECT</p>
+ </td>
+ <td>
+ <p>The object specified for this action is in the process of being deleted; therefore, the action requested cannot be completed at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C000C<br />STATUS_FLT_MUST_BE_NONPAGED_POOL</p>
+ </td>
+ <td>
+ <p>A nonpaged pool must be used for this type of context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C000D<br />STATUS_FLT_DUPLICATE_ENTRY</p>
+ </td>
+ <td>
+ <p>A duplicate handler definition has been provided for an operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C000E<br />STATUS_FLT_CBDQ_DISABLED</p>
+ </td>
+ <td>
+ <p>The callback data queue has been disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C000F<br />STATUS_FLT_DO_NOT_ATTACH</p>
+ </td>
+ <td>
+ <p>Do not attach the filter to the volume at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0010<br />STATUS_FLT_DO_NOT_DETACH</p>
+ </td>
+ <td>
+ <p>Do not detach the filter from the volume at this time.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0011<br />STATUS_FLT_INSTANCE_ALTITUDE_COLLISION</p>
+ </td>
+ <td>
+ <p>An instance already exists at this altitude on the volume specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0012<br />STATUS_FLT_INSTANCE_NAME_COLLISION</p>
+ </td>
+ <td>
+ <p>An instance already exists with this name on the volume specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0013<br />STATUS_FLT_FILTER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The system could not find the filter specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0014<br />STATUS_FLT_VOLUME_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The system could not find the volume specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0015<br />STATUS_FLT_INSTANCE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The system could not find the instance specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0016<br />STATUS_FLT_CONTEXT_ALLOCATION_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>No registered context allocation definition was found for the given request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0017<br />STATUS_FLT_INVALID_CONTEXT_REGISTRATION</p>
+ </td>
+ <td>
+ <p>An invalid parameter was specified during context registration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0018<br />STATUS_FLT_NAME_CACHE_MISS</p>
+ </td>
+ <td>
+ <p>The name requested was not found in the Filter Manager name cache and could not be retrieved from the file system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0019<br />STATUS_FLT_NO_DEVICE_OBJECT</p>
+ </td>
+ <td>
+ <p>The requested device object does not exist for the given volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C001A<br />STATUS_FLT_VOLUME_ALREADY_MOUNTED</p>
+ </td>
+ <td>
+ <p>The specified volume is already mounted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C001B<br />STATUS_FLT_ALREADY_ENLISTED</p>
+ </td>
+ <td>
+ <p>The specified transaction context is already enlisted in a transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C001C<br />STATUS_FLT_CONTEXT_ALREADY_LINKED</p>
+ </td>
+ <td>
+ <p>The specified context is already attached to another object.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01C0020<br />STATUS_FLT_NO_WAITER_FOR_REPLY</p>
+ </td>
+ <td>
+ <p>No waiter is present for the filter's reply to this message.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0001<br />STATUS_MONITOR_NO_DESCRIPTOR</p>
+ </td>
+ <td>
+ <p>A monitor descriptor could not be obtained.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0002<br />STATUS_MONITOR_UNKNOWN_DESCRIPTOR_FORMAT</p>
+ </td>
+ <td>
+ <p>This release does not support the format of the obtained monitor descriptor.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0003<br />STATUS_MONITOR_INVALID_DESCRIPTOR_CHECKSUM</p>
+ </td>
+ <td>
+ <p>The checksum of the obtained monitor descriptor is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0004<br />STATUS_MONITOR_INVALID_STANDARD_TIMING_BLOCK</p>
+ </td>
+ <td>
+ <p>The monitor descriptor contains an invalid standard timing block.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0005<br />STATUS_MONITOR_WMI_DATABLOCK_REGISTRATION_FAILED</p>
+ </td>
+ <td>
+ <p>WMI data-block registration failed for one of the MSMonitorClass WMI subclasses.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0006<br />STATUS_MONITOR_INVALID_SERIAL_NUMBER_MONDSC_BLOCK</p>
+ </td>
+ <td>
+ <p>The provided monitor descriptor block is either corrupted or does not contain the monitor's detailed serial number.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0007<br />STATUS_MONITOR_INVALID_USER_FRIENDLY_MONDSC_BLOCK</p>
+ </td>
+ <td>
+ <p>The provided monitor descriptor block is either corrupted or does not contain the monitor's user-friendly name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0008<br />STATUS_MONITOR_NO_MORE_DESCRIPTOR_DATA</p>
+ </td>
+ <td>
+ <p>There is no monitor descriptor data at the specified (offset or size) region.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D0009<br />STATUS_MONITOR_INVALID_DETAILED_TIMING_BLOCK</p>
+ </td>
+ <td>
+ <p>The monitor descriptor contains an invalid detailed timing block.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01D000A<br />STATUS_MONITOR_INVALID_MANUFACTURE_DATE</p>
+ </td>
+ <td>
+ <p>Monitor descriptor contains invalid manufacture date.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0000<br />STATUS_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER</p>
+ </td>
+ <td>
+ <p>Exclusive mode ownership is needed to create an unmanaged primary allocation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0001<br />STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER</p>
+ </td>
+ <td>
+ <p>The driver needs more DMA buffer space to complete the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0002<br />STATUS_GRAPHICS_INVALID_DISPLAY_ADAPTER</p>
+ </td>
+ <td>
+ <p>The specified display adapter handle is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0003<br />STATUS_GRAPHICS_ADAPTER_WAS_RESET</p>
+ </td>
+ <td>
+ <p>The specified display adapter and all of its state have been reset.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0004<br />STATUS_GRAPHICS_INVALID_DRIVER_MODEL</p>
+ </td>
+ <td>
+ <p>The driver stack does not match the expected driver model.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0005<br />STATUS_GRAPHICS_PRESENT_MODE_CHANGED</p>
+ </td>
+ <td>
+ <p>Present happened but ended up into the changed desktop mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0006<br />STATUS_GRAPHICS_PRESENT_OCCLUDED</p>
+ </td>
+ <td>
+ <p>Nothing to present due to desktop occlusion.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0007<br />STATUS_GRAPHICS_PRESENT_DENIED</p>
+ </td>
+ <td>
+ <p>Not able to present due to denial of desktop access.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0008<br />STATUS_GRAPHICS_CANNOTCOLORCONVERT</p>
+ </td>
+ <td>
+ <p>Not able to present with color conversion.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E000B<br />STATUS_GRAPHICS_PRESENT_REDIRECTION_DISABLED</p>
+ </td>
+ <td>
+ <p>Present redirection is disabled (desktop windowing management subsystem is off).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E000C<br />STATUS_GRAPHICS_PRESENT_UNOCCLUDED</p>
+ </td>
+ <td>
+ <p>Previous exclusive VidPn source owner has released its ownership</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0100<br />STATUS_GRAPHICS_NO_VIDEO_MEMORY</p>
+ </td>
+ <td>
+ <p>Not enough video memory is available to complete the operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0101<br />STATUS_GRAPHICS_CANT_LOCK_MEMORY</p>
+ </td>
+ <td>
+ <p>Could not probe and lock the underlying memory of an allocation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0102<br />STATUS_GRAPHICS_ALLOCATION_BUSY</p>
+ </td>
+ <td>
+ <p>The allocation is currently busy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0103<br />STATUS_GRAPHICS_TOO_MANY_REFERENCES</p>
+ </td>
+ <td>
+ <p>An object being referenced has already reached the maximum reference count and cannot be referenced further.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0104<br />STATUS_GRAPHICS_TRY_AGAIN_LATER</p>
+ </td>
+ <td>
+ <p>A problem could not be solved due to an existing condition. Try again later.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0105<br />STATUS_GRAPHICS_TRY_AGAIN_NOW</p>
+ </td>
+ <td>
+ <p>A problem could not be solved due to an existing condition. Try again now.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0106<br />STATUS_GRAPHICS_ALLOCATION_INVALID</p>
+ </td>
+ <td>
+ <p>The allocation is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0107<br />STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE</p>
+ </td>
+ <td>
+ <p>No more unswizzling apertures are currently available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0108<br />STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED</p>
+ </td>
+ <td>
+ <p>The current allocation cannot be unswizzled by an aperture.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0109<br />STATUS_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION</p>
+ </td>
+ <td>
+ <p>The request failed because a pinned allocation cannot be evicted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0110<br />STATUS_GRAPHICS_INVALID_ALLOCATION_USAGE</p>
+ </td>
+ <td>
+ <p>The allocation cannot be used from its current segment location for the specified operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0111<br />STATUS_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION</p>
+ </td>
+ <td>
+ <p>A locked allocation cannot be used in the current command buffer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0112<br />STATUS_GRAPHICS_ALLOCATION_CLOSED</p>
+ </td>
+ <td>
+ <p>The allocation being referenced has been closed permanently.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0113<br />STATUS_GRAPHICS_INVALID_ALLOCATION_INSTANCE</p>
+ </td>
+ <td>
+ <p>An invalid allocation instance is being referenced.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0114<br />STATUS_GRAPHICS_INVALID_ALLOCATION_HANDLE</p>
+ </td>
+ <td>
+ <p>An invalid allocation handle is being referenced.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0115<br />STATUS_GRAPHICS_WRONG_ALLOCATION_DEVICE</p>
+ </td>
+ <td>
+ <p>The allocation being referenced does not belong to the current device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0116<br />STATUS_GRAPHICS_ALLOCATION_CONTENT_LOST</p>
+ </td>
+ <td>
+ <p>The specified allocation lost its content.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0200<br />STATUS_GRAPHICS_GPU_EXCEPTION_ON_DEVICE</p>
+ </td>
+ <td>
+ <p>A GPU exception was detected on the given device. The device cannot be scheduled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0300<br />STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The specified VidPN topology is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0301<br />STATUS_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The specified VidPN topology is valid but is not supported by this model of the display adapter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0302<br />STATUS_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The specified VidPN topology is valid but is not currently supported by the display adapter due to allocation of its resources.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0303<br />STATUS_GRAPHICS_INVALID_VIDPN</p>
+ </td>
+ <td>
+ <p>The specified VidPN handle is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0304<br />STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE</p>
+ </td>
+ <td>
+ <p>The specified video present source is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0305<br />STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET</p>
+ </td>
+ <td>
+ <p>The specified video present target is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0306<br />STATUS_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The specified VidPN modality is not supported (for example, at least two of the pinned modes are not co-functional).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0308<br />STATUS_GRAPHICS_INVALID_VIDPN_SOURCEMODESET</p>
+ </td>
+ <td>
+ <p>The specified VidPN source mode set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0309<br />STATUS_GRAPHICS_INVALID_VIDPN_TARGETMODESET</p>
+ </td>
+ <td>
+ <p>The specified VidPN target mode set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E030A<br />STATUS_GRAPHICS_INVALID_FREQUENCY</p>
+ </td>
+ <td>
+ <p>The specified video signal frequency is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E030B<br />STATUS_GRAPHICS_INVALID_ACTIVE_REGION</p>
+ </td>
+ <td>
+ <p>The specified video signal active region is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E030C<br />STATUS_GRAPHICS_INVALID_TOTAL_REGION</p>
+ </td>
+ <td>
+ <p>The specified video signal total region is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0310<br />STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE</p>
+ </td>
+ <td>
+ <p>The specified video present source mode is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0311<br />STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE</p>
+ </td>
+ <td>
+ <p>The specified video present target mode is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0312<br />STATUS_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET</p>
+ </td>
+ <td>
+ <p>The pinned mode must remain in the set on the VidPN's co-functional modality enumeration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0313<br />STATUS_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The specified video present path is already in the VidPN's topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0314<br />STATUS_GRAPHICS_MODE_ALREADY_IN_MODESET</p>
+ </td>
+ <td>
+ <p>The specified mode is already in the mode set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0315<br />STATUS_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET</p>
+ </td>
+ <td>
+ <p>The specified video present source set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0316<br />STATUS_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET</p>
+ </td>
+ <td>
+ <p>The specified video present target set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0317<br />STATUS_GRAPHICS_SOURCE_ALREADY_IN_SET</p>
+ </td>
+ <td>
+ <p>The specified video present source is already in the video present source set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0318<br />STATUS_GRAPHICS_TARGET_ALREADY_IN_SET</p>
+ </td>
+ <td>
+ <p>The specified video present target is already in the video present target set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0319<br />STATUS_GRAPHICS_INVALID_VIDPN_PRESENT_PATH</p>
+ </td>
+ <td>
+ <p>The specified VidPN present path is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E031A<br />STATUS_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The miniport has no recommendation for augmenting the specified VidPN's topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E031B<br />STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET</p>
+ </td>
+ <td>
+ <p>The specified monitor frequency range set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E031C<br />STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE</p>
+ </td>
+ <td>
+ <p>The specified monitor frequency range is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E031D<br />STATUS_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET</p>
+ </td>
+ <td>
+ <p>The specified frequency range is not in the specified monitor frequency range set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E031F<br />STATUS_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET</p>
+ </td>
+ <td>
+ <p>The specified frequency range is already in the specified monitor frequency range set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0320<br />STATUS_GRAPHICS_STALE_MODESET</p>
+ </td>
+ <td>
+ <p>The specified mode set is stale. Reacquire the new mode set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0321<br />STATUS_GRAPHICS_INVALID_MONITOR_SOURCEMODESET</p>
+ </td>
+ <td>
+ <p>The specified monitor source mode set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0322<br />STATUS_GRAPHICS_INVALID_MONITOR_SOURCE_MODE</p>
+ </td>
+ <td>
+ <p>The specified monitor source mode is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0323<br />STATUS_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN</p>
+ </td>
+ <td>
+ <p>The miniport does not have a recommendation regarding the request to provide a functional VidPN given the current display adapter configuration.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0324<br />STATUS_GRAPHICS_MODE_ID_MUST_BE_UNIQUE</p>
+ </td>
+ <td>
+ <p>The ID of the specified mode is being used by another mode in the set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0325<br />STATUS_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION</p>
+ </td>
+ <td>
+ <p>The system failed to determine a mode that is supported by both the display adapter and the monitor connected to it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0326<br />STATUS_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES</p>
+ </td>
+ <td>
+ <p>The number of video present targets must be greater than or equal to the number of video present sources.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0327<br />STATUS_GRAPHICS_PATH_NOT_IN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The specified present path is not in the VidPN's topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0328<br />STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE</p>
+ </td>
+ <td>
+ <p>The display adapter must have at least one video present source.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0329<br />STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET</p>
+ </td>
+ <td>
+ <p>The display adapter must have at least one video present target.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E032A<br />STATUS_GRAPHICS_INVALID_MONITORDESCRIPTORSET</p>
+ </td>
+ <td>
+ <p>The specified monitor descriptor set is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E032B<br />STATUS_GRAPHICS_INVALID_MONITORDESCRIPTOR</p>
+ </td>
+ <td>
+ <p>The specified monitor descriptor is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E032C<br />STATUS_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET</p>
+ </td>
+ <td>
+ <p>The specified descriptor is not in the specified monitor descriptor set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E032D<br />STATUS_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET</p>
+ </td>
+ <td>
+ <p>The specified descriptor is already in the specified monitor descriptor set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E032E<br />STATUS_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE</p>
+ </td>
+ <td>
+ <p>The ID of the specified monitor descriptor is being used by another descriptor in the set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E032F<br />STATUS_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE</p>
+ </td>
+ <td>
+ <p>The specified video present target subset type is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0330<br />STATUS_GRAPHICS_RESOURCES_NOT_RELATED</p>
+ </td>
+ <td>
+ <p>Two or more of the specified resources are not related to each other, as defined by the interface semantics.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0331<br />STATUS_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE</p>
+ </td>
+ <td>
+ <p>The ID of the specified video present source is being used by another source in the set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0332<br />STATUS_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE</p>
+ </td>
+ <td>
+ <p>The ID of the specified video present target is being used by another target in the set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0333<br />STATUS_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET</p>
+ </td>
+ <td>
+ <p>The specified VidPN source cannot be used because there is no available VidPN target to connect it to.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0334<br />STATUS_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER</p>
+ </td>
+ <td>
+ <p>The newly arrived monitor could not be associated with a display adapter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0335<br />STATUS_GRAPHICS_NO_VIDPNMGR</p>
+ </td>
+ <td>
+ <p>The particular display adapter does not have an associated VidPN manager.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0336<br />STATUS_GRAPHICS_NO_ACTIVE_VIDPN</p>
+ </td>
+ <td>
+ <p>The VidPN manager of the particular display adapter does not have an active VidPN.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0337<br />STATUS_GRAPHICS_STALE_VIDPN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The specified VidPN topology is stale; obtain the new topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0338<br />STATUS_GRAPHICS_MONITOR_NOT_CONNECTED</p>
+ </td>
+ <td>
+ <p>No monitor is connected on the specified video present target.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0339<br />STATUS_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The specified source is not part of the specified VidPN's topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E033A<br />STATUS_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE</p>
+ </td>
+ <td>
+ <p>The specified primary surface size is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E033B<br />STATUS_GRAPHICS_INVALID_VISIBLEREGION_SIZE</p>
+ </td>
+ <td>
+ <p>The specified visible region size is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E033C<br />STATUS_GRAPHICS_INVALID_STRIDE</p>
+ </td>
+ <td>
+ <p>The specified stride is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E033D<br />STATUS_GRAPHICS_INVALID_PIXELFORMAT</p>
+ </td>
+ <td>
+ <p>The specified pixel format is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E033E<br />STATUS_GRAPHICS_INVALID_COLORBASIS</p>
+ </td>
+ <td>
+ <p>The specified color basis is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E033F<br />STATUS_GRAPHICS_INVALID_PIXELVALUEACCESSMODE</p>
+ </td>
+ <td>
+ <p>The specified pixel value access mode is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0340<br />STATUS_GRAPHICS_TARGET_NOT_IN_TOPOLOGY</p>
+ </td>
+ <td>
+ <p>The specified target is not part of the specified VidPN's topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0341<br />STATUS_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT</p>
+ </td>
+ <td>
+ <p>Failed to acquire the display mode management interface.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0342<br />STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE</p>
+ </td>
+ <td>
+ <p>The specified VidPN source is already owned by a DMM client and cannot be used until that client releases it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0343<br />STATUS_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN</p>
+ </td>
+ <td>
+ <p>The specified VidPN is active and cannot be accessed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0344<br />STATUS_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL</p>
+ </td>
+ <td>
+ <p>The specified VidPN's present path importance ordinal is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0345<br />STATUS_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION</p>
+ </td>
+ <td>
+ <p>The specified VidPN's present path content geometry transformation is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0346<br />STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The specified content geometry transformation is not supported on the respective VidPN present path.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0347<br />STATUS_GRAPHICS_INVALID_GAMMA_RAMP</p>
+ </td>
+ <td>
+ <p>The specified gamma ramp is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0348<br />STATUS_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The specified gamma ramp is not supported on the respective VidPN present path.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0349<br />STATUS_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>Multisampling is not supported on the respective VidPN present path.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E034A<br />STATUS_GRAPHICS_MODE_NOT_IN_MODESET</p>
+ </td>
+ <td>
+ <p>The specified mode is not in the specified mode set.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E034D<br />STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON</p>
+ </td>
+ <td>
+ <p>The specified VidPN topology recommendation reason is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E034E<br />STATUS_GRAPHICS_INVALID_PATH_CONTENT_TYPE</p>
+ </td>
+ <td>
+ <p>The specified VidPN present path content type is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E034F<br />STATUS_GRAPHICS_INVALID_COPYPROTECTION_TYPE</p>
+ </td>
+ <td>
+ <p>The specified VidPN present path copy protection type is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0350<br />STATUS_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS</p>
+ </td>
+ <td>
+ <p>Only one unassigned mode set can exist at any one time for a particular VidPN source or target.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0352<br />STATUS_GRAPHICS_INVALID_SCANLINE_ORDERING</p>
+ </td>
+ <td>
+ <p>The specified scan line ordering type is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0353<br />STATUS_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>The topology changes are not allowed for the specified VidPN.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0354<br />STATUS_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS</p>
+ </td>
+ <td>
+ <p>All available importance ordinals are being used in the specified topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0355<br />STATUS_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT</p>
+ </td>
+ <td>
+ <p>The specified primary surface has a different private-format attribute than the current primary surface.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0356<br />STATUS_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM</p>
+ </td>
+ <td>
+ <p>The specified mode-pruning algorithm is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0357<br />STATUS_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN</p>
+ </td>
+ <td>
+ <p>The specified monitor-capability origin is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0358<br />STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT</p>
+ </td>
+ <td>
+ <p>The specified monitor-frequency range constraint is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0359<br />STATUS_GRAPHICS_MAX_NUM_PATHS_REACHED</p>
+ </td>
+ <td>
+ <p>The maximum supported number of present paths has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E035A<br />STATUS_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION</p>
+ </td>
+ <td>
+ <p>The miniport requested that augmentation be canceled for the specified source of the specified VidPN's topology.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E035B<br />STATUS_GRAPHICS_INVALID_CLIENT_TYPE</p>
+ </td>
+ <td>
+ <p>The specified client type was not recognized.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E035C<br />STATUS_GRAPHICS_CLIENTVIDPN_NOT_SET</p>
+ </td>
+ <td>
+ <p>The client VidPN is not set on this adapter (for example, no user mode-initiated mode changes have taken place on this adapter).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0400<br />STATUS_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED</p>
+ </td>
+ <td>
+ <p>The specified display adapter child device already has an external device connected to it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0401<br />STATUS_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The display adapter child device does not support reporting a descriptor.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0430<br />STATUS_GRAPHICS_NOT_A_LINKED_ADAPTER</p>
+ </td>
+ <td>
+ <p>The display adapter is not linked to any other adapters.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0431<br />STATUS_GRAPHICS_LEADLINK_NOT_ENUMERATED</p>
+ </td>
+ <td>
+ <p>The lead adapter in a linked configuration was not enumerated yet.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0432<br />STATUS_GRAPHICS_CHAINLINKS_NOT_ENUMERATED</p>
+ </td>
+ <td>
+ <p>Some chain adapters in a linked configuration have not yet been enumerated.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0433<br />STATUS_GRAPHICS_ADAPTER_CHAIN_NOT_READY</p>
+ </td>
+ <td>
+ <p>The chain of linked adapters is not ready to start because of an unknown failure.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0434<br />STATUS_GRAPHICS_CHAINLINKS_NOT_STARTED</p>
+ </td>
+ <td>
+ <p>An attempt was made to start a lead link display adapter when the chain links had not yet started.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0435<br />STATUS_GRAPHICS_CHAINLINKS_NOT_POWERED_ON</p>
+ </td>
+ <td>
+ <p>An attempt was made to turn on a lead link display adapter when the chain links were turned off.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0436<br />STATUS_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE</p>
+ </td>
+ <td>
+ <p>The adapter link was found in an inconsistent state. Not all adapters are in an expected PNP/power state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0438<br />STATUS_GRAPHICS_NOT_POST_DEVICE_DRIVER</p>
+ </td>
+ <td>
+ <p>The driver trying to start is not the same as the driver for the posted display adapter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E043B<br />STATUS_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED</p>
+ </td>
+ <td>
+ <p>An operation is being attempted that requires the display adapter to be in a quiescent state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0500<br />STATUS_GRAPHICS_OPM_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The driver does not support OPM.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0501<br />STATUS_GRAPHICS_COPP_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The driver does not support COPP.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0502<br />STATUS_GRAPHICS_UAB_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The driver does not support UAB.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0503<br />STATUS_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS</p>
+ </td>
+ <td>
+ <p>The specified encrypted parameters are invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0504<br />STATUS_GRAPHICS_OPM_PARAMETER_ARRAY_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>An array passed to a function cannot hold all of the data that the function wants to put in it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0505<br />STATUS_GRAPHICS_OPM_NO_PROTECTED_OUTPUTS_EXIST</p>
+ </td>
+ <td>
+ <p>The GDI display device passed to this function does not have any active protected outputs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0506<br />STATUS_GRAPHICS_PVP_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME</p>
+ </td>
+ <td>
+ <p>The PVP cannot find an actual GDI display device that corresponds to the passed-in GDI display device name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0507<br />STATUS_GRAPHICS_PVP_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP</p>
+ </td>
+ <td>
+ <p>This function failed because the GDI display device passed to it was not attached to the Windows desktop.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0508<br />STATUS_GRAPHICS_PVP_MIRRORING_DEVICES_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The PVP does not support mirroring display devices because they do not have any protected outputs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E050A<br />STATUS_GRAPHICS_OPM_INVALID_POINTER</p>
+ </td>
+ <td>
+ <p>The function failed because an invalid pointer parameter was passed to it. A pointer parameter is invalid if it is null, is not correctly aligned, or it points to an invalid address or a kernel mode address.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E050B<br />STATUS_GRAPHICS_OPM_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An internal error caused an operation to fail.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E050C<br />STATUS_GRAPHICS_OPM_INVALID_HANDLE</p>
+ </td>
+ <td>
+ <p>The function failed because the caller passed in an invalid OPM user-mode handle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E050D<br />STATUS_GRAPHICS_PVP_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE</p>
+ </td>
+ <td>
+ <p>This function failed because the GDI device passed to it did not have any monitors associated with it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E050E<br />STATUS_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH</p>
+ </td>
+ <td>
+ <p>A certificate could not be returned because the certificate buffer passed to the function was too small.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E050F<br />STATUS_GRAPHICS_OPM_SPANNING_MODE_ENABLED</p>
+ </td>
+ <td>
+ <p>DxgkDdiOpmCreateProtectedOutput() could not create a protected output because the video present yarget is in spanning mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0510<br />STATUS_GRAPHICS_OPM_THEATER_MODE_ENABLED</p>
+ </td>
+ <td>
+ <p>DxgkDdiOpmCreateProtectedOutput() could not create a protected output because the video present target is in theater mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0511<br />STATUS_GRAPHICS_PVP_HFS_FAILED</p>
+ </td>
+ <td>
+ <p>The function call failed because the display adapter's hardware functionality scan (HFS) failed to validate the graphics hardware.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0512<br />STATUS_GRAPHICS_OPM_INVALID_SRM</p>
+ </td>
+ <td>
+ <p>The HDCP SRM passed to this function did not comply with section 5 of the HDCP 1.1 specification.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0513<br />STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP</p>
+ </td>
+ <td>
+ <p>The protected output cannot enable the HDCP system because it does not support it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0514<br />STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP</p>
+ </td>
+ <td>
+ <p>The protected output cannot enable analog copy protection because it does not support it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0515<br />STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA</p>
+ </td>
+ <td>
+ <p>The protected output cannot enable the CGMS-A protection technology because it does not support it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0516<br />STATUS_GRAPHICS_OPM_HDCP_SRM_NEVER_SET</p>
+ </td>
+ <td>
+ <p>DxgkDdiOPMGetInformation() cannot return the version of the SRM being used because the application never successfully passed an SRM to the protected output.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0517<br />STATUS_GRAPHICS_OPM_RESOLUTION_TOO_HIGH</p>
+ </td>
+ <td>
+ <p>DxgkDdiOPMConfigureProtectedOutput() cannot enable the specified output protection technology because the output's screen resolution is too high.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0518<br />STATUS_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE</p>
+ </td>
+ <td>
+ <p>DxgkDdiOPMConfigureProtectedOutput() cannot enable HDCP because other physical outputs are using the display adapter's HDCP hardware.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E051A<br />STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_NO_LONGER_EXISTS</p>
+ </td>
+ <td>
+ <p>The operating system asynchronously destroyed this OPM-protected output because the operating system state changed. This error typically occurs because the monitor PDO associated with this protected output was removed or stopped, the protected output's session became a nonconsole session, or the protected output's desktop became inactive.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E051B<br />STATUS_GRAPHICS_OPM_SESSION_TYPE_CHANGE_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>OPM functions cannot be called when a session is changing its type. Three types of sessions currently exist: console, disconnected, and remote (RDP or ICA).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E051C<br />STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS</p>
+ </td>
+ <td>
+ <p>The DxgkDdiOPMGetCOPPCompatibleInformation, DxgkDdiOPMGetInformation, or DxgkDdiOPMConfigureProtectedOutput function failed. This error is returned only if a protected output has OPM semantics. </p>
+ <p>DxgkDdiOPMGetCOPPCompatibleInformation always returns this error if a protected output has OPM semantics.</p>
+ <p>DxgkDdiOPMGetInformation returns this error code if the caller requested COPP-specific information.</p>
+ <p>DxgkDdiOPMConfigureProtectedOutput returns this error when the caller tries to use a COPP-specific command.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E051D<br />STATUS_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST</p>
+ </td>
+ <td>
+ <p>The DxgkDdiOPMGetInformation and DxgkDdiOPMGetCOPPCompatibleInformation functions return this error code if the passed-in sequence number is not the expected sequence number or the passed-in OMAC value is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E051E<br />STATUS_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>The function failed because an unexpected error occurred inside a display driver.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E051F<br />STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS</p>
+ </td>
+ <td>
+ <p>The DxgkDdiOPMGetCOPPCompatibleInformation, DxgkDdiOPMGetInformation, or DxgkDdiOPMConfigureProtectedOutput function failed. This error is returned only if a protected output has COPP semantics. </p>
+ <p>DxgkDdiOPMGetCOPPCompatibleInformation returns this error code if the caller requested OPM-specific information.</p>
+ <p>DxgkDdiOPMGetInformation always returns this error if a protected output has COPP semantics.</p>
+ <p>DxgkDdiOPMConfigureProtectedOutput returns this error when the caller tries to use an OPM-specific command.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0520<br />STATUS_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The DxgkDdiOPMGetCOPPCompatibleInformation and DxgkDdiOPMConfigureProtectedOutput functions return this error if the display driver does not support the DXGKMDT_OPM_GET_ACP_AND_CGMSA_SIGNALING and DXGKMDT_OPM_SET_ACP_AND_CGMSA_SIGNALING GUIDs.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0521<br />STATUS_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST</p>
+ </td>
+ <td>
+ <p>The DxgkDdiOPMConfigureProtectedOutput function returns this error code if the passed-in sequence number is not the expected sequence number or the passed-in OMAC value is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0580<br />STATUS_GRAPHICS_I2C_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The monitor connected to the specified video output does not have an I2C bus.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0581<br />STATUS_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST</p>
+ </td>
+ <td>
+ <p>No device on the I2C bus has the specified address.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0582<br />STATUS_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA</p>
+ </td>
+ <td>
+ <p>An error occurred while transmitting data to the device on the I2C bus.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0583<br />STATUS_GRAPHICS_I2C_ERROR_RECEIVING_DATA</p>
+ </td>
+ <td>
+ <p>An error occurred while receiving data from the device on the I2C bus.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0584<br />STATUS_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The monitor does not support the specified VCP code.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0585<br />STATUS_GRAPHICS_DDCCI_INVALID_DATA</p>
+ </td>
+ <td>
+ <p>The data received from the monitor is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0586<br />STATUS_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE</p>
+ </td>
+ <td>
+ <p>A function call failed because a monitor returned an invalid timing status byte when the operating system used the DDC/CI get timing report and timing message command to get a timing report from a monitor.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0587<br />STATUS_GRAPHICS_DDCCI_INVALID_CAPABILITIES_STRING</p>
+ </td>
+ <td>
+ <p>A monitor returned a DDC/CI capabilities string that did not comply with the ACCESS.bus 3.0, DDC/CI 1.1, or MCCS 2 Revision 1 specification.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0588<br />STATUS_GRAPHICS_MCA_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An internal error caused an operation to fail.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E0589<br />STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND</p>
+ </td>
+ <td>
+ <p>An operation failed because a DDC/CI message had an invalid value in its command field.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E058A<br />STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH</p>
+ </td>
+ <td>
+ <p>This error occurred because a DDC/CI message had an invalid value in its length field.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E058B<br />STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM</p>
+ </td>
+ <td>
+ <p>This error occurred because the value in a DDC/CI message's checksum field did not match the message's computed checksum value. This error implies that the data was corrupted while it was being transmitted from a monitor to a computer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E058C<br />STATUS_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE</p>
+ </td>
+ <td>
+ <p>This function failed because an invalid monitor handle was passed to it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E058D<br />STATUS_GRAPHICS_MONITOR_NO_LONGER_EXISTS</p>
+ </td>
+ <td>
+ <p>The operating system asynchronously destroyed the monitor that corresponds to this handle because the operating system's state changed. This error typically occurs because the monitor PDO associated with this handle was removed or stopped, or a display mode change occurred. A display mode change occurs when Windows sends a WM_DISPLAYCHANGE message to applications.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E0<br />STATUS_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED</p>
+ </td>
+ <td>
+ <p>This function can be used only if a program is running in the local console session. It cannot be used if a program is running on a remote desktop session or on a terminal server session.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E1<br />STATUS_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME</p>
+ </td>
+ <td>
+ <p>This function cannot find an actual GDI display device that corresponds to the specified GDI display device name.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E2<br />STATUS_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP</p>
+ </td>
+ <td>
+ <p>The function failed because the specified GDI display device was not attached to the Windows desktop.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E3<br />STATUS_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>This function does not support GDI mirroring display devices because GDI mirroring display devices do not have any physical monitors associated with them.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E4<br />STATUS_GRAPHICS_INVALID_POINTER</p>
+ </td>
+ <td>
+ <p>The function failed because an invalid pointer parameter was passed to it. A pointer parameter is invalid if it is null, is not correctly aligned, or points to an invalid address or to a kernel mode address.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E5<br />STATUS_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE</p>
+ </td>
+ <td>
+ <p>This function failed because the GDI device passed to it did not have a monitor associated with it.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E6<br />STATUS_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>An array passed to the function cannot hold all of the data that the function must copy into the array.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E7<br />STATUS_GRAPHICS_INTERNAL_ERROR</p>
+ </td>
+ <td>
+ <p>An internal error caused an operation to fail.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC01E05E8<br />STATUS_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The function failed because the current session is changing its type. This function cannot be called when the current session is changing its type. Three types of sessions currently exist: console, disconnected, and remote (RDP or ICA).</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210000<br />STATUS_FVE_LOCKED_VOLUME</p>
+ </td>
+ <td>
+ <p>The volume must be unlocked before it can be used.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210001<br />STATUS_FVE_NOT_ENCRYPTED</p>
+ </td>
+ <td>
+ <p>The volume is fully decrypted and no key is available.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210002<br />STATUS_FVE_BAD_INFORMATION</p>
+ </td>
+ <td>
+ <p>The control block for the encrypted volume is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210003<br />STATUS_FVE_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>Not enough free space remains on the volume to allow encryption.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210004<br />STATUS_FVE_FAILED_WRONG_FS</p>
+ </td>
+ <td>
+ <p>The partition cannot be encrypted because the file system is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210005<br />STATUS_FVE_FAILED_BAD_FS</p>
+ </td>
+ <td>
+ <p>The file system is inconsistent. Run the Check Disk utility.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210006<br />STATUS_FVE_FS_NOT_EXTENDED</p>
+ </td>
+ <td>
+ <p>The file system does not extend to the end of the volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210007<br />STATUS_FVE_FS_MOUNTED</p>
+ </td>
+ <td>
+ <p>This operation cannot be performed while a file system is mounted on the volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210008<br />STATUS_FVE_NO_LICENSE</p>
+ </td>
+ <td>
+ <p>BitLocker Drive Encryption is not included with this version of Windows.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210009<br />STATUS_FVE_ACTION_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>The requested action was denied by the FVE control engine.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021000A<br />STATUS_FVE_BAD_DATA</p>
+ </td>
+ <td>
+ <p>The data supplied is malformed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021000B<br />STATUS_FVE_VOLUME_NOT_BOUND</p>
+ </td>
+ <td>
+ <p>The volume is not bound to the system.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021000C<br />STATUS_FVE_NOT_DATA_VOLUME</p>
+ </td>
+ <td>
+ <p>The volume specified is not a data volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021000D<br />STATUS_FVE_CONV_READ_ERROR</p>
+ </td>
+ <td>
+ <p>A read operation failed while converting the volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021000E<br />STATUS_FVE_CONV_WRITE_ERROR</p>
+ </td>
+ <td>
+ <p>A write operation failed while converting the volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021000F<br />STATUS_FVE_OVERLAPPED_UPDATE</p>
+ </td>
+ <td>
+ <p>The control block for the encrypted volume was updated by another thread. Try again.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210010<br />STATUS_FVE_FAILED_SECTOR_SIZE</p>
+ </td>
+ <td>
+ <p>The volume encryption algorithm cannot be used on this sector size.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210011<br />STATUS_FVE_FAILED_AUTHENTICATION</p>
+ </td>
+ <td>
+ <p>BitLocker recovery authentication failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210012<br />STATUS_FVE_NOT_OS_VOLUME</p>
+ </td>
+ <td>
+ <p>The volume specified is not the boot operating system volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210013<br />STATUS_FVE_KEYFILE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The BitLocker startup key or recovery password could not be read from external media.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210014<br />STATUS_FVE_KEYFILE_INVALID</p>
+ </td>
+ <td>
+ <p>The BitLocker startup key or recovery password file is corrupt or invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210015<br />STATUS_FVE_KEYFILE_NO_VMK</p>
+ </td>
+ <td>
+ <p>The BitLocker encryption key could not be obtained from the startup key or the recovery password.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210016<br />STATUS_FVE_TPM_DISABLED</p>
+ </td>
+ <td>
+ <p>The TPM is disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210017<br />STATUS_FVE_TPM_SRK_AUTH_NOT_ZERO</p>
+ </td>
+ <td>
+ <p>The authorization data for the SRK of the TPM is not zero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210018<br />STATUS_FVE_TPM_INVALID_PCR</p>
+ </td>
+ <td>
+ <p>The system boot information changed or the TPM locked out access to BitLocker encryption keys until the computer is restarted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210019<br />STATUS_FVE_TPM_NO_VMK</p>
+ </td>
+ <td>
+ <p>The BitLocker encryption key could not be obtained from the TPM.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021001A<br />STATUS_FVE_PIN_INVALID</p>
+ </td>
+ <td>
+ <p>The BitLocker encryption key could not be obtained from the TPM and PIN.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021001B<br />STATUS_FVE_AUTH_INVALID_APPLICATION</p>
+ </td>
+ <td>
+ <p>A boot application hash does not match the hash computed when BitLocker was turned on.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021001C<br />STATUS_FVE_AUTH_INVALID_CONFIG</p>
+ </td>
+ <td>
+ <p>The Boot Configuration Data (BCD) settings are not supported or have changed because BitLocker was enabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021001D<br />STATUS_FVE_DEBUGGER_ENABLED</p>
+ </td>
+ <td>
+ <p>Boot debugging is enabled. Run Windows Boot Configuration Data Store Editor (bcdedit.exe) to turn it off.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021001E<br />STATUS_FVE_DRY_RUN_FAILED</p>
+ </td>
+ <td>
+ <p>The BitLocker encryption key could not be obtained.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC021001F<br />STATUS_FVE_BAD_METADATA_POINTER</p>
+ </td>
+ <td>
+ <p>The metadata disk region pointer is incorrect.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210020<br />STATUS_FVE_OLD_METADATA_COPY</p>
+ </td>
+ <td>
+ <p>The backup copy of the metadata is out of date.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210021<br />STATUS_FVE_REBOOT_REQUIRED</p>
+ </td>
+ <td>
+ <p>No action was taken because a system restart is required.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210022<br />STATUS_FVE_RAW_ACCESS</p>
+ </td>
+ <td>
+ <p>No action was taken because BitLocker Drive Encryption is in RAW access mode.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210023<br />STATUS_FVE_RAW_BLOCKED</p>
+ </td>
+ <td>
+ <p>BitLocker Drive Encryption cannot enter RAW access mode for this volume.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210026<br />STATUS_FVE_NO_FEATURE_LICENSE</p>
+ </td>
+ <td>
+ <p>This feature of BitLocker Drive Encryption is not included with this version of Windows.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210027<br />STATUS_FVE_POLICY_USER_DISABLE_RDV_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>Group policy does not permit turning off BitLocker Drive Encryption on roaming data volumes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210028<br />STATUS_FVE_CONV_RECOVERY_FAILED</p>
+ </td>
+ <td>
+ <p>Bitlocker Drive Encryption failed to recover from aborted conversion. This could be due to either all conversion logs being corrupted or the media being write-protected.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210029<br />STATUS_FVE_VIRTUALIZED_SPACE_TOO_BIG</p>
+ </td>
+ <td>
+ <p>The requested virtualization size is too big.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0210030<br />STATUS_FVE_VOLUME_TOO_SMALL</p>
+ </td>
+ <td>
+ <p>The drive is too small to be protected using BitLocker Drive Encryption.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220001<br />STATUS_FWP_CALLOUT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The callout does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220002<br />STATUS_FWP_CONDITION_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The filter condition does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220003<br />STATUS_FWP_FILTER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The filter does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220004<br />STATUS_FWP_LAYER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The layer does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220005<br />STATUS_FWP_PROVIDER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The provider does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220006<br />STATUS_FWP_PROVIDER_CONTEXT_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The provider context does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220007<br />STATUS_FWP_SUBLAYER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The sublayer does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220008<br />STATUS_FWP_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The object does not exist.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220009<br />STATUS_FWP_ALREADY_EXISTS</p>
+ </td>
+ <td>
+ <p>An object with that GUID or LUID already exists.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022000A<br />STATUS_FWP_IN_USE</p>
+ </td>
+ <td>
+ <p>The object is referenced by other objects and cannot be deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022000B<br />STATUS_FWP_DYNAMIC_SESSION_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The call is not allowed from within a dynamic session.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022000C<br />STATUS_FWP_WRONG_SESSION</p>
+ </td>
+ <td>
+ <p>The call was made from the wrong session and cannot be completed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022000D<br />STATUS_FWP_NO_TXN_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The call must be made from within an explicit transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022000E<br />STATUS_FWP_TXN_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The call is not allowed from within an explicit transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022000F<br />STATUS_FWP_TXN_ABORTED</p>
+ </td>
+ <td>
+ <p>The explicit transaction has been forcibly canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220010<br />STATUS_FWP_SESSION_ABORTED</p>
+ </td>
+ <td>
+ <p>The session has been canceled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220011<br />STATUS_FWP_INCOMPATIBLE_TXN</p>
+ </td>
+ <td>
+ <p>The call is not allowed from within a read-only transaction.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220012<br />STATUS_FWP_TIMEOUT</p>
+ </td>
+ <td>
+ <p>The call timed out while waiting to acquire the transaction lock.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220013<br />STATUS_FWP_NET_EVENTS_DISABLED</p>
+ </td>
+ <td>
+ <p>The collection of network diagnostic events is disabled.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220014<br />STATUS_FWP_INCOMPATIBLE_LAYER</p>
+ </td>
+ <td>
+ <p>The operation is not supported by the specified layer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220015<br />STATUS_FWP_KM_CLIENTS_ONLY</p>
+ </td>
+ <td>
+ <p>The call is allowed for kernel-mode callers only.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220016<br />STATUS_FWP_LIFETIME_MISMATCH</p>
+ </td>
+ <td>
+ <p>The call tried to associate two objects with incompatible lifetimes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220017<br />STATUS_FWP_BUILTIN_OBJECT</p>
+ </td>
+ <td>
+ <p>The object is built-in and cannot be deleted.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220018<br />STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS</p>
+ </td>
+ <td>
+ <p>The maximum number of boot-time filters has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220018<br />STATUS_FWP_TOO_MANY_CALLOUTS</p>
+ </td>
+ <td>
+ <p>The maximum number of callouts has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220019<br />STATUS_FWP_NOTIFICATION_DROPPED</p>
+ </td>
+ <td>
+ <p>A notification could not be delivered because a message queue has reached maximum capacity.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022001A<br />STATUS_FWP_TRAFFIC_MISMATCH</p>
+ </td>
+ <td>
+ <p>The traffic parameters do not match those for the security association context.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022001B<br />STATUS_FWP_INCOMPATIBLE_SA_STATE</p>
+ </td>
+ <td>
+ <p>The call is not allowed for the current security association state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022001C<br />STATUS_FWP_NULL_POINTER</p>
+ </td>
+ <td>
+ <p>A required pointer is null.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022001D<br />STATUS_FWP_INVALID_ENUMERATOR</p>
+ </td>
+ <td>
+ <p>An enumerator is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022001E<br />STATUS_FWP_INVALID_FLAGS</p>
+ </td>
+ <td>
+ <p>The flags field contains an invalid value.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022001F<br />STATUS_FWP_INVALID_NET_MASK</p>
+ </td>
+ <td>
+ <p>A network mask is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220020<br />STATUS_FWP_INVALID_RANGE</p>
+ </td>
+ <td>
+ <p>An FWP_RANGE is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220021<br />STATUS_FWP_INVALID_INTERVAL</p>
+ </td>
+ <td>
+ <p>The time interval is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220022<br />STATUS_FWP_ZERO_LENGTH_ARRAY</p>
+ </td>
+ <td>
+ <p>An array that must contain at least one element has a zero length.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220023<br />STATUS_FWP_NULL_DISPLAY_NAME</p>
+ </td>
+ <td>
+ <p>The displayData.name field cannot be null.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220024<br />STATUS_FWP_INVALID_ACTION_TYPE</p>
+ </td>
+ <td>
+ <p>The action type is not one of the allowed action types for a filter.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220025<br />STATUS_FWP_INVALID_WEIGHT</p>
+ </td>
+ <td>
+ <p>The filter weight is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220026<br />STATUS_FWP_MATCH_TYPE_MISMATCH</p>
+ </td>
+ <td>
+ <p>A filter condition contains a match type that is not compatible with the operands.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220027<br />STATUS_FWP_TYPE_MISMATCH</p>
+ </td>
+ <td>
+ <p>An FWP_VALUE or FWPM_CONDITION_VALUE is of the wrong type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220028<br />STATUS_FWP_OUT_OF_BOUNDS</p>
+ </td>
+ <td>
+ <p>An integer value is outside the allowed range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220029<br />STATUS_FWP_RESERVED</p>
+ </td>
+ <td>
+ <p>A reserved field is nonzero.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022002A<br />STATUS_FWP_DUPLICATE_CONDITION</p>
+ </td>
+ <td>
+ <p>A filter cannot contain multiple conditions operating on a single field.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022002B<br />STATUS_FWP_DUPLICATE_KEYMOD</p>
+ </td>
+ <td>
+ <p>A policy cannot contain the same keying module more than once.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022002C<br />STATUS_FWP_ACTION_INCOMPATIBLE_WITH_LAYER</p>
+ </td>
+ <td>
+ <p>The action type is not compatible with the layer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022002D<br />STATUS_FWP_ACTION_INCOMPATIBLE_WITH_SUBLAYER</p>
+ </td>
+ <td>
+ <p>The action type is not compatible with the sublayer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022002E<br />STATUS_FWP_CONTEXT_INCOMPATIBLE_WITH_LAYER</p>
+ </td>
+ <td>
+ <p>The raw context or the provider context is not compatible with the layer.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022002F<br />STATUS_FWP_CONTEXT_INCOMPATIBLE_WITH_CALLOUT</p>
+ </td>
+ <td>
+ <p>The raw context or the provider context is not compatible with the callout.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220030<br />STATUS_FWP_INCOMPATIBLE_AUTH_METHOD</p>
+ </td>
+ <td>
+ <p>The authentication method is not compatible with the policy type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220031<br />STATUS_FWP_INCOMPATIBLE_DH_GROUP</p>
+ </td>
+ <td>
+ <p>The Diffie-Hellman group is not compatible with the policy type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220032<br />STATUS_FWP_EM_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>An IKE policy cannot contain an Extended Mode policy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220033<br />STATUS_FWP_NEVER_MATCH</p>
+ </td>
+ <td>
+ <p>The enumeration template or subscription will never match any objects.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220034<br />STATUS_FWP_PROVIDER_CONTEXT_MISMATCH</p>
+ </td>
+ <td>
+ <p>The provider context is of the wrong type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220035<br />STATUS_FWP_INVALID_PARAMETER</p>
+ </td>
+ <td>
+ <p>The parameter is incorrect.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220036<br />STATUS_FWP_TOO_MANY_SUBLAYERS</p>
+ </td>
+ <td>
+ <p>The maximum number of sublayers has been reached.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220037<br />STATUS_FWP_CALLOUT_NOTIFICATION_FAILED</p>
+ </td>
+ <td>
+ <p>The notification function for a callout returned an error.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220038<br />STATUS_FWP_INCOMPATIBLE_AUTH_CONFIG</p>
+ </td>
+ <td>
+ <p>The IPsec authentication configuration is not compatible with the authentication type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220039<br />STATUS_FWP_INCOMPATIBLE_CIPHER_CONFIG</p>
+ </td>
+ <td>
+ <p>The IPsec cipher configuration is not compatible with the cipher type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC022003C<br />STATUS_FWP_DUPLICATE_AUTH_METHOD</p>
+ </td>
+ <td>
+ <p>A policy cannot contain the same auth method more than once.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220100<br />STATUS_FWP_TCPIP_NOT_READY</p>
+ </td>
+ <td>
+ <p>The TCP/IP stack is not ready.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220101<br />STATUS_FWP_INJECT_HANDLE_CLOSING</p>
+ </td>
+ <td>
+ <p>The injection handle is being closed by another thread.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220102<br />STATUS_FWP_INJECT_HANDLE_STALE</p>
+ </td>
+ <td>
+ <p>The injection handle is stale.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0220103<br />STATUS_FWP_CANNOT_PEND</p>
+ </td>
+ <td>
+ <p>The classify cannot be pended.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230002<br />STATUS_NDIS_CLOSING</p>
+ </td>
+ <td>
+ <p>The binding to the network interface is being closed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230004<br />STATUS_NDIS_BAD_VERSION</p>
+ </td>
+ <td>
+ <p>An invalid version was specified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230005<br />STATUS_NDIS_BAD_CHARACTERISTICS</p>
+ </td>
+ <td>
+ <p>An invalid characteristics table was used.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230006<br />STATUS_NDIS_ADAPTER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>Failed to find the network interface or the network interface is not ready.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230007<br />STATUS_NDIS_OPEN_FAILED</p>
+ </td>
+ <td>
+ <p>Failed to open the network interface.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230008<br />STATUS_NDIS_DEVICE_FAILED</p>
+ </td>
+ <td>
+ <p>The network interface has encountered an internal unrecoverable failure.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230009<br />STATUS_NDIS_MULTICAST_FULL</p>
+ </td>
+ <td>
+ <p>The multicast list on the network interface is full.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023000A<br />STATUS_NDIS_MULTICAST_EXISTS</p>
+ </td>
+ <td>
+ <p>An attempt was made to add a duplicate multicast address to the list.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023000B<br />STATUS_NDIS_MULTICAST_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>At attempt was made to remove a multicast address that was never added.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023000C<br />STATUS_NDIS_REQUEST_ABORTED</p>
+ </td>
+ <td>
+ <p>The network interface aborted the request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023000D<br />STATUS_NDIS_RESET_IN_PROGRESS</p>
+ </td>
+ <td>
+ <p>The network interface cannot process the request because it is being reset.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023000F<br />STATUS_NDIS_INVALID_PACKET</p>
+ </td>
+ <td>
+ <p>An attempt was made to send an invalid packet on a network interface.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230010<br />STATUS_NDIS_INVALID_DEVICE_REQUEST</p>
+ </td>
+ <td>
+ <p>The specified request is not a valid operation for the target device.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230011<br />STATUS_NDIS_ADAPTER_NOT_READY</p>
+ </td>
+ <td>
+ <p>The network interface is not ready to complete this operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230014<br />STATUS_NDIS_INVALID_LENGTH</p>
+ </td>
+ <td>
+ <p>The length of the buffer submitted for this operation is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230015<br />STATUS_NDIS_INVALID_DATA</p>
+ </td>
+ <td>
+ <p>The data used for this operation is not valid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230016<br />STATUS_NDIS_BUFFER_TOO_SHORT</p>
+ </td>
+ <td>
+ <p>The length of the submitted buffer for this operation is too small.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230017<br />STATUS_NDIS_INVALID_OID</p>
+ </td>
+ <td>
+ <p>The network interface does not support this object identifier.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230018<br />STATUS_NDIS_ADAPTER_REMOVED</p>
+ </td>
+ <td>
+ <p>The network interface has been removed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230019<br />STATUS_NDIS_UNSUPPORTED_MEDIA</p>
+ </td>
+ <td>
+ <p>The network interface does not support this media type.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023001A<br />STATUS_NDIS_GROUP_ADDRESS_IN_USE</p>
+ </td>
+ <td>
+ <p>An attempt was made to remove a token ring group address that is in use by other components.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023001B<br />STATUS_NDIS_FILE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>An attempt was made to map a file that cannot be found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023001C<br />STATUS_NDIS_ERROR_READING_FILE</p>
+ </td>
+ <td>
+ <p>An error occurred while NDIS tried to map the file.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023001D<br />STATUS_NDIS_ALREADY_MAPPED</p>
+ </td>
+ <td>
+ <p>An attempt was made to map a file that is already mapped.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023001E<br />STATUS_NDIS_RESOURCE_CONFLICT</p>
+ </td>
+ <td>
+ <p>An attempt to allocate a hardware resource failed because the resource is used by another component.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023001F<br />STATUS_NDIS_MEDIA_DISCONNECTED</p>
+ </td>
+ <td>
+ <p>The I/O operation failed because the network media is disconnected or the wireless access point is out of range.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0230022<br />STATUS_NDIS_INVALID_ADDRESS</p>
+ </td>
+ <td>
+ <p>The network address used in the request is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023002A<br />STATUS_NDIS_PAUSED</p>
+ </td>
+ <td>
+ <p>The offload operation on the network interface has been paused.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023002B<br />STATUS_NDIS_INTERFACE_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>The network interface was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023002C<br />STATUS_NDIS_UNSUPPORTED_REVISION</p>
+ </td>
+ <td>
+ <p>The revision number specified in the structure is not supported.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023002D<br />STATUS_NDIS_INVALID_PORT</p>
+ </td>
+ <td>
+ <p>The specified port does not exist on this network interface.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023002E<br />STATUS_NDIS_INVALID_PORT_STATE</p>
+ </td>
+ <td>
+ <p>The current state of the specified port on this network interface does not support the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023002F<br />STATUS_NDIS_LOW_POWER_STATE</p>
+ </td>
+ <td>
+ <p>The miniport adapter is in a lower power state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC02300BB<br />STATUS_NDIS_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The network interface does not support this request.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC023100F<br />STATUS_NDIS_OFFLOAD_POLICY</p>
+ </td>
+ <td>
+ <p>The TCP connection is not offloadable because of a local policy setting.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0231012<br />STATUS_NDIS_OFFLOAD_CONNECTION_REJECTED</p>
+ </td>
+ <td>
+ <p>The TCP connection is not offloadable by the Chimney offload target.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0231013<br />STATUS_NDIS_OFFLOAD_PATH_REJECTED</p>
+ </td>
+ <td>
+ <p>The IP Path object is not in an offloadable state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0232000<br />STATUS_NDIS_DOT11_AUTO_CONFIG_ENABLED</p>
+ </td>
+ <td>
+ <p>The wireless LAN interface is in auto-configuration mode and does not support the requested parameter change operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0232001<br />STATUS_NDIS_DOT11_MEDIA_IN_USE</p>
+ </td>
+ <td>
+ <p>The wireless LAN interface is busy and cannot perform the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0232002<br />STATUS_NDIS_DOT11_POWER_STATE_INVALID</p>
+ </td>
+ <td>
+ <p>The wireless LAN interface is power down and does not support the requested operation.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0232003<br />STATUS_NDIS_PM_WOL_PATTERN_LIST_FULL</p>
+ </td>
+ <td>
+ <p>The list of wake on LAN patterns is full.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0232004<br />STATUS_NDIS_PM_PROTOCOL_OFFLOAD_LIST_FULL</p>
+ </td>
+ <td>
+ <p>The list of low power protocol offloads is full.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360001<br />STATUS_IPSEC_BAD_SPI</p>
+ </td>
+ <td>
+ <p>The SPI in the packet does not match a valid IPsec SA.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360002<br />STATUS_IPSEC_SA_LIFETIME_EXPIRED</p>
+ </td>
+ <td>
+ <p>The packet was received on an IPsec SA whose lifetime has expired.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360003<br />STATUS_IPSEC_WRONG_SA</p>
+ </td>
+ <td>
+ <p>The packet was received on an IPsec SA that does not match the packet characteristics.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360004<br />STATUS_IPSEC_REPLAY_CHECK_FAILED</p>
+ </td>
+ <td>
+ <p>The packet sequence number replay check failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360005<br />STATUS_IPSEC_INVALID_PACKET</p>
+ </td>
+ <td>
+ <p>The IPsec header and/or trailer in the packet is invalid.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360006<br />STATUS_IPSEC_INTEGRITY_CHECK_FAILED</p>
+ </td>
+ <td>
+ <p>The IPsec integrity check failed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360007<br />STATUS_IPSEC_CLEAR_TEXT_DROP</p>
+ </td>
+ <td>
+ <p>IPsec dropped a clear text packet.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360008<br />STATUS_IPSEC_AUTH_FIREWALL_DROP</p>
+ </td>
+ <td>
+ <p>IPsec dropped an incoming ESP packet in authenticated firewall mode. This drop is benign.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0360009<br />STATUS_IPSEC_THROTTLE_DROP</p>
+ </td>
+ <td>
+ <p>IPsec dropped a packet due to DOS throttle.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368000<br />STATUS_IPSEC_DOSP_BLOCK</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection matched an explicit block rule.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368001<br />STATUS_IPSEC_DOSP_RECEIVED_MULTICAST</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection received an IPsec specific multicast packet which is not allowed.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368002<br />STATUS_IPSEC_DOSP_INVALID_PACKET</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection received an incorrectly formatted packet.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368003<br />STATUS_IPSEC_DOSP_STATE_LOOKUP_FAILED</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection failed to lookup state.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368004<br />STATUS_IPSEC_DOSP_MAX_ENTRIES</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection failed to create state because there are already maximum number of entries allowed by policy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368005<br />STATUS_IPSEC_DOSP_KEYMOD_NOT_ALLOWED</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection received an IPsec negotiation packet for a keying module which is not allowed by policy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC0368006<br />STATUS_IPSEC_DOSP_MAX_PER_IP_RATELIMIT_QUEUES</p>
+ </td>
+ <td>
+ <p>IPsec Dos Protection failed to create per internal IP ratelimit queue because there is already maximum number of queues allowed by policy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC038005B<br />STATUS_VOLMGR_MIRROR_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The system does not support mirrored volumes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC038005C<br />STATUS_VOLMGR_RAID5_NOT_SUPPORTED</p>
+ </td>
+ <td>
+ <p>The system does not support RAID-5 volumes.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC03A0014<br />STATUS_VIRTDISK_PROVIDER_NOT_FOUND</p>
+ </td>
+ <td>
+ <p>A virtual disk support provider for the specified file was not found.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC03A0015<br />STATUS_VIRTDISK_NOT_VIRTUAL_DISK</p>
+ </td>
+ <td>
+ <p>The specified disk is not a virtual disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC03A0016<br />STATUS_VHD_PARENT_VHD_ACCESS_DENIED</p>
+ </td>
+ <td>
+ <p>The chain of virtual hard disks is inaccessible. The process has not been granted access rights to the parent virtual hard disk for the differencing disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC03A0017<br />STATUS_VHD_CHILD_PARENT_SIZE_MISMATCH</p>
+ </td>
+ <td>
+ <p>The chain of virtual hard disks is corrupted. There is a mismatch in the virtual sizes of the parent virtual hard disk and differencing disk.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC03A0018<br />STATUS_VHD_DIFFERENCING_CHAIN_CYCLE_DETECTED</p>
+ </td>
+ <td>
+ <p>The chain of virtual hard disks is corrupted. A differencing disk is indicated in its own parent chain.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>0xC03A0019<br />STATUS_VHD_DIFFERENCING_CHAIN_ERROR_IN_PARENT</p>
+ </td>
+ <td>
+ <p>The chain of virtual hard disks is inaccessible. There was an error opening a virtual hard disk further up the chain.</p>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <span>Â </span>
+ </div>
+</div></div>
+
+
+
+
+
+
+
+<div class="libraryMemberFilter">
+ <div class="filterContainer">
+ <span>Show:</span>
+ <label>
+ <input type="checkbox" class="libraryFilterInherited" checked="checked" value="Inherit" />Inherited
+ </label>
+ <label>
+ <input type="checkbox" class="libraryFilterProtected" checked="checked" value="Protected" />Protected
+ </label>
+ </div>
+</div>
+
+<input type="hidden" id="libraryMemberFilterEmptyWarning" value="There are no members available with your current filter settings." />
+
+
+
+</div>
+
+
+ </div>
+ <div class="clear"></div>
+
+
+
+<input name="__RequestVerificationToken" type="hidden" value="wGkz0ACBeuAsZdP3iMh04vMoBmlhc2Sv6VqrWB_gjkEMkf3Vqztlinc6uiRNsq1MqCNPOYaEufHnzmmurJqWmbAuSg01" />
+<input id="ratingSubmitUrl" type="hidden" value="https://msdn.microsoft.com/en-us/library/feedback/add/cc704588.aspx" />
+<input id="isTopicRated" type="hidden" value="false" />
+
+
+
+
+
+
+
+ <link type="text/css" rel="stylesheet" />
+
+ <div id="ux-footer" class="" style="" dir="ltr">
+
+ <div id="footerSock" class="librarySock both">
+ <div id="footerSockInner">
+ <a name="feedback"></a>
+
+<div class="rating">
+ <div id="ratingSection1">
+ <div class="title">
+ Was this page helpful?
+ </div>
+ <div class="description">
+ Your feedback about this content is important.<br />Let us know what you think.
+ </div>
+ <div class="buttons">
+ <button class="button" id="ratingYes">Yes</button>
+ <button class="button" id="ratingNo">No</button>
+ </div>
+ <input id="ratingValue" type="hidden" value="" />
+ </div>
+ <div id="ratingSection2">
+ <div class="title">
+ Additional feedback?
+ </div>
+ <textarea id="ratingText" rows="6" cols="" maxlength="1500"></textarea>
+ <div class="counter right">
+ <span id="feedbackTextCounter">1500</span> characters remaining
+ </div>
+ <div class="buttons left">
+ <button class="button" id="ratingSubmit">Submit</button>
+ <button class="button" id="ratingSkipThis">Skip this</button>
+ </div>
+ </div>
+ <div id="ratingSection3">
+ <div class="title">
+ Thank you!
+ </div>
+ <div class="description">
+ We appreciate your feedback.
+ </div>
+ </div>
+
+
+ <div id="contentFeedbackQAContainer" style="display: none;"></div>
+</div>
+
+ <div class="userVoice">
+ <div class="title">
+ Have a suggestion to improve MSDN Library?
+ </div>
+ <div class="description">
+ Visit our UserVoice Page to submit and vote on ideas!
+ </div>
+ <div class="buttons">
+ <a class="button" id="userVoiceButton" href="http://feedback.msdn.com/forums/257782-msdn-feature-suggestions/category/83975" target="_blank">Make a suggestion</a>
+ </div>
+</div>
+ <div class="clear"></div>
+ </div>
+ </div>
+
+ <footer class="top">
+ <div data-fragmentName="LeftLinks" id="Fragment_LeftLinks" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <div class="linkListTitle">Dev centers</div>
+ <ul class="links">
+ <li>
+ <a href="https://dev.windows.com" id="LeftLinks_2148_1" class="windowsBlue" xmlns="http://www.w3.org/1999/xhtml">Windows</a>
+ </li>
+ <li>
+ <a href="http://dev.office.com" id="LeftLinks_2148_3" class="office" xmlns="http://www.w3.org/1999/xhtml">Office</a>
+ </li>
+ <li>
+ <a href="https://msdn.microsoft.com/vstudio" id="LeftLinks_2148_4" class="visualStudio" xmlns="http://www.w3.org/1999/xhtml">Visual Studio</a>
+ </li>
+ <li>
+ <a href="http://developer.nokia.com/" title="Nokia" id="LeftLinks_2148_15" class="nokia" xmlns="http://www.w3.org/1999/xhtml">Nokia</a>
+ </li>
+ <li>
+ <a href="http://azure.microsoft.com/en-us/documentation/" target="_blank" id="LeftLinks_2148_12" xmlns="http://www.w3.org/1999/xhtml">Microsoft Azure</a>
+ </li>
+ <li>
+ <a href="https://msdn.microsoft.com/aa937802" id="LeftLinks_2148_5" xmlns="http://www.w3.org/1999/xhtml">More...</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ <div id="rightLinks">
+ <div data-fragmentName="CenterLinks1" id="Fragment_CenterLinks1" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <div class="linkListTitle">Learning resources</div>
+ <ul class="links">
+ <li>
+ <a href="http://www.microsoftvirtualacademy.com/" id="CenterLinks1_2151_4" xmlns="http://www.w3.org/1999/xhtml">Microsoft Virtual Academy</a>
+ </li>
+ <li>
+ <a href="http://channel9.msdn.com/" id="CenterLinks1_2151_5" xmlns="http://www.w3.org/1999/xhtml">Channel 9</a>
+ </li>
+ <li>
+ <a href="http://www.interoperabilitybridges.com/" id="CenterLinks1_2151_6" xmlns="http://www.w3.org/1999/xhtml">Interoperability Bridges</a>
+ </li>
+ <li>
+ <a href="https://msdn.microsoft.com/magazine/" id="CenterLinks1_2151_7" xmlns="http://www.w3.org/1999/xhtml">MSDN Magazine</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ <div data-fragmentName="CenterLinks2" id="Fragment_CenterLinks2" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <div class="linkListTitle">Community</div>
+ <ul class="links">
+ <li>
+ <a href="https://social.msdn.microsoft.com/forums/en-us/home" id="CenterLinks2_2151_8" xmlns="http://www.w3.org/1999/xhtml">Forums</a>
+ </li>
+ <li>
+ <a href="http://blogs.msdn.com/b/developer-tools/" id="CenterLinks2_2151_9" xmlns="http://www.w3.org/1999/xhtml">Blogs</a>
+ </li>
+ <li>
+ <a href="http://www.codeplex.com" id="CenterLinks2_2151_10" xmlns="http://www.w3.org/1999/xhtml">Codeplex</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ <div data-fragmentName="CenterLinks3" id="Fragment_CenterLinks3" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <div class="linkListTitle">Support</div>
+ <ul class="links">
+ <li>
+ <a href="https://msdn.microsoft.com/hh361695" id="CenterLinks3_2151_11" xmlns="http://www.w3.org/1999/xhtml">Self support</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ <div data-fragmentName="CenterLinks4" id="Fragment_CenterLinks4" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <div class="linkListTitle">Programs</div>
+ <ul class="links">
+ <li>
+ <a href="https://www.microsoft.com/bizspark/" id="CenterLinks4_2151_13" xmlns="http://www.w3.org/1999/xhtml">BizSpark (for startups)</a>
+ </li>
+ <li>
+ <a href="https://www.dreamspark.com/" id="CenterLinks4_2151_14" xmlns="http://www.w3.org/1999/xhtml">DreamSpark</a>
+ </li>
+ <li>
+ <a href="http://www.imaginecup.com" id="CenterLinks4_2151_17" xmlns="http://www.w3.org/1999/xhtml">Imagine Cup</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ </div>
+ </footer>
+
+ <footer class="bottom">
+ <span class="localeContainer">
+
+ <form class="selectLocale" id="selectLocaleForm" action="https://msdn.microsoft.com/en-us/selectlocale-dmc">
+ <input type="hidden" name="fromPage" value="https%3a%2f%2fmsdn.microsoft.com%2fen-us%2flibrary%2fcc704588.aspx" />
+ <a href="#" onclick="$('#selectLocaleForm').submit();return false;" title="Change your language">United States (English)</a>
+ </form>
+
+
+ </span>
+
+ <div data-fragmentName="BottomLinks" id="Fragment_BottomLinks" xmlns="http://www.w3.org/1999/xhtml">
+
+ <div class="linkList">
+ <ul class="links horizontal">
+ <li>
+ <a href="https://msdn.microsoft.com/newsletter.aspx" id="BottomLinks_2148_7" xmlns="http://www.w3.org/1999/xhtml">Newsletter</a>
+ </li>
+ <li>
+ <a href="https://msdn.microsoft.com/dn529288" id="BottomLinks_2148_8" xmlns="http://www.w3.org/1999/xhtml">Privacy & cookies</a>
+ </li>
+ <li>
+ <a href="https://msdn.microsoft.com/cc300389" id="BottomLinks_2148_9" xmlns="http://www.w3.org/1999/xhtml">Terms of use</a>
+ </li>
+ <li>
+ <a href="https://www.microsoft.com/en-us/legal/intellectualproperty/Trademarks/EN-US.aspx" id="BottomLinks_2148_10" xmlns="http://www.w3.org/1999/xhtml">Trademarks</a>
+ </li>
+ </ul>
+ </div>
+</div>
+ <span class="logoLegal">
+ <span class="logo"></span>
+ <span class="copyright">© 2015 Microsoft</span>
+ </span>
+ </footer>
+ </div>
+
+
+
+ <div class="footerPrintView">
+ <div class="footerCopyrightPrintView">© 2015 Microsoft</div>
+ </div>
+
+
+
+
+
+ <input id="tocPaddingPerLevel" type="hidden" value="17" />
+
+
+
+ <input id="MtpsDevice" type="hidden" value="Robot" />
+
+
+<![CDATA[ Third party scripts and code linked to or referenced from this website are licensed to you by the parties that own such code, not by Microsoft. See ASP.NET Ajax CDN Terms of Use – http://www.asp.net/ajaxlibrary/CDN.ashx. ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+<noscript><div><img alt="DCSIMG" id="Img1" width="1" height="1" src="https://m.webtrends.com/dcsmgru7m99k7mqmgrhudo0k8_8c6m/njs.gif?dcsuri=/nojavascript&WT.js=No" /></div></noscript>
+
+
+
+
+
+
+
+
+
+<noscript>
+ <a href="http://www.omniture.com" title="Web Analytics">
+ <img src="//msstonojsmsdn.112.2o7.net/b/ss/msstonojsmsdn/1/H.20.2--NS/0" height="1" width="1" border="0" alt="" />
+ </a>
+</noscript>
+
+
+
+
+
+<div id="globalRequestVerification">
+ <input name="__RequestVerificationToken" type="hidden" value="nyJz1znhZGUF0XsIYht__FJ2k5KGP3POkpBgNnjn6QU7q-li0D7cf7QZIttQ_V0CaWLpPYXbX2IvB6szPDIUyGqkvVY1" />
+</div>
+
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript" class="mtps-injected">
+/*<![CDATA[*/
+(function(window,document){"use strict";function preload(scripts){for(var result=[],script,e,i=0;i<scripts.length;i++)script=scripts[i],script.hasOwnProperty("url")&&(e=document.createElement("script"),e.src=script.url,script.throwaway=e),result.push(script);return result}function inject(scripts,index){var script,elem;if(index>=scripts.length){delete mtps.injectScripts;return}script=scripts[index];elem=document.createElement("script");elem.className="mtps-injected";elem.async=!1;var isLoaded=!1,timeoutId=0,injectNextFnName="",injectNext=elem.onerror=function(){isLoaded||(isLoaded=!0,inject(scripts,index+1),window.clearTimeout(timeoutId),elem.onload=elem.onerror=elem.onreadystatechange=null,injectNextFnName&&delete mtps[injectNextFnName],elem.removeEventListener&&elem.removeEventListener("load",injectNext,!1))};elem.addEventListener?elem.addEventListener("load",injectNext,!1):elem.readyState==="uninitialized"?elem.onreadystatechange=function(){(this.readyState==="loaded"||this.readyState==="complete")&&injectNext()}:elem.onload=injectNext;script.hasOwnProperty("url")?(timeoutId=window.setTimeout(injectNext,12e4),elem.src=script.url):(injectNextFnName="_injectNextScript_"+index,mtps[injectNextFnName]=injectNext,timeoutId=window.setTimeout(injectNext,2e3),elem.text="try {\n"+script.txt+"\n} finally { MTPS."+injectNextFnName+" && MTPS."+injectNextFnName+"(); }");parent.appendChild(elem)}var mtps=window.MTPS||(window.MTPS={}),parent=document.getElementsByTagName("head")[0];mtps.injectScripts=function(scripts){inject(preload(scripts),0)}})(window,document);
+MTPS.injectScripts([
+ { txt: "/**/\r\n(window.MTPS || (window.MTPS = {})).cdnDomains || (window.MTPS.cdnDomains = { \r\n\t\"image\": \"https://i-msdn.sec.s-msft.com\", \r\n\t\"js\": \"https://i2-msdn.sec.s-msft.com\", \r\n\t\"css\": \"https://i-msdn.sec.s-msft.com\", \r\n\t\"xap\": \"https://i-vso.sec.s-msft.com\"\r\n});\r\n/**/" },
+ { url: "https://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.8.2.min.js" },
+ { txt: "//\n var literalNormalizedUrl = \u0027/en-us/library/cc704588(l=en-us,v=prot.20).aspx\u0027;\n var wt_nvr_ru = \u0027WT_NVR_RU\u0027;\n var wt_fpcdom = \u0027.microsoft.com\u0027;\n var wt_domlist = \u0027msdn.microsoft.com\u0027;\n var wt_pathlist = \u0027\u0027;\n var wt_paramlist = \u0027DCSext.mtps_devcenter\u0027;\n var wt_siteid = \u0027MSDN\u0027;\n var gDomain = \u0027m.webtrends.com\u0027;\n var gDcsId = \u0027dcsmgru7m99k7mqmgrhudo0k8_8c6m\u0027;\n var gFpc = \u0027WT_FPC\u0027;\n\n\n\n if (document.cookie.indexOf(gFpc + \"=\") == -1) {\n var wtidJs = document.createElement(\"script\");\n wtidJs.src = \"//\" + gDomain + \"/\" + gDcsId + \"/wtid.js\";\n document.getElementsByTagName(\"head\")[0].appendChild(wtidJs);\n }\n\n\n\n var detectedLocale = \u0027en-us\u0027;\n var wtsp = \u0027msdnlib_doj\u0027;\n var gTrackEvents = \u00270\u0027;\n/**/" },
+ { txt: "/**/\n var omni_guid = \"297dc630-8066-40e0-ab61-b4ff48aa007c\";\n/**/" },
+ { txt: "//\n\n window.appInsightsId = \u002760854590-027a-4ae4-98be-2741a40f355f\u0027;\n //" },
+ { url: "https://i2-msdn.sec.s-msft.com/Combined.js?resources=0:Utilities,1:Layout,2:Header,1:Rating,2:Footer,0:Topic,3:webtrendsscript,4:omni_rsid_MSDN,5:WEDCS,0:AppInsightsPerf,6:Toc,1:SearchBox;/Areas/Epx/Content/Scripts:0,/Areas/Epx/Themes/Base/Content:1,/Areas/Centers/Themes/StandardDevCenter/Content:2,/Areas/Global/Content/Webtrends/resources:3,/Areas/Global/Content/Omniture/resources/MSDN:4,/Areas/Library/Themes/Base/Content:5,/Areas/Library/Content:6\u0026amp;hashKey=FB961264348D584F46A0D35B285D2793\u0026amp;v=B824EC950EFE6A8B72B4760A16A865F4" },
+ { url: "https://i1.services.social.microsoft.com/search/Widgets/SearchBox.jss?boxid=HeaderSearchTextBox\u0026btnid=HeaderSearchButton\u0026brand=Msdn\u0026loc=en-us\u0026focusOnInit=false\u0026emptyWatermark=true\u0026searchButtonTooltip=Search MSDN" },
+ { url: "https://i2-msdn.sec.s-msft.com/Combined.js?resources=0:PrintExportButton,1:NavigationResize,1:LibraryMemberFilter,2:Toc_Fixed,2:CodeSnippet,2:TopicNotInScope,2:CollapsibleArea,2:VersionSelector,2:SurveyBroker;/Areas/Library/Themes/Base/Content:0,/Areas/Library/Content:1,/Areas/Epx/Content/Scripts:2\u0026amp;hashKey=3248804C2DE1E642F8B20C4F83DBEA3B\u0026amp;v=B824EC950EFE6A8B72B4760A16A865F4" },
+ { txt: "$(document).ready(function() {\n try {\n var token = $(\"#globalRequestVerification input[name=\u0027__RequestVerificationToken\u0027]\").clone();\n $(\"#siteFeedbackForm\").append(token);\n } catch(err) {\n \n }\n });" }
+]);
+
+/*]]>*/
+</script></body>
+</html>
\ No newline at end of file
diff --git a/indra/copy_win_scripts/CMakeLists.txt b/indra/copy_win_scripts/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/doxygen/CMakeLists.txt b/indra/doxygen/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..84188bd32f9592762a34fc9d9ebc23006b33eff3
--- /dev/null
+++ b/indra/doxygen/CMakeLists.txt
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+
+# cmake_minimum_required should appear before any
+# 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 2.8.8 FATAL_ERROR)
+
+set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
+ "The root project/makefile/solution name. Defaults to SecondLife.")
+project(${ROOT_PROJECT_NAME})
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+include(Variables)
+
+# add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+ GET_FILENAME_COMPONENT(DOXYGEN_TOP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. PATH)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+ add_custom_target(doc
+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/..
+ COMMENT "Generating API documentation with Doxygen" VERBATIM
+ )
+endif(DOXYGEN_FOUND)
+
diff --git a/indra/doxygen/Doxyfile.in b/indra/doxygen/Doxyfile.in
new file mode 100644
index 0000000000000000000000000000000000000000..6881595c2eef2cdbf587f8623edae17fc1fcb049
--- /dev/null
+++ b/indra/doxygen/Doxyfile.in
@@ -0,0 +1,1557 @@
+# Doxyfile 1.6.3
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = "@VIEWER_CHANNEL@"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER = @VIEWER_SHORT_VERSION@.@VIEWER_VERSION_REVISION@
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH = @DOXYGEN_TOP_SRC_DIR@
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = YES
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 2
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = NO
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = NO
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = NO
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE = @CMAKE_CURRENT_BINARY_DIR@/doxygen_warnings.log
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = @CMAKE_CURRENT_SOURCE_DIR@/../../indra
+## TODO We would like to also have the includes from @CMAKE_CURRENT_BINARY_DIR@/packages/include
+## but at present that is too expensive. Ideally, we will modify each package build to do
+## generation of doxygen docs, and install them in a modular way that we can connect. See TAGS
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS = */test/* */tests/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/../../doc
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX = LL
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+## TODO?
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = com.lindenlab.SecondLifeViewer
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = com.lindenlab.SecondLifeViewer
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = com.lindenlab.SecondLifeViewer
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+## TODO - ideally, all packages imported by autoubuild would come with doxygen documentation
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+#PERL_PATH = @PERL@
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = YES
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 100
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 3
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt
old mode 100755
new mode 100644
index 6f2087d58088cbfeeb19f3b201e1f67bbb0b34dc..32aa08a2b71e3eae62d6f24c97ff585f67bac9d4
--- a/indra/edit-me-to-trigger-new-build.txt
+++ b/indra/edit-me-to-trigger-new-build.txt
@@ -1,2 +1,3 @@
2014-02-25 10:34
+
diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/autocontrast.xml b/indra/integration_tests/llimage_libtest/filters/autocontrast.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/badtrip.xml b/indra/integration_tests/llimage_libtest/filters/badtrip.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/brighten.xml b/indra/integration_tests/llimage_libtest/filters/brighten.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/darken.xml b/indra/integration_tests/llimage_libtest/filters/darken.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/lightleak.xml b/indra/integration_tests/llimage_libtest/filters/lightleak.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/linearize.xml b/indra/integration_tests/llimage_libtest/filters/linearize.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/miniature.xml b/indra/integration_tests/llimage_libtest/filters/miniature.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/newsscreen.xml b/indra/integration_tests/llimage_libtest/filters/newsscreen.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/pixelate.xml b/indra/integration_tests/llimage_libtest/filters/pixelate.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/posterize.xml b/indra/integration_tests/llimage_libtest/filters/posterize.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/thematrix.xml b/indra/integration_tests/llimage_libtest/filters/thematrix.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/toycamera.xml b/indra/integration_tests/llimage_libtest/filters/toycamera.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/filters/video.xml b/indra/integration_tests/llimage_libtest/filters/video.xml
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.h b/indra/integration_tests/llimage_libtest/llimage_libtest.h
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.h b/indra/integration_tests/llui_libtest/llui_libtest.h
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
old mode 100755
new mode 100644
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.h b/indra/integration_tests/llui_libtest/llwidgetreg.h
old mode 100755
new mode 100644
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp
old mode 100755
new mode 100644
index 36f62451d7e37d9d1a89d3c274185dac129a3f50..9d5ec33fed74add89e7f34e6ee401a2e542638d5
--- a/indra/linux_crash_logger/linux_crash_logger.cpp
+++ b/indra/linux_crash_logger/linux_crash_logger.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
if (!(options.has("pid") && options.has("dumpdir")))
{
- llwarns << "Insufficient parameters to crash report." << llendl;
+ LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL;
}
if (! app.init())
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
old mode 100755
new mode 100644
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/lldriverparam.h b/indra/llappearance/lldriverparam.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
old mode 100755
new mode 100644
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llaudiodecodemgr.h b/indra/llaudio/llaudiodecodemgr.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/lllistener.cpp b/indra/llaudio/lllistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/llaudio/lllistener.h b/indra/llaudio/lllistener.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/lllistener_ds3d.h b/indra/llaudio/lllistener_ds3d.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/lllistener_openal.cpp b/indra/llaudio/lllistener_openal.cpp
old mode 100755
new mode 100644
diff --git a/indra/llaudio/lllistener_openal.h b/indra/llaudio/lllistener_openal.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llstreamingaudio.h b/indra/llaudio/llstreamingaudio.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llvorbisencode.h b/indra/llaudio/llvorbisencode.h
old mode 100755
new mode 100644
diff --git a/indra/llaudio/llwindgen.h b/indra/llaudio/llwindgen.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llanimationstates.h b/indra/llcharacter/llanimationstates.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llbvhconsts.h b/indra/llcharacter/llbvhconsts.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llgesture.h b/indra/llcharacter/llgesture.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llhandmotion.cpp b/indra/llcharacter/llhandmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llhandmotion.h b/indra/llcharacter/llhandmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lljointsolverrp3.cpp b/indra/llcharacter/lljointsolverrp3.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lljointsolverrp3.h b/indra/llcharacter/lljointsolverrp3.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lljointstate.h b/indra/llcharacter/lljointstate.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframefallmotion.h b/indra/llcharacter/llkeyframefallmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframestandmotion.h b/indra/llcharacter/llkeyframestandmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llstatemachine.h b/indra/llcharacter/llstatemachine.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lltargetingmotion.cpp b/indra/llcharacter/lltargetingmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/lltargetingmotion.h b/indra/llcharacter/lltargetingmotion.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
old mode 100755
new mode 100644
diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llcommon/ctype_workaround.h b/indra/llcommon/ctype_workaround.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/fix_macros.h b/indra/llcommon/fix_macros.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp
old mode 100755
new mode 100644
index f3989ee1d06ffd4e19733e0c087745f80a0cc154..60721977cdc6f2196732dff012441f394c4fc1cc
--- a/indra/llcommon/indra_constants.cpp
+++ b/indra/llcommon/indra_constants.cpp
@@ -67,3 +67,4 @@ const LLUUID TERRAIN_MOUNTAIN_DETAIL ("303cd381-8560-7579-23f1-f0a880799740"); /
const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
+
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/is_approx_equal_fraction.h b/indra/llcommon/is_approx_equal_fraction.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llallocator.cpp b/indra/llcommon/llallocator.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llallocator.h b/indra/llcommon/llallocator.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llallocator_heap_profile.cpp b/indra/llcommon/llallocator_heap_profile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llallocator_heap_profile.h b/indra/llcommon/llallocator_heap_profile.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llbase32.cpp b/indra/llcommon/llbase32.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llbase32.h b/indra/llcommon/llbase32.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llbase64.cpp b/indra/llcommon/llbase64.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llbase64.h b/indra/llcommon/llbase64.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llbitpack.cpp b/indra/llcommon/llbitpack.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llbitpack.h b/indra/llcommon/llbitpack.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llboost.h b/indra/llcommon/llboost.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcommon.h b/indra/llcommon/llcommon.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcommonutils.cpp b/indra/llcommon/llcommonutils.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcommonutils.h b/indra/llcommon/llcommonutils.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcrc.cpp b/indra/llcommon/llcrc.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcrc.h b/indra/llcommon/llcrc.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcriticaldamp.cpp b/indra/llcommon/llcriticaldamp.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llcriticaldamp.h b/indra/llcommon/llcriticaldamp.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldefs.h b/indra/llcommon/lldefs.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldependencies.cpp b/indra/llcommon/lldependencies.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldependencies.h b/indra/llcommon/lldependencies.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldepthstack.h b/indra/llcommon/lldepthstack.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldictionary.cpp b/indra/llcommon/lldictionary.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lldoubledispatch.h b/indra/llcommon/lldoubledispatch.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llendianswizzle.h b/indra/llcommon/llendianswizzle.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
old mode 100755
new mode 100644
index b1b5e9be7d7a913be6160cfa49a8cebb701becc7..3beef657239edcefae14c79128dbe0dcd8ae1c47
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -363,13 +363,4 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
#define LL_INFOS_ONCE(...) lllog(LLError::LEVEL_INFO, true, ##__VA_ARGS__)
#define LL_WARNS_ONCE(...) lllog(LLError::LEVEL_WARN, true, ##__VA_ARGS__)
-// DEPRECATED: Use the new macros that allow tags and *look* like macros.
-#define lldebugs LL_COMPILE_TIME_MESSAGE("Warning: lldebugs deprecated, use LL_DEBUGS() instead") LL_DEBUGS()
-#define llinfos LL_COMPILE_TIME_MESSAGE("Warning: llinfos deprecated, use LL_INFOS() instead") LL_INFOS()
-#define llwarns LL_COMPILE_TIME_MESSAGE("Warning: llwarns deprecated, use LL_WARNS() instead") LL_WARNS()
-#define llerrs LL_COMPILE_TIME_MESSAGE("Warning: llerrs deprecated, use LL_ERRS() instead") LL_ERRS()
-#define llcont LL_COMPILE_TIME_MESSAGE("Warning: llcont deprecated, use LL_CONT instead") LL_CONT
-#define llendl LL_COMPILE_TIME_MESSAGE("Warning: llendl deprecated, use LL_ENDL instead") LL_ENDL
-
-
#endif // LL_LLERROR_H
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llerrorthread.h b/indra/llcommon/llerrorthread.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llevent.cpp b/indra/llcommon/llevent.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llevent.h b/indra/llcommon/llevent.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventapi.cpp b/indra/llcommon/lleventapi.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventapi.h b/indra/llcommon/lleventapi.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventdispatcher.cpp b/indra/llcommon/lleventdispatcher.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventemitter.h b/indra/llcommon/lleventemitter.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventfilter.cpp b/indra/llcommon/lleventfilter.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventfilter.h b/indra/llcommon/lleventfilter.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventtimer.cpp b/indra/llcommon/lleventtimer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
old mode 100755
new mode 100644
index 295c97eac8949543d8fa79ffbd43d189dc52fcbc..873a7bce25f5efacb8225d052be18d2a9a1aa73b
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -421,551 +421,42 @@ LLFILE * LLFile::_Fiopen(const std::string& filename,
#endif /* LL_WINDOWS */
-/************** llstdio file buffer ********************************/
-
-
-#if !LL_WINDOWS
-llstdio_filebuf::int_type llstdio_filebuf::overflow(llstdio_filebuf::int_type __c)
-{
- int_type __ret = traits_type::eof();
- const bool __testeof = traits_type::eq_int_type(__c, __ret);
- const bool __testout = _M_mode & ios_base::out;
- if (__testout && !_M_reading)
- {
- if (this->pbase() < this->pptr())
- {
- // If appropriate, append the overflow char.
- if (!__testeof)
- {
- *this->pptr() = traits_type::to_char_type(__c);
- this->pbump(1);
- }
-
- // Convert pending sequence to external representation,
- // and output.
- if (_convert_to_external(this->pbase(),
- this->pptr() - this->pbase()))
- {
- _M_set_buffer(0);
- __ret = traits_type::not_eof(__c);
- }
- }
- else if (_M_buf_size > 1)
- {
- // Overflow in 'uncommitted' mode: set _M_writing, set
- // the buffer to the initial 'write' mode, and put __c
- // into the buffer.
- _M_set_buffer(0);
- _M_writing = true;
- if (!__testeof)
- {
- *this->pptr() = traits_type::to_char_type(__c);
- this->pbump(1);
- }
- __ret = traits_type::not_eof(__c);
- }
- else
- {
- // Unbuffered.
- char_type __conv = traits_type::to_char_type(__c);
- if (__testeof || _convert_to_external(&__conv, 1))
- {
- _M_writing = true;
- __ret = traits_type::not_eof(__c);
- }
- }
- }
- return __ret;
-}
-
-bool llstdio_filebuf::_convert_to_external(char_type* __ibuf,
- std::streamsize __ilen)
-{
- // Sizes of external and pending output.
- streamsize __elen;
- streamsize __plen;
- if (__check_facet(_M_codecvt).always_noconv())
- {
- //__elen = _M_file.xsputn(reinterpret_cast<char*>(__ibuf), __ilen);
- __elen = fwrite(reinterpret_cast<void*>(__ibuf), 1,
- __ilen, _M_file.file());
- __plen = __ilen;
- }
- else
- {
- // Worst-case number of external bytes needed.
- // XXX Not done encoding() == -1.
- streamsize __blen = __ilen * _M_codecvt->max_length();
- char* __buf = static_cast<char*>(__builtin_alloca(__blen));
-
- char* __bend;
- const char_type* __iend;
- codecvt_base::result __r;
- __r = _M_codecvt->out(_M_state_cur, __ibuf, __ibuf + __ilen,
- __iend, __buf, __buf + __blen, __bend);
-
- if (__r == codecvt_base::ok || __r == codecvt_base::partial)
- __blen = __bend - __buf;
- else if (__r == codecvt_base::noconv)
- {
- // Same as the always_noconv case above.
- __buf = reinterpret_cast<char*>(__ibuf);
- __blen = __ilen;
- }
- else
- __throw_ios_failure(__N("llstdio_filebuf::_convert_to_external "
- "conversion error"));
-
- //__elen = _M_file.xsputn(__buf, __blen);
- __elen = fwrite(__buf, 1, __blen, _M_file.file());
- __plen = __blen;
-
- // Try once more for partial conversions.
- if (__r == codecvt_base::partial && __elen == __plen)
- {
- const char_type* __iresume = __iend;
- streamsize __rlen = this->pptr() - __iend;
- __r = _M_codecvt->out(_M_state_cur, __iresume,
- __iresume + __rlen, __iend, __buf,
- __buf + __blen, __bend);
- if (__r != codecvt_base::error)
- {
- __rlen = __bend - __buf;
- //__elen = _M_file.xsputn(__buf, __rlen);
- __elen = fwrite(__buf, 1, __rlen, _M_file.file());
- __plen = __rlen;
- }
- else
- {
- __throw_ios_failure(__N("llstdio_filebuf::_convert_to_external "
- "conversion error"));
- }
- }
- }
- return __elen == __plen;
-}
-
-llstdio_filebuf::int_type llstdio_filebuf::underflow()
-{
- int_type __ret = traits_type::eof();
- const bool __testin = _M_mode & ios_base::in;
- if (__testin)
- {
- if (_M_writing)
- {
- if (overflow() == traits_type::eof())
- return __ret;
- //_M_set_buffer(-1);
- //_M_writing = false;
- }
- // Check for pback madness, and if so switch back to the
- // normal buffers and jet outta here before expensive
- // fileops happen...
- _M_destroy_pback();
-
- if (this->gptr() < this->egptr())
- return traits_type::to_int_type(*this->gptr());
-
- // Get and convert input sequence.
- const size_t __buflen = _M_buf_size > 1 ? _M_buf_size - 1 : 1;
-
- // Will be set to true if ::fread() returns 0 indicating EOF.
- bool __got_eof = false;
- // Number of internal characters produced.
- streamsize __ilen = 0;
- codecvt_base::result __r = codecvt_base::ok;
- if (__check_facet(_M_codecvt).always_noconv())
- {
- //__ilen = _M_file.xsgetn(reinterpret_cast<char*>(this->eback()),
- // __buflen);
- __ilen = fread(reinterpret_cast<void*>(this->eback()), 1,
- __buflen, _M_file.file());
- if (__ilen == 0)
- __got_eof = true;
- }
- else
- {
- // Worst-case number of external bytes.
- // XXX Not done encoding() == -1.
- const int __enc = _M_codecvt->encoding();
- streamsize __blen; // Minimum buffer size.
- streamsize __rlen; // Number of chars to read.
- if (__enc > 0)
- __blen = __rlen = __buflen * __enc;
- else
- {
- __blen = __buflen + _M_codecvt->max_length() - 1;
- __rlen = __buflen;
- }
- const streamsize __remainder = _M_ext_end - _M_ext_next;
- __rlen = __rlen > __remainder ? __rlen - __remainder : 0;
-
- // An imbue in 'read' mode implies first converting the external
- // chars already present.
- if (_M_reading && this->egptr() == this->eback() && __remainder)
- __rlen = 0;
-
- // Allocate buffer if necessary and move unconverted
- // bytes to front.
- if (_M_ext_buf_size < __blen)
- {
- char* __buf = new char[__blen];
- if (__remainder)
- __builtin_memcpy(__buf, _M_ext_next, __remainder);
-
- delete [] _M_ext_buf;
- _M_ext_buf = __buf;
- _M_ext_buf_size = __blen;
- }
- else if (__remainder)
- __builtin_memmove(_M_ext_buf, _M_ext_next, __remainder);
-
- _M_ext_next = _M_ext_buf;
- _M_ext_end = _M_ext_buf + __remainder;
- _M_state_last = _M_state_cur;
-
- do
- {
- if (__rlen > 0)
- {
- // Sanity check!
- // This may fail if the return value of
- // codecvt::max_length() is bogus.
- if (_M_ext_end - _M_ext_buf + __rlen > _M_ext_buf_size)
- {
- __throw_ios_failure(__N("llstdio_filebuf::underflow "
- "codecvt::max_length() "
- "is not valid"));
- }
- //streamsize __elen = _M_file.xsgetn(_M_ext_end, __rlen);
- streamsize __elen = fread(_M_ext_end, 1,
- __rlen, _M_file.file());
- if (__elen == 0)
- __got_eof = true;
- else if (__elen == -1)
- break;
- //_M_ext_end += __elen;
- }
-
- char_type* __iend = this->eback();
- if (_M_ext_next < _M_ext_end)
- {
- __r = _M_codecvt->in(_M_state_cur, _M_ext_next,
- _M_ext_end, _M_ext_next,
- this->eback(),
- this->eback() + __buflen, __iend);
- }
- if (__r == codecvt_base::noconv)
- {
- size_t __avail = _M_ext_end - _M_ext_buf;
- __ilen = std::min(__avail, __buflen);
- traits_type::copy(this->eback(),
- reinterpret_cast<char_type*>
- (_M_ext_buf), __ilen);
- _M_ext_next = _M_ext_buf + __ilen;
- }
- else
- __ilen = __iend - this->eback();
-
- // _M_codecvt->in may return error while __ilen > 0: this is
- // ok, and actually occurs in case of mixed encodings (e.g.,
- // XML files).
- if (__r == codecvt_base::error)
- break;
-
- __rlen = 1;
- } while (__ilen == 0 && !__got_eof);
- }
-
- if (__ilen > 0)
- {
- _M_set_buffer(__ilen);
- _M_reading = true;
- __ret = traits_type::to_int_type(*this->gptr());
- }
- else if (__got_eof)
- {
- // If the actual end of file is reached, set 'uncommitted'
- // mode, thus allowing an immediate write without an
- // intervening seek.
- _M_set_buffer(-1);
- _M_reading = false;
- // However, reaching it while looping on partial means that
- // the file has got an incomplete character.
- if (__r == codecvt_base::partial)
- __throw_ios_failure(__N("llstdio_filebuf::underflow "
- "incomplete character in file"));
- }
- else if (__r == codecvt_base::error)
- __throw_ios_failure(__N("llstdio_filebuf::underflow "
- "invalid byte sequence in file"));
- else
- __throw_ios_failure(__N("llstdio_filebuf::underflow "
- "error reading the file"));
- }
- return __ret;
-}
-
-std::streamsize llstdio_filebuf::xsgetn(char_type* __s, std::streamsize __n)
-{
- // Clear out pback buffer before going on to the real deal...
- streamsize __ret = 0;
- if (_M_pback_init)
- {
- if (__n > 0 && this->gptr() == this->eback())
- {
- *__s++ = *this->gptr();
- this->gbump(1);
- __ret = 1;
- --__n;
- }
- _M_destroy_pback();
- }
-
- // Optimization in the always_noconv() case, to be generalized in the
- // future: when __n > __buflen we read directly instead of using the
- // buffer repeatedly.
- const bool __testin = _M_mode & ios_base::in;
- const streamsize __buflen = _M_buf_size > 1 ? _M_buf_size - 1 : 1;
-
- if (__n > __buflen && __check_facet(_M_codecvt).always_noconv()
- && __testin && !_M_writing)
- {
- // First, copy the chars already present in the buffer.
- const streamsize __avail = this->egptr() - this->gptr();
- if (__avail != 0)
- {
- if (__avail == 1)
- *__s = *this->gptr();
- else
- traits_type::copy(__s, this->gptr(), __avail);
- __s += __avail;
- this->gbump(__avail);
- __ret += __avail;
- __n -= __avail;
- }
-
- // Need to loop in case of short reads (relatively common
- // with pipes).
- streamsize __len;
- for (;;)
- {
- //__len = _M_file.xsgetn(reinterpret_cast<char*>(__s), __n);
- __len = fread(reinterpret_cast<void*>(__s), 1,
- __n, _M_file.file());
- if (__len == -1)
- __throw_ios_failure(__N("llstdio_filebuf::xsgetn "
- "error reading the file"));
- if (__len == 0)
- break;
-
- __n -= __len;
- __ret += __len;
- if (__n == 0)
- break;
-
- __s += __len;
- }
-
- if (__n == 0)
- {
- _M_set_buffer(0);
- _M_reading = true;
- }
- else if (__len == 0)
- {
- // If end of file is reached, set 'uncommitted'
- // mode, thus allowing an immediate write without
- // an intervening seek.
- _M_set_buffer(-1);
- _M_reading = false;
- }
- }
- else
- __ret += __streambuf_type::xsgetn(__s, __n);
-
- return __ret;
-}
-
-std::streamsize llstdio_filebuf::xsputn(const char_type* __s, std::streamsize __n)
-{
- // Optimization in the always_noconv() case, to be generalized in the
- // future: when __n is sufficiently large we write directly instead of
- // using the buffer.
- streamsize __ret = 0;
- const bool __testout = _M_mode & ios_base::out;
- if (__check_facet(_M_codecvt).always_noconv()
- && __testout && !_M_reading)
- {
- // Measurement would reveal the best choice.
- const streamsize __chunk = 1ul << 10;
- streamsize __bufavail = this->epptr() - this->pptr();
-
- // Don't mistake 'uncommitted' mode buffered with unbuffered.
- if (!_M_writing && _M_buf_size > 1)
- __bufavail = _M_buf_size - 1;
-
- const streamsize __limit = std::min(__chunk, __bufavail);
- if (__n >= __limit)
- {
- const streamsize __buffill = this->pptr() - this->pbase();
- const char* __buf = reinterpret_cast<const char*>(this->pbase());
- //__ret = _M_file.xsputn_2(__buf, __buffill,
- // reinterpret_cast<const char*>(__s), __n);
- if (__buffill)
- {
- __ret = fwrite(__buf, 1, __buffill, _M_file.file());
- }
- if (__ret == __buffill)
- {
- __ret += fwrite(reinterpret_cast<const char*>(__s), 1,
- __n, _M_file.file());
- }
- if (__ret == __buffill + __n)
- {
- _M_set_buffer(0);
- _M_writing = true;
- }
- if (__ret > __buffill)
- __ret -= __buffill;
- else
- __ret = 0;
- }
- else
- __ret = __streambuf_type::xsputn(__s, __n);
- }
- else
- __ret = __streambuf_type::xsputn(__s, __n);
- return __ret;
-}
-
-int llstdio_filebuf::sync()
-{
- return (_M_file.sync() == 0 ? 0 : -1);
-}
-#endif
#if LL_WINDOWS
/************** input file stream ********************************/
-llifstream::llifstream() :
- _M_filebuf(),
- std::istream(&_M_filebuf)
-{
-}
+llifstream::llifstream() {}
// explicit
-llifstream::llifstream(const std::string& _Filename,
- ios_base::openmode _Mode) :
- _M_filebuf(),
- std::istream(&_M_filebuf)
+llifstream::llifstream(const std::string& _Filename, ios_base::openmode _Mode):
+ std::ifstream(utf8str_to_utf16str( _Filename ).c_str(),
+ _Mode | ios_base::in)
{
- llutf16string wideName = utf8str_to_utf16str( _Filename );
- if (_M_filebuf.open(wideName.c_str(), _Mode | ios_base::in) == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
}
-// explicit
-llifstream::llifstream(const char* _Filename,
- ios_base::openmode _Mode) :
- _M_filebuf(),
- std::istream(&_M_filebuf)
+void llifstream::open(const std::string& _Filename, ios_base::openmode _Mode)
{
- llutf16string wideName = utf8str_to_utf16str( _Filename );
- if (_M_filebuf.open(wideName.c_str(), _Mode | ios_base::in) == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
-}
-
-bool llifstream::is_open() const
-{ // test if C stream has been opened
- return _M_filebuf.is_open();
-}
-
-void llifstream::open(const char* _Filename, ios_base::openmode _Mode)
-{ // open a C stream with specified mode
- llutf16string wideName = utf8str_to_utf16str( _Filename );
- if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::in) == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
- else
- {
- _Myios::clear();
- }
-}
-
-void llifstream::close()
-{ // close the C stream
- if (_M_filebuf.close() == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
+ std::ifstream::open(utf8str_to_utf16str(_Filename).c_str(),
+ _Mode | ios_base::in);
}
/************** output file stream ********************************/
-llofstream::llofstream() :
- _M_filebuf(),
- std::ostream(&_M_filebuf)
-{
-}
+llofstream::llofstream() {}
// explicit
-llofstream::llofstream(const std::string& _Filename,
- ios_base::openmode _Mode) :
- _M_filebuf(),
- std::ostream(&_M_filebuf)
+llofstream::llofstream(const std::string& _Filename, ios_base::openmode _Mode):
+ std::ofstream(utf8str_to_utf16str( _Filename ).c_str(),
+ _Mode | ios_base::out)
{
- llutf16string wideName = utf8str_to_utf16str( _Filename );
- if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::out) == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
}
-// explicit
-llofstream::llofstream(const char* _Filename,
- ios_base::openmode _Mode) :
- _M_filebuf(),
- std::ostream(&_M_filebuf)
+void llofstream::open(const std::string& _Filename, ios_base::openmode _Mode)
{
- llutf16string wideName = utf8str_to_utf16str( _Filename );
- if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::out) == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
-}
-
-bool llofstream::is_open() const
-{ // test if C stream has been opened
- return _M_filebuf.is_open();
-}
-
-void llofstream::open(const char* _Filename, ios_base::openmode _Mode)
-{ // open a C stream with specified mode
- llutf16string wideName = utf8str_to_utf16str( _Filename );
- if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::out) == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
- else
- {
- _Myios::clear();
- }
-}
-
-void llofstream::close()
-{ // close the C stream
- if (_M_filebuf.close() == 0)
- {
- _Myios::setstate(ios_base::failbit);
- }
+ std::ofstream::open(utf8str_to_utf16str( _Filename ).c_str(),
+ _Mode | ios_base::out);
}
/************** helper functions ********************************/
diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
old mode 100755
new mode 100644
index 347c9867aa6f5633fb4d961e560d7e72e37fd3b1..3e25228aeb31bb47e1220503c13ba2954b920b30
--- a/indra/llcommon/llfile.h
+++ b/indra/llcommon/llfile.h
@@ -45,7 +45,6 @@ typedef FILE LLFILE;
typedef struct _stat llstat;
#else
typedef struct stat llstat;
-#include <ext/stdio_filebuf.h>
#include <bits/postypes.h>
#endif
@@ -86,123 +85,16 @@ class LL_COMMON_API LLFile
static const char * tmpdir();
};
-/**
- * @brief Provides a layer of compatibility for C/POSIX.
- *
- * This is taken from both the GNU __gnu_cxx::stdio_filebuf extension and
- * VC's basic_filebuf implementation.
- * This file buffer provides extensions for working with standard C FILE*'s
- * and POSIX file descriptors for platforms that support this.
-*/
-namespace
-{
-#if LL_WINDOWS
-typedef std::filebuf _Myfb;
-#else
-typedef __gnu_cxx::stdio_filebuf< char > _Myfb;
-typedef std::__c_file _Filet;
-#endif /* LL_WINDOWS */
-}
-
-class LL_COMMON_API llstdio_filebuf : public _Myfb
-{
-public:
- /**
- * deferred initialization / destruction
- */
- llstdio_filebuf() : _Myfb() {}
- virtual ~llstdio_filebuf() {}
-
- /**
- * @param f An open @c FILE*.
- * @param mode Same meaning as in a standard filebuf.
- * @param size Optimal or preferred size of internal buffer, in chars.
- * Defaults to system's @c BUFSIZ.
- *
- * This constructor associates a file stream buffer with an open
- * C @c FILE*. The @c FILE* will not be automatically closed when the
- * stdio_filebuf is closed/destroyed.
- */
- llstdio_filebuf(_Filet* __f, std::ios_base::openmode __mode,
- //size_t __size = static_cast<size_t>(BUFSIZ)) :
- size_t __size = static_cast<size_t>(1)) :
-#if LL_WINDOWS
- _Myfb(__f) {}
-#else
- _Myfb(__f, __mode, __size) {}
-#endif
-
- /**
- * @brief Opens an external file.
- * @param s The name of the file.
- * @param mode The open mode flags.
- * @return @c this on success, NULL on failure
- *
- * If a file is already open, this function immediately fails.
- * Otherwise it tries to open the file named @a s using the flags
- * given in @a mode.
- */
- //llstdio_filebuf* open(const char *_Filename,
- // std::ios_base::openmode _Mode);
-
- /**
- * @param fd An open file descriptor.
- * @param mode Same meaning as in a standard filebuf.
- * @param size Optimal or preferred size of internal buffer, in chars.
- *
- * This constructor associates a file stream buffer with an open
- * POSIX file descriptor. The file descriptor will be automatically
- * closed when the stdio_filebuf is closed/destroyed.
- */
-#if !LL_WINDOWS
- llstdio_filebuf(int __fd, std::ios_base::openmode __mode,
- //size_t __size = static_cast<size_t>(BUFSIZ)) :
- size_t __size = static_cast<size_t>(1)) :
- _Myfb(__fd, __mode, __size) {}
-#endif
-
-// *TODO: Seek the underlying c stream for better cross-platform compatibility?
-#if !LL_WINDOWS
-protected:
- /** underflow() and uflow() functions are called to get the next
- * character from the real input source when the buffer is empty.
- * Buffered input uses underflow()
- */
- /*virtual*/ int_type underflow();
-
- /* Convert internal byte sequence to external, char-based
- * sequence via codecvt.
- */
- bool _convert_to_external(char_type*, std::streamsize);
-
- /** The overflow() function is called to transfer characters to the
- * real output destination when the buffer is full. A call to
- * overflow(c) outputs the contents of the buffer plus the
- * character c.
- * Consume some sequence of the characters in the pending sequence.
- */
- /*virtual*/ int_type overflow(int_type __c = traits_type::eof());
-
- /** sync() flushes the underlying @c FILE* stream.
- */
- /*virtual*/ int sync();
-
- std::streamsize xsgetn(char_type*, std::streamsize);
- std::streamsize xsputn(const char_type*, std::streamsize);
-#endif
-};
-
#if LL_WINDOWS
/**
* @brief Controlling input for files.
*
* This class supports reading from named files, using the inherited
- * functions from std::basic_istream. To control the associated
- * sequence, an instance of std::basic_filebuf (or a platform-specific derivative)
- * which allows construction using a pre-exisintg file stream buffer.
- * We refer to this std::basic_filebuf (or derivative) as @c sb.
+ * functions from std::ifstream. The only added value is that our constructor
+ * Does The Right Thing when passed a non-ASCII pathname. Sadly, that isn't
+ * true of Microsoft's std::ifstream.
*/
-class LL_COMMON_API llifstream : public std::istream
+class LL_COMMON_API llifstream : public std::ifstream
{
// input stream associated with a C stream
public:
@@ -225,32 +117,6 @@ class LL_COMMON_API llifstream : public std::istream
*/
explicit llifstream(const std::string& _Filename,
ios_base::openmode _Mode = ios_base::in);
- explicit llifstream(const char* _Filename,
- ios_base::openmode _Mode = ios_base::in);
-
- /**
- * @brief The destructor does nothing.
- *
- * The file is closed by the filebuf object, not the formatting
- * stream.
- */
- virtual ~llifstream() {}
-
- // Members:
- /**
- * @brief Accessing the underlying buffer.
- * @return The current basic_filebuf buffer.
- *
- * This hides both signatures of std::basic_ios::rdbuf().
- */
- llstdio_filebuf* rdbuf() const
- { return const_cast<llstdio_filebuf*>(&_M_filebuf); }
-
- /**
- * @brief Wrapper to test for an open file.
- * @return @c rdbuf()->is_open()
- */
- bool is_open() const;
/**
* @brief Opens an external file.
@@ -261,34 +127,19 @@ class LL_COMMON_API llifstream : public std::istream
* fails, @c failbit is set in the stream's error state.
*/
void open(const std::string& _Filename,
- ios_base::openmode _Mode = ios_base::in)
- { open(_Filename.c_str(), _Mode); }
- void open(const char* _Filename,
ios_base::openmode _Mode = ios_base::in);
-
- /**
- * @brief Close the file.
- *
- * Calls @c llstdio_filebuf::close(). If that function
- * fails, @c failbit is set in the stream's error state.
- */
- void close();
-
- private:
- llstdio_filebuf _M_filebuf;
};
/**
* @brief Controlling output for files.
*
- * This class supports writing to named files, using the inherited
- * functions from std::basic_ostream. To control the associated
- * sequence, an instance of std::basic_filebuf (or a platform-specific derivative)
- * which allows construction using a pre-exisintg file stream buffer.
- * We refer to this std::basic_filebuf (or derivative) as @c sb.
+ * This class supports writing to named files, using the inherited functions
+ * from std::ofstream. The only added value is that our constructor Does The
+ * Right Thing when passed a non-ASCII pathname. Sadly, that isn't true of
+ * Microsoft's std::ofstream.
*/
-class LL_COMMON_API llofstream : public std::ostream
+class LL_COMMON_API llofstream : public std::ofstream
{
public:
// Constructors:
@@ -306,62 +157,20 @@ class LL_COMMON_API llofstream : public std::ostream
* @param Filename String specifying the filename.
* @param Mode Open file in specified mode (see std::ios_base).
*
- * @c ios_base::out|ios_base::trunc is automatically included in
- * @a mode.
+ * @c ios_base::out is automatically included in @a mode.
*/
explicit llofstream(const std::string& _Filename,
ios_base::openmode _Mode = ios_base::out|ios_base::trunc);
- explicit llofstream(const char* _Filename,
- ios_base::openmode _Mode = ios_base::out|ios_base::trunc);
-
- /**
- * @brief The destructor does nothing.
- *
- * The file is closed by the filebuf object, not the formatting
- * stream.
- */
- virtual ~llofstream() {}
-
- // Members:
- /**
- * @brief Accessing the underlying buffer.
- * @return The current basic_filebuf buffer.
- *
- * This hides both signatures of std::basic_ios::rdbuf().
- */
- llstdio_filebuf* rdbuf() const
- { return const_cast<llstdio_filebuf*>(&_M_filebuf); }
-
- /**
- * @brief Wrapper to test for an open file.
- * @return @c rdbuf()->is_open()
- */
- bool is_open() const;
/**
* @brief Opens an external file.
* @param Filename The name of the file.
* @param Node The open mode flags.
*
- * Calls @c llstdio_filebuf::open(s,mode|out). If that function
- * fails, @c failbit is set in the stream's error state.
+ * @c ios_base::out is automatically included in @a mode.
*/
void open(const std::string& _Filename,
- ios_base::openmode _Mode = ios_base::out|ios_base::trunc)
- { open(_Filename.c_str(), _Mode); }
- void open(const char* _Filename,
ios_base::openmode _Mode = ios_base::out|ios_base::trunc);
-
- /**
- * @brief Close the file.
- *
- * Calls @c llstdio_filebuf::close(). If that function
- * fails, @c failbit is set in the stream's error state.
- */
- void close();
-
- private:
- llstdio_filebuf _M_filebuf;
};
diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfindlocale.h b/indra/llcommon/llfindlocale.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfixedbuffer.cpp b/indra/llcommon/llfixedbuffer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfixedbuffer.h b/indra/llcommon/llfixedbuffer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llformat.cpp b/indra/llcommon/llformat.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llformat.h b/indra/llcommon/llformat.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llhandle.h b/indra/llcommon/llhandle.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llhash.h b/indra/llcommon/llhash.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llheartbeat.cpp b/indra/llcommon/llheartbeat.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llheartbeat.h b/indra/llcommon/llheartbeat.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llindexedvector.h b/indra/llcommon/llindexedvector.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llinitparam.cpp b/indra/llcommon/llinitparam.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llinstancetracker.cpp b/indra/llcommon/llinstancetracker.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llkeyusetracker.h b/indra/llcommon/llkeyusetracker.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llleap.h b/indra/llcommon/llleap.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llleaplistener.cpp b/indra/llcommon/llleaplistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llleaplistener.h b/indra/llcommon/llleaplistener.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lllistenerwrapper.h b/indra/llcommon/lllistenerwrapper.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llliveappconfig.cpp b/indra/llcommon/llliveappconfig.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llliveappconfig.h b/indra/llcommon/llliveappconfig.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lllivefile.cpp b/indra/llcommon/lllivefile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lllivefile.h b/indra/llcommon/lllivefile.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmd5.cpp b/indra/llcommon/llmd5.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmd5.h b/indra/llcommon/llmd5.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmemorystream.cpp b/indra/llcommon/llmemorystream.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmemorystream.h b/indra/llcommon/llmemorystream.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmetricperformancetester.h b/indra/llcommon/llmetricperformancetester.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmetrics.cpp b/indra/llcommon/llmetrics.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmetrics.h b/indra/llcommon/llmetrics.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llmortician.h b/indra/llcommon/llmortician.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llpriqueuemap.h b/indra/llcommon/llpriqueuemap.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llptrto.cpp b/indra/llcommon/llptrto.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llptrto.h b/indra/llcommon/llptrto.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llrand.h b/indra/llcommon/llrand.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llrun.cpp b/indra/llcommon/llrun.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llrun.h b/indra/llcommon/llrun.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsafehandle.h b/indra/llcommon/llsafehandle.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdparam.cpp b/indra/llcommon/llsdparam.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdparam.h b/indra/llcommon/llsdparam.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdserialize_xml.h b/indra/llcommon/llsdserialize_xml.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsimplehash.h b/indra/llcommon/llsimplehash.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsmoothstep.h b/indra/llcommon/llsmoothstep.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstacktrace.cpp b/indra/llcommon/llstacktrace.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstacktrace.h b/indra/llcommon/llstacktrace.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstreamqueue.cpp b/indra/llcommon/llstreamqueue.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstreamqueue.h b/indra/llcommon/llstreamqueue.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstreamtools.cpp b/indra/llcommon/llstreamtools.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstreamtools.h b/indra/llcommon/llstreamtools.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstrider.h b/indra/llcommon/llstrider.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstringtable.cpp b/indra/llcommon/llstringtable.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llthreadsafequeue.cpp b/indra/llcommon/llthreadsafequeue.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lltreeiterators.h b/indra/llcommon/lltreeiterators.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lluri.h b/indra/llcommon/lluri.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/stringize.h b/indra/llcommon/stringize.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/StringVec.h b/indra/llcommon/tests/StringVec.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/bitpack_test.cpp b/indra/llcommon/tests/bitpack_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/commonmisc_test.cpp b/indra/llcommon/tests/commonmisc_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/listener.h b/indra/llcommon/tests/listener.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llallocator_heap_profile_test.cpp b/indra/llcommon/tests/llallocator_heap_profile_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llallocator_test.cpp b/indra/llcommon/tests/llallocator_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llbase64_test.cpp b/indra/llcommon/tests/llbase64_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lldate_test.cpp b/indra/llcommon/tests/lldate_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lldependencies_test.cpp b/indra/llcommon/tests/lldependencies_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lleventdispatcher_test.cpp b/indra/llcommon/tests/lleventdispatcher_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lleventfilter_test.cpp b/indra/llcommon/tests/lleventfilter_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llframetimer_test.cpp b/indra/llcommon/tests/llframetimer_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lllazy_test.cpp b/indra/llcommon/tests/lllazy_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llmemtype_test.cpp b/indra/llcommon/tests/llmemtype_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llprocessor_test.cpp b/indra/llcommon/tests/llprocessor_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llrand_test.cpp b/indra/llcommon/tests/llrand_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llstreamqueue_test.cpp b/indra/llcommon/tests/llstreamqueue_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lltreeiterators_test.cpp b/indra/llcommon/tests/lltreeiterators_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/lluri_test.cpp b/indra/llcommon/tests/lluri_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/stringize_test.cpp b/indra/llcommon/tests/stringize_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/tests/wrapllerrs.h b/indra/llcommon/tests/wrapllerrs.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/timer.h b/indra/llcommon/timer.h
old mode 100755
new mode 100644
diff --git a/indra/llcommon/timing.cpp b/indra/llcommon/timing.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/u64.cpp b/indra/llcommon/u64.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/u64.h b/indra/llcommon/u64.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpinternal.h b/indra/llcorehttp/_httpinternal.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httplibcurl.h b/indra/llcorehttp/_httplibcurl.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpopcancel.cpp b/indra/llcorehttp/_httpopcancel.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpopcancel.h b/indra/llcorehttp/_httpopcancel.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpoperation.cpp b/indra/llcorehttp/_httpoperation.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpoperation.h b/indra/llcorehttp/_httpoperation.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpopsetget.cpp b/indra/llcorehttp/_httpopsetget.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpopsetget.h b/indra/llcorehttp/_httpopsetget.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpopsetpriority.cpp b/indra/llcorehttp/_httpopsetpriority.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpopsetpriority.h b/indra/llcorehttp/_httpopsetpriority.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httppolicy.h b/indra/llcorehttp/_httppolicy.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httppolicyclass.cpp b/indra/llcorehttp/_httppolicyclass.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httppolicyclass.h b/indra/llcorehttp/_httppolicyclass.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httppolicyglobal.cpp b/indra/llcorehttp/_httppolicyglobal.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httppolicyglobal.h b/indra/llcorehttp/_httppolicyglobal.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpreadyqueue.h b/indra/llcorehttp/_httpreadyqueue.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpreplyqueue.cpp b/indra/llcorehttp/_httpreplyqueue.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpreplyqueue.h b/indra/llcorehttp/_httpreplyqueue.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httprequestqueue.cpp b/indra/llcorehttp/_httprequestqueue.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httprequestqueue.h b/indra/llcorehttp/_httprequestqueue.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpretryqueue.h b/indra/llcorehttp/_httpretryqueue.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_httpservice.h b/indra/llcorehttp/_httpservice.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_mutex.h b/indra/llcorehttp/_mutex.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_refcounted.cpp b/indra/llcorehttp/_refcounted.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_refcounted.h b/indra/llcorehttp/_refcounted.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/_thread.h b/indra/llcorehttp/_thread.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/bufferarray.h b/indra/llcorehttp/bufferarray.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/bufferstream.cpp b/indra/llcorehttp/bufferstream.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/bufferstream.h b/indra/llcorehttp/bufferstream.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/examples/http_texture_load.cpp b/indra/llcorehttp/examples/http_texture_load.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httphandler.h b/indra/llcorehttp/httphandler.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpheaders.cpp b/indra/llcorehttp/httpheaders.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpheaders.h b/indra/llcorehttp/httpheaders.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httprequest.cpp b/indra/llcorehttp/httprequest.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpresponse.cpp b/indra/llcorehttp/httpresponse.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/llcorehttp_test.h b/indra/llcorehttp/tests/llcorehttp_test.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_allocator.cpp b/indra/llcorehttp/tests/test_allocator.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_allocator.h b/indra/llcorehttp/tests/test_allocator.h
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_bufferarray.hpp b/indra/llcorehttp/tests/test_bufferarray.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_bufferstream.hpp b/indra/llcorehttp/tests/test_bufferstream.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_httpheaders.hpp b/indra/llcorehttp/tests/test_httpheaders.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_httpoperation.hpp b/indra/llcorehttp/tests/test_httpoperation.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_httprequestqueue.hpp b/indra/llcorehttp/tests/test_httprequestqueue.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_httpstatus.hpp b/indra/llcorehttp/tests/test_httpstatus.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp
old mode 100755
new mode 100644
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
old mode 100755
new mode 100644
index 69a806bbea544129d35283ddc549e56f7df2b4fc..dfb344c908cccc66b42a0f548b3f606c0039b878
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -190,6 +190,7 @@ bool LLCrashLogger::readMinidump(std::string minidump_path)
{
minidump_stream.seekg(0, std::ios::end);
length = (size_t)minidump_stream.tellg();
+ LL_WARNS("CRASHREPORT") << "minidump length "<< length <<LL_ENDL;
minidump_stream.seekg(0, std::ios::beg);
LLSD::Binary data;
diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagebmp.h b/indra/llimage/llimagebmp.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagedimensionsinfo.cpp b/indra/llimage/llimagedimensionsinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagedimensionsinfo.h b/indra/llimage/llimagedimensionsinfo.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagedxt.h b/indra/llimage/llimagedxt.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagefilter.h b/indra/llimage/llimagefilter.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagepng.h b/indra/llimage/llimagepng.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimagetga.h b/indra/llimage/llimagetga.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llmapimagetype.h b/indra/llimage/llmapimagetype.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
old mode 100755
new mode 100644
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
old mode 100755
new mode 100644
diff --git a/indra/llimagej2coj/llimagej2coj.h b/indra/llimagej2coj/llimagej2coj.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llcategory.cpp b/indra/llinventory/llcategory.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llcategory.h b/indra/llinventory/llcategory.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lleconomy.cpp b/indra/llinventory/lleconomy.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llinventorydefines.cpp b/indra/llinventory/llinventorydefines.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llinventorydefines.h b/indra/llinventory/llinventorydefines.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lllandmark.h b/indra/llinventory/lllandmark.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llnotecard.h b/indra/llinventory/llnotecard.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llpermissionsflags.h b/indra/llinventory/llpermissionsflags.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lltransactionflags.h b/indra/llinventory/lltransactionflags.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lltransactiontypes.h b/indra/llinventory/lltransactiontypes.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lluserrelations.cpp b/indra/llinventory/lluserrelations.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h
old mode 100755
new mode 100644
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llinventory/tests/llparcel_test.cpp b/indra/llinventory/tests/llparcel_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
old mode 100755
new mode 100644
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
old mode 100755
new mode 100644
diff --git a/indra/llkdu/llkdumem.cpp b/indra/llkdu/llkdumem.cpp
old mode 100755
new mode 100644
diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h
old mode 100755
new mode 100644
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llmath/camera.h b/indra/llmath/camera.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/coordframe.h b/indra/llmath/coordframe.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llbbox.cpp b/indra/llmath/llbbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llbbox.h b/indra/llmath/llbbox.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llbboxlocal.cpp b/indra/llmath/llbboxlocal.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llbboxlocal.h b/indra/llmath/llbboxlocal.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcalc.cpp b/indra/llmath/llcalc.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcalc.h b/indra/llmath/llcalc.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcalcparser.cpp b/indra/llmath/llcalcparser.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h
old mode 100755
new mode 100644
index faa699ff7b609b862dfbeeeba288ef1b59e36b53..e2388d6702d92b1087d276a13429986f73823db9
--- a/indra/llmath/llcalcparser.h
+++ b/indra/llmath/llcalcparser.h
@@ -167,9 +167,9 @@ struct LLCalcParser : grammar<LLCalcParser>
F32 _sin(const F32& a) const { return sin(DEG_TO_RAD * a); }
F32 _cos(const F32& a) const { return cos(DEG_TO_RAD * a); }
F32 _tan(const F32& a) const { return tan(DEG_TO_RAD * a); }
- F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); }
- F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); }
- F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); }
+ F32 _asin(const F32& a) const { return asin(a) * RAD_TO_DEG; }
+ F32 _acos(const F32& a) const { return acos(a) * RAD_TO_DEG; }
+ F32 _atan(const F32& a) const { return atan(a) * RAD_TO_DEG; }
F32 _sqrt(const F32& a) const { return sqrt(a); }
F32 _log(const F32& a) const { return log(a); }
F32 _exp(const F32& a) const { return exp(a); }
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcoord.h b/indra/llmath/llcoord.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcoordframe.cpp b/indra/llmath/llcoordframe.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llcoordframe.h b/indra/llmath/llcoordframe.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llinterp.h b/indra/llmath/llinterp.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llline.cpp b/indra/llmath/llline.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llline.h b/indra/llmath/llline.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmatrix3a.cpp b/indra/llmath/llmatrix3a.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmatrix3a.h b/indra/llmath/llmatrix3a.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmatrix3a.inl b/indra/llmath/llmatrix3a.inl
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmatrix4a.h b/indra/llmath/llmatrix4a.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmodularmath.cpp b/indra/llmath/llmodularmath.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llmodularmath.h b/indra/llmath/llmodularmath.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llperlin.cpp b/indra/llmath/llperlin.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llperlin.h b/indra/llmath/llperlin.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llplane.h b/indra/llmath/llplane.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llquantize.h b/indra/llmath/llquantize.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llquaternion.cpp b/indra/llmath/llquaternion.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llquaternion.h b/indra/llmath/llquaternion.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llquaternion2.h b/indra/llmath/llquaternion2.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llquaternion2.inl b/indra/llmath/llquaternion2.inl
old mode 100755
new mode 100644
diff --git a/indra/llmath/llrect.cpp b/indra/llmath/llrect.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llrect.h b/indra/llmath/llrect.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsdutil_math.cpp b/indra/llmath/llsdutil_math.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsdutil_math.h b/indra/llmath/llsdutil_math.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsimdtypes.h b/indra/llmath/llsimdtypes.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsimdtypes.inl b/indra/llmath/llsimdtypes.inl
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsphere.cpp b/indra/llmath/llsphere.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llsphere.h b/indra/llmath/llsphere.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/lltreenode.h b/indra/llmath/lltreenode.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvector4a.cpp b/indra/llmath/llvector4a.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvector4a.h b/indra/llmath/llvector4a.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvector4a.inl b/indra/llmath/llvector4a.inl
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvector4logical.h b/indra/llmath/llvector4logical.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
old mode 100755
new mode 100644
index 8608e45a91dcf810dcbe8ae4fee2e130ba6b5c44..d932eb53a0509dbf2050adc2ad980cd94a8e0b93
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2202,7 +2202,7 @@ BOOL LLVolume::generate()
{
rot_mat.rotate(*profile++, tmp);
dst->setAdd(tmp,offset);
- llassert(dst->isFinite3());
+ llassert(dst->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds
++dst;
}
}
@@ -5663,7 +5663,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
tc->mV[0] = (*p)[0]+0.5f;
tc->mV[1] = (*p)[1]+0.5f;
- llassert(src->isFinite3());
+ llassert(src->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds
update_min_max(min,max,*src);
update_min_max(min_uv, max_uv, *tc);
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvolumemgr.h b/indra/llmath/llvolumemgr.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvolumeoctree.cpp b/indra/llmath/llvolumeoctree.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/m3math.cpp b/indra/llmath/m3math.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/m3math.h b/indra/llmath/m3math.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/m4math.cpp b/indra/llmath/m4math.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/raytrace.cpp b/indra/llmath/raytrace.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/raytrace.h b/indra/llmath/raytrace.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/alignment_test.cpp b/indra/llmath/tests/alignment_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/llbbox_test.cpp b/indra/llmath/tests/llbbox_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/llbboxlocal_test.cpp b/indra/llmath/tests/llbboxlocal_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/llmodularmath_test.cpp b/indra/llmath/tests/llmodularmath_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/llquaternion_test.cpp b/indra/llmath/tests/llquaternion_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/llrect_test.cpp b/indra/llmath/tests/llrect_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v2math_test.cpp b/indra/llmath/tests/v2math_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v3color_test.cpp b/indra/llmath/tests/v3color_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v3dmath_test.cpp b/indra/llmath/tests/v3dmath_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v3math_test.cpp b/indra/llmath/tests/v3math_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v4color_test.cpp b/indra/llmath/tests/v4color_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v4coloru_test.cpp b/indra/llmath/tests/v4coloru_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/v4math_test.cpp b/indra/llmath/tests/v4math_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/tests/xform_test.cpp b/indra/llmath/tests/xform_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v2math.cpp b/indra/llmath/v2math.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v2math.h b/indra/llmath/v2math.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/v3color.cpp b/indra/llmath/v3color.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/v3dmath.cpp b/indra/llmath/v3dmath.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v3dmath.h b/indra/llmath/v3dmath.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/v4color.cpp b/indra/llmath/v4color.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/v4coloru.cpp b/indra/llmath/v4coloru.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v4coloru.h b/indra/llmath/v4coloru.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/v4math.cpp b/indra/llmath/v4math.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/v4math.h b/indra/llmath/v4math.h
old mode 100755
new mode 100644
diff --git a/indra/llmath/xform.cpp b/indra/llmath/xform.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmath/xform.h b/indra/llmath/xform.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
old mode 100755
new mode 100644
index 61f18ed63e1191795f22b5a8495bb1937e71b5f0..1ca5f58ae2742f568163091757ecd046d49fba0f
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -397,7 +397,7 @@ void LLAvatarNameCache::requestNamesViaCapability()
if (!url.empty())
{
- LL_DEBUGS("AvNameCache") << "LLAvatarNameCache::requestNamesViaCapability requested " << ids << " ids" << LL_ENDL;
+ LL_DEBUGS("AvNameCache") << "requested " << ids << " ids" << LL_ENDL;
std::string coroname =
LLCoros::instance().launch("LLAvatarNameCache::requestAvatarNameCache_",
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llblowfishcipher.cpp b/indra/llmessage/llblowfishcipher.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llblowfishcipher.h b/indra/llmessage/llblowfishcipher.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llbuffer.h b/indra/llmessage/llbuffer.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llbufferstream.cpp b/indra/llmessage/llbufferstream.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llbufferstream.h b/indra/llmessage/llbufferstream.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llchainio.cpp b/indra/llmessage/llchainio.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llchainio.h b/indra/llmessage/llchainio.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llcipher.h b/indra/llmessage/llcipher.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llcircuit.h b/indra/llmessage/llcircuit.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llclassifiedflags.cpp b/indra/llmessage/llclassifiedflags.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llclassifiedflags.h b/indra/llmessage/llclassifiedflags.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lldatapacker.cpp b/indra/llmessage/lldatapacker.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lldbstrings.h b/indra/llmessage/lldbstrings.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lldispatcher.h b/indra/llmessage/lldispatcher.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lleventflags.h b/indra/llmessage/lleventflags.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llextendedstatus.h b/indra/llmessage/llextendedstatus.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llfiltersd2xmlrpc.cpp b/indra/llmessage/llfiltersd2xmlrpc.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llfiltersd2xmlrpc.h b/indra/llmessage/llfiltersd2xmlrpc.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llfollowcamparams.h b/indra/llmessage/llfollowcamparams.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llhost.cpp b/indra/llmessage/llhost.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llhost.h b/indra/llmessage/llhost.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llhttpnode.cpp b/indra/llmessage/llhttpnode.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llhttpnodeadapter.h b/indra/llmessage/llhttpnodeadapter.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llinstantmessage.cpp b/indra/llmessage/llinstantmessage.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llinvite.h b/indra/llmessage/llinvite.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliobuffer.cpp b/indra/llmessage/lliobuffer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliobuffer.h b/indra/llmessage/lliobuffer.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliohttpserver.h b/indra/llmessage/lliohttpserver.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliopipe.cpp b/indra/llmessage/lliopipe.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llioutil.cpp b/indra/llmessage/llioutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llioutil.h b/indra/llmessage/llioutil.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llloginflags.h b/indra/llmessage/llloginflags.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmail.cpp b/indra/llmessage/llmail.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmail.h b/indra/llmessage/llmail.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagebuilder.cpp b/indra/llmessage/llmessagebuilder.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagebuilder.h b/indra/llmessage/llmessagebuilder.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessageconfig.cpp b/indra/llmessage/llmessageconfig.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessageconfig.h b/indra/llmessage/llmessageconfig.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagereader.cpp b/indra/llmessage/llmessagereader.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagereader.h b/indra/llmessage/llmessagereader.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagesenderinterface.h b/indra/llmessage/llmessagesenderinterface.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagetemplate.cpp b/indra/llmessage/llmessagetemplate.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagetemplateparser.cpp b/indra/llmessage/llmessagetemplateparser.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagetemplateparser.h b/indra/llmessage/llmessagetemplateparser.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagethrottle.cpp b/indra/llmessage/llmessagethrottle.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmessagethrottle.h b/indra/llmessage/llmessagethrottle.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llmsgvariabletype.h b/indra/llmessage/llmsgvariabletype.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llnamevalue.cpp b/indra/llmessage/llnamevalue.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llnamevalue.h b/indra/llmessage/llnamevalue.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llnullcipher.cpp b/indra/llmessage/llnullcipher.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llnullcipher.h b/indra/llmessage/llnullcipher.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpacketack.cpp b/indra/llmessage/llpacketack.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpacketack.h b/indra/llmessage/llpacketack.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpacketbuffer.h b/indra/llmessage/llpacketbuffer.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpartdata.cpp b/indra/llmessage/llpartdata.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpartdata.h b/indra/llmessage/llpartdata.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llproxy.h b/indra/llmessage/llproxy.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llpumpio.h b/indra/llmessage/llpumpio.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llqueryflags.h b/indra/llmessage/llqueryflags.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llregionhandle.h b/indra/llmessage/llregionhandle.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdappservices.cpp b/indra/llmessage/llsdappservices.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdappservices.h b/indra/llmessage/llsdappservices.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdhttpserver.cpp b/indra/llmessage/llsdhttpserver.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdhttpserver.h b/indra/llmessage/llsdhttpserver.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdmessagebuilder.h b/indra/llmessage/llsdmessagebuilder.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llservice.cpp b/indra/llmessage/llservice.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llservice.h b/indra/llmessage/llservice.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llservicebuilder.cpp b/indra/llmessage/llservicebuilder.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llservicebuilder.h b/indra/llmessage/llservicebuilder.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llstoredmessage.cpp b/indra/llmessage/llstoredmessage.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llstoredmessage.h b/indra/llmessage/llstoredmessage.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltaskname.h b/indra/llmessage/lltaskname.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llteleportflags.h b/indra/llmessage/llteleportflags.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltemplatemessagebuilder.h b/indra/llmessage/lltemplatemessagebuilder.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltemplatemessagedispatcher.cpp b/indra/llmessage/lltemplatemessagedispatcher.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltemplatemessagedispatcher.h b/indra/llmessage/lltemplatemessagedispatcher.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltemplatemessagereader.h b/indra/llmessage/lltemplatemessagereader.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llthrottle.cpp b/indra/llmessage/llthrottle.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llthrottle.h b/indra/llmessage/llthrottle.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfermanager.h b/indra/llmessage/lltransfermanager.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfersourceasset.h b/indra/llmessage/lltransfersourceasset.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfersourcefile.cpp b/indra/llmessage/lltransfersourcefile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfersourcefile.h b/indra/llmessage/lltransfersourcefile.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfertargetfile.cpp b/indra/llmessage/lltransfertargetfile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfertargetfile.h b/indra/llmessage/lltransfertargetfile.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfertargetvfile.cpp b/indra/llmessage/lltransfertargetvfile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltransfertargetvfile.h b/indra/llmessage/lltransfertargetvfile.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltrustedmessageservice.cpp b/indra/llmessage/lltrustedmessageservice.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lltrustedmessageservice.h b/indra/llmessage/lltrustedmessageservice.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lluseroperation.cpp b/indra/llmessage/lluseroperation.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/lluseroperation.h b/indra/llmessage/lluseroperation.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llvehicleparams.h b/indra/llmessage/llvehicleparams.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer.h b/indra/llmessage/llxfer.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer_mem.cpp b/indra/llmessage/llxfer_mem.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer_mem.h b/indra/llmessage/llxfer_mem.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer_vfile.cpp b/indra/llmessage/llxfer_vfile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfer_vfile.h b/indra/llmessage/llxfer_vfile.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxfermanager.h b/indra/llmessage/llxfermanager.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxorcipher.cpp b/indra/llmessage/llxorcipher.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/llxorcipher.h b/indra/llmessage/llxorcipher.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/machine.cpp b/indra/llmessage/machine.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/machine.h b/indra/llmessage/machine.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/mean_collision_data.h b/indra/llmessage/mean_collision_data.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
old mode 100755
new mode 100644
index 2f4b47286d849b8cf5ae076397ca638e86ded099..cecb2021e7e9888d979b90965a56042befef1ab4
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -1301,7 +1301,7 @@ S32 LLMessageSystem::sendMessage(const LLHost &host)
mPacketsOut++;
- mBytesOut += buffer_length;
+ mTotalBytesOut += buffer_length;
mSendReliable = FALSE;
mReliablePacketParams.clear();
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/message_string_table.cpp b/indra/llmessage/message_string_table.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/partsyspacket.cpp b/indra/llmessage/partsyspacket.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/partsyspacket.h b/indra/llmessage/partsyspacket.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/patch_code.cpp b/indra/llmessage/patch_code.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/patch_code.h b/indra/llmessage/patch_code.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/patch_dct.cpp b/indra/llmessage/patch_dct.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/patch_dct.h b/indra/llmessage/patch_dct.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/patch_idct.cpp b/indra/llmessage/patch_idct.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/sound_ids.cpp b/indra/llmessage/sound_ids.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/sound_ids.h b/indra/llmessage/sound_ids.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/commtest.h b/indra/llmessage/tests/commtest.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llareslistener_test.cpp b/indra/llmessage/tests/llareslistener_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llavatarnamecache_test.cpp b/indra/llmessage/tests/llavatarnamecache_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llhttpnode_stub.cpp b/indra/llmessage/tests/llhttpnode_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llnamevalue_test.cpp b/indra/llmessage/tests/llnamevalue_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llpartdata_test.cpp b/indra/llmessage/tests/llpartdata_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/lltestmessagesender.cpp b/indra/llmessage/tests/lltestmessagesender.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/lltestmessagesender.h b/indra/llmessage/tests/lltestmessagesender.h
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/lltrustedmessageservice_test.cpp b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llxfer_file_test.cpp b/indra/llmessage/tests/llxfer_file_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/networkio.h b/indra/llmessage/tests/networkio.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llplugincookiestore.cpp b/indra/llplugin/llplugincookiestore.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llplugincookiestore.h b/indra/llplugin/llplugincookiestore.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llplugininstance.h b/indra/llplugin/llplugininstance.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginmessage.cpp b/indra/llplugin/llpluginmessage.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginmessage.h b/indra/llplugin/llpluginmessage.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginmessageclasses.h b/indra/llplugin/llpluginmessageclasses.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginmessagepipe.cpp b/indra/llplugin/llpluginmessagepipe.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginmessagepipe.h b/indra/llplugin/llpluginmessagepipe.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginsharedmemory.cpp b/indra/llplugin/llpluginsharedmemory.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llplugin/slplugin/slplugin-objc.h b/indra/llplugin/slplugin/slplugin-objc.h
old mode 100755
new mode 100644
diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm
old mode 100755
new mode 100644
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
old mode 100755
new mode 100644
diff --git a/indra/llplugin/slplugin/slplugin_info.plist b/indra/llplugin/slplugin/slplugin_info.plist
old mode 100755
new mode 100644
diff --git a/indra/llplugin/tests/llplugincookiestore_test.cpp b/indra/llplugin/tests/llplugincookiestore_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/legacy_object_types.h b/indra/llprimitive/legacy_object_types.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llmaterialtable.h b/indra/llprimitive/llmaterialtable.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llmediaentry.cpp b/indra/llprimitive/llmediaentry.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llmediaentry.h b/indra/llprimitive/llmediaentry.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llprimlinkinfo.h b/indra/llprimitive/llprimlinkinfo.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltextureanim.cpp b/indra/llprimitive/lltextureanim.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltextureanim.h b/indra/llprimitive/lltextureanim.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltree_common.h b/indra/llprimitive/lltree_common.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltreeparams.cpp b/indra/llprimitive/lltreeparams.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/lltreeparams.h b/indra/llprimitive/lltreeparams.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llvolumemessage.cpp b/indra/llprimitive/llvolumemessage.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/llvolumemessage.h b/indra/llprimitive/llvolumemessage.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/material_codes.cpp b/indra/llprimitive/material_codes.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/material_codes.h b/indra/llprimitive/material_codes.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/tests/llmessagesystem_stub.cpp b/indra/llprimitive/tests/llmessagesystem_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llcubemap.h b/indra/llrender/llcubemap.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llgldbg.cpp b/indra/llrender/llgldbg.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llgldbg.h b/indra/llrender/llgldbg.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llgltypes.h b/indra/llrender/llgltypes.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrendersphere.cpp b/indra/llrender/llrendersphere.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrendersphere.h b/indra/llrender/llrendersphere.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
old mode 100755
new mode 100644
index b2be3cc3b6cd30c2804e6756493f23816a13f01f..b297223c2e92280f598814acaf5ae0a278c066b8
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -515,29 +515,13 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string&
if (log.length() > 0 || warns)
{
+ LL_DEBUGS("ShaderLoading") << "Shader loading ";
+
if (!filename.empty())
{
- if (warns)
- {
- LL_WARNS("ShaderLoading") << "From " << filename << ":" << LL_ENDL;
- }
- else
- {
- LL_INFOS("ShaderLoading") << "From " << filename << ":" << LL_ENDL;
- }
- }
- }
-
- if ( log.length() > 0 )
- {
- if (warns)
- {
- LL_WARNS("ShaderLoading") << log << LL_ENDL;
- }
- else
- {
- LL_INFOS("ShaderLoading") << log << LL_ENDL;
- }
+ LL_CONT << "From " << filename << ":\n";
+ }
+ LL_CONT << log << LL_ENDL;
}
}
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/lltexture.cpp b/indra/llrender/lltexture.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/lltexture.h b/indra/llrender/lltexture.h
old mode 100755
new mode 100644
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h
old mode 100755
new mode 100644
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llbadge.h b/indra/llui/llbadge.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llbadgeholder.cpp b/indra/llui/llbadgeholder.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llbadgeholder.h b/indra/llui/llbadgeholder.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llbadgeowner.cpp b/indra/llui/llbadgeowner.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llbadgeowner.h b/indra/llui/llbadgeowner.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llchat.h b/indra/llui/llchat.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llcontainerview.h b/indra/llui/llcontainerview.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llctrlselectioninterface.cpp b/indra/llui/llctrlselectioninterface.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llctrlselectioninterface.h b/indra/llui/llctrlselectioninterface.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lleditmenuhandler.cpp b/indra/llui/lleditmenuhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lleditmenuhandler.h b/indra/llui/lleditmenuhandler.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llf32uictrl.cpp b/indra/llui/llf32uictrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llf32uictrl.h b/indra/llui/llf32uictrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfiltereditor.cpp b/indra/llui/llfiltereditor.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfiltereditor.h b/indra/llui/llfiltereditor.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfloaterreglistener.cpp b/indra/llui/llfloaterreglistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfloaterreglistener.h b/indra/llui/llfloaterreglistener.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llfunctorregistry.h b/indra/llui/llfunctorregistry.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llhelp.h b/indra/llui/llhelp.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
old mode 100755
new mode 100644
index fc4a007d9e70653729fe3a983938e9a496613efe..69e338ddb9709b60be5151c9e29f4fec5d162c26
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -680,7 +680,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
S32 seg_start = cur - base;
S32 seg_end = seg_start + seg_len;
- // llinfos << "Seg: [" << word.c_str() << "]" << llendl;
+ // LL_INFOS("SyntaxLSL") << "Seg: [" << word.c_str() << "]" << LL_ENDL;
insertSegments(wtext, *seg_list,cur_token, text_len, seg_start, seg_end, defaultColor, editor);
}
@@ -747,10 +747,10 @@ void LLKeywords::insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSe
#ifdef _DEBUG
void LLKeywords::dump()
{
- llinfos << "LLKeywords" << llendl;
+ LL_INFOS() << "LLKeywords" << LL_ENDL;
- llinfos << "LLKeywords::sWordTokenMap" << llendl;
+ LL_INFOS() << "LLKeywords::sWordTokenMap" << LL_ENDL;
word_token_map_t::iterator word_token_iter = mWordTokenMap.begin();
while( word_token_iter != mWordTokenMap.end() )
{
@@ -759,7 +759,7 @@ void LLKeywords::dump()
++word_token_iter;
}
- llinfos << "LLKeywords::sLineTokenList" << llendl;
+ LL_INFOS() << "LLKeywords::sLineTokenList" << LL_ENDL;
for (token_list_t::iterator iter = mLineTokenList.begin();
iter != mLineTokenList.end(); ++iter)
{
@@ -768,7 +768,7 @@ void LLKeywords::dump()
}
- llinfos << "LLKeywords::sDelimiterTokenList" << llendl;
+ LL_INFOS() << "LLKeywords::sDelimiterTokenList" << LL_ENDL;
for (token_list_t::iterator iter = mDelimiterTokenList.begin();
iter != mDelimiterTokenList.end(); ++iter)
{
@@ -779,12 +779,12 @@ void LLKeywords::dump()
void LLKeywordToken::dump()
{
- llinfos << "[" <<
+ LL_INFOS() << "[" <<
mColor.mV[VX] << ", " <<
mColor.mV[VY] << ", " <<
mColor.mV[VZ] << "] [" <<
wstring_to_utf8str(mToken) << "]" <<
- llendl;
+ LL_ENDL;
}
#endif // DEBUG
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lllazyvalue.h b/indra/llui/lllazyvalue.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llloadingindicator.h b/indra/llui/llloadingindicator.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lllocalcliprect.cpp b/indra/llui/lllocalcliprect.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lllocalcliprect.h b/indra/llui/lllocalcliprect.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llmenubutton.h b/indra/llui/llmenubutton.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llmodaldialog.h b/indra/llui/llmodaldialog.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llmultisliderctrl.h b/indra/llui/llmultisliderctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotificationptr.h b/indra/llui/llnotificationptr.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotificationsutil.cpp b/indra/llui/llnotificationsutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotificationsutil.h b/indra/llui/llnotificationsutil.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llnotificationvisibilityrule.h b/indra/llui/llnotificationvisibilityrule.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llprogressbar.h b/indra/llui/llprogressbar.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llresizebar.h b/indra/llui/llresizebar.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llresizehandle.h b/indra/llui/llresizehandle.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llresmgr.h b/indra/llui/llresmgr.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llrngwriter.h b/indra/llui/llrngwriter.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrollingpanellist.cpp b/indra/llui/llscrollingpanellist.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistcolumn.h b/indra/llui/llscrolllistcolumn.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistitem.cpp b/indra/llui/llscrolllistitem.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llscrolllistitem.h b/indra/llui/llscrolllistitem.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llspellcheck.cpp b/indra/llui/llspellcheck.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llspellcheckmenuhandler.h b/indra/llui/llspellcheckmenuhandler.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llstatgraph.h b/indra/llui/llstatgraph.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llstatview.h b/indra/llui/llstatview.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
old mode 100755
new mode 100644
index 4ccf1ef009d316b5269426a5ff7be81df587acfc..616c42895cdd23f50dcf7d64c006c911bd71122c
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1319,6 +1319,7 @@ void LLTextBase::replaceWithSuggestion(U32 index)
setCursorPos(it->first + (S32)suggestion.length());
+ onSpellCheckPerformed();
break;
}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
old mode 100755
new mode 100644
index 7d87271b0ed0a86db592ba71be9ae7448e15bdc5..c6ce5efcb8fc07beba3064b1c6edf1f78c6b3f76
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -369,6 +369,7 @@ class LLTextBase
std::string getMisspelledWord(U32 pos) const;
bool isMisspelledWord(U32 pos) const;
void onSpellCheckSettingsChange();
+ virtual void onSpellCheckPerformed(){}
// used by LLTextSegment layout code
bool getWordWrap() { return mWordWrap; }
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
old mode 100755
new mode 100644
index 3c86b539c476bfff2d37b846825403a9d8d4fdc6..73f961b36b517c80f26838619ca072ae129c0f2d
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2393,6 +2393,14 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars)
//----------------------------------------------------------------------------
+void LLTextEditor::onSpellCheckPerformed()
+{
+ if (isPristine())
+ {
+ mBaseDocIsPristine = FALSE;
+ }
+}
+
void LLTextEditor::makePristine()
{
mPristineCmd = mLastCmd;
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
old mode 100755
new mode 100644
index f6bdf917b4127b64551bea91d35712800819b8d4..26702b2412b8fdf4b2d81b01bb40f2f618b9b814
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -160,6 +160,8 @@ class LLTextEditor :
autoreplace_callback_t mAutoreplaceCallback;
void setAutoreplaceCallback(autoreplace_callback_t cb) { mAutoreplaceCallback = cb; }
+ /*virtual*/ void onSpellCheckPerformed();
+
//
// Text manipulation
//
diff --git a/indra/llui/lltextparser.cpp b/indra/llui/lltextparser.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextparser.h b/indra/llui/lltextparser.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextutil.h b/indra/llui/lltextutil.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextvalidate.cpp b/indra/llui/lltextvalidate.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltextvalidate.h b/indra/llui/lltextvalidate.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltimectrl.cpp b/indra/llui/lltimectrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltimectrl.h b/indra/llui/lltimectrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltoggleablemenu.h b/indra/llui/lltoggleablemenu.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltrans.cpp b/indra/llui/lltrans.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lltransutil.h b/indra/llui/lltransutil.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluicolor.cpp b/indra/llui/lluicolor.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lluicolor.h b/indra/llui/lluicolor.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lluicolortable.h b/indra/llui/lluicolortable.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluiconstants.h b/indra/llui/lluiconstants.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluifwd.h b/indra/llui/lluifwd.h
old mode 100755
new mode 100644
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llundo.cpp b/indra/llui/llundo.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llundo.h b/indra/llui/llundo.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
old mode 100755
new mode 100644
index 027a3e3a643614fc4678176ac7d1aa4b6d40a290..56977c597b3da695fa7caed90dca3e9011db0363
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -228,6 +228,6 @@ void LLUrlAction::blockObject(std::string url)
std::string object_name = getObjectName(url);
if (LLUUID::validate(object_id))
{
- executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name);
+ executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + LLURI::escape(object_name));
}
}
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlmatch.cpp b/indra/llui/llurlmatch.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewinject.cpp b/indra/llui/llviewinject.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewinject.h b/indra/llui/llviewinject.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewmodel.h b/indra/llui/llviewmodel.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewquery.cpp b/indra/llui/llviewquery.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llviewquery.h b/indra/llui/llviewquery.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llwindowshade.cpp b/indra/llui/llwindowshade.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llwindowshade.h b/indra/llui/llwindowshade.h
old mode 100755
new mode 100644
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/llxuiparser.h b/indra/llui/llxuiparser.h
old mode 100755
new mode 100644
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldirguard.h b/indra/llvfs/lldirguard.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lldiriterator.h b/indra/llvfs/lldiriterator.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/lllfsthread.h b/indra/llvfs/lllfsthread.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfs_objc.h b/indra/llvfs/llvfs_objc.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfsthread.cpp b/indra/llvfs/llvfsthread.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/llvfsthread.h b/indra/llvfs/llvfsthread.h
old mode 100755
new mode 100644
diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llvfs/tests/lldiriterator_test.cpp b/indra/llvfs/tests/lldiriterator_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llwindow/GL/glh_extensions.h b/indra/llwindow/GL/glh_extensions.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/GL/glh_genext.h b/indra/llwindow/GL/glh_genext.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llcursortypes.cpp b/indra/llwindow/llcursortypes.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llcursortypes.h b/indra/llwindow/llcursortypes.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/lldragdropwin32.cpp b/indra/llwindow/lldragdropwin32.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/lldragdropwin32.h b/indra/llwindow/lldragdropwin32.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardheadless.cpp b/indra/llwindow/llkeyboardheadless.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardheadless.h b/indra/llwindow/llkeyboardheadless.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardmacosx.cpp b/indra/llwindow/llkeyboardmacosx.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardmacosx.h b/indra/llwindow/llkeyboardmacosx.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardsdl.h b/indra/llwindow/llkeyboardsdl.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llkeyboardwin32.h b/indra/llwindow/llkeyboardwin32.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llmousehandler.cpp b/indra/llwindow/llmousehandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llmousehandler.h b/indra/llwindow/llmousehandler.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llpreeditor.h b/indra/llwindow/llpreeditor.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowmesaheadless.cpp b/indra/llwindow/llwindowmesaheadless.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowmesaheadless.h b/indra/llwindow/llwindowmesaheadless.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
old mode 100755
new mode 100644
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
old mode 100755
new mode 100644
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
old mode 100755
new mode 100644
index 4e3d0ab39276aa251d2bf2f73b03029db12aea2d..20ab1a7ad396605fbb95ca180d0021668cfdc5d7
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -334,20 +334,23 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
////////////////////////////////////////////////////////////////////////////
+// Must match the type definition in llcontrol.h
+const std::string LLControlGroup::mTypeString[TYPE_COUNT] = { "U32"
+ ,"S32"
+ ,"F32"
+ ,"Boolean"
+ ,"String"
+ ,"Vector3"
+ ,"Vector3D"
+ ,"Rect"
+ ,"Color4"
+ ,"Color3"
+ ,"LLSD"
+ };
+
LLControlGroup::LLControlGroup(const std::string& name)
: LLInstanceTracker<LLControlGroup, std::string>(name)
{
- mTypeString[TYPE_U32] = "U32";
- mTypeString[TYPE_S32] = "S32";
- mTypeString[TYPE_F32] = "F32";
- mTypeString[TYPE_BOOLEAN] = "Boolean";
- mTypeString[TYPE_STRING] = "String";
- mTypeString[TYPE_VEC3] = "Vector3";
- mTypeString[TYPE_VEC3D] = "Vector3D";
- mTypeString[TYPE_RECT] = "Rect";
- mTypeString[TYPE_COL4] = "Color4";
- mTypeString[TYPE_COL3] = "Color3";
- mTypeString[TYPE_LLSD] = "LLSD";
}
LLControlGroup::~LLControlGroup()
@@ -1170,7 +1173,7 @@ bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::strin
return sd.asBoolean();
else
{
- CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return FALSE;
}
}
@@ -1182,7 +1185,7 @@ S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string&
return sd.asInteger();
else
{
- CONTROL_ERRS << "Invalid S32 value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid S32 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return 0;
}
}
@@ -1194,7 +1197,7 @@ U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string&
return sd.asInteger();
else
{
- CONTROL_ERRS << "Invalid U32 value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid U32 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return 0;
}
}
@@ -1206,7 +1209,7 @@ F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string&
return (F32) sd.asReal();
else
{
- CONTROL_ERRS << "Invalid F32 value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid F32 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return 0.0f;
}
}
@@ -1218,7 +1221,7 @@ std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, co
return sd.asString();
else
{
- CONTROL_ERRS << "Invalid string value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid string value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLStringUtil::null;
}
}
@@ -1236,7 +1239,7 @@ LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const
return (LLVector3)sd;
else
{
- CONTROL_ERRS << "Invalid LLVector3 value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid LLVector3 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLVector3::zero;
}
}
@@ -1248,7 +1251,7 @@ LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, cons
return (LLVector3d)sd;
else
{
- CONTROL_ERRS << "Invalid LLVector3d value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid LLVector3d value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLVector3d::zero;
}
}
@@ -1260,7 +1263,7 @@ LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::s
return LLRect(sd);
else
{
- CONTROL_ERRS << "Invalid rect value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid rect value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLRect::null;
}
}
@@ -1305,7 +1308,7 @@ LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const st
return sd;
else
{
- CONTROL_ERRS << "Invalid LLColor3 value for " << control_name << ": " << sd << LL_ENDL;
+ CONTROL_ERRS << "Invalid LLColor3 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLColor3::white;
}
}
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
old mode 100755
new mode 100644
index 04575d81e09d47b7bf636e6a28209ca5eae8af5e..77065dcf8d330fe2412c5ac0da02f1a6a01fa152
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -70,6 +70,7 @@ class LLVector3d;
class LLColor4;
class LLColor3;
+// if this is changed, also modify mTypeString in llcontrol.h
typedef enum e_control_type
{
TYPE_U32 = 0,
@@ -190,11 +191,11 @@ class LLControlGroup : public LLInstanceTracker<LLControlGroup, std::string>
protected:
typedef std::map<std::string, LLControlVariablePtr > ctrl_name_table_t;
ctrl_name_table_t mNameTable;
- std::string mTypeString[TYPE_COUNT];
+ static const std::string mTypeString[TYPE_COUNT];
public:
- eControlType typeStringToEnum(const std::string& typestr);
- std::string typeEnumToString(eControlType typeenum);
+ static eControlType typeStringToEnum(const std::string& typestr);
+ static std::string typeEnumToString(eControlType typeenum);
LLControlGroup(const std::string& name);
~LLControlGroup();
diff --git a/indra/llxml/llcontrolgroupreader.h b/indra/llxml/llcontrolgroupreader.h
old mode 100755
new mode 100644
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
old mode 100755
new mode 100644
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
old mode 100755
new mode 100644
diff --git a/indra/llxml/llxmlparser.cpp b/indra/llxml/llxmlparser.cpp
old mode 100755
new mode 100644
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
old mode 100755
new mode 100644
diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp
old mode 100755
new mode 100644
diff --git a/indra/llxml/llxmltree.h b/indra/llxml/llxmltree.h
old mode 100755
new mode 100644
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/lscript/CMakeLists.txt b/indra/lscript/CMakeLists.txt
deleted file mode 100755
index 937e2ec0dc288c1232da85793e1837fc1f675ae6..0000000000000000000000000000000000000000
--- a/indra/lscript/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- cmake -*-
-
-set(lscript_HEADER_FILES
- llscriptresource.h
- llscriptresourceconsumer.h
- llscriptresourcepool.h
- lscript_alloc.h
- lscript_byteconvert.h
- lscript_byteformat.h
- lscript_execute.h
- lscript_export.h
- lscript_http.h
- lscript_library.h
- lscript_rt_interface.h
- )
-
-add_subdirectory(lscript_compile)
-add_subdirectory(lscript_execute)
-
-add_subdirectory(lscript_library)
-
diff --git a/indra/lscript/llscriptresource.h b/indra/lscript/llscriptresource.h
deleted file mode 100755
index 9dab9ff7cedf099ac739c1a99bf7b59f694aead9..0000000000000000000000000000000000000000
--- a/indra/lscript/llscriptresource.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @file llscriptresource.h
- * @brief LLScriptResource class definition
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLSCRIPTRESOURCE_H
-#define LL_LLSCRIPTRESOURCE_H
-
-#include "stdtypes.h"
-
-// An LLScriptResource is a limited resource per ID.
-class LLScriptResource
-{
-public:
- LLScriptResource();
-
- // If amount resources are available will mark amount resouces
- // used and returns true
- // Otherwise returns false and doesn't mark any resources used.
- bool request(S32 amount = 1);
-
- // Release amount resources from use if at least amount resources are used and return true
- // If amount is more than currently used no resources are released and return false
- bool release(S32 amount = 1);
-
- // Returns how many resources are available
- S32 getAvailable() const;
-
- // Sets the total amount of available resources
- // It is possible to set the amount to less than currently used
- // Most likely to happen on parcel ownership change
- void setTotal(S32 amount);
-
- // Get the total amount of available resources
- S32 getTotal() const;
-
- // Get the number of resources used
- S32 getUsed() const;
-
- // true if more resources used than total available
- bool isOverLimit() const;
-
-private:
- S32 mTotal; // How many resources have been set aside
- S32 mUsed; // How many resources are currently in use
-};
-
-#endif // LL_LLSCRIPTRESOURCE_H
diff --git a/indra/lscript/llscriptresourceconsumer.h b/indra/lscript/llscriptresourceconsumer.h
deleted file mode 100755
index 82a490d28fdb7cc4570d602a09553ce82baea5d5..0000000000000000000000000000000000000000
--- a/indra/lscript/llscriptresourceconsumer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * @file llscriptresourceconsumer.h
- * @brief An interface for a script resource consumer.
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLSCRIPTRESOURCECONSUMER_H
-#define LL_LLSCRIPTRESOURCECONSUMER_H
-
-#include "linden_common.h"
-
-class LLScriptResourcePool;
-
-// Entities that use limited script resources
-// should implement this interface
-
-class LLScriptResourceConsumer
-{
-public:
- LLScriptResourceConsumer();
-
- virtual ~LLScriptResourceConsumer() { }
-
- // Get the number of public urls used by this consumer.
- virtual S32 getUsedPublicURLs() const = 0;
-
- // Get the resource pool this consumer is currently using.
- LLScriptResourcePool& getScriptResourcePool();
- const LLScriptResourcePool& getScriptResourcePool() const;
-
- bool switchScriptResourcePools(LLScriptResourcePool& new_pool);
- bool canUseScriptResourcePool(const LLScriptResourcePool& resource_pool);
- bool isInPool(const LLScriptResourcePool& resource_pool);
-
-protected:
- virtual void setScriptResourcePool(LLScriptResourcePool& pool);
-
- LLScriptResourcePool* mScriptResourcePool;
-};
-
-#endif // LL_LLSCRIPTRESOURCECONSUMER_H
diff --git a/indra/lscript/lscript_alloc.h b/indra/lscript/lscript_alloc.h
deleted file mode 100755
index f8a4e298d245921c73e11b0b0a0473fee67238f5..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_alloc.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * @file lscript_alloc.h
- * @brief General heap management for scripting system
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_ALLOC_H
-#define LL_LSCRIPT_ALLOC_H
-// #define at top of file accelerates gcc compiles
-// Under gcc 2.9, the manual is unclear if comments can appear above #ifndef
-// Under gcc 3, the manual explicitly states comments can appear above the #ifndef
-
-#include "lscript_byteconvert.h"
-#include "lscript_library.h"
-
-void reset_hp_to_safe_spot(const U8 *buffer);
-
-
-// supported data types
-
-// basic types
-// integer 4 bytes of integer data
-// float 4 bytes of float data
-// string data null terminated 1 byte string
-// key data null terminated 1 byte string
-// vector data 12 bytes of 3 floats
-// quaternion data 16 bytes of 4 floats
-
-// list type
-// list data 4 bytes of number of entries followed by followed by pointer
-
-// string pointer 4 bytes of address of string data on the heap (only used in list data)
-// key pointer 4 bytes of address of key data on the heap (only used in list data)
-
-// heap format
-//
-// 4 byte offset to next block (in bytes)
-// 1 byte of type of variable or empty
-// 2 bytes of reference count
-// nn bytes of data
-
-const S32 MAX_HEAP_SIZE = TOP_OF_MEMORY;
-
-class LLScriptAllocEntry
-{
-public:
- LLScriptAllocEntry() : mSize(0), mType(LST_NULL), mReferenceCount(0) {}
- LLScriptAllocEntry(S32 offset, U8 type) : mSize(offset), mType(type), mReferenceCount(1) {}
- friend std::ostream& operator<<(std::ostream& s, const LLScriptAllocEntry &a)
- {
- s << "Size: " << a.mSize << " Type: " << LSCRIPTTypeNames[a.mType] << " Count: " << a.mReferenceCount;
- return s;
- }
-
- S32 mSize;
- U8 mType;
- S16 mReferenceCount;
-};
-
-// this is only OK because we only load/save via accessors below
-const S32 SIZEOF_SCRIPT_ALLOC_ENTRY = 7;
-
-inline void alloc_entry2bytestream(U8 *buffer, S32 &offset, const LLScriptAllocEntry &entry)
-{
- if ( (offset < 0)
- ||(offset > MAX_HEAP_SIZE))
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- }
- else
- {
- integer2bytestream(buffer, offset, entry.mSize);
- byte2bytestream(buffer, offset, entry.mType);
- s162bytestream(buffer, offset, entry.mReferenceCount);
- }
-}
-
-inline void bytestream2alloc_entry(LLScriptAllocEntry &entry, U8 *buffer, S32 &offset)
-{
- if ( (offset < 0)
- ||(offset > MAX_HEAP_SIZE))
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- reset_hp_to_safe_spot(buffer);
- }
- else
- {
- entry.mSize = bytestream2integer(buffer, offset);
- entry.mType = bytestream2byte(buffer, offset);
- entry.mReferenceCount = bytestream2s16(buffer, offset);
- }
-}
-
-// create a heap from the HR to TM
-BOOL lsa_create_heap(U8 *heap_start, S32 size);
-void lsa_fprint_heap(U8 *buffer, LLFILE *fp);
-
-void lsa_print_heap(U8 *buffer);
-
-// adding to heap
-// if block is empty
-// if block is at least block size + 4 larger than data
-// split block
-// insert data into first part
-// return address
-// else
-// insert data into block
-// return address
-// else
-// if next block is >= SP
-// set Stack-Heap collision
-// return NULL
-// if next block is empty
-// merge next block with current block
-// go to start of algorithm
-// else
-// move to next block
-// go to start of algorithm
-
-S32 lsa_heap_add_data(U8 *buffer, LLScriptLibData *data, S32 heapsize, BOOL b_delete);
-
-S32 lsa_heap_top(U8 *heap_start, S32 maxsize);
-
-// split block
-// set offset to point to new block
-// set offset of new block to point to original offset - block size - data size
-// set new block to empty
-// set new block reference count to 0
-void lsa_split_block(U8 *buffer, S32 &offset, S32 size, LLScriptAllocEntry &entry);
-
-// insert data
-// if data is non-list type
-// set type to basic type, set reference count to 1, copy data, return address
-// else
-// set type to list data type, set reference count to 1
-// for each list entry
-// insert data
-// return address
-
-void lsa_insert_data(U8 *buffer, S32 &offset, LLScriptLibData *data, LLScriptAllocEntry &entry, S32 heapsize);
-
-S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset);
-
-// increase reference count
-// increase reference count by 1
-
-void lsa_increase_ref_count(U8 *buffer, S32 offset);
-
-// decrease reference count
-// decrease reference count by 1
-// if reference count == 0
-// set type to empty
-
-void lsa_decrease_ref_count(U8 *buffer, S32 offset);
-
-inline S32 get_max_heap_size(U8 *buffer)
-{
- return get_register(buffer, LREG_SP) - get_register(buffer, LREG_HR);
-}
-
-
-LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref);
-LLScriptLibData *lsa_get_list_ptr(U8 *buffer, S32 &offset, BOOL b_dec_ref);
-
-S32 lsa_cat_strings(U8 *buffer, S32 offset1, S32 offset2, S32 heapsize);
-S32 lsa_cmp_strings(U8 *buffer, S32 offset1, S32 offset2);
-
-S32 lsa_cat_lists(U8 *buffer, S32 offset1, S32 offset2, S32 heapsize);
-S32 lsa_cmp_lists(U8 *buffer, S32 offset1, S32 offset2);
-S32 lsa_preadd_lists(U8 *buffer, LLScriptLibData *data, S32 offset2, S32 heapsize);
-S32 lsa_postadd_lists(U8 *buffer, S32 offset1, LLScriptLibData *data, S32 heapsize);
-
-// modifying a list
-// insert new list that is modified
-// store returned address in original list's variable
-// decrease reference count on old list
-
-// list l1 = [10];
-// list l2 = l1;
-// l1 = [11];
-
-// we want l2 == [10];
-
-// more complicated example:
-// list l1 = [10, 11];
-// list l2 = l1;
-// l1[0] = 12
-
-// I think that we want l2 = [10, 11];
-
-// one option would be to use syntax like:
-// l1 = llSetList(l1, 0, 12);
-// but this would require variable argument list matching
-// which maybe is ok, but would be work
-// the other option would be changes to lists that have multiple references causes a copy to occur
-
-// popl @l1, 0, integer, 12
-//
-// would cause l1 to be copied, 12 to replace the 0th entry, and the address of the new list to be saved in l1
-//
-
-inline LLScriptLibData *lsa_bubble_sort(LLScriptLibData *src, S32 stride, S32 ascending)
-{
- S32 number = src->getListLength();
-
- if (number <= 0)
- {
- return NULL;
- }
-
- if (stride <= 0)
- {
- stride = 1;
- }
-
- S32 i = 0;
-
- if (number % stride)
- {
- LLScriptLibData *retval = src->mListp;
- src->mListp = NULL;
- return retval;
- }
-
- LLScriptLibData **sortarray = new LLScriptLibData*[number];
-
- LLScriptLibData *temp = src->mListp;
- while (temp)
- {
- sortarray[i] = temp;
- i++;
- temp = temp->mListp;
- }
-
- S32 j, s;
-
- for (i = 0; i < number; i += stride)
- {
- for (j = i; j < number; j += stride)
- {
- if ( ((*sortarray[i]) <= (*sortarray[j]))
- != (ascending == TRUE))
- {
- for (s = 0; s < stride; s++)
- {
- temp = sortarray[i + s];
- sortarray[i + s] = sortarray[j + s];
- sortarray[j + s] = temp;
- }
- }
- }
- }
-
- i = 1;
- temp = sortarray[0];
- while (i < number)
- {
- temp->mListp = sortarray[i++];
- temp = temp->mListp;
- }
- temp->mListp = NULL;
-
- src->mListp = NULL;
-
- temp = sortarray[0];
- delete[] sortarray;
- return temp;
-}
-
-
-LLScriptLibData* lsa_randomize(LLScriptLibData* src, S32 stride);
-
-#endif
diff --git a/indra/lscript/lscript_byteconvert.h b/indra/lscript/lscript_byteconvert.h
deleted file mode 100755
index 5b08481d7d6769ef240b75832916eb2c239deb75..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_byteconvert.h
+++ /dev/null
@@ -1,1170 +0,0 @@
-/**
- * @file lscript_byteconvert.h
- * @brief Shared code for compiler and assembler for LSL
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-// data shared between compiler/assembler
-// used to convert data between byte stream and outside data types
-
-#ifndef LL_LSCRIPT_BYTECONVERT_H
-#define LL_LSCRIPT_BYTECONVERT_H
-
-#include "stdtypes.h"
-#include "v3math.h"
-#include "llquaternion.h"
-#include "lscript_byteformat.h"
-#include "lluuid.h"
-
-void reset_hp_to_safe_spot(const U8 *buffer);
-
-// remember that LScript byte stream is BigEndian
-void set_fault(const U8 *stream, LSCRIPTRunTimeFaults fault);
-
-inline S32 bytestream2integer(const U8 *stream, S32 &offset)
-{
- stream += offset;
- offset += 4;
- return (*stream<<24) | (*(stream + 1)<<16) | (*(stream + 2)<<8) | *(stream + 3);
-}
-
-inline U32 bytestream2unsigned_integer(const U8 *stream, S32 &offset)
-{
- stream += offset;
- offset += 4;
- return (*stream<<24) | (*(stream + 1)<<16) | (*(stream + 2)<<8) | *(stream + 3);
-}
-
-inline U64 bytestream2u64(const U8 *stream, S32 &offset)
-{
- stream += offset;
- offset += 8;
- return ((U64)(*stream)<<56)| ((U64)(*(stream + 1))<<48) | ((U64)(*(stream + 2))<<40) | ((U64)(*(stream + 3))<<32) |
- ((U64)(*(stream + 4))<<24) | ((U64)(*(stream + 5))<<16) | ((U64)(*(stream + 6))<<8) | (U64)(*(stream + 7));
-}
-
-inline void integer2bytestream(U8 *stream, S32 &offset, S32 integer)
-{
- stream += offset;
- offset += 4;
- *(stream) = (integer >> 24);
- *(stream + 1) = (integer >> 16) & 0xff;
- *(stream + 2) = (integer >> 8) & 0xff;
- *(stream + 3) = (integer) & 0xff;
-}
-
-inline void unsigned_integer2bytestream(U8 *stream, S32 &offset, U32 integer)
-{
- stream += offset;
- offset += 4;
- *(stream) = (integer >> 24);
- *(stream + 1) = (integer >> 16) & 0xff;
- *(stream + 2) = (integer >> 8) & 0xff;
- *(stream + 3) = (integer) & 0xff;
-}
-inline void u642bytestream(U8 *stream, S32 &offset, U64 integer)
-{
- stream += offset;
- offset += 8;
- *(stream) = (U8)(integer >> 56);
- *(stream + 1) = (U8)((integer >> 48) & 0xff);
- *(stream + 2) = (U8)((integer >> 40) & 0xff);
- *(stream + 3) = (U8)((integer >> 32) & 0xff);
- *(stream + 4) = (U8)((integer >> 24) & 0xff);
- *(stream + 5) = (U8)((integer >> 16) & 0xff);
- *(stream + 6) = (U8)((integer >> 8) & 0xff);
- *(stream + 7) = (U8)((integer) & 0xff);
-}
-
-inline S16 bytestream2s16(const U8 *stream, S32 &offset)
-{
- stream += offset;
- offset += 2;
- return (*stream<<8) | *(stream + 1);
-}
-
-inline void s162bytestream(U8 *stream, S32 &offset, S16 integer)
-{
- stream += offset;
- offset += 2;
- *(stream) = (integer >> 8);
- *(stream + 1) = (integer) & 0xff;
-}
-
-inline U16 bytestream2u16(const U8 *stream, S32 &offset)
-{
- stream += offset;
- offset += 2;
- return (*stream<<8) | *(stream + 1);
-}
-
-inline void u162bytestream(U8 *stream, S32 &offset, U16 integer)
-{
- stream += offset;
- offset += 2;
- *(stream) = (integer >> 8);
- *(stream + 1) = (integer) & 0xff;
-}
-
-inline F32 bytestream2float(const U8 *stream, S32 &offset)
-{
- S32 value = bytestream2integer(stream, offset);
- F32 fpvalue = *(F32 *)&value;
- if (!llfinite(fpvalue))
- {
- fpvalue = 0;
- set_fault(stream, LSRF_MATH);
- }
- return fpvalue;
-}
-
-inline void float2bytestream(U8 *stream, S32 &offset, F32 floatingpoint)
-{
- S32 value = *(S32 *)&floatingpoint;
- integer2bytestream(stream, offset, value);
-}
-
-inline void bytestream_int2float(U8 *stream, S32 &offset)
-{
- S32 value = bytestream2integer(stream, offset);
- offset -= 4;
- F32 fpvalue = (F32)value;
- if (!llfinite(fpvalue))
- {
- fpvalue = 0;
- set_fault(stream, LSRF_MATH);
- }
- float2bytestream(stream, offset, fpvalue);
-}
-
-// Returns true on success, return false and clip copy on buffer overflow
-inline bool bytestream2char(char *buffer, const U8 *stream, S32 &offset, S32 buffsize)
-{
- S32 source_len = strlen( (const char *)stream+offset );
- S32 copy_len = buffsize - 1;
- if( copy_len > source_len )
- {
- copy_len = source_len;
- }
-
- // strncpy without \0 padding overhead
- memcpy( buffer, stream+offset, copy_len );
- buffer[copy_len] = 0;
-
- offset += source_len + 1; // advance past source string, include terminating '\0'
-
- return source_len < buffsize;
-}
-
-inline void char2bytestream(U8 *stream, S32 &offset, const char *buffer)
-{
- while ((*(stream + offset++) = *buffer++))
- ;
-}
-
-inline U8 bytestream2byte(const U8 *stream, S32 &offset)
-{
- return *(stream + offset++);
-}
-
-inline void byte2bytestream(U8 *stream, S32 &offset, U8 byte)
-{
- *(stream + offset++) = byte;
-}
-
-inline void bytestream2bytestream(U8 *dest, S32 &dest_offset, const U8 *src, S32 &src_offset, S32 count)
-{
- while (count)
- {
- (*(dest + dest_offset++)) = (*(src + src_offset++));
- count--;
- }
-}
-
-inline void uuid2bytestream(U8 *stream, S32 &offset, const LLUUID &uuid)
-{
- S32 i;
- for (i = 0; i < UUID_BYTES; i++)
- {
- *(stream + offset++) = uuid.mData[i];
- }
-}
-
-inline void bytestream2uuid(U8 *stream, S32 &offset, LLUUID &uuid)
-{
- S32 i;
- for (i = 0; i < UUID_BYTES; i++)
- {
- uuid.mData[i] = *(stream + offset++);
- }
-}
-
-// vectors and quaternions and encoded in backwards order to match the way in which they are stored on the stack
-inline void bytestream2vector(LLVector3 &vector, const U8 *stream, S32 &offset)
-{
- S32 value = bytestream2integer(stream, offset);
- vector.mV[VZ] = *(F32 *)&value;
- if (!llfinite(vector.mV[VZ]))
- {
- vector.mV[VZ] = 0;
- set_fault(stream, LSRF_MATH);
- }
- value = bytestream2integer(stream, offset);
- vector.mV[VY] = *(F32 *)&value;
- if (!llfinite(vector.mV[VY]))
- {
- vector.mV[VY] = 0;
- set_fault(stream, LSRF_MATH);
- }
- value = bytestream2integer(stream, offset);
- vector.mV[VX] = *(F32 *)&value;
- if (!llfinite(vector.mV[VX]))
- {
- vector.mV[VX] = 0;
- set_fault(stream, LSRF_MATH);
- }
-}
-
-inline void vector2bytestream(U8 *stream, S32 &offset, const LLVector3 &vector)
-{
- S32 value = *(S32 *)&vector.mV[VZ];
- integer2bytestream(stream, offset, value);
- value = *(S32 *)&vector.mV[VY];
- integer2bytestream(stream, offset, value);
- value = *(S32 *)&vector.mV[VX];
- integer2bytestream(stream, offset, value);
-}
-
-inline void bytestream2quaternion(LLQuaternion &quat, const U8 *stream, S32 &offset)
-{
- S32 value = bytestream2integer(stream, offset);
- quat.mQ[VS] = *(F32 *)&value;
- if (!llfinite(quat.mQ[VS]))
- {
- quat.mQ[VS] = 0;
- set_fault(stream, LSRF_MATH);
- }
- value = bytestream2integer(stream, offset);
- quat.mQ[VZ] = *(F32 *)&value;
- if (!llfinite(quat.mQ[VZ]))
- {
- quat.mQ[VZ] = 0;
- set_fault(stream, LSRF_MATH);
- }
- value = bytestream2integer(stream, offset);
- quat.mQ[VY] = *(F32 *)&value;
- if (!llfinite(quat.mQ[VY]))
- {
- quat.mQ[VY] = 0;
- set_fault(stream, LSRF_MATH);
- }
- value = bytestream2integer(stream, offset);
- quat.mQ[VX] = *(F32 *)&value;
- if (!llfinite(quat.mQ[VX]))
- {
- quat.mQ[VX] = 0;
- set_fault(stream, LSRF_MATH);
- }
-}
-
-inline void quaternion2bytestream(U8 *stream, S32 &offset, const LLQuaternion &quat)
-{
- S32 value = *(S32 *)&quat.mQ[VS];
- integer2bytestream(stream, offset, value);
- value = *(S32 *)&quat.mQ[VZ];
- integer2bytestream(stream, offset, value);
- value = *(S32 *)&quat.mQ[VY];
- integer2bytestream(stream, offset, value);
- value = *(S32 *)&quat.mQ[VX];
- integer2bytestream(stream, offset, value);
-}
-
-inline S32 get_register(const U8 *stream, LSCRIPTRegisters reg)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- return bytestream2integer(stream, offset);
-}
-
-inline F32 get_register_fp(U8 *stream, LSCRIPTRegisters reg)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- F32 value = bytestream2float(stream, offset);
- if (!llfinite(value))
- {
- value = 0;
- set_fault(stream, LSRF_MATH);
- }
- return value;
-}
-inline U64 get_register_u64(U8 *stream, LSCRIPTRegisters reg)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- return bytestream2u64(stream, offset);
-}
-
-inline U64 get_event_register(U8 *stream, LSCRIPTRegisters reg, S32 major_version)
-{
- if (major_version == 1)
- {
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- return (U64)bytestream2integer(stream, offset);
- }
- else if (major_version == 2)
- {
- S32 offset = gLSCRIPTRegisterAddresses[reg + (LREG_NCE - LREG_CE)];
- return bytestream2u64(stream, offset);
- }
- else
- {
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- return (U64)bytestream2integer(stream, offset);
- }
-}
-
-inline void set_register(U8 *stream, LSCRIPTRegisters reg, S32 value)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- integer2bytestream(stream, offset, value);
-}
-
-inline void set_register_fp(U8 *stream, LSCRIPTRegisters reg, F32 value)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- float2bytestream(stream, offset, value);
-}
-
-inline void set_register_u64(U8 *stream, LSCRIPTRegisters reg, U64 value)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- u642bytestream(stream, offset, value);
-}
-
-inline void set_event_register(U8 *stream, LSCRIPTRegisters reg, U64 value, S32 major_version)
-{
- if (major_version == 1)
- {
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- integer2bytestream(stream, offset, (S32)value);
- }
- else if (major_version == 2)
- {
- S32 offset = gLSCRIPTRegisterAddresses[reg + (LREG_NCE - LREG_CE)];
- u642bytestream(stream, offset, value);
- }
- else
- {
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- integer2bytestream(stream, offset, (S32)value);
- }
-}
-
-
-inline F32 add_register_fp(U8 *stream, LSCRIPTRegisters reg, F32 value)
-{
- S32 offset = gLSCRIPTRegisterAddresses[reg];
- F32 newvalue = bytestream2float(stream, offset);
- newvalue += value;
- if (!llfinite(newvalue))
- {
- newvalue = 0;
- set_fault(stream, LSRF_MATH);
- }
- offset = gLSCRIPTRegisterAddresses[reg];
- float2bytestream(stream, offset, newvalue);
- return newvalue;
-}
-
-void lsa_print_heap(U8 *buffer);
-
-
-inline void set_fault(const U8 *stream, LSCRIPTRunTimeFaults fault)
-{
- S32 fr = get_register(stream, LREG_FR);
- // record the first error
- if (!fr)
- {
- if ( (fault == LSRF_HEAP_ERROR)
- ||(fault == LSRF_STACK_HEAP_COLLISION)
- ||(fault == LSRF_BOUND_CHECK_ERROR))
- {
- reset_hp_to_safe_spot(stream);
-// lsa_print_heap((U8 *)stream);
- }
- fr = fault;
- set_register((U8 *)stream, LREG_FR, fr);
- }
-}
-
-inline BOOL set_ip(U8 *stream, S32 ip)
-{
- // Verify that the Instruction Pointer is in a valid
- // code area (between the Global Function Register
- // and Heap Register).
- S32 gfr = get_register(stream, LREG_GFR);
- if (ip == 0)
- {
- set_register(stream, LREG_IP, ip);
- return TRUE;
- }
- if (ip < gfr)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- S32 hr = get_register(stream, LREG_HR);
- if (ip >= hr)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- set_register(stream, LREG_IP, ip);
- return TRUE;
-}
-
-inline BOOL set_bp(U8 *stream, S32 bp)
-{
- // Verify that the Base Pointer is in a valid
- // data area (between the Heap Pointer and
- // the Top of Memory, and below the
- // Stack Pointer).
- S32 hp = get_register(stream, LREG_HP);
- if (bp <= hp)
- {
- set_fault(stream, LSRF_STACK_HEAP_COLLISION);
- return FALSE;
- }
- S32 tm = get_register(stream, LREG_TM);
- if (bp >= tm)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- S32 sp = get_register(stream, LREG_SP);
- if (bp < sp)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- set_register(stream, LREG_BP, bp);
- return TRUE;
-}
-
-inline BOOL set_sp(U8 *stream, S32 sp)
-{
- // Verify that the Stack Pointer is in a valid
- // data area (between the Heap Pointer and
- // the Top of Memory).
- S32 hp = get_register(stream, LREG_HP);
- if (sp <= hp)
- {
- set_fault(stream, LSRF_STACK_HEAP_COLLISION);
- return FALSE;
- }
- S32 tm = get_register(stream, LREG_TM);
- if (sp >= tm)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- set_register(stream, LREG_SP, sp);
- return TRUE;
-}
-
-inline void lscript_push(U8 *stream, U8 value)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= 1;
-
- if (set_sp(stream, sp))
- {
- *(stream + sp) = value;
- }
-}
-
-inline void lscript_push(U8 *stream, S32 value)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= LSCRIPTDataSize[LST_INTEGER];
-
- if (set_sp(stream, sp))
- {
- integer2bytestream(stream, sp, value);
- }
-}
-
-inline void lscript_push(U8 *stream, F32 value)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= LSCRIPTDataSize[LST_FLOATINGPOINT];
-
- if (set_sp(stream, sp))
- {
- float2bytestream(stream, sp, value);
- }
-}
-
-inline void lscript_push(U8 *stream, const LLVector3 &value)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= LSCRIPTDataSize[LST_VECTOR];
-
- if (set_sp(stream, sp))
- {
- vector2bytestream(stream, sp, value);
- }
-}
-
-inline void lscript_push(U8 *stream, const LLQuaternion &value)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= LSCRIPTDataSize[LST_QUATERNION];
-
- if (set_sp(stream, sp))
- {
- quaternion2bytestream(stream, sp, value);
- }
-}
-
-inline void lscript_pusharg(U8 *stream, S32 arg)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= arg;
-
- set_sp(stream, sp);
-}
-
-inline void lscript_poparg(U8 *stream, S32 arg)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp += arg;
-
- set_sp(stream, sp);
-}
-
-inline U8 lscript_pop_char(U8 *stream)
-{
- S32 sp = get_register(stream, LREG_SP);
- U8 value = *(stream + sp++);
- set_sp(stream, sp);
- return value;
-}
-
-inline S32 lscript_pop_int(U8 *stream)
-{
- S32 sp = get_register(stream, LREG_SP);
- S32 value = bytestream2integer(stream, sp);
- set_sp(stream, sp);
- return value;
-}
-
-inline F32 lscript_pop_float(U8 *stream)
-{
- S32 sp = get_register(stream, LREG_SP);
- F32 value = bytestream2float(stream, sp);
- if (!llfinite(value))
- {
- value = 0;
- set_fault(stream, LSRF_MATH);
- }
- set_sp(stream, sp);
- return value;
-}
-
-inline void lscript_pop_vector(U8 *stream, LLVector3 &value)
-{
- S32 sp = get_register(stream, LREG_SP);
- bytestream2vector(value, stream, sp);
- set_sp(stream, sp);
-}
-
-inline void lscript_pop_quaternion(U8 *stream, LLQuaternion &value)
-{
- S32 sp = get_register(stream, LREG_SP);
- bytestream2quaternion(value, stream, sp);
- set_sp(stream, sp);
-}
-
-inline void lscript_pusharge(U8 *stream, S32 value)
-{
- S32 sp = get_register(stream, LREG_SP);
- sp -= value;
- if (set_sp(stream, sp))
- {
- S32 i;
- for (i = 0; i < value; i++)
- {
- *(stream + sp++) = 0;
- }
- }
-}
-
-inline BOOL lscript_check_local(U8 *stream, S32 &address, S32 size)
-{
- S32 sp = get_register(stream, LREG_SP);
- S32 bp = get_register(stream, LREG_BP);
-
- address += size;
- address = bp - address;
-
- if (address < sp - size)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- S32 tm = get_register(stream, LREG_TM);
- if (address + size > tm)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- return TRUE;
-}
-
-inline BOOL lscript_check_global(U8 *stream, S32 &address, S32 size)
-{
- S32 gvr = get_register(stream, LREG_GVR);
-
- // Possibility of overwriting registers? -- DK 09/07/04
- if (address < 0)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
-
- address += gvr;
- S32 gfr = get_register(stream, LREG_GFR);
-
- if (address + size > gfr)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- return TRUE;
-}
-
-inline void lscript_local_store(U8 *stream, S32 address, S32 value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_INTEGER]))
- integer2bytestream(stream, address, value);
-}
-
-inline void lscript_local_store(U8 *stream, S32 address, F32 value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_FLOATINGPOINT]))
- float2bytestream(stream, address, value);
-}
-
-inline void lscript_local_store(U8 *stream, S32 address, const LLVector3 value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_VECTOR]))
- vector2bytestream(stream, address, value);
-}
-
-inline void lscript_local_store(U8 *stream, S32 address, const LLQuaternion value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_QUATERNION]))
- quaternion2bytestream(stream, address, value);
-}
-
-inline void lscript_global_store(U8 *stream, S32 address, S32 value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_INTEGER]))
- integer2bytestream(stream, address, value);
-}
-
-inline void lscript_global_store(U8 *stream, S32 address, F32 value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_FLOATINGPOINT]))
- float2bytestream(stream, address, value);
-}
-
-inline void lscript_global_store(U8 *stream, S32 address, const LLVector3 value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_VECTOR]))
- vector2bytestream(stream, address, value);
-}
-
-inline void lscript_global_store(U8 *stream, S32 address, const LLQuaternion value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_QUATERNION]))
- quaternion2bytestream(stream, address, value);
-}
-
-inline S32 lscript_local_get(U8 *stream, S32 address)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_INTEGER]))
- return bytestream2integer(stream, address);
- return 0;
-}
-
-inline void lscript_local_get(U8 *stream, S32 address, F32 &value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_FLOATINGPOINT]))
- value = bytestream2float(stream, address);
- if (!llfinite(value))
- {
- value = 0;
- set_fault(stream, LSRF_MATH);
- }
-}
-
-inline void lscript_local_get(U8 *stream, S32 address, LLVector3 &value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_VECTOR]))
- bytestream2vector(value, stream, address);
-}
-
-inline void lscript_local_get(U8 *stream, S32 address, LLQuaternion &value)
-{
- if (lscript_check_local(stream, address, LSCRIPTDataSize[LST_QUATERNION]))
- bytestream2quaternion(value, stream, address);
-}
-
-inline S32 lscript_global_get(U8 *stream, S32 address)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_INTEGER]))
- return bytestream2integer(stream, address);
- return 0;
-}
-
-inline void lscript_global_get(U8 *stream, S32 address, F32 &value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_FLOATINGPOINT]))
- value = bytestream2float(stream, address);
- if (!llfinite(value))
- {
- value = 0;
- set_fault(stream, LSRF_MATH);
- }
-}
-
-inline void lscript_global_get(U8 *stream, S32 address, LLVector3 &value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_VECTOR]))
- bytestream2vector(value, stream, address);
-}
-
-inline void lscript_global_get(U8 *stream, S32 address, LLQuaternion &value)
-{
- if (lscript_check_global(stream, address, LSCRIPTDataSize[LST_QUATERNION]))
- bytestream2quaternion(value, stream, address);
-}
-
-
-
-inline S32 get_state_event_opcoode_start(U8 *stream, S32 state, LSCRIPTStateEventType event)
-{
- // get the start of the state table
- S32 sr = get_register(stream, LREG_SR);
-
- // get the position of the jump to the desired state
- S32 value = get_register(stream, LREG_VN);
-
- S32 state_offset_offset = 0;
- S32 major_version = 0;
- if (value == LSL2_VERSION1_END_NUMBER)
- {
- major_version = LSL2_MAJOR_VERSION_ONE;
- state_offset_offset = sr + LSCRIPTDataSize[LST_INTEGER] + LSCRIPTDataSize[LST_INTEGER]*2*state;
- }
- else if (value == LSL2_VERSION_NUMBER)
- {
- major_version = LSL2_MAJOR_VERSION_TWO;
- state_offset_offset = sr + LSCRIPTDataSize[LST_INTEGER] + LSCRIPTDataSize[LST_INTEGER]*3*state;
- }
- if ( state_offset_offset < 0 || state_offset_offset > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- // get the actual position in memory of the desired state
- S32 state_offset = sr + bytestream2integer(stream, state_offset_offset);
- if ( state_offset < 0 || state_offset > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- // save that value
- S32 state_offset_base = state_offset;
-
- // jump past the state name
- S32 event_jump_offset = state_offset_base + bytestream2integer(stream, state_offset);
-
- // get the location of the event offset
- S32 event_offset = event_jump_offset + LSCRIPTDataSize[LST_INTEGER]*2*get_event_handler_jump_position(get_event_register(stream, LREG_ER, major_version), event);
- if ( event_offset < 0 || event_offset > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- // now, jump to the event
- S32 event_start = bytestream2integer(stream, event_offset);
- if ( event_start < 0 || event_start > TOP_OF_MEMORY )
- {
- return -1;
- }
- event_start += event_jump_offset;
-
- S32 event_start_original = event_start;
-
- // now skip past the parameters
- S32 opcode_offset = bytestream2integer(stream, event_start);
- if ( opcode_offset < 0 || opcode_offset > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- return opcode_offset + event_start_original;
-}
-
-
-inline U64 get_handled_events(U8 *stream, S32 state)
-{
- U64 retvalue = 0;
- // get the start of the state table
- S32 sr = get_register(stream, LREG_SR);
-
- // get the position of the jump to the desired state
- S32 value = get_register(stream, LREG_VN);
- S32 state_handled_offset = 0;
- if (value == LSL2_VERSION1_END_NUMBER)
- {
- state_handled_offset = sr + LSCRIPTDataSize[LST_INTEGER]*2*state + 2*LSCRIPTDataSize[LST_INTEGER];
- retvalue = bytestream2integer(stream, state_handled_offset);
- }
- else if (value == LSL2_VERSION_NUMBER)
- {
- state_handled_offset = sr + LSCRIPTDataSize[LST_INTEGER]*3*state + 2*LSCRIPTDataSize[LST_INTEGER];
- retvalue = bytestream2u64(stream, state_handled_offset);
- }
-
- // get the handled events
- return retvalue;
-}
-
-// Returns -1 on error
-inline S32 get_event_stack_size(U8 *stream, S32 state, LSCRIPTStateEventType event)
-{
- // get the start of the state table
- S32 sr = get_register(stream, LREG_SR);
-
- // get state offset
- S32 value = get_register(stream, LREG_VN);
- S32 state_offset_offset = 0;
- S32 major_version = 0;
- if (value == LSL2_VERSION1_END_NUMBER)
- {
- major_version = LSL2_MAJOR_VERSION_ONE;
- state_offset_offset = sr + LSCRIPTDataSize[LST_INTEGER] + LSCRIPTDataSize[LST_INTEGER]*2*state;
- }
- else if (value == LSL2_VERSION_NUMBER)
- {
- major_version = LSL2_MAJOR_VERSION_TWO;
- state_offset_offset = sr + LSCRIPTDataSize[LST_INTEGER] + LSCRIPTDataSize[LST_INTEGER]*3*state;
- }
-
- if ( state_offset_offset < 0 || state_offset_offset > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- S32 state_offset = bytestream2integer(stream, state_offset_offset);
- state_offset += sr;
-
- state_offset_offset = state_offset;
- if ( state_offset_offset < 0 || state_offset_offset > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- // skip to jump table
- S32 jump_table = bytestream2integer(stream, state_offset_offset);
-
- jump_table += state_offset;
- if ( jump_table < 0 || jump_table > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- // get the position of the jump to the desired state
- S32 stack_size_offset = jump_table + LSCRIPTDataSize[LST_INTEGER]*2*get_event_handler_jump_position(get_event_register(stream, LREG_ER, major_version), event) + LSCRIPTDataSize[LST_INTEGER];
-
- // get the handled events
- S32 stack_size = bytestream2integer(stream, stack_size_offset);
- if ( stack_size < 0 || stack_size > TOP_OF_MEMORY )
- {
- return -1;
- }
-
- return stack_size;
-}
-
-inline LSCRIPTStateEventType return_first_event(S32 event)
-{
- S32 count = 1;
- while (count < LSTT_EOF)
- {
- if (event & 0x1)
- {
- return (LSCRIPTStateEventType) count;
- }
- else
- {
- event >>= 1;
- count++;
- }
- }
- return LSTT_NULL;
-}
-
-
-// the safe instruction versions of these commands will only work if offset is between
-// GFR and HR, meaning that it is an instruction (more or less) in global functions or event handlers
-
-inline BOOL safe_instruction_check_address(U8 *stream, S32 offset, S32 size)
-{
- S32 gfr = get_register(stream, LREG_GFR);
- if (offset < gfr)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- else
- {
- S32 hr = get_register(stream, LREG_HR);
- if (offset + size > hr)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- else
- {
- return TRUE;
- }
- }
-}
-
-inline BOOL safe_heap_check_address(U8 *stream, S32 offset, S32 size)
-{
- S32 hr = get_register(stream, LREG_HR);
- if (offset < hr)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- else
- {
- S32 hp = get_register(stream, LREG_HP);
- if (offset + size > hp)
- {
- set_fault(stream, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- else
- {
- return TRUE;
- }
- }
-}
-
-inline U8 safe_instruction_bytestream2byte(U8 *stream, S32 &offset)
-{
- if (safe_instruction_check_address(stream, offset, 1))
- {
- return *(stream + offset++);
- }
- else
- {
- return 0;
- }
-}
-
-inline void safe_instruction_byte2bytestream(U8 *stream, S32 &offset, U8 byte)
-{
- if (safe_instruction_check_address(stream, offset, 1))
- {
- *(stream + offset++) = byte;
- }
-}
-
-inline S32 safe_instruction_bytestream2integer(U8 *stream, S32 &offset)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_INTEGER]))
- {
- return (bytestream2integer(stream, offset));
- }
- else
- {
- return 0;
- }
-}
-
-inline void safe_instruction_integer2bytestream(U8 *stream, S32 &offset, S32 value)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_INTEGER]))
- {
- integer2bytestream(stream, offset, value);
- }
-}
-
-inline U16 safe_instruction_bytestream2u16(U8 *stream, S32 &offset)
-{
- if (safe_instruction_check_address(stream, offset, 2))
- {
- return (bytestream2u16(stream, offset));
- }
- else
- {
- return 0;
- }
-}
-
-inline void safe_instruction_u162bytestream(U8 *stream, S32 &offset, U16 value)
-{
- if (safe_instruction_check_address(stream, offset, 2))
- {
- u162bytestream(stream, offset, value);
- }
-}
-
-inline F32 safe_instruction_bytestream2float(U8 *stream, S32 &offset)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_INTEGER]))
- {
- F32 value = bytestream2float(stream, offset);
- if (!llfinite(value))
- {
- value = 0;
- set_fault(stream, LSRF_MATH);
- }
- return value;
- }
- else
- {
- return 0;
- }
-}
-
-inline void safe_instruction_float2bytestream(U8 *stream, S32 &offset, F32 value)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_FLOATINGPOINT]))
- {
- float2bytestream(stream, offset, value);
- }
-}
-
-inline void safe_instruction_bytestream2char(char *buffer, U8 *stream, S32 &offset, S32 buffsize)
-{
- // This varies from the old method. Previously, we would copy up until we got an error,
- // then halt the script via safe_isntruction_check_address. Now we don't bother
- // copying a thing if there's an error.
-
- if( safe_instruction_check_address(stream, offset, strlen( (const char *)stream + offset ) + 1 ) )
- {
- // Takes the same parms as this function. Won't overread, per above check.
- bytestream2char( buffer, stream, offset, buffsize );
- }
- else
- {
- // Truncate - no point in copying
- *buffer = 0;
- }
-}
-
-inline void safe_instruction_bytestream_count_char(U8 *stream, S32 &offset)
-{
- while ( (safe_instruction_check_address(stream, offset, 1))
- &&(*(stream + offset++)))
- ;
-}
-
-inline void safe_heap_bytestream_count_char(U8 *stream, S32 &offset)
-{
- while ( (safe_heap_check_address(stream, offset, 1))
- &&(*(stream + offset++)))
- ;
-}
-
-inline void safe_instruction_char2bytestream(U8 *stream, S32 &offset, const char* buffer)
-{
- while ( (safe_instruction_check_address(stream, offset, 1))
- &&(*(stream + offset++) = *buffer++))
- ;
-}
-
-inline void safe_instruction_bytestream2vector(LLVector3 &value, U8 *stream, S32 &offset)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_VECTOR]))
- {
- bytestream2vector(value, stream, offset);
- }
-}
-
-inline void safe_instruction_vector2bytestream(U8 *stream, S32 &offset, const LLVector3 &value)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_VECTOR]))
- {
- vector2bytestream(stream, offset, value);
- }
-}
-
-inline void safe_instruction_bytestream2quaternion(LLQuaternion &value, U8 *stream, S32 &offset)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_QUATERNION]))
- {
- bytestream2quaternion(value, stream, offset);
- }
-}
-
-inline void safe_instruction_quaternion2bytestream(U8 *stream, S32 &offset, const LLQuaternion &value)
-{
- if (safe_instruction_check_address(stream, offset, LSCRIPTDataSize[LST_QUATERNION]))
- {
- quaternion2bytestream(stream, offset, value);
- }
-}
-
-static inline LSCRIPTType char2type(char type)
-{
- switch(type)
- {
- case 'i':
- return LST_INTEGER;
- case 'f':
- return LST_FLOATINGPOINT;
- case 's':
- return LST_STRING;
- case 'k':
- return LST_KEY;
- case 'v':
- return LST_VECTOR;
- case 'q':
- return LST_QUATERNION;
- case 'l':
- return LST_LIST;
- default:
- return LST_NULL;
- }
-}
-
-#endif
diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h
deleted file mode 100755
index a4703b7a615c38e283f5d089ce117f3cc2ee272c..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_byteformat.h
+++ /dev/null
@@ -1,575 +0,0 @@
-/**
- * @file lscript_byteformat.h
- * @brief Shared code between compiler and assembler and LSL
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_BYTEFORMAT_H
-#define LL_LSCRIPT_BYTEFORMAT_H
-
-// Data shared between compiler/assembler and lscript execution code
-
-#include "stdtypes.h"
-
-const S32 LSL2_VERSION_NUMBER = 0x0200;
-const S32 LSL2_VERSION1_END_NUMBER = 0x0101;
-const S32 LSL2_VERSION2_START_NUMBER = 0x0200;
-
-const S32 LSL2_MAJOR_VERSION_ONE = 1;
-const S32 LSL2_MAJOR_VERSION_TWO = 2;
-const S32 LSL2_CURRENT_MAJOR_VERSION = LSL2_MAJOR_VERSION_TWO;
-
-const S32 TOP_OF_MEMORY = 16384;
-
-typedef enum e_lscript_registers
-{
- LREG_INVALID,
- LREG_IP, // instruction pointer
- LREG_VN, // version number
- LREG_BP, // base pointer - what local variables are referenced from
- LREG_SP, // stack pointer - where the top of the stack is
- LREG_HR, // heap register - where in memory does the heap start
- LREG_HP, // heap pointer - where is the top of the heap?
- LREG_CS, // current state - what state are we currently in?
- LREG_NS, // next state - what state are we currently in?
- LREG_CE, // current events - what events are waiting to be handled?
- LREG_IE, // in event - which event handler are we currently in?
- LREG_ER, // event register - what events do we have active handlers for?
- LREG_FR, // fault register - which errors are currently active?
- LREG_SLR, // sleep register - are we sleeping?
- LREG_GVR, // global variable register - where do global variables start
- LREG_GFR, // global function register - where do global functions start
- LREG_SR, // state register - where do states start
- LREG_TM, // top of memory - where is the top of memory
- LREG_PR, // parameter register - data passed to script from launcher
- LREG_ESR, // energy supply register - how much energy do we have on board?
- LREG_NCE, // 64 bit current envents - what events are waiting to be handled?
- LREG_NIE, // 64 bit in event - which event handler are we currently in?
- LREG_NER, // 64 bit event register - what events do we have active handlers for?
- LREG_EOF
-} LSCRIPTRegisters;
-
-const S32 gLSCRIPTRegisterAddresses[LREG_EOF] = /* Flawfinder: ignore */
-{
- 0, // LREG_INVALID
- 4, // LREG_IP
- 8, // LREG_VN
- 12, // LREG_BP
- 16, // LREG_SP
- 20, // LREG_HR
- 24, // LREG_HP
- 28, // LREG_CS
- 32, // LREG_NS
- 36, // LREG_CE
- 40, // LREG_IE
- 44, // LREG_ER
- 48, // LREG_FR
- 52, // LREG_SLR
- 56, // LREG_GVR
- 60, // LREG_GFR
- 72, // LREG_SR
- 0, // LREG_TM
- 64, // LREG_PR
- 68, // LREG_ESR
- 76, // LREG_NCE
- 84, // LREG_NIE
- 92, // LREG_NER
-};
-
-const char * const gLSCRIPTRegisterNames[LREG_EOF] =
-{
- "INVALID", // LREG_INVALID
- "IP", // LREG_IP
- "VN", // LREG_VN
- "BP", // LREG_BP
- "SP", // LREG_SP
- "HR", // LREG_HR
- "HP", // LREG_HP
- "CS", // LREG_CS
- "NS", // LREG_NS
- "CE", // LREG_CE
- "IE", // LREG_IE
- "ER", // LREG_ER
- "FR", // LREG_FR
- "SLR", // LREG_SLR
- "GVR", // LREG_GVR
- "GFR", // LREG_GFR
- "SR", // LREG_SR
- "TM", // LREG_TM
- "PR", // LREG_PR
- "ESR", // LREG_ESR
- "NCE", // LREG_NCE
- "NIE", // LREG_NIE
- "NER", // LREG_NER
-};
-
-typedef enum e_lscript_op_codes
-{
- LOPC_INVALID,
- LOPC_NOOP,
- LOPC_POP,
- LOPC_POPS,
- LOPC_POPL,
- LOPC_POPV,
- LOPC_POPQ,
- LOPC_POPARG,
- LOPC_POPIP,
- LOPC_POPBP,
- LOPC_POPSP,
- LOPC_POPSLR,
- LOPC_DUP,
- LOPC_DUPS,
- LOPC_DUPL,
- LOPC_DUPV,
- LOPC_DUPQ,
- LOPC_STORE,
- LOPC_STORES,
- LOPC_STOREL,
- LOPC_STOREV,
- LOPC_STOREQ,
- LOPC_STOREG,
- LOPC_STOREGS,
- LOPC_STOREGL,
- LOPC_STOREGV,
- LOPC_STOREGQ,
- LOPC_LOADP,
- LOPC_LOADSP,
- LOPC_LOADLP,
- LOPC_LOADVP,
- LOPC_LOADQP,
- LOPC_LOADGP,
- LOPC_LOADGLP,
- LOPC_LOADGSP,
- LOPC_LOADGVP,
- LOPC_LOADGQP,
- LOPC_PUSH,
- LOPC_PUSHS,
- LOPC_PUSHL,
- LOPC_PUSHV,
- LOPC_PUSHQ,
- LOPC_PUSHG,
- LOPC_PUSHGS,
- LOPC_PUSHGL,
- LOPC_PUSHGV,
- LOPC_PUSHGQ,
- LOPC_PUSHIP,
- LOPC_PUSHBP,
- LOPC_PUSHSP,
- LOPC_PUSHARGB,
- LOPC_PUSHARGI,
- LOPC_PUSHARGF,
- LOPC_PUSHARGS,
- LOPC_PUSHARGV,
- LOPC_PUSHARGQ,
- LOPC_PUSHE,
- LOPC_PUSHEV,
- LOPC_PUSHEQ,
- LOPC_PUSHARGE,
- LOPC_ADD,
- LOPC_SUB,
- LOPC_MUL,
- LOPC_DIV,
- LOPC_MOD,
- LOPC_EQ,
- LOPC_NEQ,
- LOPC_LEQ,
- LOPC_GEQ,
- LOPC_LESS,
- LOPC_GREATER,
- LOPC_BITAND,
- LOPC_BITOR,
- LOPC_BITXOR,
- LOPC_BOOLAND,
- LOPC_BOOLOR,
- LOPC_NEG,
- LOPC_BITNOT,
- LOPC_BOOLNOT,
- LOPC_JUMP,
- LOPC_JUMPIF,
- LOPC_JUMPNIF,
- LOPC_STATE,
- LOPC_CALL,
- LOPC_RETURN,
- LOPC_CAST,
- LOPC_STACKTOS,
- LOPC_STACKTOL,
- LOPC_PRINT,
- LOPC_CALLLIB,
- LOPC_CALLLIB_TWO_BYTE,
- LOPC_SHL,
- LOPC_SHR,
- LOPC_EOF
-} LSCRIPTOpCodesEnum;
-
-const U8 LSCRIPTOpCodes[LOPC_EOF] =
-{
- 0x00, // LOPC_INVALID
- 0x00, // LOPC_NOOP
- 0x01, // LOPC_POP
- 0x02, // LOPC_POPS
- 0x03, // LOPC_POPL
- 0x04, // LOPC_POPV
- 0x05, // LOPC_POPQ
- 0x06, // LOPC_POPARG
- 0x07, // LOPC_POPIP
- 0x08, // LOPC_POPBP
- 0x09, // LOPC_POPSP
- 0x0a, // LOPC_POPSLR
- 0x20, // LOPC_DUP
- 0x21, // LOPC_DUPS
- 0x22, // LOPC_DUPL
- 0x23, // LOPC_DUPV
- 0x24, // LOPC_DUPQ
- 0x30, // LOPC_STORE
- 0x31, // LOPC_STORES
- 0x32, // LOPC_STOREL
- 0x33, // LOPC_STOREV
- 0x34, // LOPC_STOREQ
- 0x35, // LOPC_STOREG
- 0x36, // LOPC_STOREGS
- 0x37, // LOPC_STOREGL
- 0x38, // LOPC_STOREGV
- 0x39, // LOPC_STOREGQ
- 0x3a, // LOPC_LOADP
- 0x3b, // LOPC_LOADSP
- 0x3c, // LOPC_LOADLP
- 0x3d, // LOPC_LOADVP
- 0x3e, // LOPC_LOADQP
- 0x3f, // LOPC_LOADGP
- 0x40, // LOPC_LOADGSP
- 0x41, // LOPC_LOADGLP
- 0x42, // LOPC_LOADGVP
- 0x43, // LOPC_LOADGQP
- 0x50, // LOPC_PUSH
- 0x51, // LOPC_PUSHS
- 0x52, // LOPC_PUSHL
- 0x53, // LOPC_PUSHV
- 0x54, // LOPC_PUSHQ
- 0x55, // LOPC_PUSHG
- 0x56, // LOPC_PUSHGS
- 0x57, // LOPC_PUSHGL
- 0x58, // LOPC_PUSHGV
- 0x59, // LOPC_PUSHGQ
- 0x5a, // LOPC_PUSHIP
- 0x5b, // LOPC_PUSHBP
- 0x5c, // LOPC_PUSHSP
- 0x5d, // LOPC_PUSHARGB
- 0x5e, // LOPC_PUSHARGI
- 0x5f, // LOPC_PUSHARGF
- 0x60, // LOPC_PUSHARGS
- 0x61, // LOPC_PUSHARGV
- 0x62, // LOPC_PUSHARGQ
- 0x63, // LOPC_PUSHE
- 0x64, // LOPC_PUSHEV
- 0x65, // LOPC_PUSHEQ
- 0x66, // LOPC_PUSHARGE
- 0x70, // LOPC_ADD
- 0x71, // LOPC_SUB
- 0x72, // LOPC_MUL
- 0x73, // LOPC_DIV
- 0x74, // LOPC_MOD
- 0x75, // LOPC_EQ
- 0x76, // LOPC_NEQ
- 0x77, // LOPC_LEQ
- 0x78, // LOPC_GEQ
- 0x79, // LOPC_LESS
- 0x7a, // LOPC_GREATER
- 0x7b, // LOPC_BITAND
- 0x7c, // LOPC_BITOR
- 0x7d, // LOPC_BITXOR
- 0x7e, // LOPC_BOOLAND
- 0x7f, // LOPC_BOOLOR
- 0x80, // LOPC_NEG
- 0x81, // LOPC_BITNOT
- 0x82, // LOPC_BOOLNOT
- 0x90, // LOPC_JUMP
- 0x91, // LOPC_JUMPIF
- 0x92, // LOPC_JUMPNIF
- 0x93, // LOPC_STATE
- 0x94, // LOPC_CALL
- 0x95, // LOPC_RETURN
- 0xa0, // LOPC_CAST
- 0xb0, // LOPC_STACKTOS
- 0xb1, // LOPC_STACKTOL
- 0xc0, // LOPC_PRINT
- 0xd0, // LOPC_CALLLIB
- 0xd1, // LOPC_CALLLIB_TWO_BYTE
- 0xe0, // LOPC_SHL
- 0xe1 // LOPC_SHR
-};
-
-typedef enum e_lscript_state_event_type
-{
- LSTT_NULL,
- LSTT_STATE_ENTRY,
- LSTT_STATE_EXIT,
- LSTT_TOUCH_START,
- LSTT_TOUCH,
- LSTT_TOUCH_END,
- LSTT_COLLISION_START,
- LSTT_COLLISION,
- LSTT_COLLISION_END,
- LSTT_LAND_COLLISION_START,
- LSTT_LAND_COLLISION,
- LSTT_LAND_COLLISION_END,
- LSTT_TIMER,
- LSTT_CHAT,
- LSTT_REZ,
- LSTT_SENSOR,
- LSTT_NO_SENSOR,
- LSTT_CONTROL,
- LSTT_MONEY,
- LSTT_EMAIL,
- LSTT_AT_TARGET,
- LSTT_NOT_AT_TARGET,
- LSTT_AT_ROT_TARGET,
- LSTT_NOT_AT_ROT_TARGET,
- LSTT_RTPERMISSIONS,
- LSTT_INVENTORY,
- LSTT_ATTACH,
- LSTT_DATASERVER,
- LSTT_LINK_MESSAGE,
- LSTT_MOVING_START,
- LSTT_MOVING_END,
- LSTT_OBJECT_REZ,
- LSTT_REMOTE_DATA,
- LSTT_HTTP_RESPONSE,
- LSTT_HTTP_REQUEST,
- LSTT_EXPERMISSIONS,
- LSTT_TRANSACTION_RESULT,
- LSTT_PATH_UPDATE,
- LSTT_EXPERMISSIONS_DENIED,
- LSTT_EOF,
-
- LSTT_STATE_BEGIN = LSTT_STATE_ENTRY,
- LSTT_STATE_END = LSTT_EOF
-} LSCRIPTStateEventType;
-
-const U64 LSCRIPTStateBitField[LSTT_EOF] =
-{
- 0x0000000000000000, // LSTT_NULL
- 0x0000000000000001, // LSTT_STATE_ENTRY
- 0x0000000000000002, // LSTT_STATE_EXIT
- 0x0000000000000004, // LSTT_TOUCH_START
- 0x0000000000000008, // LSTT_TOUCH
- 0x0000000000000010, // LSTT_TOUCH_END
- 0x0000000000000020, // LSTT_COLLISION_START
- 0x0000000000000040, // LSTT_COLLISION
- 0x0000000000000080, // LSTT_COLLISION_END
- 0x0000000000000100, // LSTT_LAND_COLLISION_START
- 0x0000000000000200, // LSTT_LAND_COLLISION
- 0x0000000000000400, // LSTT_LAND_COLLISION_END
- 0x0000000000000800, // LSTT_TIMER
- 0x0000000000001000, // LSTT_CHAT
- 0x0000000000002000, // LSTT_REZ
- 0x0000000000004000, // LSTT_SENSOR
- 0x0000000000008000, // LSTT_NO_SENSOR
- 0x0000000000010000, // LSTT_CONTROL
- 0x0000000000020000, // LSTT_MONEY
- 0x0000000000040000, // LSTT_EMAIL
- 0x0000000000080000, // LSTT_AT_TARGET
- 0x0000000000100000, // LSTT_NOT_AT_TARGET
- 0x0000000000200000, // LSTT_AT_ROT_TARGET
- 0x0000000000400000, // LSTT_NOT_AT_ROT_TARGET
- 0x0000000000800000, // LSTT_RTPERMISSIONS
- 0x0000000001000000, // LSTT_INVENTORY
- 0x0000000002000000, // LSTT_ATTACH
- 0x0000000004000000, // LSTT_DATASERVER
- 0x0000000008000000, // LSTT_LINK_MESSAGE
- 0x0000000010000000, // LSTT_MOVING_START
- 0x0000000020000000, // LSTT_MOVING_END
- 0x0000000040000000, // LSTT_OBJECT_REZ
- 0x0000000080000000, // LSTT_REMOTE_DATA
- 0x0000000100000000LL, // LSTT_HTTP_RESPOSE
- 0x0000000200000000LL, // LSTT_HTTP_REQUEST
- 0x0000000400000000LL, // LSTT_EXPERMISSIONS
- 0x0000000800000000LL, // LSTT_TRANSACTION_RESULT
- 0x0000001000000000LL, // LSTT_PATH_UPDATE
- 0x0000002000000000LL, //LSTT_EXPERMISSIONS_DENIED
-};
-
-inline S32 get_event_handler_jump_position(U64 bit_field, LSCRIPTStateEventType type)
-{
- S32 count = 0, position = LSTT_STATE_ENTRY;
- while (position < type)
- {
- if (bit_field & 0x1)
- {
- count++;
- }
- bit_field >>= 1;
- position++;
- }
- return count;
-}
-
-inline S32 get_number_of_event_handlers(U64 bit_field)
-{
- S32 count = 0, position = 0;
- while (position < LSTT_EOF)
- {
- if (bit_field & 0x1)
- {
- count++;
- }
- bit_field >>= 1;
- position++;
- }
- return count;
-}
-
-typedef enum e_lscript_types
-{
- LST_NULL,
- LST_INTEGER,
- LST_FLOATINGPOINT,
- LST_STRING,
- LST_KEY,
- LST_VECTOR,
- LST_QUATERNION,
- LST_LIST,
- LST_UNDEFINED,
- LST_EOF
-} LSCRIPTType;
-
-const U8 LSCRIPTTypeByte[LST_EOF] =
-{
- LST_NULL,
- LST_INTEGER,
- LST_FLOATINGPOINT,
- LST_STRING,
- LST_KEY,
- LST_VECTOR,
- LST_QUATERNION,
- LST_LIST,
- LST_NULL,
-};
-
-const U8 LSCRIPTTypeHi4Bits[LST_EOF] =
-{
- LST_NULL,
- LST_INTEGER << 4,
- LST_FLOATINGPOINT << 4,
- LST_STRING << 4,
- LST_KEY << 4,
- LST_VECTOR << 4,
- LST_QUATERNION << 4,
- LST_LIST << 4,
- LST_UNDEFINED << 4,
-};
-
-const char * const LSCRIPTTypeNames[LST_EOF] = /*Flawfinder: ignore*/
-{
- "VOID",
- "integer",
- "float",
- "string",
- "key",
- "vector",
- "quaternion",
- "list",
- "invalid"
-};
-
-const S32 LSCRIPTDataSize[LST_EOF] =
-{
- 0, // VOID
- 4, // integer
- 4, // float
- 4, // string
- 4, // key
- 12, // vector
- 16, // quaternion
- 4, // list
- 0 // invalid
-};
-
-
-typedef enum e_lscript_runtime_faults
-{
- LSRF_INVALID,
- LSRF_MATH,
- LSRF_STACK_HEAP_COLLISION,
- LSRF_BOUND_CHECK_ERROR,
- LSRF_HEAP_ERROR,
- LSRF_VERSION_MISMATCH,
- LSRF_MISSING_INVENTORY,
- LSRF_SANDBOX,
- LSRF_CHAT_OVERRUN,
- LSRF_TOO_MANY_LISTENS,
- LSRF_NESTING_LISTS,
- LSRF_CLI,
- LSRF_INVALID_STATE,
- LSRF_EOF
-} LSCRIPTRunTimeFaults;
-
-extern const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; /*Flawfinder: ignore*/
-
-typedef enum e_lscript_runtime_permissions
-{
- SCRIPT_PERMISSION_DEBIT,
- SCRIPT_PERMISSION_TAKE_CONTROLS,
- SCRIPT_PERMISSION_REMAP_CONTROLS,
- SCRIPT_PERMISSION_TRIGGER_ANIMATION,
- SCRIPT_PERMISSION_ATTACH,
- SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
- SCRIPT_PERMISSION_CHANGE_LINKS,
- SCRIPT_PERMISSION_CHANGE_JOINTS,
- SCRIPT_PERMISSION_CHANGE_PERMISSIONS,
- SCRIPT_PERMISSION_TRACK_CAMERA,
- SCRIPT_PERMISSION_CONTROL_CAMERA,
- SCRIPT_PERMISSION_TELEPORT,
- SCRIPT_PERMISSION_EXPERIENCE,
- SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT,
- SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
- SCRIPT_PERMISSION_RETURN_OBJECTS,
- SCRIPT_PERMISSION_EOF
-} LSCRIPTRunTimePermissions;
-
-const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
-{
- (0x1 << 1), // SCRIPT_PERMISSION_DEBIT,
- (0x1 << 2), // SCRIPT_PERMISSION_TAKE_CONTROLS,
- (0x1 << 3), // SCRIPT_PERMISSION_REMAP_CONTROLS,
- (0x1 << 4), // SCRIPT_PERMISSION_TRIGGER_ANIMATION,
- (0x1 << 5), // SCRIPT_PERMISSION_ATTACH,
- (0x1 << 6), // SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
- (0x1 << 7), // SCRIPT_PERMISSION_CHANGE_LINKS,
- (0x1 << 8), // SCRIPT_PERMISSION_CHANGE_JOINTS,
- (0x1 << 9), // SCRIPT_PERMISSION_CHANGE_PERMISSIONS
- (0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA
- (0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA
- (0x1 << 12),// SCRIPT_PERMISSION_TELEPORT
- (0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE
- (0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT
- (0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
- (0x1 << 16),// SCRIPT_PERMISSION_RETURN_OBJECTS
-};
-
-// http_request string constants
-extern const char* URL_REQUEST_GRANTED;
-extern const char* URL_REQUEST_DENIED;
-extern const U64 LSL_HTTP_REQUEST_TIMEOUT_USEC;
-
-#endif
-
diff --git a/indra/lscript/lscript_compile/CMakeLists.txt b/indra/lscript/lscript_compile/CMakeLists.txt
deleted file mode 100755
index 07662005b999ae39274f1ba6cd907870677244e0..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/CMakeLists.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- cmake -*-
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LLMessage)
-include(LLInventory)
-include(LLPrimitive)
-include(LScript)
-
-include(FindCygwin)
-
-find_program(FLEX flex
- "C:/Program Files/GnuWin32/bin"
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
- /usr/local/bin
- )
-mark_as_advanced(FLEX)
-
-find_program(BISON bison
- "C:/Program Files/GnuWin32/bin"
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
- /usr/local/bin
- )
-mark_as_advanced(BISON)
-
-find_program(M4 m4
- "C:/Program Files/GnuWin32/bin"
- ${CYGWIN_INSTALL_PATH}/bin
- /bin
- /usr/bin
- /usr/local/bin
- )
-mark_as_advanced(M4)
-
-include_directories(
- ${LLCOMMON_INCLUDE_DIRS}
- ${LLMATH_INCLUDE_DIRS}
- ${LLMESSAGE_INCLUDE_DIRS}
- ${LLINVENTORY_INCLUDE_DIRS}
- ${LLPRIMITIVE_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}
- )
-include_directories(SYSTEM
- ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
- )
-
-set(lscript_generated_SOURCE_FILES
- indra.l.cpp
- indra.y.cpp
- )
-
-set(lscript_compile_SOURCE_FILES
- lscript_alloc.cpp
- lscript_bytecode.cpp
- lscript_error.cpp
- lscript_heap.cpp
- lscript_resource.cpp
- lscript_scope.cpp
- lscript_tree.cpp
- lscript_typecheck.cpp
- )
-
-set(lscript_compile_HEADER_FILES
- CMakeLists.txt
-
- indra.l
- indra.y
-
- ../lscript_alloc.h
- ../lscript_byteformat.h
- ../lscript_byteconvert.h
- ../lscript_http.h
-
- lscript_error.h
- lscript_bytecode.h
- lscript_heap.h
- lscript_resource.h
- lscript_scope.h
- lscript_tree.h
- lscript_typecheck.h
- )
-
-set_source_files_properties(${lscript_compile_HEADER_FILES}
- PROPERTIES HEADER_FILE_ONLY TRUE)
-
-set_source_files_properties(${lscript_generated_SOURCE_FILES}
- PROPERTIES HEADER_FILE_ONLY FALSE GENERATED TRUE)
-
-list(APPEND lscript_compile_SOURCE_FILES ${lscript_generated_SOURCE_FILES} ${lscript_compile_HEADER_FILES})
-
-add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/indra.l.cpp
- COMMAND ${FLEX}
- ARGS
- -P indra_
- -o${CMAKE_CURRENT_BINARY_DIR}/indra.l.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/indra.l
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/indra.l
- )
-
-if (WINDOWS)
- set_source_files_properties(indra.l.cpp
- PROPERTIES COMPILE_FLAGS /DYY_NO_UNISTD_H)
-endif (WINDOWS)
-
-if (WINDOWS)
- get_filename_component(M4_PATH ${M4} PATH)
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat
- ARGS
- ${BISON} ${M4_PATH}
- -p indra_
- -d -o ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat
- ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
- )
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
-else (WINDOWS)
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
- COMMAND
- ${BISON}
- ARGS
- -p indra_
- -d -o ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
- )
-endif (WINDOWS)
-
-if (DARWIN)
- # Mac OS X 10.4 compatibility
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
- COMMAND
- mv
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp.h
- ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
- )
-endif (DARWIN)
-
-add_library (lscript_compile ${lscript_compile_SOURCE_FILES})
diff --git a/indra/lscript/lscript_compile/bison.bat b/indra/lscript/lscript_compile/bison.bat
deleted file mode 100644
index d40997225e01d8d744871d55002881587b966dbe..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/bison.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@REM Run bison under Windows. This script is needed so that bison can
-@REM find m4, even if neither program is present in PATH.
-
-@set bison=%1
-shift
-set M4PATH=%1
-shift
-set M4=
-
-set PATH=%M4PATH%;%PATH%
-@REM %* does not work with shift...
-%bison% %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
deleted file mode 100755
index c2e21335e9b616efaf67915ff3a0076ce711fabc..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/indra.l
+++ /dev/null
@@ -1,1031 +0,0 @@
-
-N [0-9]
-L [a-zA-Z_]
-H [a-fA-F0-9]
-E [Ee][+-]?{N}+
-FS (f|F)
-%e 10000
-%n 4000
-%p 5000
-
-%top {
- #include "linden_common.h"
-}
-
-%{
-// Deal with the fact that lex/yacc generates unreachable code
-#ifdef LL_WINDOWS
-#pragma warning (disable : 4018) // warning C4018: signed/unsigned mismatch
-#pragma warning (disable : 4702) // warning C4702: unreachable code
-#endif // LL_WINDOWS
-#include "llmath.h"
-#include "lscript_tree.h"
-#include "lscript_typecheck.h"
-#include "lscript_resource.h"
-#include "indra.y.hpp"
-#include "lltimer.h"
-#include "indra_constants.h"
-#include "lllslconstants.h"
-#include "lluuid.h"
-#include "llassetstorage.h"
-#include "llpartdata.h"
-#include "llvehicleparams.h"
-#include "llpermissionsflags.h"
-#include "llfollowcamparams.h"
-#include "llparcelflags.h"
-#include "llregionflags.h"
-#include "lscript_http.h"
-#include "llclickaction.h"
-#include "llmediaentry.h"
-
-void count();
-void line_comment();
-void block_comment();
-void parse_string();
-
-#define YYLMAX 16384
-#define YY_NEVER_INTERACTIVE 1 /* stops flex from calling isatty() */
-#ifdef LL_WINDOWS
-#define isatty(x) 0 /* hack for bug in cygwin flex 2.5.35 */
-#endif
-
-#ifdef ECHO
-#undef ECHO
-#endif
-
-#define ECHO do { } while (0)
-
-#define yyparse indra_parse
-#define yyerror indra_error
-#define yylval indra_lval
-#define yy_create_buffer indra__create_buffer
-#define yy_delete_buffer indra__delete_buffer
-#define yy_flex_debug indra__flex_debug
-#define yy_init_buffer indra__init_buffer
-#define yy_flush_buffer indra__flush_buffer
-#define yy_load_buffer_state indra__load_buffer_state
-#define yy_switch_to_buffer indra__switch_to_buffer
-#define yyin indra_in
-#define yyleng indra_leng
-#define yylex indra_lex
-#define yylineno indra_lineno
-#define yyout indra_out
-#define yyrestart indra_restart
-#define yytext indra_text
-#define yywrap indra_wrap
-#define yyalloc indra_alloc
-#define yyrealloc indra_realloc
-#define yyfree indra_free
-
-
-int yyparse( void );
-int yylex( void );
-int yyerror(const char *fmt, ...);
-
-%}
-
-%%
-"//" { gInternalLine++; gInternalColumn = 0; line_comment(); }
-"/*" { block_comment(); }
-
-"integer" { count(); return(INTEGER); }
-"float" { count(); return(FLOAT_TYPE); }
-"string" { count(); return(STRING); }
-"key" { count(); return(LLKEY); }
-"vector" { count(); return(VECTOR); }
-"quaternion" { count(); return(QUATERNION); }
-"rotation" { count(); return(QUATERNION); }
-"list" { count(); return(LIST); }
-
-"default" { count(); yylval.sval = new char[strlen(yytext) + 1]; strcpy(yylval.sval, yytext); return(STATE_DEFAULT); }
-"state" { count(); return(STATE); }
-"event" { count(); return(EVENT); }
-"jump" { count(); return(JUMP); }
-"return" { count(); return(RETURN); }
-"if" { count(); return(IF); }
-"else" { count(); return(ELSE); }
-"for" { count(); return(FOR); }
-"do" { count(); return(DO); }
-"while" { count(); return(WHILE); }
-
-"state_entry" { count(); return(STATE_ENTRY); }
-"state_exit" { count(); return(STATE_EXIT); }
-"touch_start" { count(); return(TOUCH_START); }
-"touch" { count(); return(TOUCH); }
-"touch_end" { count(); return(TOUCH_END); }
-"collision_start" { count(); return(COLLISION_START); }
-"collision" { count(); return(COLLISION); }
-"collision_end" { count(); return(COLLISION_END); }
-"land_collision_start" { count(); return(LAND_COLLISION_START); }
-"land_collision" { count(); return(LAND_COLLISION); }
-"land_collision_end" { count(); return(LAND_COLLISION_END); }
-"timer" { count(); return(TIMER); }
-"listen" { count(); return(CHAT); }
-"sensor" { count(); return(SENSOR); }
-"no_sensor" { count(); return(NO_SENSOR); }
-"control" { count(); return(CONTROL); }
-"print" { count(); return(PRINT); }
-"at_target" { count(); return(AT_TARGET); }
-"not_at_target" { count(); return(NOT_AT_TARGET); }
-"at_rot_target" { count(); return(AT_ROT_TARGET); }
-"not_at_rot_target" { count(); return(NOT_AT_ROT_TARGET); }
-"money" { count(); return(MONEY); }
-"email" { count(); return(EMAIL); }
-"run_time_permissions" { count(); return(RUN_TIME_PERMISSIONS); }
-"experience_permissions" { count(); return(EXPERIENCE_PERMISSIONS); }
-"experience_permissions_denied" { count(); return(EXPERIENCE_PERMISSIONS_DENIED); }
-"changed" { count(); return(INVENTORY); }
-"attach" { count(); return(ATTACH); }
-"dataserver" { count(); return(DATASERVER); }
-"moving_start" { count(); return(MOVING_START); }
-"moving_end" { count(); return(MOVING_END); }
-"link_message" { count(); return(LINK_MESSAGE); }
-"on_rez" { count(); return(REZ); }
-"object_rez" { count(); return(OBJECT_REZ); }
-"remote_data" { count(); return(REMOTE_DATA); }
-"http_response" { count(); return(HTTP_RESPONSE); }
-"http_request" { count(); return(HTTP_REQUEST); }
-"." { count(); return(PERIOD); }
-
-
-0[xX]{H}+ { count(); yylval.ival = strtoul(yytext, NULL, 0); return(INTEGER_CONSTANT); }
-{N}+ { count(); yylval.ival = strtoul(yytext, NULL, 10); return(INTEGER_CONSTANT); }
-"TRUE" { count(); yylval.ival = 1; return(INTEGER_TRUE); }
-"FALSE" { count(); yylval.ival = 0; return(INTEGER_FALSE); }
-"STATUS_PHYSICS" { count(); yylval.ival = 0x1; return(INTEGER_CONSTANT); }
-"STATUS_ROTATE_X" { count(); yylval.ival = 0x2; return(INTEGER_CONSTANT); }
-"STATUS_ROTATE_Y" { count(); yylval.ival = 0x4; return(INTEGER_CONSTANT); }
-"STATUS_ROTATE_Z" { count(); yylval.ival = 0x8; return(INTEGER_CONSTANT); }
-"STATUS_PHANTOM" { count(); yylval.ival = 0x10; return(INTEGER_CONSTANT); }
-"STATUS_SANDBOX" { count(); yylval.ival = 0x20; return(INTEGER_CONSTANT); }
-"STATUS_BLOCK_GRAB" { count(); yylval.ival = 0x40; return(INTEGER_CONSTANT); }
-"STATUS_DIE_AT_EDGE" { count(); yylval.ival = 0x80; return(INTEGER_CONSTANT); }
-"STATUS_RETURN_AT_EDGE" { count(); yylval.ival = 0x100; return(INTEGER_CONSTANT); }
-"STATUS_CAST_SHADOWS" { count(); yylval.ival = 0x200; return(INTEGER_CONSTANT); }
-"STATUS_BLOCK_GRAB_OBJECT" { count(); yylval.ival = 0x400; return(INTEGER_CONSTANT); }
-
-"AGENT_FLYING" { count(); yylval.ival = AGENT_FLYING; return(INTEGER_CONSTANT); }
-"AGENT_ATTACHMENTS" { count(); yylval.ival = AGENT_ATTACHMENTS; return(INTEGER_CONSTANT); }
-"AGENT_SCRIPTED" { count(); yylval.ival = AGENT_SCRIPTED; return(INTEGER_CONSTANT); }
-"AGENT_MOUSELOOK" { count(); yylval.ival = AGENT_MOUSELOOK; return(INTEGER_CONSTANT); }
-"AGENT_SITTING" { count(); yylval.ival = AGENT_SITTING; return(INTEGER_CONSTANT); }
-"AGENT_ON_OBJECT" { count(); yylval.ival = AGENT_ON_OBJECT; return(INTEGER_CONSTANT); }
-"AGENT_AWAY" { count(); yylval.ival = AGENT_AWAY; return(INTEGER_CONSTANT); }
-"AGENT_WALKING" { count(); yylval.ival = AGENT_WALKING; return(INTEGER_CONSTANT); }
-"AGENT_IN_AIR" { count(); yylval.ival = AGENT_IN_AIR; return(INTEGER_CONSTANT); }
-"AGENT_TYPING" { count(); yylval.ival = AGENT_TYPING; return(INTEGER_CONSTANT); }
-"AGENT_CROUCHING" { count(); yylval.ival = AGENT_CROUCHING; return(INTEGER_CONSTANT); }
-"AGENT_BUSY" { count(); yylval.ival = AGENT_BUSY; return(INTEGER_CONSTANT); }
-"AGENT_ALWAYS_RUN" { count(); yylval.ival = AGENT_ALWAYS_RUN; return(INTEGER_CONSTANT); }
-"AGENT_AUTOPILOT" { count(); yylval.ival = AGENT_AUTOPILOT; return(INTEGER_CONSTANT); }
-
-"CAMERA_PITCH" { count(); yylval.ival = FOLLOWCAM_PITCH; return(INTEGER_CONSTANT); }
-"CAMERA_FOCUS_OFFSET" { count(); yylval.ival = FOLLOWCAM_FOCUS_OFFSET; return (INTEGER_CONSTANT); }
-"CAMERA_POSITION_LAG" { count(); yylval.ival = FOLLOWCAM_POSITION_LAG; return (INTEGER_CONSTANT); }
-"CAMERA_FOCUS_LAG" { count(); yylval.ival = FOLLOWCAM_FOCUS_LAG; return (INTEGER_CONSTANT); }
-"CAMERA_DISTANCE" { count(); yylval.ival = FOLLOWCAM_DISTANCE; return (INTEGER_CONSTANT); }
-"CAMERA_BEHINDNESS_ANGLE" { count(); yylval.ival = FOLLOWCAM_BEHINDNESS_ANGLE; return (INTEGER_CONSTANT); }
-"CAMERA_BEHINDNESS_LAG" { count(); yylval.ival = FOLLOWCAM_BEHINDNESS_LAG; return (INTEGER_CONSTANT); }
-"CAMERA_POSITION_THRESHOLD" { count(); yylval.ival = FOLLOWCAM_POSITION_THRESHOLD; return (INTEGER_CONSTANT); }
-"CAMERA_FOCUS_THRESHOLD" { count(); yylval.ival = FOLLOWCAM_FOCUS_THRESHOLD; return (INTEGER_CONSTANT); }
-"CAMERA_ACTIVE" { count(); yylval.ival = FOLLOWCAM_ACTIVE; return (INTEGER_CONSTANT); }
-"CAMERA_POSITION" { count(); yylval.ival = FOLLOWCAM_POSITION; return (INTEGER_CONSTANT); }
-"CAMERA_FOCUS" { count(); yylval.ival = FOLLOWCAM_FOCUS; return (INTEGER_CONSTANT); }
-"CAMERA_POSITION_LOCKED" { count(); yylval.ival = FOLLOWCAM_POSITION_LOCKED; return (INTEGER_CONSTANT); }
-"CAMERA_FOCUS_LOCKED" { count(); yylval.ival = FOLLOWCAM_FOCUS_LOCKED; return (INTEGER_CONSTANT); }
-
-"ANIM_ON" { count(); yylval.ival = 0x1; return(INTEGER_CONSTANT); }
-"LOOP" { count(); yylval.ival = 0x2; return(INTEGER_CONSTANT); }
-"REVERSE" { count(); yylval.ival = 0x4; return(INTEGER_CONSTANT); }
-"PING_PONG" { count(); yylval.ival = 0x8; return(INTEGER_CONSTANT); }
-"SMOOTH" { count(); yylval.ival = 0x10; return(INTEGER_CONSTANT); }
-"ROTATE" { count(); yylval.ival = 0x20; return(INTEGER_CONSTANT); }
-"SCALE" { count(); yylval.ival = 0x40; return(INTEGER_CONSTANT); }
-
-"ALL_SIDES" { count(); yylval.ival = LSL_ALL_SIDES; return(INTEGER_CONSTANT); }
-"LINK_ROOT" { count(); yylval.ival = LSL_LINK_ROOT; return(INTEGER_CONSTANT); }
-"LINK_SET" { count(); yylval.ival = LSL_LINK_SET; return(INTEGER_CONSTANT); }
-"LINK_ALL_OTHERS" { count(); yylval.ival = LSL_LINK_ALL_OTHERS; return(INTEGER_CONSTANT); }
-"LINK_ALL_CHILDREN" { count(); yylval.ival = LSL_LINK_ALL_CHILDREN; return(INTEGER_CONSTANT); }
-"LINK_THIS" { count(); yylval.ival = LSL_LINK_THIS; return(INTEGER_CONSTANT); }
-
-"AGENT" { count(); yylval.ival = 0x1; return(INTEGER_CONSTANT); }
-"ACTIVE" { count(); yylval.ival = 0x2; return(INTEGER_CONSTANT); }
-"PASSIVE" { count(); yylval.ival = 0x4; return(INTEGER_CONSTANT); }
-"SCRIPTED" { count(); yylval.ival = 0x8; return(INTEGER_CONSTANT); }
-
-"CONTROL_FWD" { count(); yylval.ival = AGENT_CONTROL_AT_POS; return(INTEGER_CONSTANT); }
-"CONTROL_BACK" { count(); yylval.ival = AGENT_CONTROL_AT_NEG; return(INTEGER_CONSTANT); }
-"CONTROL_LEFT" { count(); yylval.ival = AGENT_CONTROL_LEFT_POS; return(INTEGER_CONSTANT); }
-"CONTROL_RIGHT" { count(); yylval.ival = AGENT_CONTROL_LEFT_NEG; return(INTEGER_CONSTANT); }
-"CONTROL_ROT_LEFT" { count(); yylval.ival = AGENT_CONTROL_YAW_POS; return(INTEGER_CONSTANT); }
-"CONTROL_ROT_RIGHT" { count(); yylval.ival = AGENT_CONTROL_YAW_NEG; return(INTEGER_CONSTANT); }
-"CONTROL_UP" { count(); yylval.ival = AGENT_CONTROL_UP_POS; return(INTEGER_CONSTANT); }
-"CONTROL_DOWN" { count(); yylval.ival = AGENT_CONTROL_UP_NEG; return(INTEGER_CONSTANT); }
-"CONTROL_LBUTTON" { count(); yylval.ival = AGENT_CONTROL_LBUTTON_DOWN; return(INTEGER_CONSTANT); }
-"CONTROL_ML_LBUTTON" { count(); yylval.ival = AGENT_CONTROL_ML_LBUTTON_DOWN; return(INTEGER_CONSTANT); }
-
-"PERMISSION_DEBIT" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_DEBIT]; return(INTEGER_CONSTANT); }
-"PERMISSION_TAKE_CONTROLS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TAKE_CONTROLS]; return(INTEGER_CONSTANT); }
-"PERMISSION_REMAP_CONTROLS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_REMAP_CONTROLS]; return(INTEGER_CONSTANT); }
-"PERMISSION_TRIGGER_ANIMATION" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRIGGER_ANIMATION]; return(INTEGER_CONSTANT); }
-"PERMISSION_ATTACH" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH]; return(INTEGER_CONSTANT); }
-"PERMISSION_RELEASE_OWNERSHIP" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_RELEASE_OWNERSHIP]; return(INTEGER_CONSTANT); }
-"PERMISSION_CHANGE_LINKS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CHANGE_LINKS]; return(INTEGER_CONSTANT); }
-"PERMISSION_CHANGE_JOINTS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CHANGE_JOINTS]; return(INTEGER_CONSTANT); }
-"PERMISSION_CHANGE_PERMISSIONS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CHANGE_PERMISSIONS]; return(INTEGER_CONSTANT); }
-"PERMISSION_TRACK_CAMERA" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRACK_CAMERA]; return(INTEGER_CONSTANT); }
-"PERMISSION_CONTROL_CAMERA" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CONTROL_CAMERA]; return(INTEGER_CONSTANT); }
-"PERMISSION_TELEPORT" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TELEPORT]; return(INTEGER_CONSTANT); }
-"PERMISSION_SILENT_ESTATE_MANAGEMENT" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT]; return(INTEGER_CONSTANT); }
-"PERMISSION_OVERRIDE_ANIMATIONS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS]; return(INTEGER_CONSTANT); }
-
-"INVENTORY_TEXTURE" { count(); yylval.ival = LLAssetType::AT_TEXTURE; return(INTEGER_CONSTANT); }
-"INVENTORY_SOUND" { count(); yylval.ival = LLAssetType::AT_SOUND; return(INTEGER_CONSTANT); }
-"INVENTORY_OBJECT" { count(); yylval.ival = LLAssetType::AT_OBJECT; return(INTEGER_CONSTANT); }
-"INVENTORY_SCRIPT" { count(); yylval.ival = LLAssetType::AT_LSL_TEXT; return(INTEGER_CONSTANT); }
-"INVENTORY_LANDMARK" { count(); yylval.ival = LLAssetType::AT_LANDMARK; return(INTEGER_CONSTANT); }
-"INVENTORY_CLOTHING" { count(); yylval.ival = LLAssetType::AT_CLOTHING; return(INTEGER_CONSTANT); }
-"INVENTORY_NOTECARD" { count(); yylval.ival = LLAssetType::AT_NOTECARD; return(INTEGER_CONSTANT); }
-"INVENTORY_BODYPART" { count(); yylval.ival = LLAssetType::AT_BODYPART; return(INTEGER_CONSTANT); }
-"INVENTORY_ANIMATION" { count(); yylval.ival = LLAssetType::AT_ANIMATION; return(INTEGER_CONSTANT); }
-"INVENTORY_GESTURE" { count(); yylval.ival = LLAssetType::AT_GESTURE; return(INTEGER_CONSTANT); }
-"INVENTORY_ALL" { count(); yylval.ival = LLAssetType::AT_NONE; return(INTEGER_CONSTANT); }
-"INVENTORY_NONE" { count(); yylval.ival = LLAssetType::AT_NONE; return(INTEGER_CONSTANT); }
-
-"CHANGED_INVENTORY" { count(); yylval.ival = CHANGED_INVENTORY; return(INTEGER_CONSTANT); }
-"CHANGED_COLOR" { count(); yylval.ival = CHANGED_COLOR; return(INTEGER_CONSTANT); }
-"CHANGED_SHAPE" { count(); yylval.ival = CHANGED_SHAPE; return(INTEGER_CONSTANT); }
-"CHANGED_SCALE" { count(); yylval.ival = CHANGED_SCALE; return(INTEGER_CONSTANT); }
-"CHANGED_TEXTURE" { count(); yylval.ival = CHANGED_TEXTURE; return(INTEGER_CONSTANT); }
-"CHANGED_LINK" { count(); yylval.ival = CHANGED_LINK; return(INTEGER_CONSTANT); }
-"CHANGED_ALLOWED_DROP" { count(); yylval.ival = CHANGED_ALLOWED_DROP; return(INTEGER_CONSTANT); }
-"CHANGED_OWNER" { count(); yylval.ival = CHANGED_OWNER; return(INTEGER_CONSTANT); }
-"CHANGED_REGION" { count(); yylval.ival = CHANGED_REGION; return(INTEGER_CONSTANT); }
-"CHANGED_TELEPORT" { count(); yylval.ival = CHANGED_TELEPORT; return(INTEGER_CONSTANT); }
-"CHANGED_REGION_START" { count(); yylval.ival = CHANGED_REGION_START; return(INTEGER_CONSTANT); }
-"CHANGED_MEDIA" { count(); yylval.ival = CHANGED_MEDIA; return(INTEGER_CONSTANT); }
-
-"OBJECT_UNKNOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKNOWN_DETAIL; return(INTEGER_CONSTANT); }
-"OBJECT_NAME" { count(); yylval.ival = OBJECT_NAME; return(INTEGER_CONSTANT); }
-"OBJECT_DESC" { count(); yylval.ival = OBJECT_DESC; return(INTEGER_CONSTANT); }
-"OBJECT_POS" { count(); yylval.ival = OBJECT_POS; return(INTEGER_CONSTANT); }
-"OBJECT_ROT" { count(); yylval.ival = OBJECT_ROT; return(INTEGER_CONSTANT); }
-"OBJECT_VELOCITY" { count(); yylval.ival = OBJECT_VELOCITY; return(INTEGER_CONSTANT); }
-"OBJECT_OWNER" { count(); yylval.ival = OBJECT_OWNER; return(INTEGER_CONSTANT); }
-"OBJECT_GROUP" { count(); yylval.ival = OBJECT_GROUP; return(INTEGER_CONSTANT); }
-"OBJECT_CREATOR" { count(); yylval.ival = OBJECT_CREATOR; return(INTEGER_CONSTANT); }
-"OBJECT_RUNNING_SCRIPT_COUNT" { count(); yylval.ival = OBJECT_RUNNING_SCRIPT_COUNT; return(INTEGER_CONSTANT); }
-"OBJECT_TOTAL_SCRIPT_COUNT" { count(); yylval.ival = OBJECT_TOTAL_SCRIPT_COUNT; return(INTEGER_CONSTANT); }
-"OBJECT_SCRIPT_MEMORY" { count(); yylval.ival = OBJECT_SCRIPT_MEMORY; return(INTEGER_CONSTANT); }
-"OBJECT_SCRIPT_TIME" { count(); yylval.ival = OBJECT_SCRIPT_TIME; return(INTEGER_CONSTANT); }
-"OBJECT_PRIM_EQUIVALENCE" { count(); yylval.ival = OBJECT_PRIM_EQUIVALENCE; return(INTEGER_CONSTANT); }
-"OBJECT_SERVER_COST" { count(); yylval.ival = OBJECT_SERVER_COST; return(INTEGER_CONSTANT); }
-"OBJECT_STREAMING_COST" { count(); yylval.ival = OBJECT_STREAMING_COST; return(INTEGER_CONSTANT); }
-"OBJECT_PHYSICS_COST" { count(); yylval.ival = OBJECT_PHYSICS_COST; return(INTEGER_CONSTANT); }
-"OBJECT_CHARACTER_TIME" { count(); yylval.ival = OBJECT_CHARACTER_TIME; return(INTEGER_CONSTANT); }
-"OBJECT_ROOT" { count(); yylval.ival = OBJECT_ROOT; return(INTEGER_CONSTANT); }
-"OBJECT_ATTACHED_POINT" { count(); yylval.ival = OBJECT_ATTACHED_POINT; return(INTEGER_CONSTANT); }
-"OBJECT_PATHFINDING_TYPE" { count(); yylval.ival = OBJECT_PATHFINDING_TYPE; return(INTEGER_CONSTANT); }
-"OBJECT_PHYSICS" { count(); yylval.ival = OBJECT_PHYSICS; return(INTEGER_CONSTANT); }
-"OBJECT_PHANTOM" { count(); yylval.ival = OBJECT_PHANTOM; return(INTEGER_CONSTANT); }
-"OBJECT_TEMP_ON_REZ" { count(); yylval.ival = OBJECT_TEMP_ON_REZ; return(INTEGER_CONSTANT); }
-"OBJECT_RENDER_WEIGHT" { count(); yylval.ival = OBJECT_RENDER_WEIGHT; return(INTEGER_CONSTANT); }
-
-"TYPE_INTEGER" { count(); yylval.ival = LST_INTEGER; return(INTEGER_CONSTANT); }
-"TYPE_FLOAT" { count(); yylval.ival = LST_FLOATINGPOINT; return(INTEGER_CONSTANT); }
-"TYPE_STRING" { count(); yylval.ival = LST_STRING; return(INTEGER_CONSTANT); }
-"TYPE_KEY" { count(); yylval.ival = LST_KEY; return(INTEGER_CONSTANT); }
-"TYPE_VECTOR" { count(); yylval.ival = LST_VECTOR; return(INTEGER_CONSTANT); }
-"TYPE_ROTATION" { count(); yylval.ival = LST_QUATERNION; return(INTEGER_CONSTANT); }
-"TYPE_INVALID" { count(); yylval.ival = LST_NULL; return(INTEGER_CONSTANT); }
-
-"NULL_KEY" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "00000000-0000-0000-0000-000000000000"); return(STRING_CONSTANT); }
-"EOF" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "\n\n\n"); return(STRING_CONSTANT); }
-"URL_REQUEST_GRANTED" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, URL_REQUEST_GRANTED); return(STRING_CONSTANT); }
-"URL_REQUEST_DENIED" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, URL_REQUEST_DENIED); return(STRING_CONSTANT); }
-
-"PI" { count(); yylval.fval = F_PI; return(FP_CONSTANT); }
-"TWO_PI" { count(); yylval.fval = F_TWO_PI; return(FP_CONSTANT); }
-"PI_BY_TWO" { count(); yylval.fval = F_PI_BY_TWO; return(FP_CONSTANT); }
-"DEG_TO_RAD" { count(); yylval.fval = DEG_TO_RAD; return(FP_CONSTANT); }
-"RAD_TO_DEG" { count(); yylval.fval = RAD_TO_DEG; return(FP_CONSTANT); }
-"SQRT2" { count(); yylval.fval = F_SQRT2; return(FP_CONSTANT); }
-
-"DEBUG_CHANNEL" { count(); yylval.ival = CHAT_CHANNEL_DEBUG; return(INTEGER_CONSTANT); }
-"PUBLIC_CHANNEL" { count(); yylval.ival = 0; return(INTEGER_CONSTANT); }
-
-"ZERO_VECTOR" { count(); return(ZERO_VECTOR); }
-"ZERO_ROTATION" { count(); return(ZERO_ROTATION); }
-
-"ATTACH_CHEST" { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
-"ATTACH_HEAD" { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
-"ATTACH_LSHOULDER" { count(); yylval.ival = 3; return(INTEGER_CONSTANT); }
-"ATTACH_RSHOULDER" { count(); yylval.ival = 4; return(INTEGER_CONSTANT); }
-"ATTACH_LHAND" { count(); yylval.ival = 5; return(INTEGER_CONSTANT); }
-"ATTACH_RHAND" { count(); yylval.ival = 6; return(INTEGER_CONSTANT); }
-"ATTACH_LFOOT" { count(); yylval.ival = 7; return(INTEGER_CONSTANT); }
-"ATTACH_RFOOT" { count(); yylval.ival = 8; return(INTEGER_CONSTANT); }
-"ATTACH_BACK" { count(); yylval.ival = 9; return(INTEGER_CONSTANT); }
-"ATTACH_PELVIS" { count(); yylval.ival = 10; return(INTEGER_CONSTANT); }
-"ATTACH_MOUTH" { count(); yylval.ival = 11; return(INTEGER_CONSTANT); }
-"ATTACH_CHIN" { count(); yylval.ival = 12; return(INTEGER_CONSTANT); }
-"ATTACH_LEAR" { count(); yylval.ival = 13; return(INTEGER_CONSTANT); }
-"ATTACH_REAR" { count(); yylval.ival = 14; return(INTEGER_CONSTANT); }
-"ATTACH_LEYE" { count(); yylval.ival = 15; return(INTEGER_CONSTANT); }
-"ATTACH_REYE" { count(); yylval.ival = 16; return(INTEGER_CONSTANT); }
-"ATTACH_NOSE" { count(); yylval.ival = 17; return(INTEGER_CONSTANT); }
-"ATTACH_RUARM" { count(); yylval.ival = 18; return(INTEGER_CONSTANT); }
-"ATTACH_RLARM" { count(); yylval.ival = 19; return(INTEGER_CONSTANT); }
-"ATTACH_LUARM" { count(); yylval.ival = 20; return(INTEGER_CONSTANT); }
-"ATTACH_LLARM" { count(); yylval.ival = 21; return(INTEGER_CONSTANT); }
-"ATTACH_RHIP" { count(); yylval.ival = 22; return(INTEGER_CONSTANT); }
-"ATTACH_RULEG" { count(); yylval.ival = 23; return(INTEGER_CONSTANT); }
-"ATTACH_RLLEG" { count(); yylval.ival = 24; return(INTEGER_CONSTANT); }
-"ATTACH_LHIP" { count(); yylval.ival = 25; return(INTEGER_CONSTANT); }
-"ATTACH_LULEG" { count(); yylval.ival = 26; return(INTEGER_CONSTANT); }
-"ATTACH_LLLEG" { count(); yylval.ival = 27; return(INTEGER_CONSTANT); }
-"ATTACH_BELLY" { count(); yylval.ival = 28; return(INTEGER_CONSTANT); }
-"ATTACH_RPEC" { count(); yylval.ival = 29; return(INTEGER_CONSTANT); }
-"ATTACH_LPEC" { count(); yylval.ival = 30; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_CENTER_2" { count(); yylval.ival = 31; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_TOP_RIGHT" { count(); yylval.ival = 32; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_TOP_CENTER" { count(); yylval.ival = 33; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_TOP_LEFT" { count(); yylval.ival = 34; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_CENTER_1" { count(); yylval.ival = 35; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_BOTTOM_LEFT" { count(); yylval.ival = 36; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_BOTTOM" { count(); yylval.ival = 37; return(INTEGER_CONSTANT); }
-"ATTACH_HUD_BOTTOM_RIGHT" { count(); yylval.ival = 38; return(INTEGER_CONSTANT); }
-"ATTACH_NECK" { count(); yylval.ival = 39; return(INTEGER_CONSTANT); }
-"ATTACH_AVATAR_CENTER" { count(); yylval.ival = 40; return(INTEGER_CONSTANT); }
-
-"LAND_LEVEL" { count(); yylval.ival = E_LANDBRUSH_LEVEL; return(INTEGER_CONSTANT); }
-"LAND_RAISE" { count(); yylval.ival = E_LANDBRUSH_RAISE; return(INTEGER_CONSTANT); }
-"LAND_LOWER" { count(); yylval.ival = E_LANDBRUSH_LOWER; return(INTEGER_CONSTANT); }
-"LAND_SMOOTH" { count(); yylval.ival = E_LANDBRUSH_SMOOTH; return(INTEGER_CONSTANT); }
-"LAND_NOISE" { count(); yylval.ival = E_LANDBRUSH_NOISE; return(INTEGER_CONSTANT); }
-"LAND_REVERT" { count(); yylval.ival = E_LANDBRUSH_REVERT; return(INTEGER_CONSTANT); }
-
-"LAND_SMALL_BRUSH" { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
-"LAND_MEDIUM_BRUSH" { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
-"LAND_LARGE_BRUSH" { count(); yylval.ival = 3; return(INTEGER_CONSTANT); }
-
-"DATA_ONLINE" { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
-"DATA_NAME" { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
-"DATA_BORN" { count(); yylval.ival = 3; return(INTEGER_CONSTANT); }
-"DATA_RATING" { count(); yylval.ival = 4; return(INTEGER_CONSTANT); }
-"DATA_SIM_POS" { count(); yylval.ival = 5; return(INTEGER_CONSTANT); }
-"DATA_SIM_STATUS" { count(); yylval.ival = 6; return(INTEGER_CONSTANT); }
-"DATA_SIM_RATING" { count(); yylval.ival = 7; return(INTEGER_CONSTANT); }
-"DATA_PAYINFO" { count(); yylval.ival = 8; return(INTEGER_CONSTANT); }
-
-"PAYMENT_INFO_ON_FILE" { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
-"PAYMENT_INFO_USED" { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
-
-"REMOTE_DATA_CHANNEL" { count(); yylval.ival = LSL_REMOTE_DATA_CHANNEL; return(INTEGER_CONSTANT); }
-"REMOTE_DATA_REQUEST" { count(); yylval.ival = LSL_REMOTE_DATA_REQUEST; return(INTEGER_CONSTANT); }
-"REMOTE_DATA_REPLY" { count(); yylval.ival = LSL_REMOTE_DATA_REPLY; return(INTEGER_CONSTANT); }
-
-
-"PSYS_PART_FLAGS" { count(); yylval.ival = LLPS_PART_FLAGS; return(INTEGER_CONSTANT); }
-"PSYS_PART_START_COLOR" { count(); yylval.ival = LLPS_PART_START_COLOR; return (INTEGER_CONSTANT); }
-"PSYS_PART_START_ALPHA" { count(); yylval.ival = LLPS_PART_START_ALPHA; return (INTEGER_CONSTANT); }
-"PSYS_PART_START_SCALE" { count(); yylval.ival = LLPS_PART_START_SCALE; return (INTEGER_CONSTANT); }
-"PSYS_PART_END_COLOR" { count(); yylval.ival = LLPS_PART_END_COLOR; return (INTEGER_CONSTANT); }
-"PSYS_PART_END_ALPHA" { count(); yylval.ival = LLPS_PART_END_ALPHA; return (INTEGER_CONSTANT); }
-"PSYS_PART_END_SCALE" { count(); yylval.ival = LLPS_PART_END_SCALE; return (INTEGER_CONSTANT); }
-"PSYS_PART_MAX_AGE" { count(); yylval.ival = LLPS_PART_MAX_AGE; return (INTEGER_CONSTANT); }
-"PSYS_PART_BLEND_FUNC_SOURCE" { count(); yylval.ival = LLPS_PART_BLEND_FUNC_SOURCE; return (INTEGER_CONSTANT); }
-"PSYS_PART_BLEND_FUNC_DEST" { count(); yylval.ival = LLPS_PART_BLEND_FUNC_DEST; return (INTEGER_CONSTANT); }
-"PSYS_PART_START_GLOW" { count(); yylval.ival = LLPS_PART_START_GLOW; return (INTEGER_CONSTANT); }
-"PSYS_PART_END_GLOW" { count(); yylval.ival = LLPS_PART_END_GLOW; return (INTEGER_CONSTANT); }
-
-"PSYS_PART_WIND_MASK" { count(); yylval.ival = LLPartData::LL_PART_WIND_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_INTERP_COLOR_MASK" { count(); yylval.ival = LLPartData::LL_PART_INTERP_COLOR_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_INTERP_SCALE_MASK" { count(); yylval.ival = LLPartData::LL_PART_INTERP_SCALE_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_BOUNCE_MASK" { count(); yylval.ival = LLPartData::LL_PART_BOUNCE_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_FOLLOW_SRC_MASK" { count(); yylval.ival = LLPartData::LL_PART_FOLLOW_SRC_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_FOLLOW_VELOCITY_MASK" { count(); yylval.ival = LLPartData::LL_PART_FOLLOW_VELOCITY_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_TARGET_POS_MASK" { count(); yylval.ival = LLPartData::LL_PART_TARGET_POS_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_EMISSIVE_MASK" { count(); yylval.ival = LLPartData::LL_PART_EMISSIVE_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_TARGET_LINEAR_MASK" { count(); yylval.ival = LLPartData::LL_PART_TARGET_LINEAR_MASK; return(INTEGER_CONSTANT); }
-"PSYS_PART_RIBBON_MASK" { count(); yylval.ival = LLPartData::LL_PART_RIBBON_MASK; return(INTEGER_CONSTANT); }
-
-"PSYS_PART_BF_ONE" { count(); yylval.ival = LLPartData::LL_PART_BF_ONE; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_ZERO" { count(); yylval.ival = LLPartData::LL_PART_BF_ZERO; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_DEST_COLOR" { count(); yylval.ival = LLPartData::LL_PART_BF_DEST_COLOR; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_SOURCE_COLOR" { count(); yylval.ival = LLPartData::LL_PART_BF_SOURCE_COLOR; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_ONE_MINUS_DEST_COLOR" { count(); yylval.ival = LLPartData::LL_PART_BF_ONE_MINUS_DEST_COLOR; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR" { count(); yylval.ival = LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_COLOR; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_SOURCE_ALPHA" { count(); yylval.ival = LLPartData::LL_PART_BF_SOURCE_ALPHA; return(INTEGER_CONSTANT); }
-"PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA" { count(); yylval.ival = LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_ALPHA; return(INTEGER_CONSTANT); }
-
-"PSYS_SRC_MAX_AGE" { count(); yylval.ival = LLPS_SRC_MAX_AGE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_PATTERN" { count(); yylval.ival = LLPS_SRC_PATTERN; return(INTEGER_CONSTANT); }
-"PSYS_SRC_INNERANGLE" { count(); yylval.ival = LLPS_SRC_INNERANGLE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_OUTERANGLE" { count(); yylval.ival = LLPS_SRC_OUTERANGLE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_ANGLE_BEGIN" { count(); yylval.ival = LLPS_SRC_ANGLE_BEGIN; return(INTEGER_CONSTANT); }
-"PSYS_SRC_ANGLE_END" { count(); yylval.ival = LLPS_SRC_ANGLE_END; return(INTEGER_CONSTANT); }
-"PSYS_SRC_BURST_RATE" { count(); yylval.ival = LLPS_SRC_BURST_RATE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_BURST_PART_COUNT" { count(); yylval.ival = LLPS_SRC_BURST_PART_COUNT; return(INTEGER_CONSTANT); }
-"PSYS_SRC_BURST_RADIUS" { count(); yylval.ival = LLPS_SRC_BURST_RADIUS; return(INTEGER_CONSTANT); }
-"PSYS_SRC_BURST_SPEED_MIN" { count(); yylval.ival = LLPS_SRC_BURST_SPEED_MIN; return(INTEGER_CONSTANT); }
-"PSYS_SRC_BURST_SPEED_MAX" { count(); yylval.ival = LLPS_SRC_BURST_SPEED_MAX; return(INTEGER_CONSTANT); }
-"PSYS_SRC_ACCEL" { count(); yylval.ival = LLPS_SRC_ACCEL; return(INTEGER_CONSTANT); }
-"PSYS_SRC_TEXTURE" { count(); yylval.ival = LLPS_SRC_TEXTURE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_TARGET_KEY" { count(); yylval.ival = LLPS_SRC_TARGET_UUID; return(INTEGER_CONSTANT); }
-"PSYS_SRC_OMEGA" { count(); yylval.ival = LLPS_SRC_OMEGA; return(INTEGER_CONSTANT); }
-
-"PSYS_SRC_OBJ_REL_MASK" { count(); yylval.ival = LLPartSysData::LL_PART_SRC_OBJ_REL_MASK; return(INTEGER_CONSTANT); }
-
-"PSYS_SRC_PATTERN_DROP" { count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_DROP; return(INTEGER_CONSTANT); }
-"PSYS_SRC_PATTERN_EXPLODE" { count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_PATTERN_ANGLE" { count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_PATTERN_ANGLE_CONE" { count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE; return(INTEGER_CONSTANT); }
-"PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY" { count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY; return(INTEGER_CONSTANT); }
-
-
-"VEHICLE_TYPE_NONE" { count(); yylval.ival = VEHICLE_TYPE_NONE; return(INTEGER_CONSTANT); }
-"VEHICLE_TYPE_SLED" { count(); yylval.ival = VEHICLE_TYPE_SLED; return(INTEGER_CONSTANT); }
-"VEHICLE_TYPE_CAR" { count(); yylval.ival = VEHICLE_TYPE_CAR; return(INTEGER_CONSTANT); }
-"VEHICLE_TYPE_BOAT" { count(); yylval.ival = VEHICLE_TYPE_BOAT; return(INTEGER_CONSTANT); }
-"VEHICLE_TYPE_AIRPLANE" { count(); yylval.ival = VEHICLE_TYPE_AIRPLANE; return(INTEGER_CONSTANT); }
-"VEHICLE_TYPE_BALLOON" { count(); yylval.ival = VEHICLE_TYPE_BALLOON; return(INTEGER_CONSTANT); }
-
-"VEHICLE_REFERENCE_FRAME" { count(); yylval.ival = VEHICLE_REFERENCE_FRAME; return(INTEGER_CONSTANT); }
-"VEHICLE_LINEAR_FRICTION_TIMESCALE" { count(); yylval.ival = VEHICLE_LINEAR_FRICTION_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_ANGULAR_FRICTION_TIMESCALE" { count(); yylval.ival = VEHICLE_ANGULAR_FRICTION_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_LINEAR_MOTOR_DIRECTION" { count(); yylval.ival = VEHICLE_LINEAR_MOTOR_DIRECTION; return(INTEGER_CONSTANT); }
-"VEHICLE_ANGULAR_MOTOR_DIRECTION" { count(); yylval.ival = VEHICLE_ANGULAR_MOTOR_DIRECTION; return(INTEGER_CONSTANT); }
-"VEHICLE_LINEAR_MOTOR_OFFSET" { count(); yylval.ival = VEHICLE_LINEAR_MOTOR_OFFSET; return(INTEGER_CONSTANT); }
-
-
-
-"VEHICLE_HOVER_HEIGHT" { count(); yylval.ival = VEHICLE_HOVER_HEIGHT; return(INTEGER_CONSTANT); }
-"VEHICLE_HOVER_EFFICIENCY" { count(); yylval.ival = VEHICLE_HOVER_EFFICIENCY; return(INTEGER_CONSTANT); }
-"VEHICLE_HOVER_TIMESCALE" { count(); yylval.ival = VEHICLE_HOVER_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_BUOYANCY" { count(); yylval.ival = VEHICLE_BUOYANCY; return(INTEGER_CONSTANT); }
-
-"VEHICLE_LINEAR_DEFLECTION_EFFICIENCY" { count(); yylval.ival = VEHICLE_LINEAR_DEFLECTION_EFFICIENCY; return(INTEGER_CONSTANT); }
-"VEHICLE_LINEAR_DEFLECTION_TIMESCALE" { count(); yylval.ival = VEHICLE_LINEAR_DEFLECTION_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_LINEAR_MOTOR_TIMESCALE" { count(); yylval.ival = VEHICLE_LINEAR_MOTOR_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE" { count(); yylval.ival = VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE; return(INTEGER_CONSTANT); }
-
-"VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY" { count(); yylval.ival = VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY; return(INTEGER_CONSTANT); }
-"VEHICLE_ANGULAR_DEFLECTION_TIMESCALE" { count(); yylval.ival = VEHICLE_ANGULAR_DEFLECTION_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_ANGULAR_MOTOR_TIMESCALE" { count(); yylval.ival = VEHICLE_ANGULAR_MOTOR_TIMESCALE; return(INTEGER_CONSTANT); }
-"VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE" { count(); yylval.ival = VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE; return(INTEGER_CONSTANT); }
-
-"VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY" { count(); yylval.ival = VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY; return(INTEGER_CONSTANT); }
-"VEHICLE_VERTICAL_ATTRACTION_TIMESCALE" { count(); yylval.ival = VEHICLE_VERTICAL_ATTRACTION_TIMESCALE; return(INTEGER_CONSTANT); }
-
-"VEHICLE_BANKING_EFFICIENCY" { count(); yylval.ival = VEHICLE_BANKING_EFFICIENCY; return(INTEGER_CONSTANT); }
-"VEHICLE_BANKING_MIX" { count(); yylval.ival = VEHICLE_BANKING_MIX; return(INTEGER_CONSTANT); }
-"VEHICLE_BANKING_TIMESCALE" { count(); yylval.ival = VEHICLE_BANKING_TIMESCALE; return(INTEGER_CONSTANT); }
-
-"VEHICLE_FLAG_NO_FLY_UP" { count(); yylval.ival = VEHICLE_FLAG_NO_DEFLECTION_UP; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_NO_DEFLECTION_UP" { count(); yylval.ival = VEHICLE_FLAG_NO_DEFLECTION_UP; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_LIMIT_ROLL_ONLY" { count(); yylval.ival = VEHICLE_FLAG_LIMIT_ROLL_ONLY; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_HOVER_WATER_ONLY" { count(); yylval.ival = VEHICLE_FLAG_HOVER_WATER_ONLY; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_HOVER_TERRAIN_ONLY" { count(); yylval.ival = VEHICLE_FLAG_HOVER_TERRAIN_ONLY; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT" { count(); yylval.ival = VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_HOVER_UP_ONLY" { count(); yylval.ival = VEHICLE_FLAG_HOVER_UP_ONLY; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_LIMIT_MOTOR_UP" { count(); yylval.ival = VEHICLE_FLAG_LIMIT_MOTOR_UP; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_MOUSELOOK_STEER" { count(); yylval.ival = VEHICLE_FLAG_MOUSELOOK_STEER; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_MOUSELOOK_BANK" { count(); yylval.ival = VEHICLE_FLAG_MOUSELOOK_BANK; return(INTEGER_CONSTANT); }
-"VEHICLE_FLAG_CAMERA_DECOUPLED" { count(); yylval.ival = VEHICLE_FLAG_CAMERA_DECOUPLED; return(INTEGER_CONSTANT); }
-
-
-
-"PRIM_TYPE" { count(); yylval.ival = LSL_PRIM_TYPE; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL" { count(); yylval.ival = LSL_PRIM_MATERIAL; return(INTEGER_CONSTANT); }
-"PRIM_PHYSICS" { count(); yylval.ival = LSL_PRIM_PHYSICS; return(INTEGER_CONSTANT); }
-"PRIM_FLEXIBLE" { count(); yylval.ival = LSL_PRIM_FLEXIBLE; return(INTEGER_CONSTANT); }
-"PRIM_POINT_LIGHT" { count(); yylval.ival = LSL_PRIM_POINT_LIGHT; return(INTEGER_CONSTANT); }
-"PRIM_TEMP_ON_REZ" { count(); yylval.ival = LSL_PRIM_TEMP_ON_REZ; return(INTEGER_CONSTANT); }
-"PRIM_PHANTOM" { count(); yylval.ival = LSL_PRIM_PHANTOM; return(INTEGER_CONSTANT); }
-"PRIM_CAST_SHADOWS" { count(); yylval.ival = LSL_PRIM_CAST_SHADOWS; return(INTEGER_CONSTANT); }
-"PRIM_POSITION" { count(); yylval.ival = LSL_PRIM_POSITION; return(INTEGER_CONSTANT); }
-"PRIM_SIZE" { count(); yylval.ival = LSL_PRIM_SIZE; return(INTEGER_CONSTANT); }
-"PRIM_ROTATION" { count(); yylval.ival = LSL_PRIM_ROTATION; return(INTEGER_CONSTANT); }
-"PRIM_TEXTURE" { count(); yylval.ival = LSL_PRIM_TEXTURE; return(INTEGER_CONSTANT); }
-"PRIM_COLOR" { count(); yylval.ival = LSL_PRIM_COLOR; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_SHINY" { count(); yylval.ival = LSL_PRIM_BUMP_SHINY; return(INTEGER_CONSTANT); }
-"PRIM_FULLBRIGHT" { count(); yylval.ival = LSL_PRIM_FULLBRIGHT; return(INTEGER_CONSTANT); }
-"PRIM_TEXGEN" { count(); yylval.ival = LSL_PRIM_TEXGEN; return(INTEGER_CONSTANT); }
-"PRIM_GLOW" { count(); yylval.ival = LSL_PRIM_GLOW; return(INTEGER_CONSTANT); }
-"PRIM_TEXT" { count(); yylval.ival = LSL_PRIM_TEXT; return(INTEGER_CONSTANT); }
-"PRIM_NAME" { count(); yylval.ival = LSL_PRIM_NAME; return(INTEGER_CONSTANT); }
-"PRIM_DESC" { count(); yylval.ival = LSL_PRIM_DESC; return(INTEGER_CONSTANT); }
-"PRIM_OMEGA" { count(); yylval.ival = LSL_PRIM_OMEGA; return(INTEGER_CONSTANT); }
-"PRIM_LINK_TARGET" { count(); yylval.ival = LSL_PRIM_LINK_TARGET; return(INTEGER_CONSTANT); }
-"PRIM_SLICE" { count(); yylval.ival = LSL_PRIM_SLICE; return(INTEGER_CONSTANT); }
-
-"PRIM_PHYSICS_SHAPE_PRIM" { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_PRIM; return(INTEGER_CONSTANT); }
-"PRIM_PHYSICS_SHAPE_NONE" { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_NONE; return(INTEGER_CONSTANT); }
-"PRIM_PHYSICS_SHAPE_CONVEX" { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_CONVEX; return(INTEGER_CONSTANT); }
-
-"PRIM_TYPE_BOX" { count(); yylval.ival = LSL_PRIM_TYPE_BOX; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_CYLINDER" { count(); yylval.ival = LSL_PRIM_TYPE_CYLINDER; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_PRISM" { count(); yylval.ival = LSL_PRIM_TYPE_PRISM; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_SPHERE" { count(); yylval.ival = LSL_PRIM_TYPE_SPHERE; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_TORUS" { count(); yylval.ival = LSL_PRIM_TYPE_TORUS; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_TUBE" { count(); yylval.ival = LSL_PRIM_TYPE_TUBE; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_RING" { count(); yylval.ival = LSL_PRIM_TYPE_RING; return(INTEGER_CONSTANT); }
-"PRIM_TYPE_SCULPT" { count(); yylval.ival = LSL_PRIM_TYPE_SCULPT; return(INTEGER_CONSTANT); }
-
-"PRIM_HOLE_DEFAULT" { count(); yylval.ival = LSL_PRIM_HOLE_DEFAULT; return(INTEGER_CONSTANT); }
-"PRIM_HOLE_CIRCLE" { count(); yylval.ival = LSL_PRIM_HOLE_CIRCLE; return(INTEGER_CONSTANT); }
-"PRIM_HOLE_SQUARE" { count(); yylval.ival = LSL_PRIM_HOLE_SQUARE; return(INTEGER_CONSTANT); }
-"PRIM_HOLE_TRIANGLE" { count(); yylval.ival = LSL_PRIM_HOLE_TRIANGLE; return(INTEGER_CONSTANT); }
-
-"PRIM_MATERIAL_STONE" { count(); yylval.ival = LSL_PRIM_MATERIAL_STONE; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_METAL" { count(); yylval.ival = LSL_PRIM_MATERIAL_METAL; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_GLASS" { count(); yylval.ival = LSL_PRIM_MATERIAL_GLASS; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_WOOD" { count(); yylval.ival = LSL_PRIM_MATERIAL_WOOD; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_FLESH" { count(); yylval.ival = LSL_PRIM_MATERIAL_FLESH; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_PLASTIC" { count(); yylval.ival = LSL_PRIM_MATERIAL_PLASTIC; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_RUBBER" { count(); yylval.ival = LSL_PRIM_MATERIAL_RUBBER; return(INTEGER_CONSTANT); }
-"PRIM_MATERIAL_LIGHT" { count(); yylval.ival = LSL_PRIM_MATERIAL_LIGHT; return(INTEGER_CONSTANT); }
-
-"PRIM_SHINY_NONE" { count(); yylval.ival = LSL_PRIM_SHINY_NONE; return(INTEGER_CONSTANT); }
-"PRIM_SHINY_LOW" { count(); yylval.ival = LSL_PRIM_SHINY_LOW; return(INTEGER_CONSTANT); }
-"PRIM_SHINY_MEDIUM" { count(); yylval.ival = LSL_PRIM_SHINY_MEDIUM; return(INTEGER_CONSTANT); }
-"PRIM_SHINY_HIGH" { count(); yylval.ival = LSL_PRIM_SHINY_HIGH; return(INTEGER_CONSTANT); }
-
-"PRIM_BUMP_NONE" { count(); yylval.ival = LSL_PRIM_BUMP_NONE; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_BRIGHT" { count(); yylval.ival = LSL_PRIM_BUMP_BRIGHT; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_DARK" { count(); yylval.ival = LSL_PRIM_BUMP_DARK; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_WOOD" { count(); yylval.ival = LSL_PRIM_BUMP_WOOD; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_BARK" { count(); yylval.ival = LSL_PRIM_BUMP_BARK; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_BRICKS" { count(); yylval.ival = LSL_PRIM_BUMP_BRICKS; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_CHECKER" { count(); yylval.ival = LSL_PRIM_BUMP_CHECKER; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_CONCRETE" { count(); yylval.ival = LSL_PRIM_BUMP_CONCRETE; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_TILE" { count(); yylval.ival = LSL_PRIM_BUMP_TILE; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_STONE" { count(); yylval.ival = LSL_PRIM_BUMP_STONE; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_DISKS" { count(); yylval.ival = LSL_PRIM_BUMP_DISKS; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_GRAVEL" { count(); yylval.ival = LSL_PRIM_BUMP_GRAVEL; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_BLOBS" { count(); yylval.ival = LSL_PRIM_BUMP_BLOBS; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_SIDING" { count(); yylval.ival = LSL_PRIM_BUMP_SIDING; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_LARGETILE" { count(); yylval.ival = LSL_PRIM_BUMP_LARGETILE; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_STUCCO" { count(); yylval.ival = LSL_PRIM_BUMP_STUCCO; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_SUCTION" { count(); yylval.ival = LSL_PRIM_BUMP_SUCTION; return(INTEGER_CONSTANT); }
-"PRIM_BUMP_WEAVE" { count(); yylval.ival = LSL_PRIM_BUMP_WEAVE; return(INTEGER_CONSTANT); }
-
-"PRIM_TEXGEN_DEFAULT" { count(); yylval.ival = LSL_PRIM_TEXGEN_DEFAULT; return(INTEGER_CONSTANT); }
-"PRIM_TEXGEN_PLANAR" { count(); yylval.ival = LSL_PRIM_TEXGEN_PLANAR; return(INTEGER_CONSTANT); }
-
-"PRIM_SCULPT_TYPE_SPHERE" { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_SPHERE; return(INTEGER_CONSTANT); }
-"PRIM_SCULPT_TYPE_TORUS" { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_TORUS; return(INTEGER_CONSTANT); }
-"PRIM_SCULPT_TYPE_PLANE" { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_PLANE; return(INTEGER_CONSTANT); }
-"PRIM_SCULPT_TYPE_CYLINDER" { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_CYLINDER; return(INTEGER_CONSTANT); }
-"PRIM_SCULPT_TYPE_MASK" { count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_MASK; return(INTEGER_CONSTANT); }
-"PRIM_SCULPT_FLAG_MIRROR" { count(); yylval.ival = LSL_PRIM_SCULPT_FLAG_MIRROR; return(INTEGER_CONSTANT); }
-"PRIM_SCULPT_FLAG_INVERT" { count(); yylval.ival = LSL_PRIM_SCULPT_FLAG_INVERT; return(INTEGER_CONSTANT); }
-
-"MASK_BASE" { count(); yylval.ival = 0; return(INTEGER_CONSTANT); }
-"MASK_OWNER" { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
-"MASK_GROUP" { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
-"MASK_EVERYONE" { count(); yylval.ival = 3; return(INTEGER_CONSTANT); }
-"MASK_NEXT" { count(); yylval.ival = 4; return(INTEGER_CONSTANT); }
-
-"PERM_TRANSFER" { count(); yylval.ival = PERM_TRANSFER; return(INTEGER_CONSTANT); }
-"PERM_MODIFY" { count(); yylval.ival = PERM_MODIFY; return(INTEGER_CONSTANT); }
-"PERM_COPY" { count(); yylval.ival = PERM_COPY; return(INTEGER_CONSTANT); }
-"PERM_MOVE" { count(); yylval.ival = PERM_MOVE; return(INTEGER_CONSTANT); }
-"PERM_ALL" { count(); yylval.ival = PERM_ALL; return(INTEGER_CONSTANT); }
-
-"PARCEL_MEDIA_COMMAND_STOP" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_STOP; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_PAUSE" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_PAUSE; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_PLAY" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_PLAY; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_LOOP" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_LOOP; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_TEXTURE" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_TEXTURE; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_URL" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_URL; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_TIME" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_TIME; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_AGENT" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_AGENT; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_UNLOAD" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_UNLOAD; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_AUTO_ALIGN" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_AUTO_ALIGN; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_TYPE" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_TYPE; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_SIZE" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_SIZE; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_DESC" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_DESC; return(INTEGER_CONSTANT); }
-"PARCEL_MEDIA_COMMAND_LOOP_SET" { count(); yylval.ival = PARCEL_MEDIA_COMMAND_LOOP_SET; return(INTEGER_CONSTANT); }
-
-"LIST_STAT_MAX" { count(); yylval.ival = LIST_STAT_MAX; return(INTEGER_CONSTANT); }
-"LIST_STAT_MIN" { count(); yylval.ival = LIST_STAT_MIN; return(INTEGER_CONSTANT); }
-"LIST_STAT_MEAN" { count(); yylval.ival = LIST_STAT_MEAN; return(INTEGER_CONSTANT); }
-"LIST_STAT_MEDIAN" { count(); yylval.ival = LIST_STAT_MEDIAN; return(INTEGER_CONSTANT); }
-"LIST_STAT_STD_DEV" { count(); yylval.ival = LIST_STAT_STD_DEV; return(INTEGER_CONSTANT); }
-"LIST_STAT_SUM" { count(); yylval.ival = LIST_STAT_SUM; return(INTEGER_CONSTANT); }
-"LIST_STAT_SUM_SQUARES" { count(); yylval.ival = LIST_STAT_SUM_SQUARES; return(INTEGER_CONSTANT); }
-"LIST_STAT_NUM_COUNT" { count(); yylval.ival = LIST_STAT_NUM_COUNT; return(INTEGER_CONSTANT); }
-"LIST_STAT_GEOMETRIC_MEAN" { count(); yylval.ival = LIST_STAT_GEO_MEAN; return(INTEGER_CONSTANT); }
-"LIST_STAT_RANGE" { count(); yylval.ival = LIST_STAT_RANGE; return(INTEGER_CONSTANT); }
-
-"PAY_HIDE" { count(); yylval.ival = PAY_PRICE_HIDE; return(INTEGER_CONSTANT); }
-"PAY_DEFAULT" { count(); yylval.ival = PAY_PRICE_DEFAULT; return(INTEGER_CONSTANT); }
-
-"PARCEL_FLAG_ALLOW_FLY" { count(); yylval.ival = PF_ALLOW_FLY; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_GROUP_SCRIPTS" { count(); yylval.ival = PF_ALLOW_GROUP_SCRIPTS; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_SCRIPTS" { count(); yylval.ival = PF_ALLOW_OTHER_SCRIPTS; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_LANDMARK" { count(); yylval.ival = PF_ALLOW_LANDMARK; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_TERRAFORM" { count(); yylval.ival = PF_ALLOW_TERRAFORM; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_DAMAGE" { count(); yylval.ival = PF_ALLOW_DAMAGE; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_CREATE_OBJECTS" { count(); yylval.ival = PF_CREATE_OBJECTS; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS" { count(); yylval.ival = PF_CREATE_GROUP_OBJECTS; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_USE_ACCESS_GROUP" { count(); yylval.ival = PF_USE_ACCESS_GROUP; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_USE_ACCESS_LIST" { count(); yylval.ival = PF_USE_ACCESS_LIST; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_USE_BAN_LIST" { count(); yylval.ival = PF_USE_BAN_LIST; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_USE_LAND_PASS_LIST" { count(); yylval.ival = PF_USE_PASS_LIST; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_LOCAL_SOUND_ONLY" { count(); yylval.ival = PF_SOUND_LOCAL; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_RESTRICT_PUSHOBJECT" { count(); yylval.ival = PF_RESTRICT_PUSHOBJECT; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY" { count(); yylval.ival = PF_ALLOW_GROUP_OBJECT_ENTRY; return(INTEGER_CONSTANT); }
-"PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY" { count(); yylval.ival = PF_ALLOW_ALL_OBJECT_ENTRY; return(INTEGER_CONSTANT); }
-
-"REGION_FLAG_ALLOW_DAMAGE" { count(); yylval.ival = REGION_FLAGS_ALLOW_DAMAGE; return(INTEGER_CONSTANT); }
-"REGION_FLAG_FIXED_SUN" { count(); yylval.ival = REGION_FLAGS_SUN_FIXED; return(INTEGER_CONSTANT); }
-"REGION_FLAG_BLOCK_TERRAFORM" { count(); yylval.ival = REGION_FLAGS_BLOCK_TERRAFORM; return(INTEGER_CONSTANT); }
-"REGION_FLAG_SANDBOX" { count(); yylval.ival = REGION_FLAGS_SANDBOX; return(INTEGER_CONSTANT); }
-"REGION_FLAG_DISABLE_COLLISIONS" { count(); yylval.ival = REGION_FLAGS_SKIP_COLLISIONS; return(INTEGER_CONSTANT); }
-"REGION_FLAG_DISABLE_PHYSICS" { count(); yylval.ival = REGION_FLAGS_SKIP_PHYSICS; return(INTEGER_CONSTANT); }
-"REGION_FLAG_BLOCK_FLY" { count(); yylval.ival = REGION_FLAGS_BLOCK_FLY; return(INTEGER_CONSTANT); }
-"REGION_FLAG_BLOCK_FLYOVER" { count(); yylval.ival = REGION_FLAGS_BLOCK_FLYOVER; return(INTEGER_CONSTANT); }
-"REGION_FLAG_ALLOW_DIRECT_TELEPORT" { count(); yylval.ival = REGION_FLAGS_ALLOW_DIRECT_TELEPORT; return(INTEGER_CONSTANT); }
-"REGION_FLAG_RESTRICT_PUSHOBJECT" { count(); yylval.ival = REGION_FLAGS_RESTRICT_PUSHOBJECT; return(INTEGER_CONSTANT); }
-
-"HTTP_METHOD" { count(); yylval.ival = HTTP_METHOD; return(INTEGER_CONSTANT); }
-"HTTP_MIMETYPE" { count(); yylval.ival = HTTP_MIMETYPE; return(INTEGER_CONSTANT); }
-"HTTP_BODY_MAXLENGTH" { count(); yylval.ival = HTTP_BODY_MAXLENGTH; return(INTEGER_CONSTANT); }
-"HTTP_BODY_TRUNCATED" { count(); yylval.ival = HTTP_BODY_TRUNCATED; return(INTEGER_CONSTANT); }
-"HTTP_VERIFY_CERT" { count(); yylval.ival = HTTP_VERIFY_CERT; return(INTEGER_CONSTANT); }
-
-"PARCEL_COUNT_TOTAL" { count(); yylval.ival = OC_TOTAL; return(INTEGER_CONSTANT); }
-"PARCEL_COUNT_OWNER" { count(); yylval.ival = OC_OWNER; return(INTEGER_CONSTANT); }
-"PARCEL_COUNT_GROUP" { count(); yylval.ival = OC_GROUP; return(INTEGER_CONSTANT); }
-"PARCEL_COUNT_OTHER" { count(); yylval.ival = OC_OTHER; return(INTEGER_CONSTANT); }
-"PARCEL_COUNT_SELECTED" { count(); yylval.ival = OC_SELECTED; return(INTEGER_CONSTANT); }
-"PARCEL_COUNT_TEMP" { count(); yylval.ival = OC_TEMP; return(INTEGER_CONSTANT); }
-
-"PARCEL_DETAILS_NAME" { count(); yylval.ival = PARCEL_DETAILS_NAME; return(INTEGER_CONSTANT); }
-"PARCEL_DETAILS_DESC" { count(); yylval.ival = PARCEL_DETAILS_DESC; return(INTEGER_CONSTANT); }
-"PARCEL_DETAILS_OWNER" { count(); yylval.ival = PARCEL_DETAILS_OWNER; return(INTEGER_CONSTANT); }
-"PARCEL_DETAILS_GROUP" { count(); yylval.ival = PARCEL_DETAILS_GROUP; return(INTEGER_CONSTANT); }
-"PARCEL_DETAILS_AREA" { count(); yylval.ival = PARCEL_DETAILS_AREA; return(INTEGER_CONSTANT); }
-"PARCEL_DETAILS_ID" { count(); yylval.ival = PARCEL_DETAILS_ID; return(INTEGER_CONSTANT); }
-"PARCEL_DETAILS_SEE_AVATARS" { count(); yylval.ival = PARCEL_DETAILS_SEE_AVATARS; return(INTEGER_CONSTANT); }
-
-"STRING_TRIM_HEAD" { count(); yylval.ival = STRING_TRIM_HEAD; return(INTEGER_CONSTANT); }
-"STRING_TRIM_TAIL" { count(); yylval.ival = STRING_TRIM_TAIL; return(INTEGER_CONSTANT); }
-"STRING_TRIM" { count(); yylval.ival = STRING_TRIM; return(INTEGER_CONSTANT); }
-
-"CLICK_ACTION_NONE" { count(); yylval.ival = CLICK_ACTION_NONE; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_TOUCH" { count(); yylval.ival = CLICK_ACTION_TOUCH; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_SIT" { count(); yylval.ival = CLICK_ACTION_SIT; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_BUY" { count(); yylval.ival = CLICK_ACTION_BUY; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_PAY" { count(); yylval.ival = CLICK_ACTION_PAY; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_OPEN" { count(); yylval.ival = CLICK_ACTION_OPEN; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_PLAY" { count(); yylval.ival = CLICK_ACTION_PLAY; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_OPEN_MEDIA" { count(); yylval.ival = CLICK_ACTION_OPEN_MEDIA; return(INTEGER_CONSTANT); }
-"CLICK_ACTION_ZOOM" { count(); yylval.ival = CLICK_ACTION_ZOOM; return(INTEGER_CONSTANT); }
-
-"TEXTURE_BLANK" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "5748decc-f629-461c-9a36-a35a221fe21f"); return(STRING_CONSTANT); }
-"TEXTURE_DEFAULT" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "89556747-24cb-43ed-920b-47caed15465f"); return(STRING_CONSTANT); }
-"TEXTURE_MEDIA" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"); return(STRING_CONSTANT); }
-"TEXTURE_PLYWOOD" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "89556747-24cb-43ed-920b-47caed15465f"); return(STRING_CONSTANT); }
-"TEXTURE_TRANSPARENT" { yylval.sval = new char[UUID_STR_LENGTH]; strcpy(yylval.sval, "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); return(STRING_CONSTANT); }
-
-"TOUCH_INVALID_FACE" { count(); yylval.ival = -1; return(INTEGER_CONSTANT); }
-"TOUCH_INVALID_VECTOR" { count(); return(TOUCH_INVALID_VECTOR); }
-"TOUCH_INVALID_TEXCOORD" { count(); return(TOUCH_INVALID_TEXCOORD); }
-
-"PRIM_MEDIA_ALT_IMAGE_ENABLE" { count(); yylval.ival = LLMediaEntry::ALT_IMAGE_ENABLE_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_CONTROLS" { count(); yylval.ival = LLMediaEntry::CONTROLS_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_CURRENT_URL" { count(); yylval.ival = LLMediaEntry::CURRENT_URL_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_HOME_URL" { count(); yylval.ival = LLMediaEntry::HOME_URL_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_AUTO_LOOP" { count(); yylval.ival = LLMediaEntry::AUTO_LOOP_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_AUTO_PLAY" { count(); yylval.ival = LLMediaEntry::AUTO_PLAY_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_AUTO_SCALE" { count(); yylval.ival = LLMediaEntry::AUTO_SCALE_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_AUTO_ZOOM" { count(); yylval.ival = LLMediaEntry::AUTO_ZOOM_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_FIRST_CLICK_INTERACT" { count(); yylval.ival = LLMediaEntry::FIRST_CLICK_INTERACT_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_WIDTH_PIXELS" { count(); yylval.ival = LLMediaEntry::WIDTH_PIXELS_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_HEIGHT_PIXELS" { count(); yylval.ival = LLMediaEntry::HEIGHT_PIXELS_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_WHITELIST_ENABLE" { count(); yylval.ival = LLMediaEntry::WHITELIST_ENABLE_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_WHITELIST" { count(); yylval.ival = LLMediaEntry::WHITELIST_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_PERMS_INTERACT" { count(); yylval.ival = LLMediaEntry::PERMS_INTERACT_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_PERMS_CONTROL" { count(); yylval.ival = LLMediaEntry::PERMS_CONTROL_ID; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_PARAM_MAX" { count(); yylval.ival = LLMediaEntry::PARAM_MAX_ID; return(INTEGER_CONSTANT); }
-
-"PRIM_MEDIA_CONTROLS_STANDARD" { count(); yylval.ival = LLMediaEntry::STANDARD; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_CONTROLS_MINI" { count(); yylval.ival = LLMediaEntry::MINI; return(INTEGER_CONSTANT); }
-
-"PRIM_MEDIA_PERM_NONE" { count(); yylval.ival = LLMediaEntry::PERM_NONE; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_PERM_OWNER" { count(); yylval.ival = LLMediaEntry::PERM_OWNER; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_PERM_GROUP" { count(); yylval.ival = LLMediaEntry::PERM_GROUP; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_PERM_ANYONE" { count(); yylval.ival = LLMediaEntry::PERM_ANYONE; return(INTEGER_CONSTANT); }
-
-"PRIM_MEDIA_MAX_URL_LENGTH" { count(); yylval.ival = LLMediaEntry::MAX_URL_LENGTH; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_MAX_WHITELIST_SIZE" { count(); yylval.ival = LLMediaEntry::MAX_WHITELIST_SIZE; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_MAX_WHITELIST_COUNT" { count(); yylval.ival = LLMediaEntry::MAX_WHITELIST_COUNT; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_MAX_WIDTH_PIXELS" { count(); yylval.ival = LLMediaEntry::MAX_WIDTH_PIXELS; return(INTEGER_CONSTANT); }
-"PRIM_MEDIA_MAX_HEIGHT_PIXELS" { count(); yylval.ival = LLMediaEntry::MAX_HEIGHT_PIXELS; return(INTEGER_CONSTANT); }
-
-"STATUS_OK" { count(); yylval.ival = LSL_STATUS_OK; return(INTEGER_CONSTANT); }
-"STATUS_MALFORMED_PARAMS" { count(); yylval.ival = LSL_STATUS_MALFORMED_PARAMS; return(INTEGER_CONSTANT); }
-"STATUS_TYPE_MISMATCH" { count(); yylval.ival = LSL_STATUS_TYPE_MISMATCH; return(INTEGER_CONSTANT); }
-"STATUS_BOUNDS_ERROR" { count(); yylval.ival = LSL_STATUS_BOUNDS_ERROR; return(INTEGER_CONSTANT); }
-"STATUS_NOT_FOUND" { count(); yylval.ival = LSL_STATUS_NOT_FOUND; return(INTEGER_CONSTANT); }
-"STATUS_NOT_SUPPORTED" { count(); yylval.ival = LSL_STATUS_NOT_SUPPORTED; return(INTEGER_CONSTANT); }
-"STATUS_INTERNAL_ERROR" { count(); yylval.ival = LSL_STATUS_INTERNAL_ERROR; return(INTEGER_CONSTANT); }
-"STATUS_WHITELIST_FAILED" { count(); yylval.ival = LSL_STATUS_WHITELIST_FAILED; return(INTEGER_CONSTANT); }
-
-"XP_ERROR_NONE" { count(); yylval.ival = LSL_XP_ERROR_NONE ; return (INTEGER_CONSTANT); }
-"XP_ERROR_THROTTLED" { count(); yylval.ival = LSL_XP_ERROR_THROTTLED ; return (INTEGER_CONSTANT); }
-"XP_ERROR_EXPERIENCES_DISABLED" { count(); yylval.ival = LSL_XP_ERROR_EXPERIENCES_DISABLED; return (INTEGER_CONSTANT); }
-"XP_ERROR_INVALID_PARAMETERS" { count(); yylval.ival = LSL_XP_ERROR_INVALID_PARAMETERS ; return (INTEGER_CONSTANT); }
-"XP_ERROR_NOT_PERMITTED" { count(); yylval.ival = LSL_XP_ERROR_NOT_PERMITTED ; return (INTEGER_CONSTANT); }
-"XP_ERROR_NO_EXPERIENCE" { count(); yylval.ival = LSL_XP_ERROR_NO_EXPERIENCE ; return (INTEGER_CONSTANT); }
-"XP_ERROR_NOT_FOUND" { count(); yylval.ival = LSL_XP_ERROR_NOT_FOUND ; return (INTEGER_CONSTANT); }
-"XP_ERROR_INVALID_EXPERIENCE" { count(); yylval.ival = LSL_XP_ERROR_INVALID_EXPERIENCE ; return (INTEGER_CONSTANT); }
-"XP_ERROR_EXPERIENCE_DISABLED" { count(); yylval.ival = LSL_XP_ERROR_EXPERIENCE_DISABLED ; return (INTEGER_CONSTANT); }
-"XP_ERROR_EXPERIENCE_SUSPENDED" { count(); yylval.ival = LSL_XP_ERROR_EXPERIENCE_SUSPENDED; return (INTEGER_CONSTANT); }
-"XP_ERROR_UNKNOWN_ERROR" { count(); yylval.ival = LSL_XP_ERROR_UNKNOWN_ERROR ; return (INTEGER_CONSTANT); }
-"XP_ERROR_QUOTA_EXCEEDED" { count(); yylval.ival = LSL_XP_ERROR_QUOTA_EXCEEDED ; return (INTEGER_CONSTANT); }
-"XP_ERROR_STORE_DISABLED" { count(); yylval.ival = LSL_XP_ERROR_STORE_DISABLED ; return (INTEGER_CONSTANT); }
-"XP_ERROR_STORAGE_EXCEPTION" { count(); yylval.ival = LSL_XP_ERROR_STORAGE_EXCEPTION ; return (INTEGER_CONSTANT); }
-"XP_ERROR_KEY_NOT_FOUND" { count(); yylval.ival = LSL_XP_ERROR_KEY_NOT_FOUND ; return (INTEGER_CONSTANT); }
-"XP_ERROR_RETRY_UPDATE" { count(); yylval.ival = LSL_XP_ERROR_RETRY_UPDATE ; return (INTEGER_CONSTANT); }
-"XP_ERROR_MATURITY_EXCEEDED" { count(); yylval.ival = LSL_XP_ERROR_MATURITY_EXCEEDED ; return (INTEGER_CONSTANT); }
-
-{L}({L}|{N})* { count(); yylval.sval = new char[strlen(yytext) + 1]; strcpy(yylval.sval, yytext); return(IDENTIFIER); }
-
-{N}+{E} { count(); yylval.fval = (F32)atof(yytext); return(FP_CONSTANT); }
-{N}*"."{N}+({E})?{FS}? { count(); yylval.fval = (F32)atof(yytext); return(FP_CONSTANT); }
-{N}+"."{N}*({E})?{FS}? { count(); yylval.fval = (F32)atof(yytext); return(FP_CONSTANT); }
-
-L?\"(\\.|[^\\"])*\" { parse_string(); count(); return(STRING_CONSTANT); }
-
-"++" { count(); return(INC_OP); }
-"--" { count(); return(DEC_OP); }
-"+=" { count(); return(ADD_ASSIGN); }
-"-=" { count(); return(SUB_ASSIGN); }
-"*=" { count(); return(MUL_ASSIGN); }
-"/=" { count(); return(DIV_ASSIGN); }
-"%=" { count(); return(MOD_ASSIGN); }
-";" { count(); return(';'); }
-"{" { count(); return('{'); }
-"}" { count(); return('}'); }
-"," { count(); return(','); }
-"=" { count(); return('='); }
-"(" { count(); return('('); }
-")" { count(); return(')'); }
-"-" { count(); return('-'); }
-"+" { count(); return('+'); }
-"*" { count(); return('*'); }
-"/" { count(); return('/'); }
-"%" { count(); return('%'); }
-"@" { count(); return('@'); }
-":" { count(); return(':'); }
-">" { count(); return('>'); }
-"<" { count(); return('<'); }
-"]" { count(); return(']'); }
-"[" { count(); return('['); }
-"==" { count(); return(EQ); }
-"!=" { count(); return(NEQ); }
-">=" { count(); return(GEQ); }
-"<=" { count(); return(LEQ); }
-"&" { count(); return('&'); }
-"|" { count(); return('|'); }
-"^" { count(); return('^'); }
-"~" { count(); return('~'); }
-"!" { count(); return('!'); }
-"&&" { count(); return(BOOLEAN_AND); }
-"||" { count(); return(BOOLEAN_OR); }
-"<<" { count(); return(SHIFT_LEFT); }
-">>" { count(); return(SHIFT_RIGHT); }
-
-[ \t\v\n\f] { count(); }
-. { /* ignore bad characters */ }
-
-%%
-
-LLScriptAllocationManager *gAllocationManager;
-LLScriptScript *gScriptp;
-
-// Prototype for the yacc parser entry point
-int yyparse(void);
-
-int yyerror(const char *fmt, ...)
-{
- gErrorToText.writeError(yyout, gLine, gColumn, LSERROR_SYNTAX_ERROR);
- return 0;
-}
-
-//#define EMERGENCY_DEBUG_PRINTOUTS
-//#define EMIT_CIL_ASSEMBLER
-
-BOOL lscript_compile(const char* src_filename, const char* dst_filename,
- const char* err_filename, BOOL compile_to_mono, const char* class_name, BOOL is_god_like)
-{
- BOOL b_parse_ok = FALSE;
- BOOL b_dummy = FALSE;
- U64 b_dummy_count = FALSE;
- LSCRIPTType type = LST_NULL;
-
- gInternalColumn = 0;
- gInternalLine = 0;
- gScriptp = NULL;
-
- gErrorToText.init();
- init_supported_expressions();
- init_temp_jumps();
- gAllocationManager = new LLScriptAllocationManager();
-
- yyin = LLFile::fopen(std::string(src_filename), "r");
- if (yyin)
- {
- yyout = LLFile::fopen(std::string(err_filename), "w");
-
- // Reset the lexer's internal buffering.
-
- yyrestart(yyin);
-
- b_parse_ok = !yyparse();
-
- if (b_parse_ok)
- {
-#ifdef EMERGENCY_DEBUG_PRINTOUTS
- char compiled[256];
- sprintf(compiled, "%s.o", src_filename);
- LLFILE* compfile;
- compfile = LLFile::fopen(compiled, "w");
-#endif
-
- if(dst_filename)
- {
- gScriptp->setBytecodeDest(dst_filename);
- }
-
- gScriptp->mGodLike = is_god_like;
-
- gScriptp->setClassName(class_name);
-
- gScopeStringTable = new LLStringTable(16384);
-#ifdef EMERGENCY_DEBUG_PRINTOUTS
- gScriptp->recurse(compfile, 0, 4, LSCP_PRETTY_PRINT, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
-#endif
- gScriptp->recurse(yyout, 0, 0, LSCP_PRUNE, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
- gScriptp->recurse(yyout, 0, 0, LSCP_SCOPE_PASS1, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
- gScriptp->recurse(yyout, 0, 0, LSCP_SCOPE_PASS2, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
- gScriptp->recurse(yyout, 0, 0, LSCP_TYPE, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
- if (!gErrorToText.getErrors())
- {
- gScriptp->recurse(yyout, 0, 0, LSCP_RESOURCE, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
-#ifdef EMERGENCY_DEBUG_PRINTOUTS
- gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_ASSEMBLY, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
-#endif
- if(TRUE == compile_to_mono)
- {
- gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_CIL_ASSEMBLY, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
- }
- else
- {
- gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_BYTE_CODE, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
- }
- }
- delete gScopeStringTable;
- gScopeStringTable = NULL;
-#ifdef EMERGENCY_DEBUG_PRINTOUTS
- fclose(compfile);
-#endif
- }
- fclose(yyout);
- fclose(yyin);
- }
-
- delete gAllocationManager;
- delete gScopeStringTable;
-
- return b_parse_ok && !gErrorToText.getErrors();
-}
-
-
-BOOL lscript_compile(char *filename, BOOL compile_to_mono, BOOL is_god_like = FALSE)
-{
- char src_filename[MAX_STRING];
- sprintf(src_filename, "%s.lsl", filename);
- char err_filename[MAX_STRING];
- sprintf(err_filename, "%s.out", filename);
- char class_name[MAX_STRING];
- sprintf(class_name, "%s", filename);
- return lscript_compile(src_filename, NULL, err_filename, compile_to_mono, class_name, is_god_like);
-}
-
-
-S32 yywrap()
-{
-#if defined(FLEX_SCANNER) && !defined(LL_WINDOWS)
- // get gcc to stop complaining about lack of use of yyunput
- (void) yyunput;
-#endif
- return(1);
-}
-
-void line_comment()
-{
- char c;
-
- while ((c = yyinput()) != '\n' && c != 0 && c != EOF)
- ;
-}
-
-void block_comment()
-{
- char c1 = 0;
- char c2 = yyinput();
- while (c2 != 0 && c2 != EOF && !(c1 == '*' && c2 == '/')) {
- if (c2 == '\n')
- {
- gInternalLine++;
- gInternalColumn = 0;
- }
- else if (c2 == '\t')
- gInternalColumn += 4 - (gInternalColumn % 8);
- else
- gInternalColumn++;
- c1 = c2;
- c2 = yyinput();
- }
-}
-
-void count()
-{
- S32 i;
-
- gColumn = gInternalColumn;
- gLine = gInternalLine;
-
- for (i = 0; yytext[i] != '\0'; i++)
- if (yytext[i] == '\n')
- {
- gInternalLine++;
- gInternalColumn = 0;
- }
- else if (yytext[i] == '\t')
- gInternalColumn += 4 - (gInternalColumn % 8);
- else
- gInternalColumn++;
-}
-
-void parse_string()
-{
- S32 length = (S32)strlen(yytext);
- length = length - 2;
- char *temp = yytext + 1;
-
- S32 i;
- S32 escapes = 0;
- S32 tabs = 0;
- for (i = 0; i < length; i++)
- {
- if (temp[i] == '\\')
- {
- escapes++;
- i++;
- if (temp[i] == 't')
- tabs++;
- }
- }
-
- S32 newlength = length - escapes + tabs*3;
- yylval.sval = new char[newlength + 1];
-
- char *dest = yylval.sval;
-
- for (i = 0; i < length; i++)
- {
- if (temp[i] == '\\')
- {
- i++;
- // linefeed
- if (temp[i] == 'n')
- {
- *dest++ = 10;
- }
- else if (temp[i] == 't')
- {
- *dest++ = ' ';
- *dest++ = ' ';
- *dest++ = ' ';
- *dest++ = ' ';
- }
- else
- {
- *dest++ = temp[i];
- }
- }
- else
- {
- *dest++ = temp[i];
- }
- }
- yylval.sval[newlength] = 0;
-}
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y
deleted file mode 100755
index c451eee3d8f6868df5f8d41546ebd32eb55f0522..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/indra.y
+++ /dev/null
@@ -1,1826 +0,0 @@
-%{
- #include "linden_common.h"
- #include "lscript_tree.h"
-
- int yylex(void);
- int yyparse( void );
- int yyerror(const char *fmt, ...);
-
- #if LL_LINUX
- // broken yacc codegen... --ryan.
- #define getenv getenv_workaround
- #endif
-
- #ifdef LL_WINDOWS
- #pragma warning (disable : 4702) // warning C4702: unreachable code
- #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels
- #endif
-%}
-
-%union
-{
- S32 ival;
- F32 fval;
- char *sval;
- class LLScriptType *type;
- class LLScriptConstant *constant;
- class LLScriptIdentifier *identifier;
- class LLScriptSimpleAssignable *assignable;
- class LLScriptGlobalVariable *global;
- class LLScriptEvent *event;
- class LLScriptEventHandler *handler;
- class LLScriptExpression *expression;
- class LLScriptStatement *statement;
- class LLScriptGlobalFunctions *global_funcs;
- class LLScriptFunctionDec *global_decl;
- class LLScriptState *state;
- class LLScritpGlobalStorage *global_store;
- class LLScriptScript *script;
-};
-
-%token INTEGER
-%token FLOAT_TYPE
-%token STRING
-%token LLKEY
-%token VECTOR
-%token QUATERNION
-%token LIST
-
-%token STATE
-%token EVENT
-%token JUMP
-%token RETURN
-
-%token STATE_ENTRY
-%token STATE_EXIT
-%token TOUCH_START
-%token TOUCH
-%token TOUCH_END
-%token COLLISION_START
-%token COLLISION
-%token COLLISION_END
-%token LAND_COLLISION_START
-%token LAND_COLLISION
-%token LAND_COLLISION_END
-%token TIMER
-%token CHAT
-%token SENSOR
-%token NO_SENSOR
-%token CONTROL
-%token AT_TARGET
-%token NOT_AT_TARGET
-%token AT_ROT_TARGET
-%token NOT_AT_ROT_TARGET
-%token MONEY
-%token EMAIL
-%token RUN_TIME_PERMISSIONS
-%token EXPERIENCE_PERMISSIONS
-%token EXPERIENCE_PERMISSIONS_DENIED
-%token INVENTORY
-%token ATTACH
-%token DATASERVER
-%token MOVING_START
-%token MOVING_END
-%token REZ
-%token OBJECT_REZ
-%token LINK_MESSAGE
-%token REMOTE_DATA
-%token HTTP_RESPONSE
-%token HTTP_REQUEST
-
-%token <sval> IDENTIFIER
-%token <sval> STATE_DEFAULT
-
-%token <ival> INTEGER_CONSTANT
-%token <ival> INTEGER_TRUE
-%token <ival> INTEGER_FALSE
-
-%token <fval> FP_CONSTANT
-
-%token <sval> STRING_CONSTANT
-
-%token INC_OP
-%token DEC_OP
-%token ADD_ASSIGN
-%token SUB_ASSIGN
-%token MUL_ASSIGN
-%token DIV_ASSIGN
-%token MOD_ASSIGN
-
-%token EQ
-%token NEQ
-%token GEQ
-%token LEQ
-
-%token BOOLEAN_AND
-%token BOOLEAN_OR
-
-%token SHIFT_LEFT
-%token SHIFT_RIGHT
-
-%token IF
-%token ELSE
-%token FOR
-%token DO
-%token WHILE
-
-%token PRINT
-
-%token PERIOD
-
-%token ZERO_VECTOR
-%token ZERO_ROTATION
-
-%token TOUCH_INVALID_VECTOR
-%token TOUCH_INVALID_TEXCOORD
-
-%nonassoc LOWER_THAN_ELSE
-%nonassoc ELSE
-
-
-%type <script> lscript_program
-%type <global_store> globals
-%type <global_store> global
-%type <global> global_variable
-%type <assignable> simple_assignable
-%type <assignable> simple_assignable_no_list
-%type <constant> constant
-%type <ival> integer_constant
-%type <fval> fp_constant
-%type <assignable> special_constant
-%type <assignable> vector_constant
-%type <assignable> quaternion_constant
-%type <assignable> list_constant
-%type <assignable> list_entries
-%type <assignable> list_entry
-%type <type> typename
-%type <global_funcs> global_function
-%type <global_decl> function_parameters
-%type <global_decl> function_parameter
-%type <state> states
-%type <state> other_states
-%type <state> default
-%type <state> state
-%type <handler> state_body
-%type <handler> event
-%type <event> state_entry
-%type <event> state_exit
-%type <event> touch_start
-%type <event> touch
-%type <event> touch_end
-%type <event> collision_start
-%type <event> collision
-%type <event> collision_end
-%type <event> land_collision_start
-%type <event> land_collision
-%type <event> land_collision_end
-%type <event> at_target
-%type <event> not_at_target
-%type <event> at_rot_target
-%type <event> not_at_rot_target
-%type <event> money
-%type <event> email
-%type <event> run_time_permissions
-%type <event> experience_permissions
-%type <event> experience_permissions_denied
-%type <event> inventory
-%type <event> attach
-%type <event> dataserver
-%type <event> moving_start
-%type <event> moving_end
-%type <event> rez
-%type <event> object_rez
-%type <event> remote_data
-%type <event> http_response
-%type <event> http_request
-%type <event> link_message
-%type <event> timer
-%type <event> chat
-%type <event> sensor
-%type <event> no_sensor
-%type <event> control
-%type <statement> compound_statement
-%type <statement> statement
-%type <statement> statements
-%type <statement> declaration
-%type <statement> ';'
-%type <statement> '@'
-%type <expression> nextforexpressionlist
-%type <expression> forexpressionlist
-%type <expression> nextfuncexpressionlist
-%type <expression> funcexpressionlist
-%type <expression> nextlistexpressionlist
-%type <expression> listexpressionlist
-%type <expression> unarypostfixexpression
-%type <expression> vector_initializer
-%type <expression> quaternion_initializer
-%type <expression> list_initializer
-%type <expression> lvalue
-%type <expression> '-'
-%type <expression> '!'
-%type <expression> '~'
-%type <expression> '='
-%type <expression> '<'
-%type <expression> '>'
-%type <expression> '+'
-%type <expression> '*'
-%type <expression> '/'
-%type <expression> '%'
-%type <expression> '&'
-%type <expression> '|'
-%type <expression> '^'
-%type <expression> ADD_ASSIGN
-%type <expression> SUB_ASSIGN
-%type <expression> MUL_ASSIGN
-%type <expression> DIV_ASSIGN
-%type <expression> MOD_ASSIGN
-%type <expression> EQ
-%type <expression> NEQ
-%type <expression> LEQ
-%type <expression> GEQ
-%type <expression> BOOLEAN_AND
-%type <expression> BOOLEAN_OR
-%type <expression> SHIFT_LEFT
-%type <expression> SHIFT_RIGHT
-%type <expression> INC_OP
-%type <expression> DEC_OP
-%type <expression> '('
-%type <expression> ')'
-%type <expression> PRINT
-%type <identifier> name_type
-%type <expression> expression
-%type <expression> unaryexpression
-%type <expression> typecast
-
-%right '=' MUL_ASSIGN DIV_ASSIGN MOD_ASSIGN ADD_ASSIGN SUB_ASSIGN
-%left BOOLEAN_AND BOOLEAN_OR
-%left '|'
-%left '^'
-%left '&'
-%left EQ NEQ
-%left '<' LEQ '>' GEQ
-%left SHIFT_LEFT SHIFT_RIGHT
-%left '+' '-'
-%left '*' '/' '%'
-%right '!' '~' INC_OP DEC_OP
-%nonassoc INITIALIZER
-
-%%
-
-lscript_program
- : globals states
- {
- $$ = new LLScriptScript($1, $2);
- gAllocationManager->addAllocation($$);
- gScriptp = $$;
- }
- | states
- {
- $$ = new LLScriptScript(NULL, $1);
- gAllocationManager->addAllocation($$);
- gScriptp = $$;
- }
- ;
-
-globals
- : global
- {
- $$ = $1;
- }
- | global globals
- {
- $$ = $1;
- $1->addGlobal($2);
- }
- ;
-
-global
- : global_variable
- {
- $$ = new LLScritpGlobalStorage($1);
- gAllocationManager->addAllocation($$);
- }
- | global_function
- {
- $$ = new LLScritpGlobalStorage($1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-name_type
- : typename IDENTIFIER
- {
- $$ = new LLScriptIdentifier(gLine, gColumn, $2, $1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-global_variable
- : name_type ';'
- {
- $$ = new LLScriptGlobalVariable(gLine, gColumn, $1->mType, $1, NULL);
- gAllocationManager->addAllocation($$);
- }
- | name_type '=' simple_assignable ';'
- {
- $$ = new LLScriptGlobalVariable(gLine, gColumn, $1->mType, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-simple_assignable
- : simple_assignable_no_list
- {
- $$ = $1;
- }
- | list_constant
- {
- $$ = $1;
- }
- ;
-
-simple_assignable_no_list
- : IDENTIFIER
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptSAIdentifier(gLine, gColumn, id);
- gAllocationManager->addAllocation($$);
- }
- | constant
- {
- $$ = new LLScriptSAConstant(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- | special_constant
- {
- $$ = $1;
- }
- ;
-
-constant
- : integer_constant
- {
- $$ = new LLScriptConstantInteger(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- | fp_constant
- {
- $$ = new LLScriptConstantFloat(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- | STRING_CONSTANT
- {
- $$ = new LLScriptConstantString(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-fp_constant
- : FP_CONSTANT
- {
- $$ = $1;
- }
- | '-' FP_CONSTANT
- {
- $$ = -$2;
- }
- ;
-
-integer_constant
- : INTEGER_CONSTANT
- {
- $$ = $1;
- }
- | INTEGER_TRUE
- {
- $$ = $1;
- }
- | INTEGER_FALSE
- {
- $$ = $1;
- }
- | '-' INTEGER_CONSTANT
- {
- $$ = -$2;
- }
- ;
-
-special_constant
- : vector_constant
- {
- $$ = $1;
- }
- | quaternion_constant
- {
- $$ = $1;
- }
- ;
-
-vector_constant
- : '<' simple_assignable ',' simple_assignable ',' simple_assignable '>'
- {
- $$ = new LLScriptSAVector(gLine, gColumn, $2, $4, $6);
- gAllocationManager->addAllocation($$);
- }
- | ZERO_VECTOR
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptSAConstant *sa0 = new LLScriptSAConstant(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptSAConstant *sa1 = new LLScriptSAConstant(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptSAConstant *sa2 = new LLScriptSAConstant(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- $$ = new LLScriptSAVector(gLine, gColumn, sa0, sa1, sa2);
- gAllocationManager->addAllocation($$);
- }
- | TOUCH_INVALID_VECTOR
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptSAConstant *sa0 = new LLScriptSAConstant(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptSAConstant *sa1 = new LLScriptSAConstant(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptSAConstant *sa2 = new LLScriptSAConstant(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- $$ = new LLScriptSAVector(gLine, gColumn, sa0, sa1, sa2);
- gAllocationManager->addAllocation($$);
- }
- | TOUCH_INVALID_TEXCOORD
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, -1.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptSAConstant *sa0 = new LLScriptSAConstant(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, -1.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptSAConstant *sa1 = new LLScriptSAConstant(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptSAConstant *sa2 = new LLScriptSAConstant(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- $$ = new LLScriptSAVector(gLine, gColumn, sa0, sa1, sa2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-quaternion_constant
- : '<' simple_assignable ',' simple_assignable ',' simple_assignable ',' simple_assignable '>'
- {
- $$ = new LLScriptSAQuaternion(gLine, gColumn, $2, $4, $6, $8);
- gAllocationManager->addAllocation($$);
- }
- | ZERO_ROTATION
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptSAConstant *sa0 = new LLScriptSAConstant(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptSAConstant *sa1 = new LLScriptSAConstant(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptSAConstant *sa2 = new LLScriptSAConstant(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- LLScriptConstantFloat *cf3 = new LLScriptConstantFloat(gLine, gColumn, 1.f);
- gAllocationManager->addAllocation(cf3);
- LLScriptSAConstant *sa3 = new LLScriptSAConstant(gLine, gColumn, cf3);
- gAllocationManager->addAllocation(sa3);
- $$ = new LLScriptSAQuaternion(gLine, gColumn, sa0, sa1, sa2, sa3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-list_constant
- : '[' list_entries ']'
- {
- $$ = new LLScriptSAList(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | '[' ']'
- {
- $$ = new LLScriptSAList(gLine, gColumn, NULL);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-list_entries
- : list_entry
- {
- $$ = $1;
- }
- | list_entry ',' list_entries
- {
- $$ = $1;
- $1->addAssignable($3);
- }
- ;
-
-list_entry
- : simple_assignable_no_list
- {
- $$ = $1;
- }
- ;
-
-typename
- : INTEGER
- {
- $$ = new LLScriptType(gLine, gColumn, LST_INTEGER);
- gAllocationManager->addAllocation($$);
- }
- | FLOAT_TYPE
- {
- $$ = new LLScriptType(gLine, gColumn, LST_FLOATINGPOINT);
- gAllocationManager->addAllocation($$);
- }
- | STRING
- {
- $$ = new LLScriptType(gLine, gColumn, LST_STRING);
- gAllocationManager->addAllocation($$);
- }
- | LLKEY
- {
- $$ = new LLScriptType(gLine, gColumn, LST_KEY);
- gAllocationManager->addAllocation($$);
- }
- | VECTOR
- {
- $$ = new LLScriptType(gLine, gColumn, LST_VECTOR);
- gAllocationManager->addAllocation($$);
- }
- | QUATERNION
- {
- $$ = new LLScriptType(gLine, gColumn, LST_QUATERNION);
- gAllocationManager->addAllocation($$);
- }
- | LIST
- {
- $$ = new LLScriptType(gLine, gColumn, LST_LIST);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-global_function
- : IDENTIFIER '(' ')' compound_statement
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptGlobalFunctions(gLine, gColumn, NULL, id, NULL, $4);
- gAllocationManager->addAllocation($$);
- }
- | name_type '(' ')' compound_statement
- {
- $$ = new LLScriptGlobalFunctions(gLine, gColumn, $1->mType, $1, NULL, $4);
- gAllocationManager->addAllocation($$);
- }
- | IDENTIFIER '(' function_parameters ')' compound_statement
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptGlobalFunctions(gLine, gColumn, NULL, id, $3, $5);
- gAllocationManager->addAllocation($$);
- }
- | name_type '(' function_parameters ')' compound_statement
- {
- $$ = new LLScriptGlobalFunctions(gLine, gColumn, $1->mType, $1, $3, $5);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-function_parameters
- : function_parameter
- {
- $$ = $1;
- }
- | function_parameter ',' function_parameters
- {
- $$ = $1;
- $1->addFunctionParameter($3);
- }
- ;
-
-function_parameter
- : typename IDENTIFIER
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptFunctionDec(gLine, gColumn, $1, id);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-states
- : default
- {
- $$ = $1;
- }
- | default other_states
- {
- $$ = $1;
- $1->mNextp = $2;
- }
- ;
-
-other_states
- : state
- {
- $$ = $1;
- }
- | state other_states
- {
- $$ = $1;
- $1->addState($2);
- }
- ;
-
-default
- : STATE_DEFAULT '{' state_body '}'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptState(gLine, gColumn, LSSTYPE_DEFAULT, id, $3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-state
- : STATE IDENTIFIER '{' state_body '}'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptState(gLine, gColumn, LSSTYPE_USER, id, $4);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-state_body
- : event
- {
- $$ = $1;
- }
- | event state_body
- {
- $$ = $1;
- $1->addEvent($2);
- }
- ;
-
-event
- : state_entry compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | state_exit compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | touch_start compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | touch compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | touch_end compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | collision_start compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | collision compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | collision_end compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | land_collision_start compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | land_collision compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | land_collision_end compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | timer compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | chat compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | sensor compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | no_sensor compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | at_target compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | not_at_target compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | at_rot_target compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | not_at_rot_target compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | money compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | email compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | run_time_permissions compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | experience_permissions compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | experience_permissions_denied compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | inventory compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | attach compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | dataserver compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | control compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | moving_start compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | moving_end compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | rez compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | object_rez compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | link_message compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | remote_data compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | http_response compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- | http_request compound_statement
- {
- $$ = new LLScriptEventHandler(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-state_entry
- : STATE_ENTRY '(' ')'
- {
- $$ = new LLScriptStateEntryEvent(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-state_exit
- : STATE_EXIT '(' ')'
- {
- $$ = new LLScriptStateExitEvent(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-touch_start
- : TOUCH_START '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptTouchStartEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-touch
- : TOUCH '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptTouchEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-touch_end
- : TOUCH_END '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptTouchEndEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-collision_start
- : COLLISION_START '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptCollisionStartEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-collision
- : COLLISION '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptCollisionEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-collision_end
- : COLLISION_END '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptCollisionEndEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-land_collision_start
- : LAND_COLLISION_START '(' VECTOR IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptLandCollisionStartEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-land_collision
- : LAND_COLLISION '(' VECTOR IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptLandCollisionEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-land_collision_end
- : LAND_COLLISION_END '(' VECTOR IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptLandCollisionEndEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-at_target
- : AT_TARGET '(' INTEGER IDENTIFIER ',' VECTOR IDENTIFIER ',' VECTOR IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- $$ = new LLScriptAtTarget(gLine, gColumn, id1, id2, id3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-not_at_target
- : NOT_AT_TARGET '(' ')'
- {
- $$ = new LLScriptNotAtTarget(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-at_rot_target
- : AT_ROT_TARGET '(' INTEGER IDENTIFIER ',' QUATERNION IDENTIFIER ',' QUATERNION IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- $$ = new LLScriptAtRotTarget(gLine, gColumn, id1, id2, id3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-not_at_rot_target
- : NOT_AT_ROT_TARGET '(' ')'
- {
- $$ = new LLScriptNotAtRotTarget(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-money
- : MONEY '(' LLKEY IDENTIFIER ',' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- $$ = new LLScriptMoneyEvent(gLine, gColumn, id1, id2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-email
- : EMAIL '(' STRING IDENTIFIER ',' STRING IDENTIFIER ',' STRING IDENTIFIER ',' STRING IDENTIFIER ',' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- LLScriptIdentifier *id4 = new LLScriptIdentifier(gLine, gColumn, $13);
- gAllocationManager->addAllocation(id4);
- LLScriptIdentifier *id5 = new LLScriptIdentifier(gLine, gColumn, $16);
- gAllocationManager->addAllocation(id5);
- $$ = new LLScriptEmailEvent(gLine, gColumn, id1, id2, id3, id4, id5);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-run_time_permissions
- : RUN_TIME_PERMISSIONS '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptRTPEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-experience_permissions
- : EXPERIENCE_PERMISSIONS '(' LLKEY IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptEXPEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-experience_permissions_denied
- : EXPERIENCE_PERMISSIONS_DENIED '(' LLKEY IDENTIFIER ',' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- $$ = new LLScriptEXPDeniedEvent(gLine, gColumn, id1, id2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-inventory
- : INVENTORY '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptInventoryEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-attach
- : ATTACH '(' LLKEY IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptAttachEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-dataserver
- : DATASERVER '(' LLKEY IDENTIFIER ',' STRING IDENTIFIER')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- $$ = new LLScriptDataserverEvent(gLine, gColumn, id1, id2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-moving_start
- : MOVING_START '(' ')'
- {
- $$ = new LLScriptMovingStartEvent(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-moving_end
- : MOVING_END '(' ')'
- {
- $$ = new LLScriptMovingEndEvent(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-timer
- : TIMER '(' ')'
- {
- $$ = new LLScriptTimerEvent(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-chat
- : CHAT '(' INTEGER IDENTIFIER ',' STRING IDENTIFIER ',' LLKEY IDENTIFIER ',' STRING IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- LLScriptIdentifier *id4 = new LLScriptIdentifier(gLine, gColumn, $13);
- gAllocationManager->addAllocation(id4);
- $$ = new LLScriptChatEvent(gLine, gColumn, id1, id2, id3, id4);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-sensor
- : SENSOR '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptSensorEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-no_sensor
- : NO_SENSOR '(' ')'
- {
- $$ = new LLScriptNoSensorEvent(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-control
- : CONTROL '(' LLKEY IDENTIFIER ',' INTEGER IDENTIFIER ',' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- $$ = new LLScriptControlEvent(gLine, gColumn, id1, id2, id3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-rez
- : REZ '(' INTEGER IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptRezEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-object_rez
- : OBJECT_REZ '(' LLKEY IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- $$ = new LLScriptObjectRezEvent(gLine, gColumn, id1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-link_message
- : LINK_MESSAGE '(' INTEGER IDENTIFIER ',' INTEGER IDENTIFIER ',' STRING IDENTIFIER ',' LLKEY IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- LLScriptIdentifier *id4 = new LLScriptIdentifier(gLine, gColumn, $13);
- gAllocationManager->addAllocation(id4);
- $$ = new LLScriptLinkMessageEvent(gLine, gColumn, id1, id2, id3, id4);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-remote_data
- : REMOTE_DATA '(' INTEGER IDENTIFIER ',' LLKEY IDENTIFIER ',' LLKEY IDENTIFIER ',' STRING IDENTIFIER ',' INTEGER IDENTIFIER ',' STRING IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- LLScriptIdentifier *id4 = new LLScriptIdentifier(gLine, gColumn, $13);
- gAllocationManager->addAllocation(id4);
- LLScriptIdentifier *id5 = new LLScriptIdentifier(gLine, gColumn, $16);
- gAllocationManager->addAllocation(id4);
- LLScriptIdentifier *id6 = new LLScriptIdentifier(gLine, gColumn, $19);
- gAllocationManager->addAllocation(id4);
- $$ = new LLScriptRemoteEvent(gLine, gColumn, id1, id2, id3, id4, id5, id6);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-http_response
- : HTTP_RESPONSE '(' LLKEY IDENTIFIER ',' INTEGER IDENTIFIER ',' LIST IDENTIFIER ',' STRING IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- LLScriptIdentifier *id4 = new LLScriptIdentifier(gLine, gColumn, $13);
- gAllocationManager->addAllocation(id4);
- $$ = new LLScriptHTTPResponseEvent(gLine, gColumn, id1, id2, id3, id4);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-http_request
- : HTTP_REQUEST '(' LLKEY IDENTIFIER ',' STRING IDENTIFIER ',' STRING IDENTIFIER ')'
- {
- LLScriptIdentifier *id1 = new LLScriptIdentifier(gLine, gColumn, $4);
- gAllocationManager->addAllocation(id1);
- LLScriptIdentifier *id2 = new LLScriptIdentifier(gLine, gColumn, $7);
- gAllocationManager->addAllocation(id2);
- LLScriptIdentifier *id3 = new LLScriptIdentifier(gLine, gColumn, $10);
- gAllocationManager->addAllocation(id3);
- $$ = new LLScriptHTTPRequestEvent(gLine, gColumn, id1, id2, id3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-compound_statement
- : '{' '}'
- {
- $$ = new LLScriptCompoundStatement(gLine, gColumn, NULL);
- gAllocationManager->addAllocation($$);
- }
- | '{' statements '}'
- {
- $$ = new LLScriptCompoundStatement(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-statements
- : statement
- {
- $$ = $1;
- }
- | statements statement
- {
- $$ = new LLScriptStatementSequence(gLine, gColumn, $1, $2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-statement
- : ';'
- {
- $$ = new LLScriptNOOP(gLine, gColumn);
- gAllocationManager->addAllocation($$);
- }
- | STATE IDENTIFIER ';'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptStateChange(gLine, gColumn, id);
- gAllocationManager->addAllocation($$);
- }
- | STATE STATE_DEFAULT ';'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptStateChange(gLine, gColumn, id);
- gAllocationManager->addAllocation($$);
- }
- | JUMP IDENTIFIER ';'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptJump(gLine, gColumn, id);
- gAllocationManager->addAllocation($$);
- }
- | '@' IDENTIFIER ';'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptLabel(gLine, gColumn, id);
- gAllocationManager->addAllocation($$);
- }
- | RETURN expression ';'
- {
- $$ = new LLScriptReturn(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | RETURN ';'
- {
- $$ = new LLScriptReturn(gLine, gColumn, NULL);
- gAllocationManager->addAllocation($$);
- }
- | expression ';'
- {
- $$ = new LLScriptExpressionStatement(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- | declaration ';'
- {
- $$ = $1;
- }
- | compound_statement
- {
- $$ = $1;
- }
- | IF '(' expression ')' statement %prec LOWER_THAN_ELSE
- {
- $$ = new LLScriptIf(gLine, gColumn, $3, $5);
- $5->mAllowDeclarations = FALSE;
- gAllocationManager->addAllocation($$);
- }
- | IF '(' expression ')' statement ELSE statement
- {
- $$ = new LLScriptIfElse(gLine, gColumn, $3, $5, $7);
- $5->mAllowDeclarations = FALSE;
- $7->mAllowDeclarations = FALSE;
- gAllocationManager->addAllocation($$);
- }
- | FOR '(' forexpressionlist ';' expression ';' forexpressionlist ')' statement
- {
- $$ = new LLScriptFor(gLine, gColumn, $3, $5, $7, $9);
- $9->mAllowDeclarations = FALSE;
- gAllocationManager->addAllocation($$);
- }
- | DO statement WHILE '(' expression ')' ';'
- {
- $$ = new LLScriptDoWhile(gLine, gColumn, $2, $5);
- $2->mAllowDeclarations = FALSE;
- gAllocationManager->addAllocation($$);
- }
- | WHILE '(' expression ')' statement
- {
- $$ = new LLScriptWhile(gLine, gColumn, $3, $5);
- $5->mAllowDeclarations = FALSE;
- gAllocationManager->addAllocation($$);
- }
- ;
-
-declaration
- : typename IDENTIFIER
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptDeclaration(gLine, gColumn, $1, id, NULL);
- gAllocationManager->addAllocation($$);
- }
- | typename IDENTIFIER '=' expression
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $2);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptDeclaration(gLine, gColumn, $1, id, $4);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-forexpressionlist
- : /* empty */
- {
- $$ = NULL;
- }
- | nextforexpressionlist
- {
- $$ = $1;
- }
- ;
-
-nextforexpressionlist
- : expression
- {
- $$ = new LLScriptForExpressionList(gLine, gColumn, $1, NULL);
- gAllocationManager->addAllocation($$);
- }
- | expression ',' nextforexpressionlist
- {
- $$ = new LLScriptForExpressionList(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-funcexpressionlist
- : /* empty */
- {
- $$ = NULL;
- }
- | nextfuncexpressionlist
- {
- $$ = $1;
- }
- ;
-
-nextfuncexpressionlist
- : expression
- {
- $$ = new LLScriptFuncExpressionList(gLine, gColumn, $1, NULL);
- gAllocationManager->addAllocation($$);
- }
- | expression ',' nextfuncexpressionlist
- {
- $$ = new LLScriptFuncExpressionList(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-listexpressionlist
- : /* empty */
- {
- $$ = NULL;
- }
- | nextlistexpressionlist
- {
- $$ = $1;
- }
- ;
-
-nextlistexpressionlist
- : expression
- {
- $$ = new LLScriptListExpressionList(gLine, gColumn, $1, NULL);
- gAllocationManager->addAllocation($$);
- }
- | expression ',' nextlistexpressionlist
- {
- $$ = new LLScriptListExpressionList(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-expression
- : unaryexpression
- {
- $$ = $1;
- }
- | lvalue '=' expression
- {
- $$ = new LLScriptAssignment(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | lvalue ADD_ASSIGN expression
- {
- $$ = new LLScriptAddAssignment(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | lvalue SUB_ASSIGN expression
- {
- $$ = new LLScriptSubAssignment(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | lvalue MUL_ASSIGN expression
- {
- $$ = new LLScriptMulAssignment(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | lvalue DIV_ASSIGN expression
- {
- $$ = new LLScriptDivAssignment(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | lvalue MOD_ASSIGN expression
- {
- $$ = new LLScriptModAssignment(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression EQ expression
- {
- $$ = new LLScriptEquality(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression NEQ expression
- {
- $$ = new LLScriptNotEquals(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression LEQ expression
- {
- $$ = new LLScriptLessEquals(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression GEQ expression
- {
- $$ = new LLScriptGreaterEquals(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '<' expression
- {
- $$ = new LLScriptLessThan(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '>' expression
- {
- $$ = new LLScriptGreaterThan(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '+' expression
- {
- $$ = new LLScriptPlus(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '-' expression
- {
- $$ = new LLScriptMinus(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '*' expression
- {
- $$ = new LLScriptTimes(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '/' expression
- {
- $$ = new LLScriptDivide(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '%' expression
- {
- $$ = new LLScriptMod(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '&' expression
- {
- $$ = new LLScriptBitAnd(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '|' expression
- {
- $$ = new LLScriptBitOr(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression '^' expression
- {
- $$ = new LLScriptBitXor(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression BOOLEAN_AND expression
- {
- $$ = new LLScriptBooleanAnd(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression BOOLEAN_OR expression
- {
- $$ = new LLScriptBooleanOr(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression SHIFT_LEFT expression
- {
- $$ = new LLScriptShiftLeft(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- | expression SHIFT_RIGHT expression
- {
- $$ = new LLScriptShiftRight(gLine, gColumn, $1, $3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-unaryexpression
- : '-' expression
- {
- $$ = new LLScriptUnaryMinus(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | '!' expression
- {
- $$ = new LLScriptBooleanNot(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | '~' expression
- {
- $$ = new LLScriptBitNot(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | INC_OP lvalue
- {
- $$ = new LLScriptPreIncrement(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | DEC_OP lvalue
- {
- $$ = new LLScriptPreDecrement(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- | typecast
- {
- $$ = $1;
- }
- | unarypostfixexpression
- {
- $$ = $1;
- }
- | '(' expression ')'
- {
- $$ = new LLScriptParenthesis(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-typecast
- : '(' typename ')' lvalue
- {
- $$ = new LLScriptTypeCast(gLine, gColumn, $2, $4);
- gAllocationManager->addAllocation($$);
- }
- | '(' typename ')' constant
- {
- LLScriptConstantExpression *temp = new LLScriptConstantExpression(gLine, gColumn, $4);
- gAllocationManager->addAllocation(temp);
- $$ = new LLScriptTypeCast(gLine, gColumn, $2, temp);
- gAllocationManager->addAllocation($$);
- }
- | '(' typename ')' unarypostfixexpression
- {
- $$ = new LLScriptTypeCast(gLine, gColumn, $2, $4);
- gAllocationManager->addAllocation($$);
- }
- | '(' typename ')' '(' expression ')'
- {
- $$ = new LLScriptTypeCast(gLine, gColumn, $2, $5);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-unarypostfixexpression
- : vector_initializer
- {
- $$ = $1;
- }
- | quaternion_initializer
- {
- $$ = $1;
- }
- | list_initializer
- {
- $$ = $1;
- }
- | lvalue
- {
- $$ = $1;
- }
- | lvalue INC_OP
- {
- $$ = new LLScriptPostIncrement(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- | lvalue DEC_OP
- {
- $$ = new LLScriptPostDecrement(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- | IDENTIFIER '(' funcexpressionlist ')'
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptFunctionCall(gLine, gColumn, id, $3);
- gAllocationManager->addAllocation($$);
- }
- | PRINT '(' expression ')'
- {
- $$ = new LLScriptPrint(gLine, gColumn, $3);
- gAllocationManager->addAllocation($$);
- }
- | constant
- {
- $$ = new LLScriptConstantExpression(gLine, gColumn, $1);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-vector_initializer
- : '<' expression ',' expression ',' expression '>' %prec INITIALIZER
- {
- $$ = new LLScriptVectorInitializer(gLine, gColumn, $2, $4, $6);
- gAllocationManager->addAllocation($$);
- }
- | ZERO_VECTOR
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptConstantExpression *sa0 = new LLScriptConstantExpression(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptConstantExpression *sa1 = new LLScriptConstantExpression(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptConstantExpression *sa2 = new LLScriptConstantExpression(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- $$ = new LLScriptVectorInitializer(gLine, gColumn, sa0, sa1, sa2);
- gAllocationManager->addAllocation($$);
- }
- | TOUCH_INVALID_VECTOR
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptConstantExpression *sa0 = new LLScriptConstantExpression(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptConstantExpression *sa1 = new LLScriptConstantExpression(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptConstantExpression *sa2 = new LLScriptConstantExpression(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- $$ = new LLScriptVectorInitializer(gLine, gColumn, sa0, sa1, sa2);
- gAllocationManager->addAllocation($$);
- }
- | TOUCH_INVALID_TEXCOORD
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, -1.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptConstantExpression *sa0 = new LLScriptConstantExpression(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, -1.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptConstantExpression *sa1 = new LLScriptConstantExpression(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptConstantExpression *sa2 = new LLScriptConstantExpression(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- $$ = new LLScriptVectorInitializer(gLine, gColumn, sa0, sa1, sa2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-quaternion_initializer
- : '<' expression ',' expression ',' expression ',' expression '>' %prec INITIALIZER
- {
- $$ = new LLScriptQuaternionInitializer(gLine, gColumn, $2, $4, $6, $8);
- gAllocationManager->addAllocation($$);
- }
- | ZERO_ROTATION
- {
- LLScriptConstantFloat *cf0 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf0);
- LLScriptConstantExpression *sa0 = new LLScriptConstantExpression(gLine, gColumn, cf0);
- gAllocationManager->addAllocation(sa0);
- LLScriptConstantFloat *cf1 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf1);
- LLScriptConstantExpression *sa1 = new LLScriptConstantExpression(gLine, gColumn, cf1);
- gAllocationManager->addAllocation(sa1);
- LLScriptConstantFloat *cf2 = new LLScriptConstantFloat(gLine, gColumn, 0.f);
- gAllocationManager->addAllocation(cf2);
- LLScriptConstantExpression *sa2 = new LLScriptConstantExpression(gLine, gColumn, cf2);
- gAllocationManager->addAllocation(sa2);
- LLScriptConstantFloat *cf3 = new LLScriptConstantFloat(gLine, gColumn, 1.f);
- gAllocationManager->addAllocation(cf3);
- LLScriptConstantExpression *sa3 = new LLScriptConstantExpression(gLine, gColumn, cf3);
- gAllocationManager->addAllocation(sa3);
- $$ = new LLScriptQuaternionInitializer(gLine, gColumn, sa0, sa1, sa2, sa3);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-list_initializer
- : '[' listexpressionlist ']' %prec INITIALIZER
- {
- $$ = new LLScriptListInitializer(gLine, gColumn, $2);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-lvalue
- : IDENTIFIER
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptLValue(gLine, gColumn, id, NULL);
- gAllocationManager->addAllocation($$);
- }
- | IDENTIFIER PERIOD IDENTIFIER
- {
- LLScriptIdentifier *id = new LLScriptIdentifier(gLine, gColumn, $1);
- gAllocationManager->addAllocation(id);
- LLScriptIdentifier *ac = new LLScriptIdentifier(gLine, gColumn, $3);
- gAllocationManager->addAllocation(id);
- $$ = new LLScriptLValue(gLine, gColumn, id, ac);
- gAllocationManager->addAllocation($$);
- }
- ;
-
-%%
diff --git a/indra/lscript/lscript_compile/lscript_alloc.cpp b/indra/lscript/lscript_compile/lscript_alloc.cpp
deleted file mode 100755
index 5856a94e48b518e10fb1131a0c31bcbc1ecb1481..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_alloc.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file lscript_alloc.cpp
- * @brief Allocation tracking
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
diff --git a/indra/lscript/lscript_compile/lscript_bytecode.cpp b/indra/lscript/lscript_compile/lscript_bytecode.cpp
deleted file mode 100755
index 667e5dafc1b0ec9256c652fd63f85910d083dff1..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_bytecode.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * @file lscript_bytecode.cpp
- * @brief classes to build actual bytecode
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lscript_bytecode.h"
-#include "lscript_error.h"
-
-#if defined(_MSC_VER)
-# pragma warning(disable: 4102) // 'yy_more' : unreferenced label
-# pragma warning(disable: 4702) // unreachable code
-#endif
-
-LLScriptJumpTable::LLScriptJumpTable()
-{
-}
-
-LLScriptJumpTable::~LLScriptJumpTable()
-{
- delete_and_clear(mLabelMap);
- delete_and_clear(mJumpMap);
-}
-
-void LLScriptJumpTable::addLabel(char *name, S32 offset)
-{
- char *temp = gScopeStringTable->addString(name);
- mLabelMap[temp] = new S32(offset);
-}
-
-void LLScriptJumpTable::addJump(char *name, S32 offset)
-{
- char *temp = gScopeStringTable->addString(name);
- mJumpMap[temp] = new S32(offset);
-}
-
-
-LLScriptByteCodeChunk::LLScriptByteCodeChunk(BOOL b_need_jumps)
-: mCodeChunk(NULL), mCurrentOffset(0), mJumpTable(NULL)
-{
- if (b_need_jumps)
- {
- mJumpTable = new LLScriptJumpTable();
- }
-}
-
-LLScriptByteCodeChunk::~LLScriptByteCodeChunk()
-{
- delete [] mCodeChunk;
- delete mJumpTable;
-}
-
-void LLScriptByteCodeChunk::addByte(U8 byte)
-{
- if (mCodeChunk)
- {
- U8 *temp = new U8[mCurrentOffset + 1];
- memcpy(temp, mCodeChunk, mCurrentOffset); /* Flawfinder: ignore */
- delete [] mCodeChunk;
- mCodeChunk = temp;
- }
- else
- {
- mCodeChunk = new U8[1];
- }
- *(mCodeChunk + mCurrentOffset++) = byte;
-}
-
-void LLScriptByteCodeChunk::addU16(U16 data)
-{
- U8 temp[2];
- S32 offset = 0;
- u162bytestream(temp, offset, data);
- addBytes(temp, 2);
-}
-
-void LLScriptByteCodeChunk::addBytes(const U8 *bytes, S32 size)
-{
- if (mCodeChunk)
- {
- U8 *temp = new U8[mCurrentOffset + size];
- memcpy(temp, mCodeChunk, mCurrentOffset); /* Flawfinder: ignore */
- delete [] mCodeChunk;
- mCodeChunk = temp;
- }
- else
- {
- mCodeChunk = new U8[size];
- }
- memcpy(mCodeChunk + mCurrentOffset, bytes, size);/* Flawfinder: ignore */
- mCurrentOffset += size;
-}
-
-void LLScriptByteCodeChunk::addBytes(const char *bytes, S32 size)
-{
- if (mCodeChunk)
- {
- U8 *temp = new U8[mCurrentOffset + size];
- memcpy(temp, mCodeChunk, mCurrentOffset); /*Flawfinder: ignore*/
- delete [] mCodeChunk;
- mCodeChunk = temp;
- }
- else
- {
- mCodeChunk = new U8[size];
- }
- memcpy(mCodeChunk + mCurrentOffset, bytes, size); /*Flawfinder: ignore*/
- mCurrentOffset += size;
-}
-
-void LLScriptByteCodeChunk::addBytes(S32 size)
-{
- if (mCodeChunk)
- {
- U8 *temp = new U8[mCurrentOffset + size];
- memcpy(temp, mCodeChunk, mCurrentOffset); /*Flawfinder: ignore*/
- delete [] mCodeChunk;
- mCodeChunk = temp;
- }
- else
- {
- mCodeChunk = new U8[size];
- }
- memset(mCodeChunk + mCurrentOffset, 0, size);
- mCurrentOffset += size;
-}
-
-void LLScriptByteCodeChunk::addBytesDontInc(S32 size)
-{
- if (mCodeChunk)
- {
- U8 *temp = new U8[mCurrentOffset + size];
- memcpy(temp, mCodeChunk, mCurrentOffset); /*Flawfinder: ignore*/
- delete [] mCodeChunk;
- mCodeChunk = temp;
- }
- else
- {
- mCodeChunk = new U8[size];
- }
- memset(mCodeChunk + mCurrentOffset, 0, size);
-}
-
-void LLScriptByteCodeChunk::addInteger(S32 value)
-{
- U8 temp[4];
- S32 offset = 0;
- integer2bytestream(temp, offset, value);
- addBytes(temp, 4);
-}
-
-void LLScriptByteCodeChunk::addFloat(F32 value)
-{
- U8 temp[4];
- S32 offset = 0;
- float2bytestream(temp, offset, value);
- addBytes(temp, 4);
-}
-
-void LLScriptByteCodeChunk::addLabel(char *name)
-{
- if (mJumpTable)
- {
- mJumpTable->addLabel(name, mCurrentOffset);
- }
-}
-
-void LLScriptByteCodeChunk::addJump(char *name)
-{
- if (mJumpTable)
- {
- mJumpTable->addJump(name, mCurrentOffset);
- }
-}
-
-// format is Byte 0: jump op code Byte 1 - 4: offset
-// the jump position points to Byte 5, so we need to add the data at
-// offset - 4, offset - 3, offset - 2, and offset - 1
-
-// offset is label - jump
-
-void LLScriptByteCodeChunk::connectJumps()
-{
- if (mJumpTable)
- {
- for(std::map<char *, S32 *>::iterator it = mJumpTable->mJumpMap.begin(), end_it = mJumpTable->mJumpMap.end();
- it != end_it;
- ++it)
- {
- S32 jumppos = *it->second;
- S32 offset = *mJumpTable->mLabelMap[it->first] - jumppos;
- jumppos = jumppos - 4;
- integer2bytestream(mCodeChunk, jumppos, offset);
- }
- }
-}
-
-LLScriptScriptCodeChunk::LLScriptScriptCodeChunk(S32 total_size)
-: mTotalSize(total_size), mCompleteCode(NULL)
-{
- mRegisters = new LLScriptByteCodeChunk(FALSE);
- mGlobalVariables = new LLScriptByteCodeChunk(FALSE);
- mGlobalFunctions = new LLScriptByteCodeChunk(FALSE);
- mStates = new LLScriptByteCodeChunk(FALSE);
- mHeap = new LLScriptByteCodeChunk(FALSE);
-}
-
-LLScriptScriptCodeChunk::~LLScriptScriptCodeChunk()
-{
- delete mRegisters;
- delete mGlobalVariables;
- delete mGlobalFunctions;
- delete mStates;
- delete mHeap;
- delete [] mCompleteCode;
-}
-
-void LLScriptScriptCodeChunk::build(LLFILE *efp, LLFILE *bcfp)
-{
- S32 code_data_size = mRegisters->mCurrentOffset +
- mGlobalVariables->mCurrentOffset +
- mGlobalFunctions->mCurrentOffset +
- mStates->mCurrentOffset +
- mHeap->mCurrentOffset;
-
- S32 offset = 0;
-
- if (code_data_size < mTotalSize)
- {
- mCompleteCode = new U8[mTotalSize];
- memset(mCompleteCode, 0, mTotalSize);
-
- memcpy(mCompleteCode, mRegisters->mCodeChunk, mRegisters->mCurrentOffset);
- offset += mRegisters->mCurrentOffset;
-
- set_register(mCompleteCode, LREG_IP, 0);
- set_register(mCompleteCode, LREG_VN, LSL2_VERSION_NUMBER);
- set_event_register(mCompleteCode, LREG_IE, 0, LSL2_CURRENT_MAJOR_VERSION);
- set_register(mCompleteCode, LREG_BP, mTotalSize - 1);
- set_register(mCompleteCode, LREG_SP, mTotalSize - 1);
-
- set_register(mCompleteCode, LREG_GVR, offset);
-
- memcpy(mCompleteCode + offset, mGlobalVariables->mCodeChunk, mGlobalVariables->mCurrentOffset); /*Flawfinder: ignore*/
- offset += mGlobalVariables->mCurrentOffset;
-
- set_register(mCompleteCode, LREG_GFR, offset);
-
- memcpy(mCompleteCode + offset, mGlobalFunctions->mCodeChunk, mGlobalFunctions->mCurrentOffset); /*Flawfinder: ignore*/
- offset += mGlobalFunctions->mCurrentOffset;
-
- set_register(mCompleteCode, LREG_SR, offset);
- // zero is, by definition the default state
- set_register(mCompleteCode, LREG_CS, 0);
- set_register(mCompleteCode, LREG_NS, 0);
- set_event_register(mCompleteCode, LREG_CE, LSCRIPTStateBitField[LSTT_STATE_ENTRY], LSL2_CURRENT_MAJOR_VERSION);
- S32 default_state_offset = 0;
- if (LSL2_CURRENT_MAJOR_VERSION == LSL2_MAJOR_VERSION_TWO)
- {
- default_state_offset = 8;
- }
- else
- {
- default_state_offset = 4;
- }
- set_event_register(mCompleteCode, LREG_ER, bytestream2u64(mStates->mCodeChunk, default_state_offset), LSL2_CURRENT_MAJOR_VERSION);
-
- memcpy(mCompleteCode + offset, mStates->mCodeChunk, mStates->mCurrentOffset); /*Flawfinder: ignore*/
- offset += mStates->mCurrentOffset;
-
- set_register(mCompleteCode, LREG_HR, offset);
-
- memcpy(mCompleteCode + offset, mHeap->mCodeChunk, mHeap->mCurrentOffset); /*Flawfinder: ignore*/
- offset += mHeap->mCurrentOffset;
-
- set_register(mCompleteCode, LREG_HP, offset);
- set_register(mCompleteCode, LREG_FR, 0);
- set_register(mCompleteCode, LREG_SLR, 0);
- set_register(mCompleteCode, LREG_ESR, 0);
- set_register(mCompleteCode, LREG_PR, 0);
- set_register(mCompleteCode, LREG_TM, mTotalSize);
-
-
- if (fwrite(mCompleteCode, 1, mTotalSize, bcfp) != (size_t)mTotalSize)
- {
- LL_WARNS() << "Short write" << LL_ENDL;
- }
- }
- else
- {
- gErrorToText.writeError(efp, 0, 0, LSERROR_ASSEMBLE_OUT_OF_MEMORY);
- }
-}
-
-LLScriptScriptCodeChunk *gScriptCodeChunk;
diff --git a/indra/lscript/lscript_compile/lscript_bytecode.h b/indra/lscript/lscript_compile/lscript_bytecode.h
deleted file mode 100755
index 1908bebcb9a9bb84b4c315a2760eb490ed38db8f..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_bytecode.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file lscript_bytecode.h
- * @brief classes to build actual bytecode
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_BYTECODE_H
-#define LL_LSCRIPT_BYTECODE_H
-
-#include "lscript_byteconvert.h"
-#include "lscript_scope.h"
-#include <map>
-
-class LLScriptJumpTable
-{
-public:
- LLScriptJumpTable();
- ~LLScriptJumpTable();
-
- void addLabel(char *name, S32 offset);
- void addJump(char *name, S32 offset);
-
- std::map<char *, S32 *> mLabelMap;
- std::map<char *, S32 *> mJumpMap;
-};
-
-class LLScriptByteCodeChunk
-{
-public:
- LLScriptByteCodeChunk(BOOL b_need_jumps);
- ~LLScriptByteCodeChunk();
-
- void addByte(U8 byte);
- void addU16(U16 data);
- void addBytes(const U8 *bytes, S32 size);
- void addBytes(const char *bytes, S32 size);
- void addBytes(S32 size);
- void addBytesDontInc(S32 size);
- void addInteger(S32 value);
- void addFloat(F32 value);
- void addLabel(char *name);
- void addJump(char *name);
- void connectJumps();
-
- U8 *mCodeChunk;
- S32 mCurrentOffset;
- LLScriptJumpTable *mJumpTable;
-};
-
-class LLScriptScriptCodeChunk
-{
-public:
- LLScriptScriptCodeChunk(S32 total_size);
- ~LLScriptScriptCodeChunk();
-
- void build(LLFILE *efp, LLFILE *bcfp);
-
- LLScriptByteCodeChunk *mRegisters;
- LLScriptByteCodeChunk *mGlobalVariables;
- LLScriptByteCodeChunk *mGlobalFunctions;
- LLScriptByteCodeChunk *mStates;
- LLScriptByteCodeChunk *mHeap;
- S32 mTotalSize;
- U8 *mCompleteCode;
-};
-
-extern LLScriptScriptCodeChunk *gScriptCodeChunk;
-
-#endif
-
diff --git a/indra/lscript/lscript_compile/lscript_error.cpp b/indra/lscript/lscript_compile/lscript_error.cpp
deleted file mode 100755
index a574981555819271e0dec0021992b627ca2f5ac0..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_error.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file lscript_error.cpp
- * @brief error reporting class and strings
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lscript_error.h"
-
-S32 gColumn = 0;
-S32 gLine = 0;
-S32 gInternalColumn = 0;
-S32 gInternalLine = 0;
-
-LLScriptGenerateErrorText gErrorToText;
-
-void LLScriptFilePosition::fdotabs(LLFILE *fp, S32 tabs, S32 tabsize)
-{
- S32 i;
- for (i = 0; i < tabs * tabsize; i++)
- {
- fprintf(fp, " ");
- }
-}
-
-const char* gWarningText[LSWARN_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "Dead code found beyond return statement"
-};
-
-const char* gErrorText[LSERROR_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "Syntax error",
- "Not all code paths return a value",
- "Function returns a value but return statement doesn't",
- "Return statement type doesn't match function return type",
- "Global functions can't change state",
- "Name previously declared within scope",
- "Name not defined within scope",
- "Type mismatch",
- "Expression must act on LValue",
- "Byte code assembly failed -- out of memory",
- "Function call mismatches type or number of arguments",
- "Use of vector or quaternion method on incorrect type",
- "Lists can't be included in lists",
- "Unitialized variables can't be included in lists",
- "Declaration requires a new scope -- use { and }",
- "CIL assembler failed",
- "Bytecode transformer failed",
- "Bytecode verification failed"
-};
-
-void LLScriptGenerateErrorText::writeWarning(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning)
-{
- fprintf(fp, "(%d, %d) : WARNING : %s\n", pos->mLineNumber, pos->mColumnNumber, gWarningText[warning]);
- mTotalWarnings++;
-}
-
-void LLScriptGenerateErrorText::writeWarning(LLFILE *fp, S32 line, S32 col, LSCRIPTWarnings warning)
-{
- fprintf(fp, "(%d, %d) : WARNING : %s\n", line, col, gWarningText[warning]);
- mTotalWarnings++;
-}
-
-void LLScriptGenerateErrorText::writeError(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTErrors error)
-{
- fprintf(fp, "(%d, %d) : ERROR : %s\n", pos->mLineNumber, pos->mColumnNumber, gErrorText[error]);
- mTotalErrors++;
-}
-
-void LLScriptGenerateErrorText::writeError(LLFILE *fp, S32 line, S32 col, LSCRIPTErrors error)
-{
- fprintf(fp, "(%d, %d) : ERROR : %s\n", line, col, gErrorText[error]);
- mTotalErrors++;
-}
-
-std::string getLScriptErrorString(LSCRIPTErrors error)
-{
- return gErrorText[error];
-}
diff --git a/indra/lscript/lscript_compile/lscript_error.h b/indra/lscript/lscript_compile/lscript_error.h
deleted file mode 100755
index 43fb968a40378542db5cc594064efc9c4435fd5a..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_error.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @file lscript_error.h
- * @brief error reporting class and strings
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_ERROR_H
-#define LL_LSCRIPT_ERROR_H
-
-#include "lscript_scope.h"
-
-typedef enum e_lscript_compile_pass
-{
- LSCP_INVALID,
- LSCP_PRETTY_PRINT,
- LSCP_PRUNE,
- LSCP_SCOPE_PASS1,
- LSCP_SCOPE_PASS2,
- LSCP_TYPE,
- LSCP_RESOURCE,
- LSCP_EMIT_ASSEMBLY,
- LSCP_EMIT_BYTE_CODE,
- LSCP_DETERMINE_HANDLERS,
- LSCP_LIST_BUILD_SIMPLE,
- LSCP_TO_STACK,
- LSCP_BUILD_FUNCTION_ARGS,
- LSCP_EMIT_CIL_ASSEMBLY,
- LSCP_EOF
-} LSCRIPTCompilePass;
-
-typedef enum e_lscript_prune_type
-{
- LSPRUNE_INVALID,
- LSPRUNE_GLOBAL_VOIDS,
- LSPRUNE_GLOBAL_NON_VOIDS,
- LSPRUNE_EVENTS,
- LSPRUNE_DEAD_CODE,
- LSPRUNE_EOF
-} LSCRIPTPruneType;
-
-extern S32 gColumn;
-extern S32 gLine;
-extern S32 gInternalColumn;
-extern S32 gInternalLine;
-
-
-// used to describe where in the file this piece is
-class LLScriptByteCodeChunk;
-
-class LLScriptLibData;
-
-class LLScriptFilePosition
-{
-public:
- LLScriptFilePosition(S32 line, S32 col)
- : mLineNumber(line), mColumnNumber(col), mByteOffset(0), mByteSize(0)
- {
- }
-
- virtual ~LLScriptFilePosition() {}
-
- virtual void recurse(LLFILE *fp, S32 tabs, S32 tabsize,
- LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg,
- LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count,
- LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) = 0;
- virtual S32 getSize() = 0;
-
- void fdotabs(LLFILE *fp, S32 tabs, S32 tabsize);
-
- S32 mLineNumber;
- S32 mColumnNumber;
-
- S32 mByteOffset;
- S32 mByteSize;
-};
-
-typedef enum e_lscript_warnings
-{
- LSWARN_INVALID,
- LSWARN_DEAD_CODE,
- LSWARN_EOF
-} LSCRIPTWarnings;
-
-typedef enum e_lscript_errors
-{
- LSERROR_INVALID,
- LSERROR_SYNTAX_ERROR,
- LSERROR_NO_RETURN,
- LSERROR_INVALID_VOID_RETURN,
- LSERROR_INVALID_RETURN,
- LSERROR_STATE_CHANGE_IN_GLOBAL,
- LSERROR_DUPLICATE_NAME,
- LSERROR_UNDEFINED_NAME,
- LSERROR_TYPE_MISMATCH,
- LSERROR_EXPRESSION_ON_LVALUE,
- LSERROR_ASSEMBLE_OUT_OF_MEMORY,
- LSERROR_FUNCTION_TYPE_ERROR,
- LSERROR_VECTOR_METHOD_ERROR,
- LSERROR_NO_LISTS_IN_LISTS,
- LSERROR_NO_UNITIALIZED_VARIABLES_IN_LISTS,
- LSERROR_NEED_NEW_SCOPE,
- LSERROR_CIL_ASSEMBLER_FAILED = 16, // Mono build error.
- LSERROR_BYTECODE_TRANSFORM_FAILED = 17, // Mono build error.
- LSERROR_BYTECODE_VERIFICATION_FAILED, // Mono build error.
- LSERROR_EOF
-} LSCRIPTErrors;
-
-class LLScriptGenerateErrorText
-{
-public:
- LLScriptGenerateErrorText() { init(); }
- ~LLScriptGenerateErrorText() {}
-
- void init() { mTotalErrors = 0; mTotalWarnings = 0; }
-
- void writeWarning(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning);
- void writeWarning(LLFILE *fp, S32 line, S32 col, LSCRIPTWarnings warning);
- void writeError(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTErrors error);
- void writeError(LLFILE *fp, S32 line, S32 col, LSCRIPTErrors error);
-
- BOOL getErrors() { return mTotalErrors; }
- BOOL getWarnings() { return mTotalWarnings; }
-
- S32 mTotalErrors;
- S32 mTotalWarnings;
-};
-
-std::string getLScriptErrorString(LSCRIPTErrors error);
-
-extern LLScriptGenerateErrorText gErrorToText;
-
-#endif
diff --git a/indra/lscript/lscript_compile/lscript_heap.cpp b/indra/lscript/lscript_compile/lscript_heap.cpp
deleted file mode 100755
index 476c1ac5a64c6d875148d5be5dcd5f94377313c1..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_heap.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @file lscript_heap.cpp
- * @brief classes to manage script heap
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#if 0
-
-#include "linden_common.h"
-
-#include "lscript_heap.h"
-
-LLScriptHeapEntry::LLScriptHeapEntry(U8 *entry)
-: mEntry(entry)
-{
- S32 offset = 0;
- mNext = bytestream2integer(entry, offset);
- mRefCount = bytestream2integer(entry, offset);
- mType = *(entry + offset);
- mData = entry + offset;
- mListOffset = offset;
-}
-
-LLScriptHeapEntry::LLScriptHeapEntry(U8 *heap, S32 offset)
-: mNext(0x9), mType(0), mRefCount(0), mEntry(heap + offset), mData(heap + offset + 0x9), mListOffset(0x9)
-{
-}
-
-LLScriptHeapEntry::~LLScriptHeapEntry()
-{
-}
-
-void LLScriptHeapEntry::addString(char *string)
-{
- S32 size = strlen(string) + 1; /*Flawfinder: ignore*/
- S32 offset = 0;
- memcpy(mData, string, size); /*Flawfinder: ignore*/
- mNext += size;
- integer2bytestream(mEntry, offset, mNext);
- mRefCount++;
- integer2bytestream(mEntry, offset, mRefCount);
- *(mEntry + offset) = LSCRIPTTypeByte[LST_STRING];
-}
-
-
-
-#endif
diff --git a/indra/lscript/lscript_compile/lscript_resource.cpp b/indra/lscript/lscript_compile/lscript_resource.cpp
deleted file mode 100755
index 6cc3e3c5ee1d7563f3ce347e50f87ebba1f7f7f6..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_resource.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file lscript_resource.cpp
- * @brief resource determination prior to assembly
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lscript_resource.h"
-
-void init_temp_jumps()
-{
- gTempJumpCount = 0;
-}
-
-S32 gTempJumpCount = 0;
diff --git a/indra/lscript/lscript_compile/lscript_resource.h b/indra/lscript/lscript_compile/lscript_resource.h
deleted file mode 100755
index 82cece0a85602a9f7b701ab53e5c7880c525f42e..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_resource.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file lscript_resource.h
- * @brief resource determination prior to assembly
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_RESOURCE_H
-#define LL_LSCRIPT_RESOURCE_H
-
-#include "lscript_scope.h"
-
-void init_temp_jumps();
-
-extern S32 gTempJumpCount;
-
-#endif
-
diff --git a/indra/lscript/lscript_compile/lscript_scope.cpp b/indra/lscript/lscript_compile/lscript_scope.cpp
deleted file mode 100755
index e0fdf44d7a03da23167b8553ae9fb16990dcd54e..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_scope.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file lscript_scope.cpp
- * @brief builds nametable and checks scope
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lscript_tree.h"
-
-LLStringTable *gScopeStringTable;
diff --git a/indra/lscript/lscript_compile/lscript_scope.h b/indra/lscript/lscript_compile/lscript_scope.h
deleted file mode 100755
index ffff91c81bc0a3cc01fbf5ff4c030aac944ac2e3..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_scope.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/**
- * @file lscript_scope.h
- * @brief builds nametable and checks scope
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_SCOPE_H
-#define LL_LSCRIPT_SCOPE_H
-
-#include <map>
-#include "llstringtable.h"
-#include "lscript_byteformat.h"
-
-typedef enum e_lscript_identifier_type
-{
- LIT_INVALID,
- LIT_GLOBAL,
- LIT_VARIABLE,
- LIT_FUNCTION,
- LIT_LABEL,
- LIT_STATE,
- LIT_HANDLER,
- LIT_LIBRARY_FUNCTION,
- LIT_EOF
-} LSCRIPTIdentifierType;
-
-const char LSCRIPTFunctionTypeStrings[LST_EOF] = /*Flawfinder: ignore*/
-{
- '0',
- 'i',
- 'f',
- 's',
- 'k',
- 'v',
- 'q',
- 'l',
- '0'
-};
-
-const char * const LSCRIPTListDescription[LST_EOF] = /*Flawfinder: ignore*/
-{
- "PUSHARGB 0",
- "PUSHARGB 1",
- "PUSHARGB 2",
- "PUSHARGB 3",
- "PUSHARGB 4",
- "PUSHARGB 5",
- "PUSHARGB 6",
- "PUSHARGB 7",
- "PUSHARGB 0"
-};
-
-const char * const LSCRIPTTypePush[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "PUSHE",
- "PUSHE",
- "PUSHE",
- "PUSHE",
- "PUSHEV",
- "PUSHEQ",
- "PUSHE",
- "undefined"
-};
-
-const char * const LSCRIPTTypeReturn[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "LOADP -12",
- "LOADP -12",
- "STORES -12\nPOP",
- "STORES -12\nPOP",
- "LOADVP -20",
- "LOADQP -24",
- "LOADLP -12",
- "undefined"
-};
-
-const char * const LSCRIPTTypePop[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "POP",
- "POP",
- "POPS",
- "POPS",
- "POPV",
- "POPQ",
- "POPL",
- "undefined"
-};
-
-const char * const LSCRIPTTypeDuplicate[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "DUP",
- "DUP",
- "DUPS",
- "DUPS",
- "DUPV",
- "DUPQ",
- "DUPL",
- "undefined"
-};
-
-const char * const LSCRIPTTypeLocalStore[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "STORE ",
- "STORE ",
- "STORES ",
- "STORES ",
- "STOREV ",
- "STOREQ ",
- "STOREL ",
- "undefined"
-};
-
-const char * const LSCRIPTTypeLocalDeclaration[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "STOREP ",
- "STOREP ",
- "STORESP ",
- "STORESP ",
- "STOREVP ",
- "STOREQP ",
- "STORELP ",
- "undefined"
-};
-
-const char * const LSCRIPTTypeGlobalStore[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "STOREG ",
- "STOREG ",
- "STORESG ",
- "STORESG ",
- "STOREGV ",
- "STOREGQ ",
- "STORELG ",
- "undefined"
-};
-
-const char * const LSCRIPTTypeLocalPush[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "PUSH ",
- "PUSH ",
- "PUSHS ",
- "PUSHS ",
- "PUSHV ",
- "PUSHQ ",
- "PUSHL ",
- "undefined"
-};
-
-const char * const LSCRIPTTypeLocalPush1[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "PUSHARGI 1",
- "PUSHARGF 1",
- "undefined",
- "undefined",
- "undefined",
- "undefined",
- "undefined",
- "undefined"
-};
-
-const char * const LSCRIPTTypeGlobalPush[LST_EOF] = /*Flawfinder: ignore*/
-{
- "INVALID",
- "PUSHG ",
- "PUSHG ",
- "PUSHGS ",
- "PUSHGS ",
- "PUSHGV ",
- "PUSHGQ ",
- "PUSHGL ",
- "undefined"
-};
-
-class LLScriptSimpleAssignable;
-
-class LLScriptArgString
-{
-public:
- LLScriptArgString() : mString(NULL) {}
- ~LLScriptArgString() { delete [] mString; }
-
- LSCRIPTType getType(S32 count)
- {
- if (!mString)
- return LST_NULL;
- S32 length = (S32)strlen(mString); /*Flawfinder: ignore*/
- if (count >= length)
- {
- return LST_NULL;
- }
- switch(mString[count])
- {
- case 'i':
- return LST_INTEGER;
- case 'f':
- return LST_FLOATINGPOINT;
- case 's':
- return LST_STRING;
- case 'k':
- return LST_KEY;
- case 'v':
- return LST_VECTOR;
- case 'q':
- return LST_QUATERNION;
- case 'l':
- return LST_LIST;
- default:
- return LST_NULL;
- }
- }
-
- void addType(LSCRIPTType type)
- {
- S32 count = 0;
- if (mString)
- {
- count = (S32)strlen(mString); /*Flawfinder: ignore*/
- char *temp = new char[count + 2];
- memcpy(temp, mString, count); /*Flawfinder: ignore*/
- delete [] mString;
- mString = temp;
- mString[count + 1] = 0;
- }
- else
- {
- mString = new char[count + 2];
- mString[count + 1] = 0;
- }
- mString[count++] = LSCRIPTFunctionTypeStrings[type];
- }
-
- S32 getNumber()
- {
- if (mString)
- return (S32)strlen(mString); /*Flawfinder: ignore*/
- else
- return 0;
- }
-
- char *mString;
-};
-
-class LLScriptScopeEntry
-{
-public:
- LLScriptScopeEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
- : mIdentifier(identifier), mIDType(idtype), mType(type), mOffset(0), mSize(0), mAssignable(NULL), mCount(count), mLibraryNumber(0)
- {
- }
-
- ~LLScriptScopeEntry() {}
-
- const char *mIdentifier;
- LSCRIPTIdentifierType mIDType;
- LSCRIPTType mType;
- S32 mOffset;
- S32 mSize;
- LLScriptSimpleAssignable *mAssignable;
- S32 mCount; // NOTE: Index for locals in CIL.
- U16 mLibraryNumber;
- LLScriptArgString mFunctionArgs;
- LLScriptArgString mLocals;
-};
-
-class LLScriptScope
-{
-public:
- LLScriptScope(LLStringTable *stable)
- : mParentScope(NULL), mSTable(stable), mFunctionCount(0), mStateCount(0)
- {
- }
-
- ~LLScriptScope()
- {
- delete_and_clear(mEntryMap);
- }
-
- LLScriptScopeEntry *addEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
- {
- const char *name = mSTable->addString(identifier);
- if (mEntryMap.find(name) == mEntryMap.end())
- {
- if (idtype == LIT_FUNCTION)
- mEntryMap[name] = new LLScriptScopeEntry(name, idtype, type, mFunctionCount++);
- else if (idtype == LIT_STATE)
- mEntryMap[name] = new LLScriptScopeEntry(name, idtype, type, mStateCount++);
- else
- mEntryMap[name] = new LLScriptScopeEntry(name, idtype, type);
- return mEntryMap[name];
- }
- else
- {
- // identifier already exists at this scope
- return NULL;
- }
- }
-
- bool checkEntry(const char *identifier)
- {
- const char *name = mSTable->addString(identifier);
- return mEntryMap.find(name) != mEntryMap.end();
- }
-
- LLScriptScopeEntry *findEntry(const char *identifier)
- {
- const char *name = mSTable->addString(identifier);
- LLScriptScope *scope = this;
-
- while (scope)
- {
- entry_map_t::iterator found_it = mEntryMap.find(name);
- if (found_it != mEntryMap.end())
- {
- // cool, we found it at this scope
- return found_it->second;
- }
- scope = scope->mParentScope;
- }
- return NULL;
- }
-
- LLScriptScopeEntry *findEntryTyped(const char *identifier, LSCRIPTIdentifierType idtype)
- {
- const char *name = mSTable->addString(identifier);
- LLScriptScope *scope = this;
-
- while (scope)
- {
- entry_map_t::iterator found_it = scope->mEntryMap.find(name);
- if (found_it != scope->mEntryMap.end())
- {
- // need to check type, and if type is function we need to check both types
- if (idtype == LIT_FUNCTION)
- {
- if (found_it->second->mIDType == LIT_FUNCTION)
- {
- return (found_it->second);
- }
- else if (found_it->second->mIDType == LIT_LIBRARY_FUNCTION)
- {
- return (found_it->second);
- }
- }
- else if (found_it->second->mIDType == idtype)
- {
- // cool, we found it at this scope
- return (found_it->second);
- }
- }
- scope = scope->mParentScope;
- }
- return NULL;
- }
-
- void addParentScope(LLScriptScope *scope)
- {
- mParentScope = scope;
- }
-
- typedef std::map<const char *, LLScriptScopeEntry *> entry_map_t;
- entry_map_t mEntryMap;
- LLScriptScope* mParentScope;
- LLStringTable* mSTable;
- S32 mFunctionCount;
- S32 mStateCount;
-};
-
-extern LLStringTable *gScopeStringTable;
-
-
-
-#endif
diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp
deleted file mode 100755
index 4215596c8b8e58ab40cea97647f621007b8423a0..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_tree.cpp
+++ /dev/null
@@ -1,11052 +0,0 @@
-/**
- * @file lscript_tree.cpp
- * @brief implements methods for lscript_tree.h classes
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-// TO DO: Move print functionality from .h file to here
-
-#include "linden_common.h"
-
-#include "lscript_tree.h"
-#include "lscript_typecheck.h"
-#include "lscript_resource.h"
-#include "lscript_bytecode.h"
-#include "lscript_heap.h"
-#include "lscript_library.h"
-#include "lscript_alloc.h"
-
-//#define LSL_INCLUDE_DEBUG_INFO
-
-
-static void print_cil_box(LLFILE* fp, LSCRIPTType type)
-{
-
-switch(type)
- {
- case LST_INTEGER:
- fprintf(fp, "box [mscorlib]System.Int32\n");
- break;
- case LST_FLOATINGPOINT:
- fprintf(fp, "box [mscorlib]System.Single\n");
- break;
- case LST_STRING:
- // System.String is not a System.ValueType,
- // so does not need to be boxed.
- break;
- case LST_KEY:
- fprintf(fp, "box [ScriptTypes]LindenLab.SecondLife.Key\n");
- break;
- case LST_VECTOR:
- fprintf(fp, "box [ScriptTypes]LindenLab.SecondLife.Vector\n");
- break;
- case LST_QUATERNION:
- fprintf(fp, "box [ScriptTypes]LindenLab.SecondLife.Quaternion\n");
- break;
- default:
- llassert(false);
- break;
- }
-}
-
-static void print_cil_type(LLFILE* fp, LSCRIPTType type)
-{
- switch(type)
- {
- case LST_INTEGER:
- fprintf(fp, "int32");
- break;
- case LST_FLOATINGPOINT:
- fprintf(fp, "float32");
- break;
- case LST_STRING:
- fprintf(fp, "string");
- break;
- case LST_KEY:
- fprintf(fp, "valuetype [ScriptTypes]LindenLab.SecondLife.Key");
- break;
- case LST_VECTOR:
- fprintf(fp, "class [ScriptTypes]LindenLab.SecondLife.Vector");
- break;
- case LST_QUATERNION:
- fprintf(fp, "class [ScriptTypes]LindenLab.SecondLife.Quaternion");
- break;
- case LST_LIST:
- fprintf(fp, "class [mscorlib]System.Collections.ArrayList");
- break;
- case LST_NULL:
- fprintf(fp, "void");
- break;
- default:
- break;
- }
-}
-
-void LLScriptType::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp,"%s",LSCRIPTTypeNames[mType]);
- break;
- case LSCP_TYPE:
- type = mType;
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- print_cil_type(fp, mType);
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptType::getSize()
-{
- return LSCRIPTDataSize[mType];
-}
-
-void LLScriptConstant::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp,"Script Constant Base class -- should never get here!\n");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptConstant::getSize()
-{
- printf("Script Constant Base class -- should never get here!\n");
- return 0;
-}
-
-
-
-void LLScriptConstantInteger::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "%d", mValue);
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "PUSHARGI %d\n", mValue);
- break;
- case LSCP_TYPE:
- type = mType;
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- chunk->addInteger(mValue);
- type = mType;
- }
- break;
- case LSCP_TO_STACK:
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(mValue);
- type = mType;
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- *ldata = new LLScriptLibData(mValue);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "ldc.i4 %d\n", mValue);
- type = mType;
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptConstantInteger::getSize()
-{
- return LSCRIPTDataSize[LST_INTEGER];
-}
-
-void LLScriptConstantFloat::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "%5.5f", mValue);
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "PUSHARGF %5.5f\n", mValue);
- break;
- case LSCP_TYPE:
- type = mType;
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- chunk->addFloat(mValue);
- type = mType;
- }
- break;
- case LSCP_TO_STACK:
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGF]);
- chunk->addFloat(mValue);
- type = mType;
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- *ldata = new LLScriptLibData(mValue);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- double v = (double)mValue;
- U8 * p = (U8 *)&v; // See ECMA-335 Partition VI, Appendix C.4.6 Examples, line 4
- fprintf(fp, "ldc.r8 (%02x %02x %02x %02x %02x %02x %02x %02x)\n", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
- type = mType;
- }
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptConstantFloat::getSize()
-{
- return LSCRIPTDataSize[LST_FLOATINGPOINT];
-}
-
-void print_escaped(LLFILE* fp, const char* str)
-{
- putc('"', fp);
- for(const char* c = str; *c != '\0'; ++c)
- {
- switch(*c)
- {
- case '"':
- putc('\\', fp);
- putc(*c, fp);
- break;
- case '\n':
- putc('\\', fp);
- putc('n', fp);
- break;
- case '\t':
- putc(' ', fp);
- putc(' ', fp);
- putc(' ', fp);
- putc(' ', fp);
- break;
- case '\\':
- putc('\\', fp);
- putc('\\', fp);
- break;
- default:
- putc(*c, fp);
- }
- }
- putc('"', fp);
-}
-
-void LLScriptConstantString::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "\"%s\"", mValue);
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "PUSHARGS \"%s\"\n", mValue);
- break;
- case LSCP_TYPE:
- type = mType;
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- chunk->addInteger(heap->mCurrentOffset + 1);
- LLScriptLibData *data = new LLScriptLibData(mValue);
- U8 *temp;
- S32 size = lsa_create_data_block(&temp, data, heap->mCurrentOffset);
-
- heap->addBytes(temp, size);
- delete [] temp;
- delete data;
- }
- break;
- case LSCP_TO_STACK:
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGS]);
- chunk->addBytes(mValue, (S32)strlen(mValue) + 1);
- type = mType;
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- *ldata = new LLScriptLibData(mValue);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "ldstr ");
- print_escaped(fp, mValue);
- fprintf(fp, "\n");
- default:
- break;
- }
-}
-
-S32 LLScriptConstantString::getSize()
-{
- return (S32)strlen(mValue) + 1;
-}
-
-void LLScriptIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "%s", mName);
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mScopeEntry)
- {
- if (mScopeEntry->mIDType == LIT_VARIABLE)
- {
- fprintf(fp, "$BP + %d [%s]", mScopeEntry->mOffset, mName);
- }
- else if (mScopeEntry->mIDType == LIT_GLOBAL)
- {
- fprintf(fp, "$GVR + %d [%s]", mScopeEntry->mOffset, mName);
- }
- else
- {
- fprintf(fp, "%s", mName);
- }
- }
- break;
- case LSCP_TYPE:
- if (mScopeEntry)
- type = mScopeEntry->mType;
- else
- type = LST_NULL;
- break;
- case LSCP_RESOURCE:
- if (mScopeEntry)
- {
- if (mScopeEntry->mIDType == LIT_VARIABLE)
- {
-// fprintf(fp, "LOCAL : %d : %d : %s\n", mScopeEntry->mOffset, mScopeEntry->mSize, mName);
- }
- else if (mScopeEntry->mIDType == LIT_GLOBAL)
- {
-// fprintf(fp, "GLOBAL: %d : %d : %s\n", mScopeEntry->mOffset, mScopeEntry->mSize, mName);
- }
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- if (mScopeEntry)
- {
- if (mScopeEntry->mType == LST_LIST)
- {
- gErrorToText.writeError(fp, this, LSERROR_NO_LISTS_IN_LISTS);
- }
- else if (mScopeEntry->mAssignable)
- {
- mScopeEntry->mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, ldata);
- }
- else
- {
- gErrorToText.writeError(fp, this, LSERROR_NO_UNITIALIZED_VARIABLES_IN_LISTS);
- }
- }
- else
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "'%s'", mName);
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptIdentifier::getSize()
-{
-
- return 0;
-}
-
-
-
-void LLScriptSimpleAssignable::addAssignable(LLScriptSimpleAssignable *assign)
-{
- if (mNextp)
- {
- assign->mNextp = mNextp;
- }
- mNextp = assign;
-}
-
-void LLScriptSimpleAssignable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- fprintf(fp, "Simple Assignable Base Class -- should never get here!\n");
-}
-
-S32 LLScriptSimpleAssignable::getSize()
-{
-
- printf("Simple Assignable Base Class -- should never get here!\n");
- return 0;
-}
-
-static void print_cil_member(LLFILE* fp, LLScriptIdentifier *ident)
-{
- print_cil_type(fp, ident->mScopeEntry->mType);
- fprintf(fp, " %s::'%s'\n", gScriptp->getClassName(), ident->mScopeEntry->mIdentifier);
-}
-
-void LLScriptSAIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_SCOPE_PASS1:
- {
- LLScriptScopeEntry *entry = scope->findEntry(mIdentifier->mName);
- if (!entry)
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- else
- {
- // if we did find it, make sure this identifier is associated with the correct scope entry
- mIdentifier->mScopeEntry = entry;
- }
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- if (mIdentifier->mScopeEntry)
- {
- if(mIdentifier->mScopeEntry->mAssignable)
- {
- mIdentifier->mScopeEntry->mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- else
- {
- // Babbage: 29/8/06: If the scope entry has no mAssignable,
- // set the default type and add the default 0 value to the
- // chunk. Without this SAVectors and SAQuaternions will
- // assume the arbitrary current type is the assignable type
- // and may attempt to access a null chunk. (SL-20156)
- type = mIdentifier->mScopeEntry->mType;
- chunk->addBytes(LSCRIPTDataSize[type]);
- }
- }
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, ldata);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, &(*ldata)->mListp);
- }
- }
- break;
-
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- fprintf(fp, "ldarg.0\n");
- fprintf(fp, "ldfld ");
- print_cil_member(fp, mIdentifier);
- fprintf(fp, "\n");
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- default:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptSAIdentifier::getSize()
-{
- return mIdentifier->getSize();
-}
-
-void LLScriptSAConstant::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, ldata);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, &(*ldata)->mListp);
- }
- }
- break;
- default:
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptSAConstant::getSize()
-{
- return mConstant->getSize();
-}
-
-
-static void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
-{
- switch(srcType)
- {
- case LST_INTEGER:
- switch(targetType)
- {
- case LST_FLOATINGPOINT:
- fprintf(fp, "conv.r8\n");
- break;
- case LST_STRING:
- fprintf(fp, "call string class [mscorlib]System.Convert::ToString(int32)\n");
- break;
- case LST_LIST:
- print_cil_box(fp, LST_INTEGER);
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
- break;
- default:
- break;
- }
- break;
- case LST_FLOATINGPOINT:
- switch(targetType)
- {
- case LST_INTEGER:
- fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::ToInteger(float32)\n");
- break;
- case LST_STRING:
- fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ToString(float32)\n");
- break;
- case LST_LIST:
- print_cil_box(fp, LST_FLOATINGPOINT);
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
- break;
- default:
- break;
- }
- break;
- case LST_STRING:
- switch(targetType)
- {
- case LST_INTEGER:
- fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::StringToInt(string)\n");
- break;
- case LST_FLOATINGPOINT:
- fprintf(fp, "call float32 [LslLibrary]LindenLab.SecondLife.LslRunTime::StringToFloat(string)\n");
- break;
- case LST_KEY:
- fprintf(fp, "call valuetype [ScriptTypes]LindenLab.SecondLife.Key class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateKey'(string)\n");
- break;
- case LST_LIST:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
- break;
- case LST_VECTOR:
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'ParseVector'(string)\n");
- break;
- case LST_QUATERNION:
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'ParseQuaternion'(string)\n");
- break;
- default:
- break;
- }
- break;
- case LST_KEY:
- switch(targetType)
- {
- case LST_KEY:
- break;
- case LST_STRING:
- fprintf(fp, "call string [LslUserScript]LindenLab.SecondLife.LslUserScript::'ToString'(valuetype [ScriptTypes]LindenLab.SecondLife.Key)\n");
- break;
- case LST_LIST:
- print_cil_box(fp, LST_KEY);
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
- break;
- default:
- break;
- }
- break;
- case LST_VECTOR:
- switch(targetType)
- {
- case LST_VECTOR:
- break;
- case LST_STRING:
- fprintf(fp, "call string [LslUserScript]LindenLab.SecondLife.LslUserScript::'ToString'(valuetype [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
- case LST_LIST:
- print_cil_box(fp, LST_VECTOR);
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
- break;
- default:
- break;
- }
- break;
- case LST_QUATERNION:
- switch(targetType)
- {
- case LST_QUATERNION:
- break;
- case LST_STRING:
- fprintf(fp, "call string [LslUserScript]LindenLab.SecondLife.LslUserScript::'ToString'(valuetype [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
- case LST_LIST:
- print_cil_box(fp, LST_QUATERNION);
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
- break;
- default:
- break;
- }
- break;
- case LST_LIST:
- switch(targetType)
- {
- case LST_LIST:
- break;
- case LST_STRING:
- fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ListToString(class [mscorlib]System.Collections.ArrayList)\n");
- break;
- default:
- break;
- }
- break;
- default:
- break;
- }
-}
-
-static void print_cil_numeric_cast(LLFILE* fp, LSCRIPTType currentArg, LSCRIPTType otherArg)
-{
- if((currentArg == LST_INTEGER) && ((otherArg == LST_FLOATINGPOINT) || (otherArg == LST_VECTOR)))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
-}
-
-static void print_cil_assignment_cast(LLFILE* fp, LSCRIPTType src,
- LSCRIPTType dest)
-{
- if (LST_STRING == src && LST_KEY == dest)
- {
- print_cil_cast(fp, src, dest);
- }
- else if(LST_KEY == src && LST_STRING == dest)
- {
- print_cil_cast(fp, src, dest);
- }
- else
- {
- print_cil_numeric_cast(fp, src, dest);
- }
-}
-
-// HACK! Babbage: should be converted to virtual on LSCRIPTSimpleAssignableType to avoid downcasts.
-LSCRIPTType get_type(LLScriptSimpleAssignable* sa)
-{
- LSCRIPTType result = LST_NULL;
- switch(sa->mType)
- {
- case LSSAT_IDENTIFIER:
- result = ((LLScriptSAIdentifier*) sa)->mIdentifier->mScopeEntry->mType;
- break;
- case LSSAT_CONSTANT:
- result = ((LLScriptSAConstant*) sa)->mConstant->mType;
- break;
- case LSSAT_VECTOR_CONSTANT:
- result = LST_VECTOR;
- break;
- case LSSAT_QUATERNION_CONSTANT:
- result = LST_QUATERNION;
- break;
- case LSSAT_LIST_CONSTANT:
- result = LST_LIST;
- break;
- default:
- result = LST_UNDEFINED;
- break;
- }
- return result;
-}
-
-void LLScriptSAVector::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "< ");
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " >");
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TYPE:
- // vector's take floats
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = LST_VECTOR;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- LLScriptByteCodeChunk *list = new LLScriptByteCodeChunk(FALSE);
- mEntry3->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- mEntry2->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- mEntry1->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- LLVector3 vec;
- S32 offset = 0;
- bytestream2vector(vec, list->mCodeChunk, offset);
- *ldata = new LLScriptLibData(vec);
- delete list;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, &(*ldata)->mListp);
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
-
- // Load arguments.
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry1))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry2))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry3))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
-
- // Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
-
- // Next.
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptSAVector::getSize()
-{
- return mEntry1->getSize() + mEntry2->getSize() + mEntry3->getSize();
-}
-
-void LLScriptSAQuaternion::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "< ");
- mEntry4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " >");
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TYPE:
- // vector's take floats
- mEntry4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = LST_QUATERNION;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- mEntry4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = chunk->mCurrentOffset - 4;
- bytestream_int2float(chunk->mCodeChunk, offset);
- }
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_LIST_BUILD_SIMPLE:
- {
- LLScriptByteCodeChunk *list = new LLScriptByteCodeChunk(FALSE);
- mEntry4->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- mEntry3->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- mEntry2->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- mEntry1->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, list, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_INTEGER)
- {
- S32 offset = list->mCurrentOffset - 4;
- bytestream_int2float(list->mCodeChunk, offset);
- }
- LLQuaternion quat;
- S32 offset = 0;
- bytestream2quaternion(quat, list->mCodeChunk, offset);
- *ldata = new LLScriptLibData(quat);
- delete list;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, &(*ldata)->mListp);
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
-
- // Load arguments.
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry1))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry2))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry3))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
- mEntry4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(LST_INTEGER == get_type(mEntry4))
- {
- print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
- }
-
- // Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
-
- // Next.
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- mEntry4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptSAQuaternion::getSize()
-{
- return mEntry1->getSize() + mEntry2->getSize() + mEntry3->getSize() + mEntry4->getSize();
-}
-
-void LLScriptSAList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "[ ");
- if (mEntryList)
- mEntryList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ]");
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TYPE:
- if (mEntryList)
- mEntryList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- type = LST_LIST;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- LLScriptLibData *list_data = new LLScriptLibData;
-
- list_data->mType = LST_LIST;
- if (mEntryList)
- mEntryList->recurse(fp, tabs, tabsize, LSCP_LIST_BUILD_SIMPLE, ptype, prunearg, scope, type, basetype, count, chunk, NULL, stacksize, entry, entrycount, &(list_data->mListp));
-
- U8 *temp;
- chunk->addInteger(heap->mCurrentOffset + 1);
- S32 size = lsa_create_data_block(&temp, list_data, heap->mCurrentOffset);
- heap->addBytes(temp, size);
- delete list_data;
- delete [] temp;
-
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, LSCP_EMIT_BYTE_CODE, ptype, prunearg, scope, type, basetype, count, chunk, NULL, stacksize, entry, entrycount, NULL);
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- // Create list.
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
-
- // Add elements.
- LLScriptSimpleAssignable* current_entry = mEntryList;
- LLScriptSimpleAssignable* next_entry = NULL;
- while(NULL != current_entry)
- {
- next_entry = current_entry->mNextp;
-
- // Null mNextp pointer, so only current list element is processed.
- current_entry->mNextp = NULL;
- current_entry->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- // Restore mNextp pointer.
- current_entry->mNextp = next_entry;
-
- // Box element and store in list.
- print_cil_box(fp, get_type(current_entry));
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(class [mscorlib]System.Collections.ArrayList, object)\n");
-
- // Process next element.
- current_entry = next_entry;
- }
-
- // Process next list.
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- }
- break;
- default:
- if (mEntryList)
- mEntryList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, ldata);
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, ldata);
- }
- break;
- }
-}
-
-S32 LLScriptSAList::getSize()
-{
- return mEntryList->getSize();
-}
-
-void LLScriptGlobalVariable::addGlobal(LLScriptGlobalVariable *global)
-{
- if (mNextp)
- {
- global->mNextp = mNextp;
- }
- mNextp = global;
-}
-
-void LLScriptGlobalVariable::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-// Push initialised variable of type on to stack.
-static void print_cil_init_variable(LLFILE* fp, LSCRIPTType type)
-{
- switch(type)
- {
- case LST_INTEGER:
- fprintf(fp, "ldc.i4.0\n");
- break;
- case LST_FLOATINGPOINT:
- fprintf(fp, "ldc.r8 0\n");
- break;
- case LST_STRING:
- fprintf(fp, "ldstr \"\"\n");
- break;
- case LST_KEY:
- fprintf(fp, "ldstr \"\"\n");
- fprintf(fp, "call valuetype [ScriptTypes]LindenLab.SecondLife.Key class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateKey'(string)\n");
- break;
- case LST_VECTOR:
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
- break;
- case LST_QUATERNION:
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 1\n");
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
- break;
- case LST_LIST:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
- break;
- default:
- break;
- }
-}
-
-void LLScriptGlobalVariable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp,"\t");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mAssignable)
- {
- fprintf(fp, " = ");
- mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- fprintf(fp, ";\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp,"\t");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mAssignable)
- {
- fprintf(fp, " = ");
- mAssignable->recurse(fp, tabs, tabsize, LSCP_PRETTY_PRINT, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fprintf(fp, "Offset: %d Type: %d\n", mIdentifier->mScopeEntry->mOffset, (S32)LSCRIPTTypeByte[mType->mType]);
- }
- else
- {
- fprintf(fp, "\n");
- fprintf(fp, "Offset: %d Type: %d\n", mIdentifier->mScopeEntry->mOffset, (S32)LSCRIPTTypeByte[mType->mType]);
- }
- break;
- case LSCP_SCOPE_PASS1:
- if (scope->checkEntry(mIdentifier->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- if (mAssignable)
- {
- mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- // this needs to go after expression decent to make sure that we don't add ourselves or something silly
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_GLOBAL, mType->mType);
- if (mIdentifier->mScopeEntry && mAssignable)
- mIdentifier->mScopeEntry->mAssignable = mAssignable;
- }
- break;
- case LSCP_TYPE:
- // if the variable has an assignable, it must assignable to the variable's type
- if (mAssignable)
- {
- mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mAssignableType = type;
- if (!legal_assignment(mType->mType, mAssignableType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- // it also includes the name of the variable as well as the type
- // plus 4 bytes of offset from it's apparent address to the actual data
-#ifdef LSL_INCLUDE_DEBUG_INFO
- count += strlen(mIdentifier->mName) + 1 + 1 + 4;
-#else
- count += 1 + 1 + 4;
-#endif
- mIdentifier->mScopeEntry->mOffset = (S32)count;
- mIdentifier->mScopeEntry->mSize = mType->getSize();
- count += mIdentifier->mScopeEntry->mSize;
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- // order for global variables
- // 0 - 4: offset to actual data
- S32 offsetoffset = chunk->mCurrentOffset;
- S32 offsetdelta = 0;
- chunk->addBytes(4);
- // type
- char vtype;
- vtype = LSCRIPTTypeByte[mType->mType];
- chunk->addBytes(&vtype, 1);
- // null terminated name
-#ifdef LSL_INCLUDE_DEBUG_INFO
- chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
-#else
- chunk->addBytes(1);
-#endif
- // put correct offset delta in
- offsetdelta = chunk->mCurrentOffset - offsetoffset;
- integer2bytestream(chunk->mCodeChunk, offsetoffset, offsetdelta);
-
- // now we need space for the variable itself
- LLScriptByteCodeChunk *value = new LLScriptByteCodeChunk(FALSE);
- if (mAssignable)
- {
- mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, value, heap, stacksize, entry, entrycount, NULL);
- // need to put sneaky type conversion here
- if (mAssignableType != mType->mType)
- {
- // the only legal case that is a problem is int->float
- if (mType->mType == LST_FLOATINGPOINT && mAssignableType == LST_INTEGER)
- {
- S32 offset = value->mCurrentOffset - 4;
- bytestream_int2float(value->mCodeChunk, offset);
- }
- }
- }
- else
- {
- if ( (mType->mType == LST_STRING)
- ||(mType->mType == LST_KEY))
- {
- // string and keys (even empty ones) need heap entries
- chunk->addInteger(heap->mCurrentOffset + 1);
- LLScriptLibData *data = new LLScriptLibData("");
- U8 *temp;
- S32 size = lsa_create_data_block(&temp, data, heap->mCurrentOffset);
-
- heap->addBytes(temp, size);
- delete [] temp;
- delete data;
- }
- else if (mType->mType == LST_LIST)
- {
- chunk->addInteger(heap->mCurrentOffset + 1);
- LLScriptLibData *data = new LLScriptLibData;
- data->mType = LST_LIST;
- U8 *temp;
- S32 size = lsa_create_data_block(&temp, data, heap->mCurrentOffset);
-
- heap->addBytes(temp, size);
- delete [] temp;
- delete data;
- }
- else if (mType->mType == LST_QUATERNION)
- {
- chunk->addFloat(1.f);
- chunk->addFloat(0.f);
- chunk->addFloat(0.f);
- chunk->addFloat(0.f);
- }
- else
- {
- value->addBytes(LSCRIPTDataSize[mType->mType]);
- }
- }
- chunk->addBytes(value->mCodeChunk, value->mCurrentOffset);
- delete value;
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
-
- // Initialisation inside ctor.
- fprintf(fp, "ldarg.0\n");
- if (mAssignable)
- {
- // Initialise to value.
- mAssignable->recurse(fp, tabs, tabsize, LSCP_EMIT_CIL_ASSEMBLY,
- ptype, prunearg, scope, type, basetype,
- count, chunk, heap, stacksize, entry,
- entrycount, NULL);
- print_cil_assignment_cast(fp, get_type(mAssignable), mType->mType);
- }
- else
- {
- // Initialise to zero.
- print_cil_init_variable(fp, mType->mType);
- }
- // Store value.
- fprintf(fp, "stfld ");
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp," %s::", gScriptp->getClassName());
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- break;
- default:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mAssignable)
- {
- mAssignable->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptGlobalVariable::getSize()
-{
- S32 return_size;
-
- return_size = mType->getSize();
- return return_size;
-}
-
-void LLScriptEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- fprintf(fp, "Event Base Class -- should never get here!\n");
-}
-
-S32 LLScriptEvent::getSize()
-{
- printf("Event Base Class -- should never get here!\n");
- return 0;
-}
-static void checkForDuplicateHandler(LLFILE *fp, LLScriptFilePosition *pos,
- LLScriptScope *scope,
- const char* name)
-{
- LLScriptScope *parent = scope->mParentScope;
- if (parent->checkEntry((char*)name))
- {
- gErrorToText.writeError(fp, pos, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- parent->addEntry(((char*)name), LIT_HANDLER, LST_NULL);
- }
-}
-
-void LLScriptStateEntryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "state_entry()\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "state_entry()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "state_entry");
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "state_entry";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "state_entry()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptStateEntryEvent::getSize()
-{
- return 0;
-}
-
-void LLScriptStateExitEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "state_exit()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "state_exit");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "state_exit()\n");
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "state_exit";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "state_exit()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptStateExitEvent::getSize()
-{
- return 0;
-}
-
-void LLScriptTouchStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "touch_start( integer ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "touch_start");
- if (scope->checkEntry(mCount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mCount->mScopeEntry = scope->addEntry(mCount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mCount->mScopeEntry)
- {
- mCount->mScopeEntry->mOffset = (S32)count;
- mCount->mScopeEntry->mSize = 4;
- count += mCount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "touch_start";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "touch_start( int32 ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- break;
- default:
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptTouchStartEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptTouchEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "touch( integer ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "touch");
- if (scope->checkEntry(mCount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mCount->mScopeEntry = scope->addEntry(mCount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mCount->mScopeEntry)
- {
- mCount->mScopeEntry->mOffset = (S32)count;
- mCount->mScopeEntry->mSize = 4;
- count += mCount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "touch";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "touch( int32 ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- break;
- default:
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptTouchEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptTouchEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "touch_end( integer ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "touch_end");
- if (scope->checkEntry(mCount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mCount->mScopeEntry = scope->addEntry(mCount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mCount->mScopeEntry)
- {
- mCount->mScopeEntry->mOffset = (S32)count;
- mCount->mScopeEntry->mSize = 4;
- count += mCount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "touch_end";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "touch_end( int32 ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- break;
- default:
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptTouchEndEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "collision_start( integer ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "collision_start");
- if (scope->checkEntry(mCount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mCount->mScopeEntry = scope->addEntry(mCount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mCount->mScopeEntry)
- {
- mCount->mScopeEntry->mOffset = (S32)count;
- mCount->mScopeEntry->mSize = 4;
- count += mCount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "collision_start";
- chunk->addBytes(name, (S32)strlen(name) + 1);
- chunk->addBytes(mCount->mName, (S32)strlen(mCount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "collision_start( int32 ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptCollisionStartEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "collision( integer ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "collision");
- if (scope->checkEntry(mCount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mCount->mScopeEntry = scope->addEntry(mCount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mCount->mScopeEntry)
- {
- mCount->mScopeEntry->mOffset = (S32)count;
- mCount->mScopeEntry->mSize = 4;
- count += mCount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "collision";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "collision( int32 ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptCollisionEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "collision_end( integer ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "collision_end");
- if (scope->checkEntry(mCount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mCount->mScopeEntry = scope->addEntry(mCount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mCount->mScopeEntry)
- {
- mCount->mScopeEntry->mOffset = (S32)count;
- mCount->mScopeEntry->mSize = 4;
- count += mCount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "collision_end";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "collision_end( int32 ");
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptCollisionEndEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptLandCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "land_collision_start( vector ");
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "land_collision_start");
- if (scope->checkEntry(mPosition->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mPosition->mScopeEntry = scope->addEntry(mPosition->mName, LIT_VARIABLE, LST_VECTOR);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mPosition->mScopeEntry)
- {
- mPosition->mScopeEntry->mOffset = (S32)count;
- mPosition->mScopeEntry->mSize = 12;
- count += mPosition->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "land_collision_start";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "land_collision_start( class [ScriptTypes]LindenLab.SecondLife.Vector ");
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptLandCollisionStartEvent::getSize()
-{
- // vector = 12
- return 12;
-}
-
-
-
-void LLScriptLandCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "land_collision( vector ");
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "land_collision");
- if (scope->checkEntry(mPosition->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mPosition->mScopeEntry = scope->addEntry(mPosition->mName, LIT_VARIABLE, LST_VECTOR);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mPosition->mScopeEntry)
- {
- mPosition->mScopeEntry->mOffset = (S32)count;
- mPosition->mScopeEntry->mSize = 12;
- count += mPosition->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "land_collision";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "land_collision( class [ScriptTypes]LindenLab.SecondLife.Vector ");
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptLandCollisionEvent::getSize()
-{
- // vector = 12
- return 12;
-}
-
-
-void LLScriptLandCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "land_collision_end( vector ");
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "land_collision_end");
- if (scope->checkEntry(mPosition->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mPosition->mScopeEntry = scope->addEntry(mPosition->mName, LIT_VARIABLE, LST_VECTOR);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mPosition->mScopeEntry)
- {
- mPosition->mScopeEntry->mOffset = (S32)count;
- mPosition->mScopeEntry->mSize = 12;
- count += mPosition->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "land_collision_end";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "land_collision_end( class [ScriptTypes]LindenLab.SecondLife.Vector ");
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptLandCollisionEndEvent::getSize()
-{
- // vector = 12
- return 12;
-}
-
-
-void LLScriptInventoryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "changed( integer ");
- mChange->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "changed");
- if (scope->checkEntry(mChange->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mChange->mScopeEntry = scope->addEntry(mChange->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mChange->mScopeEntry)
- {
- mChange->mScopeEntry->mOffset = (S32)count;
- mChange->mScopeEntry->mSize = 4;
- count += mChange->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "changed";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mChange->mName, strlen(mChange->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "changed( int32 ");
- mChange->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mChange->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptInventoryEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptAttachEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "attach( key ");
- mAttach->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "attach");
- if (scope->checkEntry(mAttach->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mAttach->mScopeEntry = scope->addEntry(mAttach->mName, LIT_VARIABLE, LST_KEY);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mAttach->mScopeEntry)
- {
- mAttach->mScopeEntry->mOffset = (S32)count;
- mAttach->mScopeEntry->mSize = 4;
- count += mAttach->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "attach";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mAttach->mName, strlen(mAttach->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "attach( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mAttach->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- default:
- mAttach->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptAttachEvent::getSize()
-{
- // key = 4
- return 4;
-}
-
-void LLScriptDataserverEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "dataserver( key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mData->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "dataserver");
- if (scope->checkEntry(mID->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mID->mScopeEntry = scope->addEntry(mID->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mData->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mData->mScopeEntry = scope->addEntry(mData->mName, LIT_VARIABLE, LST_STRING);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mID->mScopeEntry)
- {
- mID->mScopeEntry->mOffset = (S32)count;
- mID->mScopeEntry->mSize = 4;
- count += mID->mScopeEntry->mSize;
- mData->mScopeEntry->mOffset = (S32)count;
- mData->mScopeEntry->mSize = 4;
- count += mData->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "dataserver";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
- chunk->addBytes(mData->mName, strlen(mData->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "dataserver( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mData->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mData->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptDataserverEvent::getSize()
-{
- // key + string = 8
- return 8;
-}
-
-void LLScriptTimerEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "timer()\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "timer()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "timer");
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "timer";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "timer()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptTimerEvent::getSize()
-{
- return 0;
-}
-
-void LLScriptMovingStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "moving_start()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "moving_start");
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "moving_start";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "moving_start()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptMovingStartEvent::getSize()
-{
- return 0;
-}
-
-void LLScriptMovingEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "moving_end()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "moving_end");
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "moving_end";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "moving_end()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptMovingEndEvent::getSize()
-{
- return 0;
-}
-
-void LLScriptRTPEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "chat( integer ");
- mRTPermissions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "run_time_perms");
- if (scope->checkEntry(mRTPermissions->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mRTPermissions->mScopeEntry = scope->addEntry(mRTPermissions->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mRTPermissions->mScopeEntry)
- {
- mRTPermissions->mScopeEntry->mOffset = (S32)count;
- mRTPermissions->mScopeEntry->mSize = 4;
- count += mRTPermissions->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "chat";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mRTPermissions->mName, strlen(mRTPermissions->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- // NOTE: Not replicating LSL2 bug by calling RTP event hander "chat"
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "run_time_perms( int32 ");
- mRTPermissions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mRTPermissions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptRTPEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptChatEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "chat( integer ");
- mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mMessage->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "listen"); // note: this is actually listen in lsl source
- if (scope->checkEntry(mChannel->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mChannel->mScopeEntry = scope->addEntry(mChannel->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mName->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mName->mScopeEntry = scope->addEntry(mName->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mID->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mID->mScopeEntry = scope->addEntry(mID->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mMessage->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mMessage->mScopeEntry = scope->addEntry(mMessage->mName, LIT_VARIABLE, LST_STRING);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mName->mScopeEntry)
- {
- mChannel->mScopeEntry->mOffset = (S32)count;
- mChannel->mScopeEntry->mSize = 4;
- count += mChannel->mScopeEntry->mSize;
- mName->mScopeEntry->mOffset = (S32)count;
- mName->mScopeEntry->mSize = 4;
- count += mName->mScopeEntry->mSize;
- mID->mScopeEntry->mOffset = (S32)count;
- mID->mScopeEntry->mSize = 4;
- count += mID->mScopeEntry->mSize;
- mMessage->mScopeEntry->mOffset = (S32)count;
- mMessage->mScopeEntry->mSize = 4;
- count += mMessage->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "chat";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);
- chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
- chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
- chunk->addBytes(mMessage->mName, strlen(mMessage->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "chat( int32 ");
- mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mMessage->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mMessage->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptChatEvent::getSize()
-{
- // integer + key + string + string = 16
- return 16;
-}
-
-void LLScriptSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "sensor( integer ");
- mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "sensor");
- if (scope->checkEntry(mNumber->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mNumber->mScopeEntry = scope->addEntry(mNumber->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mNumber->mScopeEntry)
- {
- mNumber->mScopeEntry->mOffset = (S32)count;
- mNumber->mScopeEntry->mSize = 4;
- count += mNumber->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "sensor";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "sensor( int32 ");
- mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptSensorEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptObjectRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "object_rez( key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "object_rez");
- if (scope->checkEntry(mID->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mID->mScopeEntry = scope->addEntry(mID->mName, LIT_VARIABLE, LST_KEY);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mID->mScopeEntry)
- {
- mID->mScopeEntry->mOffset = (S32)count;
- mID->mScopeEntry->mSize = 4;
- count += mID->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "sensor";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "object_rez( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptObjectRezEvent::getSize()
-{
- // key = 4
- return 4;
-}
-
-void LLScriptControlEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "control( key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mLevels->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mEdges->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "control");
- if (scope->checkEntry(mName->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mName->mScopeEntry = scope->addEntry(mName->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mLevels->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mLevels->mScopeEntry = scope->addEntry(mLevels->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mEdges->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mEdges->mScopeEntry = scope->addEntry(mEdges->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mName->mScopeEntry)
- {
- mName->mScopeEntry->mOffset = (S32)count;
- mName->mScopeEntry->mSize = 4;
- count += mName->mScopeEntry->mSize;
- mLevels->mScopeEntry->mOffset = (S32)count;
- mLevels->mScopeEntry->mSize = 4;
- count += mLevels->mScopeEntry->mSize;
- mEdges->mScopeEntry->mOffset = (S32)count;
- mEdges->mScopeEntry->mSize = 4;
- count += mEdges->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "control";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
- chunk->addBytes(mLevels->mName, strlen(mLevels->mName) + 1);
- chunk->addBytes(mEdges->mName, strlen(mEdges->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "control( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mLevels->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mEdges->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLevels->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mEdges->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptControlEvent::getSize()
-{
- // key + integer + integer = 12
- return 12;
-}
-
-void LLScriptLinkMessageEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "link_message( integer ");
- mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mNum->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mStr->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "link_message");
- if (scope->checkEntry(mSender->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mSender->mScopeEntry = scope->addEntry(mSender->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mNum->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mNum->mScopeEntry = scope->addEntry(mNum->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mStr->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mStr->mScopeEntry = scope->addEntry(mStr->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mID->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mID->mScopeEntry = scope->addEntry(mID->mName, LIT_VARIABLE, LST_KEY);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mSender->mScopeEntry)
- {
- mSender->mScopeEntry->mOffset = (S32)count;
- mSender->mScopeEntry->mSize = 4;
- count += mSender->mScopeEntry->mSize;
- mNum->mScopeEntry->mOffset = (S32)count;
- mNum->mScopeEntry->mSize = 4;
- count += mNum->mScopeEntry->mSize;
- mStr->mScopeEntry->mOffset = (S32)count;
- mStr->mScopeEntry->mSize = 4;
- count += mStr->mScopeEntry->mSize;
- mID->mScopeEntry->mOffset = (S32)count;
- mID->mScopeEntry->mSize = 4;
- count += mID->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "link_message";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);
- chunk->addBytes(mNum->mName, strlen(mNum->mName) + 1);
- chunk->addBytes(mStr->mName, strlen(mStr->mName) + 1);
- chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "link_message( int32 ");
- mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mNum->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mStr->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mNum->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStr->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptLinkMessageEvent::getSize()
-{
- // integer + key + integer + string = 16
- return 16;
-}
-
-void LLScriptRemoteEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "remote_event( integer ");
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", key ");
- mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", key ");
- mMessageID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mIntVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mStrVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "remote_event");
- if (scope->checkEntry(mType->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mType->mScopeEntry = scope->addEntry(mType->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mChannel->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mChannel->mScopeEntry = scope->addEntry(mChannel->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mMessageID->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mMessageID->mScopeEntry = scope->addEntry(mMessageID->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mSender->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mSender->mScopeEntry = scope->addEntry(mSender->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mIntVal->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mIntVal->mScopeEntry = scope->addEntry(mIntVal->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mStrVal->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mStrVal->mScopeEntry = scope->addEntry(mStrVal->mName, LIT_VARIABLE, LST_STRING);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mType->mScopeEntry)
- {
- mType->mScopeEntry->mOffset = (S32)count;
- mType->mScopeEntry->mSize = 4;
- count += mType->mScopeEntry->mSize;
- mChannel->mScopeEntry->mOffset = (S32)count;
- mChannel->mScopeEntry->mSize = 4;
- count += mChannel->mScopeEntry->mSize;
- mMessageID->mScopeEntry->mOffset = (S32)count;
- mMessageID->mScopeEntry->mSize = 4;
- count += mMessageID->mScopeEntry->mSize;
- mSender->mScopeEntry->mOffset = (S32)count;
- mSender->mScopeEntry->mSize = 4;
- count += mSender->mScopeEntry->mSize;
- mIntVal->mScopeEntry->mOffset = (S32)count;
- mIntVal->mScopeEntry->mSize = 4;
- count += mIntVal->mScopeEntry->mSize;
- mStrVal->mScopeEntry->mOffset = (S32)count;
- mStrVal->mScopeEntry->mSize = 4;
- count += mStrVal->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "remote_event";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mType->mName, strlen(mType->mName) + 1);
- chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);
- chunk->addBytes(mMessageID->mName, strlen(mMessageID->mName) + 1);
- chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);
- chunk->addBytes(mIntVal->mName, strlen(mIntVal->mName) + 1);
- chunk->addBytes(mStrVal->mName, strlen(mStrVal->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "remote_event( int32 ");
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mMessageID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mIntVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mStrVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mMessageID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mIntVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStrVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptRemoteEvent::getSize()
-{
- // integer + key + key + string + integer + string = 24
- return 24;
-}
-
-void LLScriptHTTPResponseEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "http_response( key ");
- mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mStatus->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", class [mscorlib]System.Collections.ArrayList ");
- mMetadata->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
-
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "http_response");
- if (scope->checkEntry(mRequestId->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mRequestId->mScopeEntry = scope->addEntry(mRequestId->mName, LIT_VARIABLE, LST_KEY);
- }
-
- if (scope->checkEntry(mStatus->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mStatus->mScopeEntry = scope->addEntry(mStatus->mName, LIT_VARIABLE, LST_INTEGER);
- }
-
- if (scope->checkEntry(mMetadata->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mMetadata->mScopeEntry = scope->addEntry(mMetadata->mName, LIT_VARIABLE, LST_LIST);
- }
-
- if (scope->checkEntry(mBody->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mBody->mScopeEntry = scope->addEntry(mBody->mName, LIT_VARIABLE, LST_STRING);
- }
- break;
-
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mRequestId->mScopeEntry)
- {
- mRequestId->mScopeEntry->mOffset = (S32)count;
- mRequestId->mScopeEntry->mSize = 4;
- count += mRequestId->mScopeEntry->mSize;
-
- mStatus->mScopeEntry->mOffset = (S32)count;
- mStatus->mScopeEntry->mSize = 4;
- count += mStatus->mScopeEntry->mSize;
-
- mMetadata->mScopeEntry->mOffset = (S32)count;
- mMetadata->mScopeEntry->mSize = 4;
- count += mMetadata->mScopeEntry->mSize;
-
- mBody->mScopeEntry->mOffset = (S32)count;
- mBody->mScopeEntry->mSize = 4;
- count += mBody->mScopeEntry->mSize;
- }
- }
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "http_response";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1);
- chunk->addBytes(mStatus->mName, strlen(mStatus->mName) + 1);
- chunk->addBytes(mMetadata->mName, strlen(mMetadata->mName) + 1);
- chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "http_response( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mStatus->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", class [mscorlib]System.Collections.ArrayList ");
- mMetadata->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- default:
- mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatus->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mMetadata->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptHTTPResponseEvent::getSize()
-{
- // key + integer + list + string = 16
- return 16;
-}
-
-void LLScriptHTTPRequestEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "http_request( key ");
- mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mMethod->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
-
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "http_request");
- if (scope->checkEntry(mRequestId->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mRequestId->mScopeEntry = scope->addEntry(mRequestId->mName, LIT_VARIABLE, LST_KEY);
- }
-
- if (scope->checkEntry(mMethod->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mMethod->mScopeEntry = scope->addEntry(mMethod->mName, LIT_VARIABLE, LST_STRING);
- }
-
- if (scope->checkEntry(mBody->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mBody->mScopeEntry = scope->addEntry(mBody->mName, LIT_VARIABLE, LST_STRING);
- }
- break;
-
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mRequestId->mScopeEntry)
- {
- mRequestId->mScopeEntry->mOffset = (S32)count;
- mRequestId->mScopeEntry->mSize = 4;
- count += mRequestId->mScopeEntry->mSize;
-
- mMethod->mScopeEntry->mOffset = (S32)count;
- mMethod->mScopeEntry->mSize = 4;
- count += mMethod->mScopeEntry->mSize;
-
- mBody->mScopeEntry->mOffset = (S32)count;
- mBody->mScopeEntry->mSize = 4;
- count += mBody->mScopeEntry->mSize;
- }
- }
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "http_request";
- chunk->addBytes(name, strlen(name) + 1); /*Flawfinder: ignore*/
- chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1); /*Flawfinder: ignore*/
- chunk->addBytes(mMethod->mName, strlen(mMethod->mName) + 1); /*Flawfinder: ignore*/
- chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1); /*Flawfinder: ignore*/
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "http_request( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mMethod->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- default:
- mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mMethod->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptHTTPRequestEvent::getSize()
-{
- // key + string + string = 12
- return 12;
-}
-
-void LLScriptMoneyEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "money( key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mAmount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "money");
- if (scope->checkEntry(mName->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mName->mScopeEntry = scope->addEntry(mName->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mAmount->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mAmount->mScopeEntry = scope->addEntry(mAmount->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mName->mScopeEntry)
- {
- mName->mScopeEntry->mOffset = (S32)count;
- mName->mScopeEntry->mSize = 4;
- count += mName->mScopeEntry->mSize;
- mAmount->mScopeEntry->mOffset = (S32)count;
- mAmount->mScopeEntry->mSize = 4;
- count += mAmount->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "money";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
- chunk->addBytes(mAmount->mName, strlen(mAmount->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "money( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mAmount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mAmount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptMoneyEvent::getSize()
-{
- // key + integer = 8
- return 8;
-}
-
-void LLScriptEmailEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "email( string ");
- mTime->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mAddress->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mSubject->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "email");
- if (scope->checkEntry(mTime->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mTime->mScopeEntry = scope->addEntry(mTime->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mAddress->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mAddress->mScopeEntry = scope->addEntry(mAddress->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mSubject->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mSubject->mScopeEntry = scope->addEntry(mSubject->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mBody->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mBody->mScopeEntry = scope->addEntry(mBody->mName, LIT_VARIABLE, LST_STRING);
- }
- if (scope->checkEntry(mNumber->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mNumber->mScopeEntry = scope->addEntry(mNumber->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mAddress->mScopeEntry)
- {
- mTime->mScopeEntry->mOffset = (S32)count;
- mTime->mScopeEntry->mSize = 4;
- count += mTime->mScopeEntry->mSize;
- mAddress->mScopeEntry->mOffset = (S32)count;
- mAddress->mScopeEntry->mSize = 4;
- count += mAddress->mScopeEntry->mSize;
- mSubject->mScopeEntry->mOffset = (S32)count;
- mSubject->mScopeEntry->mSize = 4;
- count += mSubject->mScopeEntry->mSize;
- mBody->mScopeEntry->mOffset = (S32)count;
- mBody->mScopeEntry->mSize = 4;
- count += mBody->mScopeEntry->mSize;
- mNumber->mScopeEntry->mOffset = (S32)count;
- mNumber->mScopeEntry->mSize = 4;
- count += mNumber->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "email";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mTime->mName, strlen(mTime->mName) + 1);
- chunk->addBytes(mAddress->mName, strlen(mAddress->mName) + 1);
- chunk->addBytes(mSubject->mName, strlen(mSubject->mName) + 1);
- chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);
- chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "email( string ");
- mTime->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mAddress->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mSubject->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", string ");
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mTime->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mAddress->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mSubject->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptEmailEvent::getSize()
-{
- // string + string + string + string + integer = 16
- return 20;
-}
-
-void LLScriptRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "rez( integer ");
- mStartParam->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "on_rez");
- if (scope->checkEntry(mStartParam->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mStartParam->mScopeEntry = scope->addEntry(mStartParam->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mStartParam->mScopeEntry)
- {
- mStartParam->mScopeEntry->mOffset = (S32)count;
- mStartParam->mScopeEntry->mSize = 4;
- count += mStartParam->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "rez";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mStartParam->mName, strlen(mStartParam->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "rez( int32 ");
- mStartParam->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mStartParam->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptRezEvent::getSize()
-{
- // integer = 4
- return 4;
-}
-
-void LLScriptNoSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "no_sensor()\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "no_sensor()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "no_sensor");
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "no_sensor";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "no_sensor()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptNoSensorEvent::getSize()
-{
- return 0;
-}
-
-void LLScriptAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "at_target( integer ");
- mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", vector ");
- mTargetPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", vector ");
- mOurPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "at_target");
- if (scope->checkEntry(mTargetNumber->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mTargetNumber->mScopeEntry = scope->addEntry(mTargetNumber->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mTargetPosition->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mTargetPosition->mScopeEntry = scope->addEntry(mTargetPosition->mName, LIT_VARIABLE, LST_VECTOR);
- }
- if (scope->checkEntry(mOurPosition->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mOurPosition->mScopeEntry = scope->addEntry(mOurPosition->mName, LIT_VARIABLE, LST_VECTOR);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mTargetNumber->mScopeEntry)
- {
- mTargetNumber->mScopeEntry->mOffset = (S32)count;
- mTargetNumber->mScopeEntry->mSize = 4;
- count += mTargetNumber->mScopeEntry->mSize;
- mTargetPosition->mScopeEntry->mOffset = (S32)count;
- mTargetPosition->mScopeEntry->mSize = 12;
- count += mTargetPosition->mScopeEntry->mSize;
- mOurPosition->mScopeEntry->mOffset = (S32)count;
- mOurPosition->mScopeEntry->mSize = 12;
- count += mOurPosition->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "at_target";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);
- chunk->addBytes(mTargetPosition->mName, strlen(mTargetPosition->mName) + 1);
- chunk->addBytes(mOurPosition->mName, strlen(mOurPosition->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "at_target( int32 ");
- mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Vector ");
- mTargetPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Vector ");
- mOurPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mTargetPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mOurPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptAtTarget::getSize()
-{
- // integer + vector + vector = 28
- return 28;
-}
-
-
-
-void LLScriptNotAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "not_at_target()\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "not_at_target()\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "not_at_target");
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "not_at_target";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "not_at_target()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptNotAtTarget::getSize()
-{
- return 0;
-}
-
-
-void LLScriptEXPEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "experience_permissions( key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "experience_permissions");
- if (scope->checkEntry(mName->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mName->mScopeEntry = scope->addEntry(mName->mName, LIT_VARIABLE, LST_KEY);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mName->mScopeEntry)
- {
- mName->mScopeEntry->mOffset = (S32)count;
- mName->mScopeEntry->mSize = 4;
- count += mName->mScopeEntry->mSize;
- }
- }
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "experience_permissions";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "experience_permissions( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptEXPEvent::getSize()
-{
- // key = 4
- return 4;
-}
-
-
-void LLScriptEXPDeniedEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "experience_permissions_denied( key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", integer ");
- mReason->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "experience_permissions_denied");
- if (scope->checkEntry(mName->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mName->mScopeEntry = scope->addEntry(mName->mName, LIT_VARIABLE, LST_KEY);
- }
- if (scope->checkEntry(mReason->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mReason->mScopeEntry = scope->addEntry(mReason->mName, LIT_VARIABLE, LST_INTEGER);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just trying to determine how much space the variable needs
- if (mName->mScopeEntry)
- {
- mName->mScopeEntry->mOffset = (S32)count;
- mName->mScopeEntry->mSize = 4;
- count += mName->mScopeEntry->mSize;
-
- mReason->mScopeEntry->mOffset = (S32)count;
- mReason->mScopeEntry->mSize = 4;
- count += mReason->mScopeEntry->mSize;
- }
- }
- break;
-
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "experience_permissions_denied";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
- chunk->addBytes(mReason->mName, strlen(mReason->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "experience_permissions_denied( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", int32 ");
- mReason->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mReason->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptEXPDeniedEvent::getSize()
-{
- // key = 4 + integer
- return LSCRIPTDataSize[LST_KEY]+LSCRIPTDataSize[LST_INTEGER];
-}
-
-void LLScriptAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- case LSCP_EMIT_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "at_rot_target( integer ");
- mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", quaternion ");
- mTargetRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", quaternion ");
- mOurRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "at_rot_target");
- if (scope->checkEntry(mTargetNumber->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mTargetNumber->mScopeEntry = scope->addEntry(mTargetNumber->mName, LIT_VARIABLE, LST_INTEGER);
- }
- if (scope->checkEntry(mTargetRotation->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mTargetRotation->mScopeEntry = scope->addEntry(mTargetRotation->mName, LIT_VARIABLE, LST_QUATERNION);
- }
- if (scope->checkEntry(mOurRotation->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mOurRotation->mScopeEntry = scope->addEntry(mOurRotation->mName, LIT_VARIABLE, LST_QUATERNION);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- if (mTargetNumber->mScopeEntry)
- {
- mTargetNumber->mScopeEntry->mOffset = (S32)count;
- mTargetNumber->mScopeEntry->mSize = 4;
- count += mTargetNumber->mScopeEntry->mSize;
- mTargetRotation->mScopeEntry->mOffset = (S32)count;
- mTargetRotation->mScopeEntry->mSize = 16;
- count += mTargetRotation->mScopeEntry->mSize;
- mOurRotation->mScopeEntry->mOffset = (S32)count;
- mOurRotation->mScopeEntry->mSize = 16;
- count += mOurRotation->mScopeEntry->mSize;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "at_rot_target";
- chunk->addBytes(name, strlen(name) + 1);
- chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);
- chunk->addBytes(mTargetRotation->mName, strlen(mTargetRotation->mName) + 1);
- chunk->addBytes(mOurRotation->mName, strlen(mOurRotation->mName) + 1);
-#endif
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "at_rot_target( int32 ");
- mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Quaternion ");
- mTargetRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Quaternion ");
- mOurRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- default:
- mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mTargetRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mOurRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
-
-S32 LLScriptAtRotTarget::getSize()
-{
- // integer + quaternion + quaternion = 36
- return 36;
-}
-
-
-
-void LLScriptNotAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "not_at_rot_target()\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "not_at_rot_target()\n");
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
-#ifdef LSL_INCLUDE_DEBUG_INFO
- char name[] = "not_at_rot_target";
- chunk->addBytes(name, strlen(name) + 1);
-#endif
- }
- break;
- case LSCP_SCOPE_PASS1:
- checkForDuplicateHandler(fp, this, scope, "not_at_rot_target");
- break;
-
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "not_at_rot_target()");
- break;
- default:
- break;
- }
-}
-
-S32 LLScriptNotAtRotTarget::getSize()
-{
- return 0;
-}
-
-
-
-void LLScriptExpression::addExpression(LLScriptExpression *expression)
-{
- if (mNextp)
- {
- expression->mNextp = mNextp;
- }
- mNextp = expression;
-}
-
-void LLScriptExpression::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- fprintf(fp, "Expression Base Class -- should never get here!\n");
-}
-
-S32 LLScriptExpression::getSize()
-{
- printf("Expression Base Class -- should never get here!\n");
- return 0;
-}
-
-void LLScriptExpression::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-void LLScriptForExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp)
- {
- fprintf(fp, ", ");
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mFirstp->mReturnType)
- {
- fprintf(fp, "%s\n", LSCRIPTTypePop[mFirstp->mReturnType]);
- }
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mReturnType)
- {
- fprintf(fp, "%s\n", LSCRIPTTypePop[mSecondp->mReturnType]);
- }
- }
- break;
- case LSCP_TO_STACK:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- switch(mFirstp->mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_STRING:
- case LST_KEY:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- default:
- break;
- }
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- switch(mSecondp->mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_STRING:
- case LST_KEY:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- default:
- break;
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mFirstp->mReturnType)
- {
- fprintf(fp, "pop\n");
- }
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mReturnType)
- {
- fprintf(fp, "pop\n");
- }
- }
- break;
- default:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptForExpressionList::getSize()
-{
- return 0;
-}
-
-// CIL code generation requires both caller and callee scope entries, so cannot use normal recurse signature.
-// TODO: Refactor general purpose recurse calls in to pass specific virtuals using visitor pattern to select method by pass and node type.
-static void print_cil_func_expression_list(LLScriptFuncExpressionList* self, LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata, LLScriptScopeEntry *callee_entry)
-{
- self->mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- LSCRIPTType argtype = callee_entry->mFunctionArgs.getType(entrycount);
- if (argtype != self->mFirstp->mReturnType)
- {
- print_cil_cast(fp, self->mFirstp->mReturnType, argtype);
- }
- entrycount++;
- if (self->mSecondp)
- {
- llassert(LET_FUNC_EXPRESSION_LIST == self->mSecondp->mType);
- print_cil_func_expression_list((LLScriptFuncExpressionList*) self->mSecondp, fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL, callee_entry);
-
- }
-}
-
-void LLScriptFuncExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp)
- {
- fprintf(fp, ", ");
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TYPE:
- {
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!entry->mFunctionArgs.getType(entrycount))
- {
- gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
- }
- if (!legal_assignment(entry->mFunctionArgs.getType(entrycount), mFirstp->mReturnType))
- {
- gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
- }
- count++;
- entrycount++;
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mReturnType)
- {
- count++;
- if (!entry->mFunctionArgs.getType(entrycount))
- {
- gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
- }
- if (!legal_assignment(entry->mFunctionArgs.getType(entrycount), mSecondp->mReturnType))
- {
- gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
- }
- }
- }
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- LSCRIPTType argtype = entry->mFunctionArgs.getType(entrycount);
- if (argtype != mFirstp->mReturnType)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mFirstp->mReturnType], LSCRIPTTypeNames[argtype]);
- }
- entrycount++;
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mReturnType)
- {
- argtype = entry->mFunctionArgs.getType(entrycount);
- if (argtype != mSecondp->mReturnType)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mSecondp->mReturnType], LSCRIPTTypeNames[argtype]);
- }
- }
- }
- }
- break;
- case LSCP_TO_STACK:
- {
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- LSCRIPTType argtype = entry->mFunctionArgs.getType(entrycount);
- if (argtype != mFirstp->mReturnType)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[argtype] | LSCRIPTTypeHi4Bits[mFirstp->mReturnType];
- chunk->addByte(castbyte);
- }
- entrycount++;
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mReturnType)
- {
- argtype = entry->mFunctionArgs.getType(entrycount);
- if (argtype != mSecondp->mReturnType)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[argtype] | LSCRIPTTypeHi4Bits[mSecondp->mReturnType];
- chunk->addByte(castbyte);
- }
- }
- }
- }
- break;
- default:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptFuncExpressionList::getSize()
-{
- return 0;
-}
-
-void LLScriptListExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp)
- {
- fprintf(fp, ", ");
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mFirstp->mType != LET_LIST_EXPRESSION_LIST)
- {
- fprintf(fp, "%s\n", LSCRIPTListDescription[mFirstp->mReturnType]);
- count++;
- }
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mType != LET_LIST_EXPRESSION_LIST)
- {
- fprintf(fp, "%s\n", LSCRIPTListDescription[mSecondp->mReturnType]);
- count++;
- }
- }
- break;
- case LSCP_TO_STACK:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mFirstp->mType != LET_LIST_EXPRESSION_LIST)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGB]);
- chunk->addByte(LSCRIPTTypeByte[mFirstp->mReturnType]);
- count++;
- }
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mType != LET_LIST_EXPRESSION_LIST)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGB]);
- chunk->addByte(LSCRIPTTypeByte[mSecondp->mReturnType]);
- count++;
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mFirstp->mType != LET_LIST_EXPRESSION_LIST)
- {
- // Box value.
- print_cil_box(fp, mFirstp->mReturnType);
- ++count;
- }
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp->mType != LET_LIST_EXPRESSION_LIST)
- {
- // Box value.
- print_cil_box(fp, mSecondp->mReturnType);
- ++count;
- }
- }
- break;
- default:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mSecondp)
- {
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptListExpressionList::getSize()
-{
- return 0;
-}
-
-// Returns true if identifier is a parameter and false if identifier is a local variable within function_scope.
-bool is_parameter(LLScriptIdentifier* identifier, LLScriptScopeEntry* function_scope)
-{
- // Function stores offset of first local.
- if(0 == function_scope->mOffset)
- {
- // Function offset 0 -> no parameters -> identifier is a local.
- return false;
- }
- else
- {
- // Compare variable offset with function offset to
- // determine whether variable is local or parameter.
- return (identifier->mScopeEntry->mOffset < function_scope->mOffset);
- }
-}
-
-// If assignment is to global variable, pushes this pointer on to stack.
-static void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEntry* function_scope)
-{
- LLScriptLValue *lvalue = (LLScriptLValue *) exp;
- LLScriptIdentifier *ident = lvalue->mIdentifier;
-
- // If global (member), load this pointer.
- if(ident->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- fprintf(fp, "ldarg.0\n");
- }
-
- // If accessor, load value type address, consumed by ldfld.
- if(lvalue->mAccessor)
- {
- if(ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- if(is_parameter(ident, function_scope))
- {
- // Parameter, load by name.
- fprintf(fp, "ldarga.s '%s'\n", ident->mScopeEntry->mIdentifier);
- }
- else
- {
- // Local, load by index.
- fprintf(fp, "ldloca.s %d\n", ident->mScopeEntry->mCount);
- }
- }
- else if (ident->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- fprintf(fp, "ldflda ");
- print_cil_member(fp, ident);
- }
- }
-}
-
-static void print_cil_accessor(LLFILE* fp, LLScriptLValue *lvalue)
-
-{
- LLScriptIdentifier *ident = lvalue->mIdentifier;
- print_cil_type(fp, lvalue->mReturnType);
- fprintf(fp, " ");
- print_cil_type(fp, ident->mScopeEntry->mType);
- fprintf(fp, "::%s\n", lvalue->mAccessor->mName);
-}
-
-void LLScriptLValue::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mAccessor)
- {
- fprintf(fp, ".");
- mAccessor->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- if (mAccessor)
- {
- fprintf(fp, "%s%d [%s.%s]\n", LSCRIPTTypeLocalPush[mReturnType], mIdentifier->mScopeEntry->mOffset + mOffset, mIdentifier->mName, mAccessor->mName);
- }
- else
- {
- fprintf(fp, "%s%d [%s]\n", LSCRIPTTypeLocalPush[mIdentifier->mScopeEntry->mType], mIdentifier->mScopeEntry->mOffset, mIdentifier->mName);
- }
- }
- else if (mIdentifier->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- if (mAccessor)
- {
- fprintf(fp, "%s%d [%s.%s]\n", LSCRIPTTypeGlobalPush[mReturnType], mIdentifier->mScopeEntry->mOffset + mOffset, mIdentifier->mName, mAccessor->mName);
- }
- else
- {
- fprintf(fp, "%s%d [%s]\n", LSCRIPTTypeGlobalPush[mIdentifier->mScopeEntry->mType], mIdentifier->mScopeEntry->mOffset, mIdentifier->mName);
- }
- }
- else
- {
- fprintf(fp, "Unexpected LValue!\n");
- }
- break;
- case LSCP_SCOPE_PASS1:
- {
- LLScriptScopeEntry *entry = scope->findEntry(mIdentifier->mName);
- if (!entry || ( (entry->mIDType != LIT_GLOBAL) && (entry->mIDType != LIT_VARIABLE)))
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- else
- {
- // if we did find it, make sure this identifier is associated with the correct scope entry
- mIdentifier->mScopeEntry = entry;
- }
- }
- break;
- case LSCP_TYPE:
- // if we have an accessor, we need to change what type our identifier returns and set our offset value
- if (mIdentifier->mScopeEntry)
- {
- if (mAccessor)
- {
- BOOL b_ok = FALSE;
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- if (mIdentifier->mScopeEntry->mType == LST_VECTOR)
- {
- if (!strcmp("x", mAccessor->mName))
- {
- mOffset = 0;
- b_ok = TRUE;
- }
- else if (!strcmp("y", mAccessor->mName))
- {
- mOffset = 4;
- b_ok = TRUE;
- }
- else if (!strcmp("z", mAccessor->mName))
- {
- mOffset = 8;
- b_ok = TRUE;
- }
- }
- else if (mIdentifier->mScopeEntry->mType == LST_QUATERNION)
- {
- if (!strcmp("x", mAccessor->mName))
- {
- mOffset = 0;
- b_ok = TRUE;
- }
- else if (!strcmp("y", mAccessor->mName))
- {
- mOffset = 4;
- b_ok = TRUE;
- }
- else if (!strcmp("z", mAccessor->mName))
- {
- mOffset = 8;
- b_ok = TRUE;
- }
- else if (!strcmp("s", mAccessor->mName))
- {
- mOffset = 12;
- b_ok = TRUE;
- }
- }
- }
- else
- {
- if (mIdentifier->mScopeEntry->mType == LST_VECTOR)
- {
- if (!strcmp("x", mAccessor->mName))
- {
- mOffset = 8;
- b_ok = TRUE;
- }
- else if (!strcmp("y", mAccessor->mName))
- {
- mOffset = 4;
- b_ok = TRUE;
- }
- else if (!strcmp("z", mAccessor->mName))
- {
- mOffset = 0;
- b_ok = TRUE;
- }
- }
- else if (mIdentifier->mScopeEntry->mType == LST_QUATERNION)
- {
- if (!strcmp("x", mAccessor->mName))
- {
- mOffset = 12;
- b_ok = TRUE;
- }
- else if (!strcmp("y", mAccessor->mName))
- {
- mOffset = 8;
- b_ok = TRUE;
- }
- else if (!strcmp("z", mAccessor->mName))
- {
- mOffset = 4;
- b_ok = TRUE;
- }
- else if (!strcmp("s", mAccessor->mName))
- {
- mOffset = 0;
- b_ok = TRUE;
- }
- }
- }
- if (b_ok)
- {
- mReturnType = type = LST_FLOATINGPOINT;
- }
- else
- {
- gErrorToText.writeError(fp, this, LSERROR_VECTOR_METHOD_ERROR);
- }
- }
- else
- {
- mReturnType = type = mIdentifier->mScopeEntry->mType;
- }
- }
- else
- {
- mReturnType = type = LST_UNDEFINED;
- }
- break;
- case LSCP_TO_STACK:
- {
- switch(mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSH]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHG]);
- }
- break;
- case LST_KEY:
- case LST_STRING:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHS]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHGS]);
- }
- break;
- case LST_LIST:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHL]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHGL]);
- }
- break;
- case LST_VECTOR:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHV]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHGV]);
- }
- break;
- case LST_QUATERNION:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHQ]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHGQ]);
- }
- break;
- default:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSH]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHG]);
- }
- break;
- }
- S32 address = mIdentifier->mScopeEntry->mOffset + mOffset;
- chunk->addInteger(address);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- print_cil_load_address(fp, this, entry);
- if(mAccessor)
- {
- fprintf(fp, "ldfld ");
- print_cil_accessor(fp, this);
- }
- else if(mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- if(is_parameter(mIdentifier, entry))
- {
- // Parameter, load by name.
- fprintf(fp, "ldarg.s '%s'\n", mIdentifier->mScopeEntry->mIdentifier);
- }
- else
- {
- // Local, load by index.
- fprintf(fp, "ldloc.s %d\n", mIdentifier->mScopeEntry->mCount);
- }
- }
- else if (mIdentifier->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- fprintf(fp, "ldfld ");
- print_cil_member(fp, mIdentifier);
- }
- else
- {
- fprintf(fp, "Unexpected LValue!\n");
- }
- break;
- default:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptLValue::getSize()
-{
- return 0;
-}
-
-static void print_assignment(LLFILE *fp, LLScriptExpression *exp)
-{
- LLScriptLValue *lvalue = (LLScriptLValue *)exp;
- LLScriptIdentifier *ident = lvalue->mIdentifier;
- if (lvalue->mAccessor)
- {
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- fprintf(fp, "%s%d [%s.%s]\n", LSCRIPTTypeLocalStore[ident->mScopeEntry->mType], ident->mScopeEntry->mOffset + lvalue->mOffset, ident->mName, lvalue->mAccessor->mName);
- }
- else if (ident->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- fprintf(fp, "%s%d [%s.%s]\n", LSCRIPTTypeGlobalStore[ident->mScopeEntry->mType], ident->mScopeEntry->mOffset + lvalue->mOffset, ident->mName, lvalue->mAccessor->mName);
- }
- }
- else
- {
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- fprintf(fp, "%s%d [%s]\n", LSCRIPTTypeLocalStore[ident->mScopeEntry->mType], ident->mScopeEntry->mOffset, ident->mName);
- }
- else if (ident->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- fprintf(fp, "%s%d [%s]\n", LSCRIPTTypeGlobalStore[ident->mScopeEntry->mType], ident->mScopeEntry->mOffset, ident->mName);
- }
- }
-}
-
-static void print_cil_assignment(LLFILE *fp, LLScriptExpression *exp, LLScriptScopeEntry* function_scope)
-{
- LLScriptLValue *lvalue = (LLScriptLValue *) exp;
- LLScriptIdentifier *ident = lvalue->mIdentifier;
- if (lvalue->mAccessor)
- {
- // Object address loaded, store in to field.
- fprintf(fp, "stfld ");
- print_cil_accessor(fp, lvalue);
-
- // Load object address.
- print_cil_load_address(fp, exp, function_scope);
-
- // Load field.
- fprintf(fp, "ldfld ");
- print_cil_accessor(fp, lvalue);
- }
- else
- {
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- // Language semantics require value of assignment to be left on stack.
- // TODO: Optimise away redundant dup/pop pairs.
- fprintf(fp, "dup\n");
- if(is_parameter(ident, function_scope))
- {
- // Parameter, store by name.
- fprintf(fp, "starg.s '%s'\n", ident->mScopeEntry->mIdentifier);
- }
- else
- {
- // Local, store by index.
- fprintf(fp, "stloc.s %d\n", ident->mScopeEntry->mCount);
- }
- }
- else if (ident->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- // Object address loaded, store in to field.
- fprintf(fp, "stfld ");
- print_cil_member(fp, ident);
-
- // Load object address.
- print_cil_load_address(fp, exp, function_scope);
-
- // Load field.
- fprintf(fp, "ldfld ");
- print_cil_member(fp, ident);
- }
- }
-}
-
-void print_cast(LLFILE *fp, LSCRIPTType ret_type, LSCRIPTType right_type)
-{
- if (right_type != ret_type)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[right_type], LSCRIPTTypeNames[ret_type]);
- }
-}
-
-void cast2stack(LLScriptByteCodeChunk *chunk, LSCRIPTType ret_type, LSCRIPTType right_type)
-{
- if (right_type != ret_type)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[right_type] | LSCRIPTTypeHi4Bits[ret_type];
- chunk->addByte(castbyte);
- }
-}
-
-void operation2stack(LLScriptByteCodeChunk *chunk, LSCRIPTType ret_type, LSCRIPTType right_type)
-{
- U8 typebyte = LSCRIPTTypeByte[right_type] | LSCRIPTTypeHi4Bits[ret_type];
- chunk->addByte(typebyte);
-}
-
-void store2stack(LLScriptExpression *exp, LLScriptExpression *lv, LLScriptByteCodeChunk *chunk, LSCRIPTType right_type)
-{
- LLScriptLValue *lvalue = (LLScriptLValue *)lv;
- LLScriptIdentifier *ident = lvalue->mIdentifier;
- LSCRIPTType rettype = exp->mReturnType;
-
- if (exp->mRightType != LST_NULL)
- {
- if (legal_binary_expression(rettype, exp->mLeftType, exp->mRightType, exp->mType))
- cast2stack(chunk, right_type, exp->mReturnType);
- }
- switch(exp->mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STORE]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREG]);
- }
- break;
- case LST_KEY:
- case LST_STRING:
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STORES]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREGS]);
- }
- break;
- case LST_LIST:
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREL]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREGL]);
- }
- break;
- case LST_VECTOR:
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREV]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREGV]);
- }
- break;
- case LST_QUATERNION:
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREQ]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREGQ]);
- }
- break;
- default:
- if (ident->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STORE]);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STOREG]);
- }
- break;
- }
- S32 address = ident->mScopeEntry->mOffset + lvalue->mOffset;
- chunk->addInteger(address);
-}
-
-void LLScriptAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " = ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cast(fp, mReturnType, mRightType);
- print_assignment(fp, mLValue);
- }
- break;
- case LSCP_TYPE:
- {
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_assignment(mLeftType, mRightType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType = mLeftType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- store2stack(this, mLValue, chunk, mRightType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mLValue, entry);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_assignment_cast(fp, mRightType, mReturnType);
- print_cil_assignment(fp, mLValue, entry);
- }
- break;
- default:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptAssignment::getSize()
-{
- return 0;
-}
-
-static void print_cil_add(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
-{
- if(LST_LIST == right_type && LST_LIST != left_type)
- {
- print_cil_box(fp, left_type);
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Prepend(class [mscorlib]System.Collections.ArrayList, object)\n");
- return;
- }
-
- switch(left_type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
-
- // Numeric addition.
- fprintf(fp, "add\n");
- break;
-
- case LST_STRING:
- case LST_KEY:
-
- // String concatenation.
- fprintf(fp, "call string valuetype [LslUserScript]LindenLab.SecondLife.LslUserScript::Add(string, string)\n");
- break;
-
- case LST_VECTOR:
-
- // Vector addition.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Add'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- case LST_QUATERNION:
-
- // Rotation addition.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Add'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
-
- case LST_LIST:
- switch(right_type)
- {
- case LST_LIST:
- // Concatenate lists.
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- case LST_INTEGER:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(int32, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- case LST_FLOATINGPOINT:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(float32, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- case LST_STRING:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(string, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- case LST_KEY:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(valuetype [ScriptTypes]LindenLab.SecondLife.Key, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- case LST_VECTOR:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(valuetype [ScriptTypes]LindenLab.SecondLife.Vector, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- case LST_QUATERNION:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(valuetype [ScriptTypes]LindenLab.SecondLife.Quaternion, class [mscorlib]System.Collections.ArrayList)\n");
- break;
- default:
- break;
- }
-
- default:
- break;
- }
-}
-
-void LLScriptAddAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " += ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ADD %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- print_assignment(fp, mLValue);
- }
- break;
- case LSCP_TYPE:
- {
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- operation2stack(chunk, mReturnType, mRightType);
- store2stack(this, mLValue, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mLValue, entry);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_add(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_assignment(fp, mLValue, entry);
- }
- break;
- default:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptAddAssignment::getSize()
-{
- return 0;
-}
-
-static void print_cil_sub(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
-{
- switch(left_type)
- {
- case LST_INTEGER:
- if(LST_INTEGER == right_type)
- {
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Subtract(int32, int32)\n");
- break;
- }
- case LST_FLOATINGPOINT:
- // Numeric subtraction.
- fprintf(fp, "call float64 [LslUserScript]LindenLab.SecondLife.LslUserScript::Subtract(float64, float64)\n");
- break;
- case LST_VECTOR:
-
- // Vector subtraction.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Subtract'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- case LST_QUATERNION:
-
- // Rotation subtraction.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Subtract'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
-
- default:
-
- // Error.
- break;
- }
-}
-
-void LLScriptSubAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " -= ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "SUB %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- print_assignment(fp, mLValue);
- }
- break;
- case LSCP_TYPE:
- {
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SUB]);
- operation2stack(chunk, mReturnType, mRightType);
- store2stack(this, mLValue, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mLValue, entry);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_sub(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_assignment(fp, mLValue, entry);
- }
- break;
- default:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptSubAssignment::getSize()
-{
- return 0;
-}
-
-static void print_cil_neg(LLFILE* fp, LSCRIPTType type)
-{
- switch(type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- fprintf(fp, "neg\n");
- break;
- case LST_VECTOR:
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Negate'(class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
- case LST_QUATERNION:
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Negate'(class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
- default:
- break;
- }
-}
-
-static void print_cil_mul(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
-{
- switch(left_type)
- {
- case LST_INTEGER:
-
- switch(right_type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
-
- // Numeric multiplication.
- fprintf(fp, "mul\n");
- break;
-
- case LST_VECTOR:
-
- // Vector scaling.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Vector, float32)\n");
- break;
- default:
- break;
- }
- break;
-
- case LST_FLOATINGPOINT:
-
- switch(right_type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
-
- // Numeric multiplication.
- fprintf(fp, "mul\n");
- break;
-
- case LST_VECTOR:
-
- // Vector scaling.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Vector, float32)\n");
- break;
-
- default:
- break;
- }
- break;
-
- case LST_VECTOR:
-
- switch(right_type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
-
- // Vector scaling.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(float32, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- case LST_VECTOR:
-
- // Dot product.
- fprintf(fp, "call float32 class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- case LST_QUATERNION:
-
- // Vector rotation.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- default:
- break;
- }
- break;
-
- case LST_QUATERNION:
-
- // Rotation multiplication.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
-
- default:
-
- // Error.
- break;
- }
-}
-
-void LLScriptMulAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " *= ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "MUL %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- print_assignment(fp, mLValue);
- }
- break;
- case LSCP_TYPE:
- {
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType) /*|| !legal_assignment(mLValue->mReturnType, mReturnType)*/)
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_MUL]);
- operation2stack(chunk, mReturnType, mRightType);
- store2stack(this, mLValue, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mLValue, entry);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_mul(fp, mLValue->mReturnType, mRightSide->mReturnType);
- if((mLValue->mReturnType == LST_INTEGER) &&
- (mRightSide->mReturnType == LST_FLOATINGPOINT))
- {
- print_cil_cast(fp, LST_FLOATINGPOINT, LST_INTEGER);
- }
- print_cil_assignment(fp, mLValue, entry);
- }
- break;
- default:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptMulAssignment::getSize()
-{
- return 0;
-}
-
-static void print_cil_div(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
-{
- switch(left_type)
- {
- case LST_INTEGER:
- if(LST_INTEGER == right_type)
- {
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Divide(int32, int32)\n");
- break;
- }
- case LST_FLOATINGPOINT:
-
- // Numeric division.
- fprintf(fp, "call float64 [LslUserScript]LindenLab.SecondLife.LslUserScript::Divide(float64, float64)\n");
- break;
-
- case LST_VECTOR:
-
- switch(right_type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
-
- // Scale.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Divide'(float32, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- case LST_QUATERNION:
-
- // Inverse rotation.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Divide'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- default:
- break;
- }
- break;
-
- case LST_QUATERNION:
-
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Divide'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
-
- default:
-
- // Error.
- break;
- }
-}
-
-void LLScriptDivAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " /= ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "DIV %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- print_assignment(fp, mLValue);
- }
- break;
- case LSCP_TYPE:
- {
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_DIV]);
- operation2stack(chunk, mReturnType, mRightType);
- store2stack(this, mLValue, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mLValue, entry);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_div(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_assignment(fp, mLValue, entry);
- }
- break;
- default:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptDivAssignment::getSize()
-{
- return 0;
-}
-
-static void print_cil_mod(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
-{
- switch(left_type)
- {
- case LST_INTEGER:
-
- // Numeric remainder.
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Modulo(int32, int32)\n");
- break;
-
- case LST_VECTOR:
-
- // Vector cross product.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Modulo'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- default:
-
- // Error.
- break;
- }
-}
-
-void LLScriptModAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " %%= ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "MOD %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- print_assignment(fp, mLValue);
- }
- break;
- case LSCP_TYPE:
- {
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_MOD]);
- operation2stack(chunk, mReturnType, mRightType);
- store2stack(this, mLValue, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mLValue, entry);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_mod(fp, mLValue->mReturnType, mRightSide->mReturnType);
- print_cil_assignment(fp, mLValue, entry);
- }
- break;
- default:
- mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptModAssignment::getSize()
-{
- return 0;
-}
-
-static void print_cil_eq(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
-{
-
- switch(right_type)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
-
- // Numeric equality.
- fprintf(fp, "ceq\n");
- break;
-
- case LST_STRING:
- // NOTE: babbage: strings and keys can be compared, so a cast
- // may be required
- print_cil_cast(fp, left_type, right_type);
- // String equality.
- fprintf(fp, "call bool valuetype [mscorlib]System.String::op_Equality(string, string)\n");
- break;
-
- case LST_KEY:
- // NOTE: babbage: strings and keys can be compared, so a cast
- // may be required
- print_cil_cast(fp, left_type, right_type);
-
- // Key equality.
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(valuetype [ScriptTypes]LindenLab.SecondLife.Key, valuetype [ScriptTypes]LindenLab.SecondLife.Key)\n");
- break;
-
- case LST_VECTOR:
-
- // Vector equality.
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- break;
-
- case LST_QUATERNION:
-
- // Rotation equality.
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- break;
-
- case LST_LIST:
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Equals(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
- break;
-
- default:
-
- // Error.
- break;
- }
-}
-
-void LLScriptEquality::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " == ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "EQ %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_EQ]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_eq(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptEquality::getSize()
-{
- return 0;
-}
-
-void LLScriptNotEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " != ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "NEQ %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_NEQ]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- if (LST_LIST == mLeftSide->mReturnType)
- {
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::NotEquals(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
- }
- else
- {
- print_cil_eq(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n"); // Compare result of first compare equal with 0 to get compare not equal.
- }
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptNotEquals::getSize()
-{
- return 0;
-}
-
-static void print_cil_lte(LLFILE* fp)
-{
- // NOTE: LSL pushes operands backwards, so <= becomes >=
- fprintf(fp, "clt\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
-}
-
-void LLScriptLessEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " <= ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LEQ %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_LEQ]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_lte(fp);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptLessEquals::getSize()
-{
- return 0;
-}
-
-static void print_cil_gte(LLFILE* fp)
-{
- // NOTE: LSL pushes operands backwards, so >= becomes <=
- fprintf(fp, "cgt\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
-}
-
-void LLScriptGreaterEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " >= ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "GEQ %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_GEQ]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_gte(fp);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptGreaterEquals::getSize()
-{
- return 0;
-}
-
-static void print_cil_lt(LLFILE* fp)
-{
- // NOTE: LSL pushes operands backwards, so < becomes >
- fprintf(fp, "cgt\n");
-}
-
-void LLScriptLessThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " < ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LESS %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_LESS]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_lt(fp);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptLessThan::getSize()
-{
- return 0;
-}
-
-static void print_cil_gt(LLFILE* fp)
-{
- // NOTE: LSL pushes operands backwards, so > becomes <
- fprintf(fp, "clt\n");
-}
-
-void LLScriptGreaterThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " > ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "GREATER %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_GREATER]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_gt(fp);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptGreaterThan::getSize()
-{
- return 0;
-}
-
-void LLScriptPlus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " + ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ADD %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_add(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptPlus::getSize()
-{
- return 0;
-}
-
-void LLScriptMinus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " - ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "SUB %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_SUB]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_sub(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptMinus::getSize()
-{
- return 0;
-}
-
-void LLScriptTimes::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " * ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "MUL %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_MUL]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_mul(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptTimes::getSize()
-{
- return 0;
-}
-
-void LLScriptDivide::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " / ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "DIV %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_DIV]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- print_cil_div(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptDivide::getSize()
-{
- return 0;
-}
-
-void LLScriptMod::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " %% ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "MOD %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mRightType] | LSCRIPTTypeHi4Bits[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_MOD]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_mod(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptMod::getSize()
-{
- return 0;
-}
-
-void LLScriptBitAnd::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " & ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BITAND\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BITAND]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "and\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBitAnd::getSize()
-{
- return 0;
-}
-
-void LLScriptBitOr::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " | ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BITOR\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BITOR]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "or\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBitOr::getSize()
-{
- return 0;
-}
-
-void LLScriptBitXor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ^ ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BITXOR\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BITXOR]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "xor\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBitXor::getSize()
-{
- return 0;
-}
-
-void LLScriptBooleanAnd::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " && ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BOOLAND\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BOOLAND]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- fprintf(fp, "or\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBooleanAnd::getSize()
-{
- return 0;
-}
-
-void LLScriptBooleanOr::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " || ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BOOLOR\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BOOLOR]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "or\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBooleanOr::getSize()
-{
- return 0;
-}
-
-void LLScriptShiftLeft::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " << ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "SHL\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SHL]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::ShiftLeft(int32, int32)\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptShiftLeft::getSize()
-{
- return 0;
-}
-
-
-void LLScriptShiftRight::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " >> ");
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "SHR\n");
- break;
- case LSCP_TYPE:
- {
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mReturnType;
- }
- break;
- case LSCP_TO_STACK:
- {
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SHR]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::ShiftRight(int32, int32)\n");
- break;
- default:
- mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptShiftRight::getSize()
-{
- return 0;
-}
-
-void LLScriptParenthesis::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "( ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mReturnType = mLeftType = type;
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mReturnType = mLeftType = type;
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptParenthesis::getSize()
-{
- return 0;
-}
-
-void LLScriptUnaryMinus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "-");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "NEG %s\n", LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- break;
- case LSCP_TO_STACK:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- U8 typebyte = LSCRIPTTypeByte[mLeftType];
- chunk->addByte(LSCRIPTOpCodes[LOPC_NEG]);
- chunk->addByte(typebyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_neg(fp, mLeftType);
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptUnaryMinus::getSize()
-{
- return 0;
-}
-
-void LLScriptBooleanNot::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "!");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BOOLNOT\n");
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- break;
- case LSCP_TO_STACK:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BOOLNOT]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n"); // If f(e) is (e == 0), f(e) returns 1 if e is 0 and 0 otherwise, therefore f(e) implements boolean not.
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBooleanNot::getSize()
-{
- return 0;
-}
-
-void LLScriptBitNot::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "~");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "BITNOT\n");
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- break;
- case LSCP_TO_STACK:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_BITNOT]);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "not\n");
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptBitNot::getSize()
-{
- return 0;
-}
-
-void LLScriptPreIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "++");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- if (mReturnType == LST_INTEGER)
- {
- fprintf(fp, "PUSHARGI 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fprintf(fp, "ADD integer, integer\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- fprintf(fp, "PUSHARGF 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fprintf(fp, "ADD float, float\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- print_assignment(fp, mExpression);
- }
- break;
- case LSCP_TYPE:
- if (mExpression->mType != LET_LVALUE)
- {
- gErrorToText.writeError(fp, this, LSERROR_EXPRESSION_ON_LVALUE);
- }
- else
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- }
- break;
- case LSCP_TO_STACK:
- {
- if (mReturnType == LST_INTEGER)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- chunk->addByte(LSCRIPTTypeByte[LST_INTEGER] | LSCRIPTTypeHi4Bits[LST_INTEGER]);
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGF]);
- chunk->addFloat(1.f);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- chunk->addByte(LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[LST_FLOATINGPOINT]);
- }
- store2stack(this, mExpression, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mExpression, entry);
- if (mReturnType == LST_INTEGER)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.i4.1\n");
- fprintf(fp, "add\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.r8 1\n");
- fprintf(fp, "add\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- print_cil_assignment(fp, mExpression, entry);
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptPreIncrement::getSize()
-{
- return 0;
-}
-
-void LLScriptPreDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "--");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- if (mReturnType == LST_INTEGER)
- {
- fprintf(fp, "PUSHARGI 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fprintf(fp, "SUB integer, integer\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- fprintf(fp, "PUSHARGF 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fprintf(fp, "SUB float, float\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- print_assignment(fp, mExpression);
- }
- break;
- case LSCP_TYPE:
- if (mExpression->mType != LET_LVALUE)
- {
- gErrorToText.writeError(fp, this, LSERROR_EXPRESSION_ON_LVALUE);
- }
- else
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- }
- break;
- case LSCP_TO_STACK:
- {
- if (mReturnType == LST_INTEGER)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SUB]);
- chunk->addByte(LSCRIPTTypeByte[LST_INTEGER] | LSCRIPTTypeHi4Bits[LST_INTEGER]);
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGF]);
- chunk->addFloat(1.f);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SUB]);
- chunk->addByte(LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[LST_FLOATINGPOINT]);
- }
- store2stack(this, mExpression, chunk, mReturnType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- print_cil_load_address(fp, mExpression, entry);
- if (mReturnType == LST_INTEGER)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.i4.1\n");
- fprintf(fp, "sub\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ldc.r8 1\n");
- fprintf(fp, "sub\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- print_cil_assignment(fp, mExpression, entry);
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptPreDecrement::getSize()
-{
- return 0;
-}
-
-void LLScriptTypeCast::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "( ");
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ") ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mType->mType]);
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mRightType = type;
- if (!legal_casts(mType->mType, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- type = mType->mType;
- mReturnType = mLeftType = type;
- break;
- case LSCP_TO_STACK:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[mType->mType] | LSCRIPTTypeHi4Bits[mRightType];
- chunk->addByte(castbyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_cast(fp, mRightType, mType->mType);
- break;
- default:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptTypeCast::getSize()
-{
- return 0;
-}
-
-void LLScriptVectorInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "< ");
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " >");
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression1->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression1->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression2->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression2->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression3->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression3->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- break;
- case LSCP_TYPE:
- // vector's take floats
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mReturnType = type = LST_VECTOR;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TO_STACK:
- pass = LSCP_TO_STACK;
- mExpression1->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression1->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression1->mReturnType];
- chunk->addByte(castbyte);
- }
- mExpression2->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression2->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression2->mReturnType];
- chunk->addByte(castbyte);
- }
- mExpression3->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression3->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression3->mReturnType];
- chunk->addByte(castbyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
-
- // Load arguments.
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression1->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression1->mReturnType, LST_FLOATINGPOINT);
- }
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression2->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression2->mReturnType, LST_FLOATINGPOINT);
- }
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression3->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression3->mReturnType, LST_FLOATINGPOINT);
- }
- // Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
- break;
- default:
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptVectorInitializer::getSize()
-{
- return 0;
-}
-
-void LLScriptQuaternionInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "< ");
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", ");
- mExpression4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " >");
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression1->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression1->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression2->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression2->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression3->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression3->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- mExpression4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression4->mReturnType != LST_FLOATINGPOINT)
- {
- fprintf(fp, "CAST %s->%s\n", LSCRIPTTypeNames[mExpression4->mReturnType], LSCRIPTTypeNames[LST_FLOATINGPOINT]);
- }
- break;
- case LSCP_TYPE:
- // vector's take floats
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mExpression4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(LST_FLOATINGPOINT, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- mReturnType = type = LST_QUATERNION;
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TO_STACK:
- pass = LSCP_TO_STACK;
- mExpression1->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression1->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression1->mReturnType];
- chunk->addByte(castbyte);
- }
- mExpression2->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression2->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression2->mReturnType];
- chunk->addByte(castbyte);
- }
- mExpression3->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression3->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression3->mReturnType];
- chunk->addByte(castbyte);
- }
- mExpression4->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression4->mReturnType != LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CAST]);
- U8 castbyte = LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[mExpression4->mReturnType];
- chunk->addByte(castbyte);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
-
- // Load arguments.
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression1->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression1->mReturnType, LST_FLOATINGPOINT);
- }
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression2->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression2->mReturnType, LST_FLOATINGPOINT);
- }
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression3->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression3->mReturnType, LST_FLOATINGPOINT);
- }
- mExpression4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression4->mReturnType != LST_FLOATINGPOINT)
- {
- print_cil_cast(fp, mExpression4->mReturnType, LST_FLOATINGPOINT);
- }
-
- // Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
- break;
- default:
- mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptQuaternionInitializer::getSize()
-{
- return 0;
-}
-
-void LLScriptListInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, "[ ");
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ]");
- break;
- case LSCP_EMIT_ASSEMBLY:
- count = 0;
- if (mExpressionList)
- {
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "STACKTOL %llu\n", count);
- }
- break;
- case LSCP_TYPE:
- if (mExpressionList)
- {
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mReturnType = type = LST_LIST;
- }
- mReturnType = type = LST_LIST;
- break;
- case LSCP_TO_STACK:
- {
- if (mExpressionList)
- {
- pass = LSCP_TO_STACK;
- U64 list_element_count = 0;
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, list_element_count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_STACKTOL]);
- chunk->addInteger((S32)list_element_count);
-
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STACKTOL]);
- chunk->addInteger(0);
- }
- break;
- }
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- // Push boxed elements on stack.
- U64 list_element_count = 0;
- if (mExpressionList)
- {
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, list_element_count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
-
- // Create list on stack.
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
-
- // Call Prepend to add remaining boxed expressions.
- for(U64 i = 0; i < list_element_count; i++)
- {
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Prepend(object, class [mscorlib]System.Collections.ArrayList)\n");
- }
- break;
- }
- default:
- if (mExpressionList)
- {
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptListInitializer::getSize()
-{
- return 0;
-}
-
-void LLScriptPostIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "++");
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mReturnType == LST_INTEGER)
- {
- fprintf(fp, "PUSHARGI 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ADD integer, integer\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- fprintf(fp, "PUSHARGF 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "ADD float, float\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- print_assignment(fp, mExpression);
- fprintf(fp, "%s\n", LSCRIPTTypePop[mReturnType]);
- }
- break;
- case LSCP_TYPE:
- if (mExpression->mType != LET_LVALUE)
- {
- gErrorToText.writeError(fp, this, LSERROR_EXPRESSION_ON_LVALUE);
- }
- else
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- }
- break;
- case LSCP_TO_STACK:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mReturnType == LST_INTEGER)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- chunk->addByte(LSCRIPTTypeByte[LST_INTEGER] | LSCRIPTTypeHi4Bits[LST_INTEGER]);
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGF]);
- chunk->addFloat(1.f);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- chunk->addByte(LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[LST_FLOATINGPOINT]);
- }
- store2stack(this, mExpression, chunk, mReturnType);
- switch(mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_KEY:
- case LST_STRING:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- default:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- // Push original value on to stack.
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- // Load address if needed for store.
- print_cil_load_address(fp, mExpression, entry);
-
- // Load value again.
- // TODO: Work out if sideeffects can result in 2 evaluations of expression giving different values.
- // Original LSL2 uses this method, so any bugs due to side effects will probably be identical ;-)
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mReturnType == LST_INTEGER)
- {
- fprintf(fp, "ldc.i4.1\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- fprintf(fp, "ldc.r8 1\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- fprintf(fp, "add\n");
- print_cil_assignment(fp, mExpression, entry);
-
- // Pop assignment result to leave original expression result on stack.
- // TODO: Optimise away redundant pop/dup pairs.
- fprintf(fp, "pop\n");
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptPostIncrement::getSize()
-{
- return 0;
-}
-
-void LLScriptPostDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "--");
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mReturnType == LST_INTEGER)
- {
- fprintf(fp, "PUSHARGI 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "SUB integer, integer\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- fprintf(fp, "PUSHARGF 1\n");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "SUB float, float\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- print_assignment(fp, mExpression);
- fprintf(fp, "%s\n", LSCRIPTTypePop[mReturnType]);
- }
- break;
- case LSCP_TYPE:
- if (mExpression->mType != LET_LVALUE)
- {
- gErrorToText.writeError(fp, this, LSERROR_EXPRESSION_ON_LVALUE);
- }
- else
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_unary_expression(type, type, mType))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mReturnType = mLeftType = type;
- }
- }
- break;
- case LSCP_TO_STACK:
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mReturnType == LST_INTEGER)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SUB]);
- chunk->addByte(LSCRIPTTypeByte[LST_INTEGER] | LSCRIPTTypeHi4Bits[LST_INTEGER]);
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGF]);
- chunk->addFloat(1.f);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_SUB]);
- chunk->addByte(LSCRIPTTypeByte[LST_FLOATINGPOINT] | LSCRIPTTypeHi4Bits[LST_FLOATINGPOINT]);
- }
- store2stack(this, mExpression, chunk, mReturnType);
- switch(mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_KEY:
- case LST_STRING:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- default:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- // Push original value on to stack.
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- // Load address if needed for store.
- print_cil_load_address(fp, mExpression, entry);
-
- // Load value again.
- // TODO: Work out if sideeffects can result in 2 evaluations of expression giving different values.
- // Original LSL2 uses this method, so any bugs due to side effects will probably be identical ;-)
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mReturnType == LST_INTEGER)
- {
- fprintf(fp, "ldc.i4.1\n");
- }
- else if (mReturnType == LST_FLOATINGPOINT)
- {
- fprintf(fp, "ldc.r8 1\n");
- }
- else
- {
- fprintf(fp, "Unexpected Type\n");
- }
- fprintf(fp, "sub\n");
- print_cil_assignment(fp, mExpression, entry);
-
- // Pop assignment result to leave original expression result on stack.
- // TODO: Optimise away redundant pop/dup pairs.
- fprintf(fp, "pop\n");
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptPostDecrement::getSize()
-{
- return 0;
-}
-
-// Generate arg list.
-static void print_cil_arg_list(LLFILE *fp, LLScriptArgString& args)
-{
- int i = 0;
- bool finished = (i >= args.getNumber());
- while(! finished)
- {
- print_cil_type(fp, args.getType(i));
- ++i;
- finished = (i >= args.getNumber());
- if(! finished)
- {
- fprintf(fp, ", ");
- }
- }
-}
-
-void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "( ");
- if (mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mIdentifier->mScopeEntry->mType)
- fprintf(fp, "%s\n", LSCRIPTTypePush[mIdentifier->mScopeEntry->mType]);
- fprintf(fp,"PUSHE\n");
- fprintf(fp, "PUSHBP\n");
- if (mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mIdentifier->mScopeEntry, 0, NULL);
- fprintf(fp, "PUSHARGE %d\n", mIdentifier->mScopeEntry->mSize - mIdentifier->mScopeEntry->mOffset);
- fprintf(fp, "PUSHSP\n");
- fprintf(fp, "PUSHARGI %d\n", mIdentifier->mScopeEntry->mSize);
- fprintf(fp, "ADD integer, integer\n");
- fprintf(fp, "POPBP\n");
- if (mIdentifier->mScopeEntry->mIDType != LIT_LIBRARY_FUNCTION)
- {
- fprintf(fp, "CALL ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- else
- {
- fprintf(fp, "CALLLID ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ", %d", (U32)mIdentifier->mScopeEntry->mLibraryNumber);
- }
- fprintf(fp, "\n");
- fprintf(fp, "POPBP\n");
- break;
- case LSCP_SCOPE_PASS1:
- if (mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_SCOPE_PASS2:
- {
- LLScriptScopeEntry *entry = scope->findEntryTyped(mIdentifier->mName, LIT_FUNCTION);
- if (!entry)
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- else
- {
- // if we did find it, make sure this identifier is associated with the correct scope entry
- mIdentifier->mScopeEntry = entry;
- }
- if (mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TYPE:
- if (mIdentifier->mScopeEntry)
- {
- U64 argcount = 0;
- if (mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, argcount, chunk, heap, stacksize, mIdentifier->mScopeEntry, 0, NULL);
-
- if (!mIdentifier->mScopeEntry->mFunctionArgs.mString)
- {
- if (argcount)
- {
- gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
- }
- }
- else if (argcount != strlen(mIdentifier->mScopeEntry->mFunctionArgs.mString))
- {
- gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
- }
- }
-
- if (mIdentifier->mScopeEntry)
- type = mIdentifier->mScopeEntry->mType;
- else
- type = LST_NULL;
- mReturnType = type;
- break;
- case LSCP_TO_STACK:
- switch(mIdentifier->mScopeEntry->mType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- case LST_STRING:
- case LST_KEY:
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHE]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHEV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHEQ]);
- break;
- default:
- break;
- }
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHE]);
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHBP]);
- if (mExpressionList)
- {
- // Don't let this change the count.
- U64 dummy_count = 0;
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, dummy_count, chunk, heap, stacksize, mIdentifier->mScopeEntry, 0, NULL);
- //mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mIdentifier->mScopeEntry, 0, NULL);
- }
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGE]);
- chunk->addInteger(mIdentifier->mScopeEntry->mSize - mIdentifier->mScopeEntry->mOffset);
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHSP]);
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(mIdentifier->mScopeEntry->mSize);
- chunk->addByte(LSCRIPTOpCodes[LOPC_ADD]);
- chunk->addByte(LSCRIPTTypeByte[LST_INTEGER] | LSCRIPTTypeHi4Bits[LST_INTEGER]);
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPBP]);
- if (mIdentifier->mScopeEntry->mIDType != LIT_LIBRARY_FUNCTION)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CALL]);
- chunk->addInteger(mIdentifier->mScopeEntry->mCount);
- }
- else
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_CALLLIB_TWO_BYTE]);
- chunk->addU16(mIdentifier->mScopeEntry->mLibraryNumber);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- bool library_call = (mIdentifier->mScopeEntry->mIDType == LIT_LIBRARY_FUNCTION);
- if(! library_call)
- {
- // Load this pointer.
- fprintf(fp, "ldarg.0\n");
- }
-
- // Load args on to stack.
- if (mExpressionList)
- {
- //mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry /* Needed for is_parameter calls */, 0, NULL);
- llassert(LET_FUNC_EXPRESSION_LIST == mExpressionList->mType);
- print_cil_func_expression_list((LLScriptFuncExpressionList*) mExpressionList, fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry /* Caller entry needed for is_parameter calls */, 0, NULL, mIdentifier->mScopeEntry /* Callee entry needed for argument casting */);
- }
-
- // Make call.
- if (! library_call)
- {
- fprintf(fp, "call instance ");
- }
- else
- {
- fprintf(fp, "call ");
- }
- print_cil_type(fp, mIdentifier->mScopeEntry->mType);
- fprintf(fp, " class ");
- if (library_call)
- {
- fprintf(fp, "[LslLibrary]LindenLab.SecondLife.Library::'");
- }
- else
- {
- // Prefix function name with g to distinguish from
- // event handlers.
- fprintf(fp, "%s", gScriptp->getClassName());
- fprintf(fp, "::'g");
- }
- fprintf(fp, "%s", mIdentifier->mName);
- fprintf(fp, "'(");
- print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs);
- fprintf(fp, ")\n");
- }
- break;
- default:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptFunctionCall::getSize()
-{
- return 0;
-}
-
-void LLScriptPrint::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fprintf(fp, " PRINT ( ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "PRINT %s\n", LSCRIPTTypeNames[mLeftType]);
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mLeftType = type;
- mReturnType = LST_NULL;
- break;
- case LSCP_TO_STACK:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_PRINT]);
- chunk->addByte(LSCRIPTTypeByte[mLeftType]);
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_cast(fp, mLeftType, LST_STRING);
- fprintf(fp, "call void class [LslLibrary]LindenLab.SecondLife.Library::Print(string)");
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptPrint::getSize()
-{
- return 0;
-}
-
-void LLScriptConstantExpression::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_TYPE:
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mReturnType = type;
- break;
- case LSCP_TO_STACK:
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- default:
- mConstant->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptConstantExpression::getSize()
-{
- return 0;
-}
-
-void LLScriptStatement::addStatement(LLScriptStatement *event)
-{
- if (mNextp)
- {
- event->mNextp = mNextp;
- }
- mNextp = event;
-}
-
-void LLScriptStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- fprintf(fp, "Statement Base Class -- should never get here!\n");
-}
-
-S32 LLScriptStatement::getSize()
-{
- printf("Statement Base Class -- should never get here!\n");
- return 0;
-}
-
-void LLScriptStatement::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptStatementSequence::getSize()
-{
- return 0;
-}
-
-void LLScriptStatementSequence::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_PRUNE:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (prunearg)
- {
- // babbage: only warn on first dead code block found.
- if(ptype != LSPRUNE_DEAD_CODE)
- {
- gErrorToText.writeWarning(fp, this, LSWARN_DEAD_CODE);
- }
-
- // babbage: set prune type to LSPRUNE_DEAD_CODE to mask other
- // prune errors.
- ptype = LSPRUNE_DEAD_CODE;
-
- // babbage: reset prunearg, to track whether return needed at
- // end of dead code path as CIL always needs a return/throw.
- prunearg = FALSE;
- }
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_TYPE:
- // pass the return type into all statements so we can check returns
- {
- LSCRIPTType return_type = type;
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, return_type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- return_type = type;
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, return_type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptNOOP::getSize()
-{
- return 0;
-}
-
-void LLScriptNOOP::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, ";\n");
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- default:
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-void add_exit_pops(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry)
-{
- // remember that we need to pop in reverse order
- S32 number, i;
-
- if (entry->mLocals.mString)
- {
- number = (S32)strlen(entry->mLocals.mString);
- for (i = number - 1; i >= 0; i--)
- {
- switch(entry->mLocals.getType(i))
- {
- case LST_INTEGER:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_STRING:
- case LST_KEY:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
-
- default:
- break;
- }
- }
- }
-
- if (entry->mFunctionArgs.mString)
- {
- number = (S32)strlen(entry->mFunctionArgs.mString);
- for (i = number - 1; i >= 0; i--)
- {
- switch(entry->mFunctionArgs.getType(i))
- {
- case LST_INTEGER:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_STRING:
- case LST_KEY:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
-
- default:
- break;
- }
- }
- }
-}
-
-void print_exit_pops(LLFILE *fp, LLScriptScopeEntry *entry)
-{
- // remember that we need to pop in reverse order
- S32 number, i;
-
- if (entry->mLocals.mString)
- {
- number = (S32)strlen(entry->mLocals.mString);
- for (i = number - 1; i >= 0; i--)
- {
- fprintf(fp, "%s", LSCRIPTTypePop[entry->mLocals.getType(i)]);
- }
- }
-
- if (entry->mFunctionArgs.mString)
- {
- number = (S32)strlen(entry->mFunctionArgs.mString);
- for (i = number - 1; i >= 0; i--)
- {
- fprintf(fp, "%s", LSCRIPTTypePop[entry->mFunctionArgs.getType(i)]);
- }
- }
-}
-
-
-S32 LLScriptStateChange::getSize()
-{
- return 0;
-}
-
-void LLScriptStateChange::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "state ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- print_exit_pops(fp, entry);
- fprintf(fp, "STATE ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- break;
- case LSCP_PRUNE:
- if ( (ptype == LSPRUNE_GLOBAL_VOIDS)
- ||(ptype == LSPRUNE_GLOBAL_NON_VOIDS))
- {
- gErrorToText.writeError(fp, this, LSERROR_STATE_CHANGE_IN_GLOBAL);
- }
- prunearg = FALSE;
- break;
- case LSCP_SCOPE_PASS2:
- {
- LLScriptScopeEntry *entry = scope->findEntryTyped(mIdentifier->mName, LIT_STATE);
- if (!entry)
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- else
- {
- // if we did find it, make sure this identifier is associated with the correct scope entry
- mIdentifier->mScopeEntry = entry;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- add_exit_pops(chunk, entry);
- chunk->addByte(LSCRIPTOpCodes[LOPC_STATE]);
- chunk->addInteger(mIdentifier->mScopeEntry->mCount);
- }
- break;
- case LSCP_TYPE:
- mReturnType = basetype;
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "ldarg.0\n");
- fprintf(fp, "ldstr \"%s\"\n", mIdentifier->mName);
- fprintf(fp, "call instance void class [LslUserScript]LindenLab.SecondLife.LslUserScript::ChangeState(string)\n");
- // We are doing a state change. In the LSL interpreter, this is basically a longjmp. We emulate it
- // here using a call to the ChangeState followed by a short cut return of the current method. To
- // maintain type safety we need to push an arbitrary variable of the current method's return type
- // onto the stack before returning. This will be ignored and discarded.
- print_cil_init_variable(fp, mReturnType);
- fprintf(fp, "ret\n");
- break;
- default:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptJump::getSize()
-{
- return 0;
-}
-
-void LLScriptJump::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "jump ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "JUMP ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_SCOPE_PASS2:
- {
- LLScriptScopeEntry *entry = scope->findEntryTyped(mIdentifier->mName, LIT_LABEL);
- if (!entry)
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- else
- {
- // if we did find it, make sure this identifier is associated with the correct scope entry
- mIdentifier->mScopeEntry = entry;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMP]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(mIdentifier->mName);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- fprintf(fp, "br ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- break;
- default:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptLabel::getSize()
-{
- return 0;
-}
-
-void LLScriptLabel::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "@");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- fprintf(fp, "LABEL ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- break;
- case LSCP_PRUNE:
- // Always clear this flag, to stop pruning after return statements. A jump
- // might start up code at this label, so we need to stop pruning.
- prunearg = FALSE;
- break;
- case LSCP_SCOPE_PASS1:
- // add labels to scope
- if (scope->checkEntry(mIdentifier->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_LABEL, LST_NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- chunk->addLabel(mIdentifier->mName);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ":\n");
- break;
- default:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-void add_return(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry)
-{
- add_exit_pops(chunk, entry);
- chunk->addByte(LSCRIPTOpCodes[LOPC_RETURN]);
-}
-
-void print_return(LLFILE *fp, LLScriptScopeEntry *entry)
-{
- print_exit_pops(fp, entry);
- fprintf(fp, "RETURN\n");
-}
-
-
-S32 LLScriptReturn::getSize()
-{
- return 0;
-}
-
-void LLScriptReturn::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mExpression)
- {
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "return ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- }
- else
- {
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "return;\n");
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "%s\n", LSCRIPTTypeReturn[mType]);
- }
- print_return(fp, entry);
- break;
- case LSCP_PRUNE:
- if ( (ptype == LSPRUNE_GLOBAL_VOIDS)
- ||(ptype == LSPRUNE_EVENTS))
- {
- if (mExpression)
- {
- gErrorToText.writeError(fp, this, LSERROR_INVALID_RETURN);
- }
- }
- else if (ptype == LSPRUNE_GLOBAL_NON_VOIDS)
- {
- if (!mExpression)
- {
- gErrorToText.writeError(fp, this, LSERROR_INVALID_VOID_RETURN);
- }
- }
- prunearg = TRUE;
- break;
- case LSCP_TYPE:
- // if there is a return expression, it must be promotable to the return type of the function
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(basetype, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- else
- {
- mType = basetype;
- }
- }
- else if (basetype != LST_NULL)
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- switch(mType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADP]);
- chunk->addInteger(-12);
- break;
- case LST_STRING:
- case LST_KEY:
- // use normal store for reference counted types
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADSP]);
- chunk->addInteger(-12);
- break;
- case LST_LIST:
- // use normal store for reference counted types
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADLP]);
- chunk->addInteger(-12);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADVP]);
- chunk->addInteger(-20);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADQP]);
- chunk->addInteger(-24);
- break;
- default:
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADP]);
- chunk->addInteger(-12);
- break;
- }
- }
- add_return(chunk, entry);
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_cast(fp, mExpression->mReturnType, mType);
- }
- fprintf(fp, "ret\n");
- break;
- default:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptExpressionStatement::getSize()
-{
- return 0;
-}
-
-void LLScriptExpressionStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression->mReturnType)
- {
- fprintf(fp, "%s\n", LSCRIPTTypePop[mExpression->mReturnType]);
- }
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_EMIT_BYTE_CODE:
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- switch(mExpression->mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POP]);
- break;
- case LST_STRING:
- case LST_KEY:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPS]);
- break;
- case LST_LIST:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPL]);
- break;
- case LST_VECTOR:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPV]);
- break;
- case LST_QUATERNION:
- chunk->addByte(LSCRIPTOpCodes[LOPC_POPQ]);
- break;
- default:
- break;
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mExpression->mReturnType)
- {
- fprintf(fp, "pop\n");
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptIf::getSize()
-{
- return 0;
-}
-
-static void print_cil_if_test(LLFILE* fp, LSCRIPTType type)
-{
- switch(type)
- {
- case LST_INTEGER:
- break;
- case LST_FLOATINGPOINT:
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ceq\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- case LST_VECTOR:
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
- fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- case LST_QUATERNION:
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 0\n");
- fprintf(fp, "ldc.r8 1\n");
- fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
- fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- case LST_KEY:
- fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::'IsNonNullUuid'(valuetype [ScriptTypes]LindenLab.SecondLife.Key)\n");
- break;
- case LST_STRING:
- fprintf(fp, "ldstr \"\"\n");
- fprintf(fp, "call bool string::op_Equality(string, string)\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- case LST_LIST:
- fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
- fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::Equals(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
- fprintf(fp, "ldc.i4.0\n");
- fprintf(fp, "ceq\n");
- break;
- default:
- break;
- }
-
-}
-
-void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "if ( ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- S32 tjump = gTempJumpCount++;
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMPNIF ##Temp Jump %d##\n", tjump);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump);
- }
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_NULL)
- {
- gErrorToText.writeError(fp, mExpression, LSERROR_TYPE_MISMATCH);
- }
- mType = type;
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- char jumpname[32]; /*Flawfinder: ignore*/
- snprintf(jumpname, sizeof(jumpname),"##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
-
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]);
- chunk->addByte(LSCRIPTTypeByte[mType]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addLabel(jumpname);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- S32 tjump = gTempJumpCount++;
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_if_test(fp, mExpression->mReturnType);
- fprintf(fp, "brfalse LabelTempJump%d\n", tjump);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LabelTempJump%d:\n", tjump);
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptIfElse::getSize()
-{
- return 0;
-}
-
-void LLScriptIfElse::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "if ( ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "else\n");
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- S32 tjump2 = gTempJumpCount++;
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMPNIF ##Temp Jump %d##\n", tjump1);
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMP ##Temp Jump %d##\n", tjump2);
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump1);
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump2);
- }
- break;
- case LSCP_PRUNE:
- {
- BOOL arg1 = TRUE, arg2 = TRUE;
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, arg1, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, arg2, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- prunearg = arg1 && arg2;
- }
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_NULL)
- {
- gErrorToText.writeError(fp, mExpression, LSERROR_TYPE_MISMATCH);
- }
- mType = type;
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- char jumpname1[32]; /*Flawfinder: ignore*/
- snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
- char jumpname2[32]; /*Flawfinder: ignore*/
- snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
-
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]);
- chunk->addByte(LSCRIPTTypeByte[mType]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname1);
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMP]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname2);
- chunk->addLabel(jumpname1);
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addLabel(jumpname2);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- S32 tjump2 = gTempJumpCount++;
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_if_test(fp, mExpression->mReturnType);
- fprintf(fp, "brfalse LabelTempJump%d\n", tjump1);
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "br LabelTempJump%d\n", tjump2);
- fprintf(fp, "LabelTempJump%d:\n", tjump1);
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LabelTempJump%d:\n", tjump2);
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatement2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- };
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptFor::getSize()
-{
- return 0;
-}
-
-void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "for ( ");
- if(mSequence)
- mSequence->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ; ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ; ");
- if(mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- if(mStatement)
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- S32 tjump2 = gTempJumpCount++;
- if(mSequence)
- mSequence->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMPNIF ##Temp Jump %d##\n", tjump2);
- if(mStatement)
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMP ##Temp Jump %d##\n", tjump1);
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump2);
- }
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_TYPE:
- if(mSequence)
- mSequence->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_NULL)
- {
- gErrorToText.writeError(fp, mExpression, LSERROR_TYPE_MISMATCH);
- }
- mType = type;
- if(mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mStatement)
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- char jumpname1[32]; /*Flawfinder: ignore*/
- snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
- char jumpname2[32]; /*Flawfinder: ignore*/
- snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
-
- if(mSequence)
- mSequence->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addLabel(jumpname1);
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]);
- chunk->addByte(LSCRIPTTypeByte[mType]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname2);
- if(mStatement)
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMP]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname1);
- chunk->addLabel(jumpname2);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- S32 tjump2 = gTempJumpCount++;
- if(mSequence)
- mSequence->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "LabelTempJump%d:\n", tjump1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_if_test(fp, mExpression->mReturnType);
- fprintf(fp, "brfalse LabelTempJump%d\n", tjump2);
- if(mStatement)
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "br LabelTempJump%d\n", tjump1);
- fprintf(fp, "LabelTempJump%d:\n", tjump2);
- }
- break;
- default:
- if(mSequence)
- mSequence->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mExpressionList)
- mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(mStatement)
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptDoWhile::getSize()
-{
- return 0;
-}
-
-void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "do\n");
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "while( ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " );\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump1);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMPIF ##Temp Jump %d##\n", tjump1);
- }
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_TYPE:
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_NULL)
- {
- gErrorToText.writeError(fp, mExpression, LSERROR_TYPE_MISMATCH);
- }
- mType = type;
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- char jumpname1[32]; /*Flawfinder: ignore*/
- snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
-
- chunk->addLabel(jumpname1);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPIF]);
- chunk->addByte(LSCRIPTTypeByte[mType]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname1);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- fprintf(fp, "LabelTempJump%d:\n", tjump1);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_if_test(fp, mExpression->mReturnType);
- fprintf(fp, "brtrue LabelTempJump%d\n", tjump1);
- }
- break;
- default:
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptWhile::getSize()
-{
- return 0;
-}
-
-void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "while( ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- S32 tjump2 = gTempJumpCount++;
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMPNIF ##Temp Jump %d##\n", tjump2);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "JUMP ##Temp Jump %d##\n", tjump1);
- fprintf(fp, "LABEL ##Temp Jump %d##\n", tjump2);
- }
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_TYPE:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (type == LST_NULL)
- {
- gErrorToText.writeError(fp, mExpression, LSERROR_TYPE_MISMATCH);
- }
- mType = type;
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- char jumpname1[32]; /*Flawfinder: ignore*/
- snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
- char jumpname2[32]; /*Flawfinder: ignore*/
- snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */
-
- chunk->addLabel(jumpname1);
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]);
- chunk->addByte(LSCRIPTTypeByte[mType]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname2);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- chunk->addByte(LSCRIPTOpCodes[LOPC_JUMP]);
- chunk->addBytes(LSCRIPTDataSize[LST_INTEGER]);
- chunk->addJump(jumpname1);
- chunk->addLabel(jumpname2);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- S32 tjump1 = gTempJumpCount++;
- S32 tjump2 = gTempJumpCount++;
- fprintf(fp, "LabelTempJump%d:\n", tjump1);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_if_test(fp, mExpression->mReturnType);
- fprintf(fp, "brfalse LabelTempJump%d\n", tjump2);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "br LabelTempJump%d\n", tjump1);
- fprintf(fp, "LabelTempJump%d:\n", tjump2);
- }
- break;
- default:
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptDeclaration::getSize()
-{
- return mType->getSize();
-}
-
-void LLScriptDeclaration::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mExpression)
- {
- fdotabs(fp, tabs, tabsize);
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\t");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " = ");
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- }
- else
- {
- fdotabs(fp, tabs, tabsize);
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\t");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ";\n");
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- fprintf(fp, "%s%d [%s]\n", LSCRIPTTypeLocalDeclaration[mIdentifier->mScopeEntry->mType], mIdentifier->mScopeEntry->mOffset, mIdentifier->mName);
- }
- else if (mIdentifier->mScopeEntry->mIDType == LIT_GLOBAL)
- {
- gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
- }
- }
- break;
- case LSCP_PRUNE:
- prunearg = FALSE;
- break;
- case LSCP_SCOPE_PASS1:
- // Check to see if a declaration is valid here.
- if (!mAllowDeclarations)
- {
- gErrorToText.writeError(fp, this, LSERROR_NEED_NEW_SCOPE);
- }
- // add labels to scope
- else if (scope->checkEntry(mIdentifier->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- // this needs to go after expression decent to make sure that we don't add ourselves or something silly
- // check expression if it exists
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_VARIABLE, mType->mType);
- }
- break;
- case LSCP_TYPE:
- // if there is an expression, it must be promotable to variable type
- if (mExpression && mIdentifier->mScopeEntry)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!legal_assignment(mIdentifier->mScopeEntry->mType, type))
- {
- gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
- }
- }
- break;
- case LSCP_RESOURCE:
- {
- mIdentifier->mScopeEntry->mOffset = (S32)count;
- mIdentifier->mScopeEntry->mSize = mType->getSize();
- count += mIdentifier->mScopeEntry->mSize;
- // Index into locals is current number of locals. Stored in mCount member of mScopeEntry.
- mIdentifier->mScopeEntry->mCount = entry->mLocals.getNumber();
- entry->mLocals.addType(mType->mType);
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mExpression->mReturnType != mIdentifier->mScopeEntry->mType)
- {
- cast2stack(chunk, mExpression->mReturnType, mIdentifier->mScopeEntry->mType);
- }
- switch(mExpression->mReturnType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADP]);
- }
- break;
- case LST_STRING:
- case LST_KEY:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADSP]);
- }
- break;
- case LST_LIST:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADLP]);
- }
- break;
- case LST_VECTOR:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADVP]);
- }
- break;
- case LST_QUATERNION:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADQP]);
- }
- break;
- default:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADP]);
- }
- break;
- }
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- S32 address = mIdentifier->mScopeEntry->mOffset;
- chunk->addInteger(address);
- }
- }
- else
- {
- switch(mIdentifier->mScopeEntry->mType)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(0);
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADP]);
- }
- break;
- case LST_STRING:
- case LST_KEY:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGS]);
- chunk->addBytes("", 1);
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADSP]);
- }
- break;
- case LST_LIST:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_STACKTOL]);
- chunk->addInteger(0);
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADLP]);
- }
- break;
- case LST_VECTOR:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGV]);
- chunk->addFloat(0);
- chunk->addFloat(0);
- chunk->addFloat(0);
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADVP]);
- }
- break;
- case LST_QUATERNION:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGQ]);
- chunk->addFloat(1);
- chunk->addFloat(0);
- chunk->addFloat(0);
- chunk->addFloat(0);
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADQP]);
- }
- break;
- default:
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGI]);
- chunk->addInteger(0);
- chunk->addByte(LSCRIPTOpCodes[LOPC_LOADP]);
- }
- break;
- }
- if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
- {
- S32 address = mIdentifier->mScopeEntry->mOffset;
- chunk->addInteger(address);
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- if (mExpression)
- {
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- print_cil_cast(fp, mExpression->mReturnType, mIdentifier->mScopeEntry->mType);
- }
- else
- {
- print_cil_init_variable(fp, mIdentifier->mScopeEntry->mType);
- }
- fprintf(fp, "stloc.s %d\n", mIdentifier->mScopeEntry->mCount);
- break;
- default:
- if (mExpression)
- {
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- else
- {
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-S32 LLScriptCompoundStatement::getSize()
-{
- return 0;
-}
-
-void LLScriptCompoundStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mStatement)
- {
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "{\n");
- mStatement->recurse(fp, tabs + 1, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "}\n");
- }
- else
- {
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "{\n");
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "}\n");
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mStatement)
- {
- mStatement->recurse(fp, tabs + 1, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_PRUNE:
- if (mStatement)
- {
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- else
- {
- prunearg = FALSE;
- }
- break;
- case LSCP_SCOPE_PASS1:
- // compound statements create a new scope
- if (mStatement)
- {
- mStatementScope = new LLScriptScope(gScopeStringTable);
- mStatementScope->addParentScope(scope);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mStatementScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_SCOPE_PASS2:
- // compound statements create a new scope
- if (mStatement)
- {
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mStatementScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mStatement)
- {
- mStatement->recurse(fp, tabs + 1, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-void LLScriptEventHandler::addEvent(LLScriptEventHandler *event)
-{
- if (mNextp)
- {
- event->mNextp = mNextp;
- }
- mNextp = event;
-}
-
-void LLScriptEventHandler::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptEventHandler::getSize()
-{
- return mStackSpace;
-}
-
-U64 gCurrentHandler = 0;
-
-static void print_cil_local_init(LLFILE* fp, LLScriptScopeEntry* scopeEntry)
-{
- if(scopeEntry->mLocals.getNumber() > 0)
- {
- fprintf(fp, ".locals init (");
- for(int local = 0; local < scopeEntry->mLocals.getNumber(); ++local)
- {
- if(local > 0)
- {
- fprintf(fp, ", ");
- }
- print_cil_type(fp, scopeEntry->mLocals.getType(local));
- }
- fprintf(fp, ")\n");
- }
-}
-
-void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mStatement)
- {
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- else
- {
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "{\n");
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "}\n");
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mStatement)
- {
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, getSize(), mScopeEntry, entrycount, NULL);
- }
- if (mbNeedTrailingReturn)
- {
- print_return(fp, mScopeEntry);
- }
- fprintf(fp, "\n");
- break;
- case LSCP_PRUNE:
- mbNeedTrailingReturn = FALSE;
- prunearg = TRUE;
- mStatement->recurse(fp, tabs, tabsize, pass, LSPRUNE_EVENTS, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!prunearg)
- {
- // this means that we didn't end with a return statement, need to add one
- mbNeedTrailingReturn = TRUE;
- }
- break;
- case LSCP_SCOPE_PASS1:
- // create event level scope
- mEventScope = new LLScriptScope(gScopeStringTable);
- mEventScope->addParentScope(scope);
-
- // add event parameters
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mEventScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mEventScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_SCOPE_PASS2:
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mEventScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_TYPE:
- mScopeEntry = new LLScriptScopeEntry("Event", LIT_HANDLER, LST_NULL);
- switch(mEventp->mType)
- {
- case LSTT_STATE_ENTRY:
- break;
- case LSTT_STATE_EXIT:
- break;
- case LSTT_TOUCH_START:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_TOUCH:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_TOUCH_END:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_COLLISION_START:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_COLLISION:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_COLLISION_END:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_LAND_COLLISION_START:
- mScopeEntry->mFunctionArgs.addType(LST_VECTOR);
- break;
- case LSTT_LAND_COLLISION:
- mScopeEntry->mFunctionArgs.addType(LST_VECTOR);
- break;
- case LSTT_LAND_COLLISION_END:
- mScopeEntry->mFunctionArgs.addType(LST_VECTOR);
- break;
- case LSTT_INVENTORY:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_ATTACH:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- break;
- case LSTT_DATASERVER:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- break;
- case LSTT_TIMER:
- break;
- case LSTT_MOVING_START:
- break;
- case LSTT_MOVING_END:
- break;
- case LSTT_OBJECT_REZ:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- break;
- case LSTT_REMOTE_DATA:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- break;
- case LSTT_CHAT:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- break;
- case LSTT_SENSOR:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_CONTROL:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_LINK_MESSAGE:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- break;
- case LSTT_MONEY:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_EMAIL:
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_REZ:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_NO_SENSOR:
- break;
- case LSTT_AT_TARGET:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_VECTOR);
- mScopeEntry->mFunctionArgs.addType(LST_VECTOR);
- break;
- case LSTT_NOT_AT_TARGET:
- break;
- case LSTT_AT_ROT_TARGET:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_QUATERNION);
- mScopeEntry->mFunctionArgs.addType(LST_QUATERNION);
- break;
- case LSTT_NOT_AT_ROT_TARGET:
- break;
- case LSTT_RTPERMISSIONS:
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- case LSTT_HTTP_RESPONSE:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- mScopeEntry->mFunctionArgs.addType(LST_LIST);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- break;
- case LSTT_HTTP_REQUEST:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- mScopeEntry->mFunctionArgs.addType(LST_STRING);
- break;
- case LSTT_EXPERMISSIONS:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- break;
- case LSTT_EXPERMISSIONS_DENIED:
- mScopeEntry->mFunctionArgs.addType(LST_KEY);
- mScopeEntry->mFunctionArgs.addType(LST_INTEGER);
- break;
- default:
- break;
- }
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_RESOURCE:
- // first determine resource counts for globals
- count = 0;
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- // Store offset of first local as with global functions, so locals and arguments can be distinguished with is_parameter when compiling to CIL.
- mScopeEntry->mOffset = (S32) count;
-
- if (mStatement)
- {
- entrycount = 0;
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mScopeEntry, entrycount, NULL);
-
- const char *function_args = mScopeEntry->mFunctionArgs.mString;
- fprintf(fp, "Function Args: %s\n", function_args?function_args:"");
-
- const char *local_list = mScopeEntry->mLocals.mString;
- fprintf(fp, "Local List: %s\n", local_list?local_list:"");
- }
- mStackSpace = (S32)count;
- break;
- case LSCP_DETERMINE_HANDLERS:
- count |= LSCRIPTStateBitField[mEventp->mType];
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- llassert(mEventp);
- if (!mEventp) return;
-
- // order for event handler
- // set jump table value
- S32 jumpoffset;
- jumpoffset = LSCRIPTDataSize[LST_INTEGER]*get_event_handler_jump_position(gCurrentHandler, mEventp->mType)*2;
-
- integer2bytestream(chunk->mCodeChunk, jumpoffset, chunk->mCurrentOffset);
-
- // 0 - 3: offset to actual data
- S32 offsetoffset = chunk->mCurrentOffset;
- S32 offsetdelta = 0;
- chunk->addBytes(4);
-
- // null terminated event name and null terminated parameters
- LLScriptByteCodeChunk *event = new LLScriptByteCodeChunk(FALSE);
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, event, heap, stacksize, entry, entrycount, NULL);
- chunk->addBytes(event->mCodeChunk, event->mCurrentOffset);
- delete event;
-
- chunk->addBytes(1);
-
- // now we're at the first opcode
- offsetdelta = chunk->mCurrentOffset - offsetoffset;
- integer2bytestream(chunk->mCodeChunk, offsetoffset, offsetdelta);
-
- // get ready to compute the number of bytes of opcode
- offsetdelta = chunk->mCurrentOffset;
-
- if (mStatement)
- {
- LLScriptByteCodeChunk *statements = new LLScriptByteCodeChunk(TRUE);
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, statements, heap, getSize(), mScopeEntry, entrycount, NULL);
- statements->connectJumps();
- chunk->addBytes(statements->mCodeChunk, statements->mCurrentOffset);
- delete statements;
- }
- if (mbNeedTrailingReturn)
- {
- add_return(chunk, mScopeEntry);
- }
- // now stuff in the number of bytes of stack space that this routine needs
- integer2bytestream(chunk->mCodeChunk, jumpoffset, getSize());
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
-
- // Method signature prefix.
- fprintf(fp, ".method public hidebysig instance default void ");
-
- // Mangle event handler name by prefixing it with state name.
- // Allows state changing by finding handlers prefixed with new
- // state name. Prefix disambiguates functions and event handlers.
- fprintf(fp, "e");
- fprintf(fp, "%s", entry->mIdentifier);
-
- // Handler name and arguments.
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- // Method signature postfix.
- fprintf(fp, " cil managed\n");
-
- // Function header.
- fprintf(fp,"{\n");
- fprintf(fp, ".maxstack 500\n"); // TODO: Calculated stack size...
-
- // Allocate space for locals.
- print_cil_local_init(fp, mScopeEntry);
-
- if (mStatement)
- {
- // Pass scope so identifiers can determine parameter or local.
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mScopeEntry, entrycount, NULL);
- }
-
- // Function footer.
- if (mbNeedTrailingReturn)
- {
- // TODO: throw exception?
- fprintf(fp, "ret\n");
- }
- fprintf(fp, "}\n");
-
- break;
- default:
- mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mStatement)
- {
- mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-void LLScriptFunctionDec::addFunctionParameter(LLScriptFunctionDec *dec)
-{
- if (mNextp)
- {
- dec->mNextp = mNextp;
- }
- mNextp = dec;
-}
-
-void LLScriptFunctionDec::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- if (mNextp)
- {
- fprintf(fp, ", ");
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-
-}
-
-S32 LLScriptFunctionDec::getSize()
-{
- return 0;
-}
-
-void LLScriptFunctionDec::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_SCOPE_PASS1:
- // add function names into global scope
- if (scope->checkEntry(mIdentifier->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_VARIABLE, mType->mType);
- }
- break;
- case LSCP_RESOURCE:
- {
- // we're just tryng to determine how much space the variable needs
- mIdentifier->mScopeEntry->mOffset = (S32)count;
- mIdentifier->mScopeEntry->mSize = mType->getSize();
- count += mIdentifier->mScopeEntry->mSize;
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- // return type
- char typereturn;
- if (mType)
- {
- typereturn = LSCRIPTTypeByte[mType->mType];
- }
- else
- {
- typereturn = LSCRIPTTypeByte[LST_NULL];
- }
- chunk->addBytes(&typereturn, 1);
- // name
-#ifdef LSL_INCLUDE_DEBUG_INFO
- chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
-#else
- chunk->addBytes(1);
-#endif
- }
- break;
- case LSCP_BUILD_FUNCTION_ARGS:
- {
- entry->mFunctionArgs.addType(mType->mType);
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if(NULL != mNextp)
- {
- fprintf(fp, ",");
- }
- break;
- default:
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-void LLScriptGlobalFunctions::addGlobalFunction(LLScriptGlobalFunctions *global)
-{
- if (mNextp)
- {
- global->mNextp = mNextp;
- }
- mNextp = global;
-}
-
-void LLScriptGlobalFunctions::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptGlobalFunctions::getSize()
-{
- return 0;
-}
-
-void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- if (mType)
- {
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\t");
- }
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mParameters)
- {
- fprintf(fp, "( ");
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- }
- else
- {
- fprintf(fp, "()\n");
- }
- if (mStatements)
- {
- fdotabs(fp, tabs, tabsize);
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mIdentifier->mScopeEntry, entrycount, NULL);
- }
- else
- {
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "{\n");
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "}\n");
- }
- break;
- case LSCP_EMIT_ASSEMBLY:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mParameters)
- {
- fprintf(fp, "( ");
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )\n");
- }
- else
- {
- fprintf(fp, "()\n");
- }
- if (mStatements)
- {
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, mIdentifier->mScopeEntry->mSize, mIdentifier->mScopeEntry, entrycount, NULL);
- }
- if (mbNeedTrailingReturn)
- {
- print_return(fp, mIdentifier->mScopeEntry);
- }
- fprintf(fp, "\n");
- break;
- case LSCP_PRUNE:
- mbNeedTrailingReturn = FALSE;
- if (mType)
- {
- prunearg = TRUE;
- mStatements->recurse(fp, tabs, tabsize, pass, LSPRUNE_GLOBAL_NON_VOIDS, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!prunearg)
- {
- gErrorToText.writeError(fp, this, LSERROR_NO_RETURN);
- }
- }
- else
- {
- prunearg = TRUE;
- mStatements->recurse(fp, tabs, tabsize, pass, LSPRUNE_GLOBAL_VOIDS, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (!prunearg)
- {
- // this means that we didn't end with a return statement, need to add one
- mbNeedTrailingReturn = TRUE;
- }
- }
- break;
- case LSCP_SCOPE_PASS1:
- // add function names into global scope
- if (scope->checkEntry(mIdentifier->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- if (mType)
- {
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_FUNCTION, mType->mType);
- }
- else
- {
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_FUNCTION, LST_NULL);
- }
- }
-
- // create function level scope
- mFunctionScope = new LLScriptScope(gScopeStringTable);
- mFunctionScope->addParentScope(scope);
-
- // function parameters
- if (mParameters)
- {
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mFunctionScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
-
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mFunctionScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_SCOPE_PASS2:
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mFunctionScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-
- if (mParameters)
- {
- if (mIdentifier->mScopeEntry)
- {
- mParameters->recurse(fp, tabs, tabsize, LSCP_BUILD_FUNCTION_ARGS, ptype, prunearg, mFunctionScope, type, basetype, count, chunk, heap, stacksize, mIdentifier->mScopeEntry, 0, NULL);
- }
- }
- break;
- case LSCP_TYPE:
- if (mType)
- {
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, mType->mType, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- else
- {
- type = LST_NULL;
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_RESOURCE:
- // first determine resource counts for globals
- count = 0;
-
- if (mParameters)
- {
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
-
- if (mIdentifier->mScopeEntry)
- {
- // this isn't a bug . . . Offset is used to determine how much is params vs locals
- mIdentifier->mScopeEntry->mOffset = (S32)count;
- }
-
- if (mStatements)
- {
- entrycount = 0;
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mIdentifier->mScopeEntry, entrycount, NULL);
- fprintf(fp, "Function Args: %s\n", mIdentifier->mScopeEntry->mFunctionArgs.mString);
- fprintf(fp, "Local List: %s\n", mIdentifier->mScopeEntry->mLocals.mString);
- if (mIdentifier->mScopeEntry)
- {
- mIdentifier->mScopeEntry->mSize = (S32)count;
- }
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- // order for global functions
- // set jump table value
- S32 jumpoffset = LSCRIPTDataSize[LST_INTEGER]*mIdentifier->mScopeEntry->mCount + LSCRIPTDataSize[LST_INTEGER];
- integer2bytestream(chunk->mCodeChunk, jumpoffset, chunk->mCurrentOffset);
-
- // 0 - 3: offset to actual data
- S32 offsetoffset = chunk->mCurrentOffset;
- S32 offsetdelta = 0;
- chunk->addBytes(4);
-
- // null terminated function name
-#ifdef LSL_INCLUDE_DEBUG_INFO
- chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
-#else
- chunk->addBytes(1);
-#endif
- // return type
- char typereturn;
- if (mType)
- {
- typereturn = LSCRIPTTypeByte[mType->mType];
- }
- else
- {
- typereturn = LSCRIPTTypeByte[LST_NULL];
- }
- chunk->addBytes(&typereturn, 1);
-
- // null terminated parameters, followed by type
- if (mParameters)
- {
- LLScriptByteCodeChunk *params = new LLScriptByteCodeChunk(FALSE);
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, params, heap, stacksize, entry, entrycount, NULL);
- chunk->addBytes(params->mCodeChunk, params->mCurrentOffset);
- delete params;
- }
- chunk->addBytes(1);
-
- // now we're at the first opcode
- offsetdelta = chunk->mCurrentOffset - offsetoffset;
- integer2bytestream(chunk->mCodeChunk, offsetoffset, offsetdelta);
-
- if (mStatements)
- {
- LLScriptByteCodeChunk *statements = new LLScriptByteCodeChunk(TRUE);
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, statements, heap, mIdentifier->mScopeEntry->mSize, mIdentifier->mScopeEntry, entrycount, NULL);
- statements->connectJumps();
- chunk->addBytes(statements->mCodeChunk, statements->mCurrentOffset);
- delete statements;
- }
- if (mbNeedTrailingReturn)
- {
- add_return(chunk, mIdentifier->mScopeEntry);
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- // Function header. Prefix function name with g to distinguish
- // from event handlers.
- fprintf(fp, ".method public hidebysig instance default ");
- print_cil_type(fp, mType ? mType->mType : LST_NULL);
- fprintf(fp, " 'g");
- fprintf(fp, "%s", mIdentifier->mName);
- fprintf(fp, "'");
- if (mParameters)
- {
- fprintf(fp, "( ");
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, " )");
- }
- else
- {
- fprintf(fp, "()");
- }
- fprintf(fp, " cil managed\n{\n");
- fprintf(fp, ".maxstack 500\n"); // TODO: Calculated stack size...
-
- // Allocate space for locals.
- print_cil_local_init(fp, mIdentifier->mScopeEntry);
-
- if (mStatements)
- {
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, mIdentifier->mScopeEntry->mSize, mIdentifier->mScopeEntry, entrycount, NULL);
- }
-
- // Function footer.
- if (mbNeedTrailingReturn)
- {
- // TODO: throw exception?
- fprintf(fp, "ret\n");
- }
- fprintf(fp, "}\n");
- fprintf(fp, "\n");
- }
- break;
- default:
- if (mType)
- {
- mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mParameters)
- {
- mParameters->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- if (mStatements)
- {
- mStatements->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-void LLScriptState::addState(LLScriptState *state)
-{
- if (mNextp)
- {
- state->mNextp = mNextp;
- }
- mNextp = state;
-}
-
-void LLScriptState::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- default:
- if (mNextp)
- {
- mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
-}
-
-S32 LLScriptState::getSize()
-{
- return 0;
-}
-
-void LLScriptState::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- fdotabs(fp, tabs, tabsize);
- if (mType == LSSTYPE_DEFAULT)
- {
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "{\n");
- }
- else
- {
- fprintf(fp, "state ");
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "{\n");
- }
- if (mEvent)
- {
- mEvent->recurse(fp, tabs + 1, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- fdotabs(fp, tabs, tabsize);
- fprintf(fp, "}\n");
- break;
- case LSCP_EMIT_ASSEMBLY:
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, ":\n");
- if (mEvent)
- {
- fprintf(fp, "EVENTS\n");
- mEvent->recurse(fp, tabs + 1, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- }
- break;
- case LSCP_SCOPE_PASS1:
- // add state name
- if (scope->checkEntry(mIdentifier->mName))
- {
- gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
- }
- else
- {
- mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_STATE, LST_NULL);
- }
- mStateScope = new LLScriptScope(gScopeStringTable);
- mStateScope->addParentScope(scope);
- // now do the events
- if (mEvent)
- {
- mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mStateScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_SCOPE_PASS2:
- if (mEvent)
- {
- mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_TYPE:
- if (mEvent)
- {
- mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- // order for states
- // set jump table value
-
- S32 jumpoffset;
- if (LSL2_CURRENT_MAJOR_VERSION == LSL2_MAJOR_VERSION_TWO)
- {
- jumpoffset = LSCRIPTDataSize[LST_INTEGER]*3*mIdentifier->mScopeEntry->mCount + LSCRIPTDataSize[LST_INTEGER];
- }
- else
- {
- jumpoffset = LSCRIPTDataSize[LST_INTEGER]*2*mIdentifier->mScopeEntry->mCount + LSCRIPTDataSize[LST_INTEGER];
- }
- integer2bytestream(chunk->mCodeChunk, jumpoffset, chunk->mCurrentOffset);
-
- // need to figure out what handlers this state has registered
- // we'll use to count to find it
- count = 0;
-
- if (mEvent)
- {
- mEvent->recurse(fp, tabs, tabsize, LSCP_DETERMINE_HANDLERS, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- gCurrentHandler = count;
- }
-
- // add description word into chunk
- if (LSL2_CURRENT_MAJOR_VERSION == LSL2_MAJOR_VERSION_TWO)
- {
- u642bytestream(chunk->mCodeChunk, jumpoffset, gCurrentHandler);
- }
- else
- {
- integer2bytestream(chunk->mCodeChunk, jumpoffset, (S32)gCurrentHandler);
- }
-
-
- // 0 - 3: offset to event jump table
- S32 offsetoffset = chunk->mCurrentOffset;
- S32 offsetdelta = 0;
- chunk->addBytes(4);
-
- // null terminated state name
-#ifdef LSL_INCLUDE_DEBUG_INFO
- chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
-#else
- chunk->addBytes(1);
-#endif
- // now we're at the jump table
- offsetdelta = chunk->mCurrentOffset - offsetoffset;
- integer2bytestream(chunk->mCodeChunk, offsetoffset, offsetdelta);
-
- // add the events themselves
- if (mEvent)
- {
- LLScriptByteCodeChunk *events = new LLScriptByteCodeChunk(FALSE);
- // make space for event jump table
- events->addBytes(LSCRIPTDataSize[LST_INTEGER]*get_number_of_event_handlers(gCurrentHandler)*2);
- mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, events, heap, stacksize, entry, entrycount, NULL);
- chunk->addBytes(events->mCodeChunk, events->mCurrentOffset);
- delete events;
- }
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- if (mEvent)
- {
- // Entry not used at this level, so pass state scope as entry parameter, to allow event handlers to do name mangling.
- mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mIdentifier->mScopeEntry, entrycount, NULL);
- }
- break;
- default:
- if (mType == LSSTYPE_DEFAULT)
- {
- }
- else
- {
- mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- if (mEvent)
- {
- mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- break;
- }
- gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-}
-
-// Converts string to a valid CIL class name and stores the result
-// in the supplied buffer, which should be at least 32 chars long.
-// If the string starts with a UUID, all characters in the UUID are included
-// in the generated name.
-void to_class_name(char* buffer, const char* string)
-{
- strcpy(buffer, "LSL-");
- strcat(buffer, string);
- char* current_char = buffer;
- while((*current_char) != 0)
- {
- if(isalnum(*current_char))
- {
- ++current_char;
- }
- else if((*current_char) == '-')
- {
- (*current_char) = '_';
- ++current_char;
- }
- else
- {
- (*current_char) = 0;
- }
- }
-}
-
-void LLScriptScript::setClassName(const char* class_name)
-{
- to_class_name(mClassName, class_name);
-}
-
-S32 LLScriptScript::getSize()
-{
- return 0;
-}
-
-LLScriptScript::LLScriptScript(LLScritpGlobalStorage *globals,
- LLScriptState *states) :
- LLScriptFilePosition(0, 0),
- mStates(states), mGlobalScope(NULL), mGlobals(NULL), mGlobalFunctions(NULL), mGodLike(FALSE)
-{
- const char DEFAULT_BYTECODE_FILENAME[] = "lscript.lso";
-
- mBytecodeDest = DEFAULT_BYTECODE_FILENAME;
- LLScriptGlobalVariable *tvar;
- LLScriptGlobalFunctions *tfunc;
- LLScritpGlobalStorage *temp;
-
- temp = globals;
- while(temp)
- {
- if (temp->mbGlobalFunction)
- {
- if (!mGlobalFunctions)
- {
- mGlobalFunctions = (LLScriptGlobalFunctions *)temp->mGlobal;
- }
- else
- {
- tfunc = mGlobalFunctions;
- while(tfunc->mNextp)
- {
- tfunc = tfunc->mNextp;
- }
- tfunc->mNextp = (LLScriptGlobalFunctions *)temp->mGlobal;
- }
- }
- else
- {
- if (!mGlobals)
- {
- mGlobals = (LLScriptGlobalVariable *)temp->mGlobal;
- }
- else
- {
- tvar = mGlobals;
- while(tvar->mNextp)
- {
- tvar = tvar->mNextp;
- }
- tvar->mNextp = (LLScriptGlobalVariable *)temp->mGlobal;
- }
- }
- temp = temp->mNextp;
- }
-
- mClassName[0] = '\0';
-}
-
-void LLScriptScript::setBytecodeDest(const char* dst_filename)
-{
- mBytecodeDest = ll_safe_string(dst_filename);
-}
-
-static void print_cil_globals(LLFILE* fp, LLScriptGlobalVariable* global)
-{
- fprintf(fp, ".field public ");
- print_cil_type(fp, global->mType->mType);
- fprintf(fp, " '%s'\n", global->mIdentifier->mName);
- if(NULL != global->mNextp)
- {
- print_cil_globals(fp, global->mNextp);
- }
-}
-
-void LLScriptScript::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
-{
- if (gErrorToText.getErrors())
- {
- return;
- }
- switch(pass)
- {
- case LSCP_PRETTY_PRINT:
- if (mGlobals)
- {
- fdotabs(fp, tabs, tabsize);
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
-
- if (mGlobalFunctions)
- {
- fdotabs(fp, tabs, tabsize);
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
-
- fdotabs(fp, tabs, tabsize);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_PRUNE:
- if (mGlobalFunctions)
- {
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- }
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_SCOPE_PASS1:
- {
- mGlobalScope = new LLScriptScope(gScopeStringTable);
- // zeroth, add library functions to global scope
- U16 function_index = 0;
- const char *arg;
- LLScriptScopeEntry *sentry;
- for (std::vector<LLScriptLibraryFunction>::const_iterator i = gScriptLibrary.mFunctions.begin();
- i != gScriptLibrary.mFunctions.end(); ++i)
- {
- // First, check to make sure this isn't a god only function, or that the viewer's agent is a god.
- if (!i->mGodOnly || mGodLike)
- {
- if (i->mReturnType)
- sentry = mGlobalScope->addEntry(i->mName, LIT_LIBRARY_FUNCTION, char2type(*i->mReturnType));
- else
- sentry = mGlobalScope->addEntry(i->mName, LIT_LIBRARY_FUNCTION, LST_NULL);
- sentry->mLibraryNumber = function_index;
- arg = i->mArgs;
- if (arg)
- {
- while (*arg)
- {
- sentry->mFunctionArgs.addType(char2type(*arg));
- sentry->mSize += LSCRIPTDataSize[char2type(*arg)];
- sentry->mOffset += LSCRIPTDataSize[char2type(*arg)];
- arg++;
- }
- }
- }
- function_index++;
- }
- // first go and collect all the global variables
- if (mGlobals)
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mGlobalScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- // second, do the global functions
- if (mGlobalFunctions)
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mGlobalScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- // now do states
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mGlobalScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
- case LSCP_SCOPE_PASS2:
- // now we're checking jumps, function calls, and state transitions
- if (mGlobalFunctions)
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mGlobalScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mGlobalScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_TYPE:
- // first we need to check global variables
- if (mGlobals)
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- // now do global functions and states
- if (mGlobalFunctions)
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_RESOURCE:
- // first determine resource counts for globals
- count = 0;
- if (mGlobals)
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- // now do locals
- if (mGlobalFunctions)
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- case LSCP_EMIT_ASSEMBLY:
-
- if (mGlobals)
- {
- fprintf(fp, "GLOBALS\n");
- fdotabs(fp, tabs, tabsize);
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- }
-
- if (mGlobalFunctions)
- {
- fprintf(fp, "GLOBAL FUNCTIONS\n");
- fdotabs(fp, tabs, tabsize);
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- }
-
- fprintf(fp, "STATES\n");
- fdotabs(fp, tabs, tabsize);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(fp, "\n");
- break;
- case LSCP_EMIT_BYTE_CODE:
- {
- // first, create data structure to hold the whole shebang
- LLScriptScriptCodeChunk *code = new LLScriptScriptCodeChunk(TOP_OF_MEMORY);
-
- // ok, let's add the registers, all zeroes for now
- S32 i;
- S32 nooffset = 0;
-
- for (i = LREG_IP; i < LREG_EOF; i++)
- {
- if (i < LREG_NCE)
- code->mRegisters->addBytes(4);
- else if (LSL2_CURRENT_MAJOR_VERSION == LSL2_MAJOR_VERSION_TWO)
- code->mRegisters->addBytes(8);
- }
- // global variables
- if (mGlobals)
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, code->mGlobalVariables, code->mHeap, stacksize, entry, entrycount, NULL);
-
- // put the ending heap block onto the heap
- U8 *temp;
- S32 size = lsa_create_data_block(&temp, NULL, 0);
- code->mHeap->addBytes(temp, size);
- delete [] temp;
-
- // global functions
- // make space for global function jump table
- if (mGlobalFunctions)
- {
- code->mGlobalFunctions->addBytes(LSCRIPTDataSize[LST_INTEGER]*mGlobalScope->mFunctionCount + LSCRIPTDataSize[LST_INTEGER]);
- integer2bytestream(code->mGlobalFunctions->mCodeChunk, nooffset, mGlobalScope->mFunctionCount);
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, code->mGlobalFunctions, NULL, stacksize, entry, entrycount, NULL);
- }
-
-
- nooffset = 0;
- // states
- // make space for state jump/info table
- if (LSL2_CURRENT_MAJOR_VERSION == LSL2_MAJOR_VERSION_TWO)
- {
- code->mStates->addBytes(LSCRIPTDataSize[LST_INTEGER]*3*mGlobalScope->mStateCount + LSCRIPTDataSize[LST_INTEGER]);
- }
- else
- {
- code->mStates->addBytes(LSCRIPTDataSize[LST_INTEGER]*2*mGlobalScope->mStateCount + LSCRIPTDataSize[LST_INTEGER]);
- }
- integer2bytestream(code->mStates->mCodeChunk, nooffset, mGlobalScope->mStateCount);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, code->mStates, NULL, stacksize, entry, entrycount, NULL);
-
- // now, put it all together and spit it out
- // we need
- LLFILE* bcfp = LLFile::fopen(mBytecodeDest, "wb"); /*Flawfinder: ignore*/
-
- code->build(fp, bcfp);
- fclose(bcfp);
-
- delete code;
- }
- break;
- case LSCP_EMIT_CIL_ASSEMBLY:
- {
- LLFILE *bcfp = LLFile::fopen(mBytecodeDest, "wb");
-
- // Output dependencies.
- fprintf(bcfp, ".assembly extern mscorlib {.ver 1:0:5000:0}\n");
- fprintf(bcfp, ".assembly extern LslLibrary {.ver 0:1:0:0}\n");
- fprintf(bcfp, ".assembly extern LslUserScript {.ver 0:1:0:0}\n");
- fprintf(bcfp, ".assembly extern ScriptTypes {.ver 0:1:0:0}\n");
-
- // Output assembly name.
- fprintf(bcfp, ".assembly '%s' {.ver 0:0:0:0}\n", gScriptp->getClassName());
-
- // Output class header.
- fprintf(bcfp, ".class public auto ansi serializable beforefieldinit %s extends [LslUserScript]LindenLab.SecondLife.LslUserScript\n", gScriptp->getClassName());
- fprintf(bcfp, "{\n");
-
- // Output globals as members.
- if(NULL != mGlobals)
- {
- print_cil_globals(bcfp, mGlobals);
- }
-
- // Output ctor header.
- fprintf(bcfp, ".method public hidebysig specialname rtspecialname instance default void .ctor () cil managed\n");
- fprintf(bcfp, "{\n");
- fprintf(bcfp, ".maxstack 500\n");
-
- // Initialise globals as members in ctor.
- if (mGlobals)
- {
- fdotabs(bcfp, tabs, tabsize);
- mGlobals->recurse(bcfp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(bcfp, "\n");
- }
-
- // Output ctor footer.
- fprintf(bcfp, "ldarg.0\n");
- fprintf(bcfp, "call instance void [LslUserScript]LindenLab.SecondLife.LslUserScript::.ctor()\n");
- fprintf(bcfp, "ret\n");
- fprintf(bcfp, "}\n");
-
- // Output functions as methods.
- if (mGlobalFunctions)
- {
- fdotabs(bcfp, tabs, tabsize);
- mGlobalFunctions->recurse(bcfp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(bcfp, "\n");
- }
-
- // Output states as name mangled methods.
- fdotabs(bcfp, tabs, tabsize);
- mStates->recurse(bcfp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- fprintf(bcfp, "\n");
-
- // Output class footer.
- fprintf(bcfp, "}\n");
-
- // Close file.
- fclose(bcfp);
- }
- break;
- default:
- if (mGlobals)
- mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- if (mGlobalFunctions)
- mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
- break;
- }
-}
diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h
deleted file mode 100755
index 38a69cece833311401ffc5eb4c84a5a0f6801dda..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_tree.h
+++ /dev/null
@@ -1,2358 +0,0 @@
-/**
- * @file lscript_tree.h
- * @brief provides the classes required to build lscript's abstract syntax tree and symbol table
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_TREE_H
-#define LL_LSCRIPT_TREE_H
-
-#include "v3math.h"
-#include "llquaternion.h"
-#include "lscript_error.h"
-#include "lscript_typecheck.h"
-#include "lscript_byteformat.h"
-
-
-// Nota Bene: Class destructors don't delete pointed to classes because it isn't guaranteed that lex/yacc will build
-// complete data structures. Instead various chunks that are allocated are stored and deleted by allocation lists
-
-class LLScriptType : public LLScriptFilePosition
-{
-public:
- LLScriptType(S32 line, S32 col, LSCRIPTType type)
- : LLScriptFilePosition(line, col), mType(type)
- {
- }
-
- ~LLScriptType() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTType mType;
-};
-
-// contains a literal or constant value
-class LLScriptConstant : public LLScriptFilePosition
-{
-public:
- LLScriptConstant(S32 line, S32 col, LSCRIPTType type)
- : LLScriptFilePosition(line, col), mType(type)
- {
- }
-
- virtual ~LLScriptConstant() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTType mType;
-};
-
-class LLScriptConstantInteger : public LLScriptConstant
-{
-public:
- LLScriptConstantInteger(S32 line, S32 col, S32 value)
- : LLScriptConstant(line, col, LST_INTEGER), mValue(value)
- {
- }
-
- ~LLScriptConstantInteger() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- S32 mValue;
-};
-
-class LLScriptConstantFloat : public LLScriptConstant
-{
-public:
- LLScriptConstantFloat(S32 line, S32 col, F32 value)
- : LLScriptConstant(line, col, LST_FLOATINGPOINT), mValue(value)
- {
- }
-
- ~LLScriptConstantFloat() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- F32 mValue;
-};
-
-class LLScriptConstantString : public LLScriptConstant
-{
-public:
- LLScriptConstantString(S32 line, S32 col, char *value)
- : LLScriptConstant(line, col, LST_STRING), mValue(value)
- {
- }
-
- ~LLScriptConstantString()
- {
- delete [] mValue;
- mValue = NULL;
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- char *mValue;
-};
-
-// container for individual identifiers
-class LLScriptIdentifier : public LLScriptFilePosition
-{
-public:
- LLScriptIdentifier(S32 line, S32 col, char *name, LLScriptType *type = NULL)
- : LLScriptFilePosition(line, col), mName(name), mScopeEntry(NULL), mType(type)
- {
- }
-
- ~LLScriptIdentifier()
- {
- delete [] mName;
- mName = NULL;
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- char *mName;
- LLScriptScopeEntry *mScopeEntry;
- LLScriptType *mType;
-};
-
-typedef enum e_lscript_simple_assignable_type
-{
- LSSAT_NULL,
- LSSAT_IDENTIFIER,
- LSSAT_CONSTANT,
- LSSAT_VECTOR_CONSTANT,
- LSSAT_QUATERNION_CONSTANT,
- LSSAT_LIST_CONSTANT,
- LSSAT_EOF
-} LSCRIPTSimpleAssignableType;
-
-class LLScriptSimpleAssignable : public LLScriptFilePosition
-{
-public:
- LLScriptSimpleAssignable(S32 line, S32 col, LSCRIPTSimpleAssignableType type)
- : LLScriptFilePosition(line, col), mType(type), mNextp(NULL)
- {
- }
-
- void addAssignable(LLScriptSimpleAssignable *assign);
-
- virtual ~LLScriptSimpleAssignable()
- {
- // don't delete next pointer because we're going to store allocation lists and delete from those
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTSimpleAssignableType mType;
- LLScriptSimpleAssignable *mNextp;
-};
-
-class LLScriptSAIdentifier : public LLScriptSimpleAssignable
-{
-public:
- LLScriptSAIdentifier(S32 line, S32 col, LLScriptIdentifier *identifier)
- : LLScriptSimpleAssignable(line, col, LSSAT_IDENTIFIER), mIdentifier(identifier)
- {
- }
-
- ~LLScriptSAIdentifier()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mIdentifier;
-};
-
-class LLScriptSAConstant : public LLScriptSimpleAssignable
-{
-public:
- LLScriptSAConstant(S32 line, S32 col, LLScriptConstant *constant)
- : LLScriptSimpleAssignable(line, col, LSSAT_CONSTANT), mConstant(constant)
- {
- }
-
- ~LLScriptSAConstant()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptConstant *mConstant;
-};
-
-class LLScriptSAVector : public LLScriptSimpleAssignable
-{
-public:
- LLScriptSAVector(S32 line, S32 col, LLScriptSimpleAssignable *e1,
- LLScriptSimpleAssignable *e2,
- LLScriptSimpleAssignable *e3)
- : LLScriptSimpleAssignable(line, col, LSSAT_VECTOR_CONSTANT),
- mEntry1(e1), mEntry2(e2), mEntry3(e3)
- {
- }
-
- ~LLScriptSAVector()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptSimpleAssignable *mEntry1;
- LLScriptSimpleAssignable *mEntry2;
- LLScriptSimpleAssignable *mEntry3;
-};
-
-class LLScriptSAQuaternion : public LLScriptSimpleAssignable
-{
-public:
- LLScriptSAQuaternion(S32 line, S32 col, LLScriptSimpleAssignable *e1,
- LLScriptSimpleAssignable *e2,
- LLScriptSimpleAssignable *e3,
- LLScriptSimpleAssignable *e4)
- : LLScriptSimpleAssignable(line, col, LSSAT_QUATERNION_CONSTANT),
- mEntry1(e1), mEntry2(e2), mEntry3(e3), mEntry4(e4)
- {
- }
-
- ~LLScriptSAQuaternion()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptSimpleAssignable *mEntry1;
- LLScriptSimpleAssignable *mEntry2;
- LLScriptSimpleAssignable *mEntry3;
- LLScriptSimpleAssignable *mEntry4;
-};
-
-class LLScriptSAList : public LLScriptSimpleAssignable
-{
-public:
- LLScriptSAList(S32 line, S32 col, LLScriptSimpleAssignable *elist)
- : LLScriptSimpleAssignable(line, col, LSSAT_QUATERNION_CONSTANT), mEntryList(elist)
- {
- }
-
- ~LLScriptSAList()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptSimpleAssignable *mEntryList;
-};
-
-// global variables
-class LLScriptGlobalVariable : public LLScriptFilePosition
-{
-public:
- LLScriptGlobalVariable(S32 line, S32 col, LLScriptType *type,
- LLScriptIdentifier *identifier,
- LLScriptSimpleAssignable *assignable)
- : LLScriptFilePosition(line, col), mType(type), mIdentifier(identifier), mAssignable(assignable), mNextp(NULL), mAssignableType(LST_NULL)
- {
- }
-
- void addGlobal(LLScriptGlobalVariable *global);
-
- ~LLScriptGlobalVariable()
- {
- }
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptType *mType;
- LLScriptIdentifier *mIdentifier;
- LLScriptSimpleAssignable *mAssignable;
- LLScriptGlobalVariable *mNextp;
- LSCRIPTType mAssignableType;
-};
-
-// events
-
-class LLScriptEvent : public LLScriptFilePosition
-{
-public:
- LLScriptEvent(S32 line, S32 col, LSCRIPTStateEventType type)
- : LLScriptFilePosition(line, col), mType(type)
- {
- }
-
- virtual ~LLScriptEvent()
- {
- // don't delete next pointer because we're going to store allocation lists and delete from those
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTStateEventType mType;
-};
-
-class LLScriptStateEntryEvent : public LLScriptEvent
-{
-public:
- LLScriptStateEntryEvent(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_STATE_ENTRY)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- ~LLScriptStateEntryEvent() {}
-};
-
-class LLScriptStateExitEvent : public LLScriptEvent
-{
-public:
- LLScriptStateExitEvent(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_STATE_EXIT)
- {
- }
-
- ~LLScriptStateExitEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-};
-
-class LLScriptTouchStartEvent : public LLScriptEvent
-{
-public:
- LLScriptTouchStartEvent(S32 line, S32 col, LLScriptIdentifier *count)
- : LLScriptEvent(line, col, LSTT_TOUCH_START), mCount(count)
- {
- }
-
- ~LLScriptTouchStartEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mCount;
-};
-
-class LLScriptTouchEvent : public LLScriptEvent
-{
-public:
- LLScriptTouchEvent(S32 line, S32 col, LLScriptIdentifier *count)
- : LLScriptEvent(line, col, LSTT_TOUCH), mCount(count)
- {
- }
-
- ~LLScriptTouchEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mCount;
-};
-
-class LLScriptTouchEndEvent : public LLScriptEvent
-{
-public:
- LLScriptTouchEndEvent(S32 line, S32 col, LLScriptIdentifier *count)
- : LLScriptEvent(line, col, LSTT_TOUCH_END), mCount(count)
- {
- }
-
- ~LLScriptTouchEndEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mCount;
-};
-
-class LLScriptCollisionStartEvent : public LLScriptEvent
-{
-public:
- LLScriptCollisionStartEvent(S32 line, S32 col, LLScriptIdentifier *count)
- : LLScriptEvent(line, col, LSTT_COLLISION_START), mCount(count)
- {
- }
-
- ~LLScriptCollisionStartEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mCount;
-};
-
-class LLScriptCollisionEvent : public LLScriptEvent
-{
-public:
- LLScriptCollisionEvent(S32 line, S32 col, LLScriptIdentifier *count)
- : LLScriptEvent(line, col, LSTT_COLLISION), mCount(count)
- {
- }
-
- ~LLScriptCollisionEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mCount;
-};
-
-class LLScriptCollisionEndEvent : public LLScriptEvent
-{
-public:
- LLScriptCollisionEndEvent(S32 line, S32 col, LLScriptIdentifier *count)
- : LLScriptEvent(line, col, LSTT_COLLISION_END), mCount(count)
- {
- }
-
- ~LLScriptCollisionEndEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mCount;
-};
-
-class LLScriptLandCollisionStartEvent : public LLScriptEvent
-{
-public:
- LLScriptLandCollisionStartEvent(S32 line, S32 col, LLScriptIdentifier *pos)
- : LLScriptEvent(line, col, LSTT_LAND_COLLISION_START), mPosition(pos)
- {
- }
-
- ~LLScriptLandCollisionStartEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mPosition;
-};
-
-class LLScriptLandCollisionEvent : public LLScriptEvent
-{
-public:
- LLScriptLandCollisionEvent(S32 line, S32 col, LLScriptIdentifier *pos)
- : LLScriptEvent(line, col, LSTT_LAND_COLLISION), mPosition(pos)
- {
- }
-
- ~LLScriptLandCollisionEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mPosition;
-};
-
-class LLScriptLandCollisionEndEvent : public LLScriptEvent
-{
-public:
- LLScriptLandCollisionEndEvent(S32 line, S32 col, LLScriptIdentifier *pos)
- : LLScriptEvent(line, col, LSTT_LAND_COLLISION_END), mPosition(pos)
- {
- }
-
- ~LLScriptLandCollisionEndEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mPosition;
-};
-
-class LLScriptInventoryEvent : public LLScriptEvent
-{
-public:
- LLScriptInventoryEvent(S32 line, S32 col, LLScriptIdentifier *change)
- : LLScriptEvent(line, col, LSTT_INVENTORY), mChange(change)
- {
- }
-
- ~LLScriptInventoryEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mChange;
-};
-
-class LLScriptAttachEvent : public LLScriptEvent
-{
-public:
- LLScriptAttachEvent(S32 line, S32 col, LLScriptIdentifier *attach)
- : LLScriptEvent(line, col, LSTT_ATTACH), mAttach(attach)
- {
- }
-
- ~LLScriptAttachEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mAttach;
-};
-
-class LLScriptDataserverEvent : public LLScriptEvent
-{
-public:
- LLScriptDataserverEvent(S32 line, S32 col, LLScriptIdentifier *id, LLScriptIdentifier *data)
- : LLScriptEvent(line, col, LSTT_DATASERVER), mID(id), mData(data)
- {
- }
-
- ~LLScriptDataserverEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mID;
- LLScriptIdentifier *mData;
-};
-
-class LLScriptTimerEvent : public LLScriptEvent
-{
-public:
- LLScriptTimerEvent(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_TIMER)
- {
- }
-
- ~LLScriptTimerEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-};
-
-class LLScriptMovingStartEvent : public LLScriptEvent
-{
-public:
- LLScriptMovingStartEvent(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_MOVING_START)
- {
- }
-
- ~LLScriptMovingStartEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-};
-
-class LLScriptMovingEndEvent : public LLScriptEvent
-{
-public:
- LLScriptMovingEndEvent(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_MOVING_END)
- {
- }
-
- ~LLScriptMovingEndEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-};
-
-class LLScriptRTPEvent : public LLScriptEvent
-{
-public:
- LLScriptRTPEvent(S32 line, S32 col, LLScriptIdentifier *rtperm)
- : LLScriptEvent(line, col, LSTT_RTPERMISSIONS), mRTPermissions(rtperm)
- {
- }
-
- ~LLScriptRTPEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mRTPermissions;
-};
-
-class LLScriptEXPEvent : public LLScriptEvent
-{
-public:
- LLScriptEXPEvent(S32 line, S32 col, LLScriptIdentifier *name)
- : LLScriptEvent(line, col, LSTT_EXPERMISSIONS), mName(name)
- {
- }
-
- ~LLScriptEXPEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mName;
-};
-
-class LLScriptEXPDeniedEvent : public LLScriptEvent
-{
-public:
- LLScriptEXPDeniedEvent(S32 line, S32 col, LLScriptIdentifier *name, LLScriptIdentifier *reason)
- : LLScriptEvent(line, col, LSTT_EXPERMISSIONS_DENIED), mName(name), mReason(reason)
- {
- }
-
- ~LLScriptEXPDeniedEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mName;
- LLScriptIdentifier *mReason;
-};
-
-class LLScriptChatEvent : public LLScriptEvent
-{
-public:
- LLScriptChatEvent(S32 line, S32 col, LLScriptIdentifier *channel, LLScriptIdentifier *name, LLScriptIdentifier *id, LLScriptIdentifier *message)
- : LLScriptEvent(line, col, LSTT_CHAT), mChannel(channel), mName(name), mID(id), mMessage(message)
- {
- }
-
- ~LLScriptChatEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mChannel;
- LLScriptIdentifier *mName;
- LLScriptIdentifier *mID;
- LLScriptIdentifier *mMessage;
-};
-
-class LLScriptObjectRezEvent : public LLScriptEvent
-{
-public:
- LLScriptObjectRezEvent(S32 line, S32 col, LLScriptIdentifier *id)
- : LLScriptEvent(line, col, LSTT_OBJECT_REZ), mID(id)
- {
- }
-
- ~LLScriptObjectRezEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mID;
-};
-
-class LLScriptSensorEvent : public LLScriptEvent
-{
-public:
- LLScriptSensorEvent(S32 line, S32 col, LLScriptIdentifier *number)
- : LLScriptEvent(line, col, LSTT_SENSOR), mNumber(number)
- {
- }
-
- ~LLScriptSensorEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mNumber;
-};
-
-class LLScriptControlEvent : public LLScriptEvent
-{
-public:
- LLScriptControlEvent(S32 line, S32 col, LLScriptIdentifier *name, LLScriptIdentifier *levels, LLScriptIdentifier *edges)
- : LLScriptEvent(line, col, LSTT_CONTROL), mName(name), mLevels(levels), mEdges(edges)
- {
- }
-
- ~LLScriptControlEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mName;
- LLScriptIdentifier *mLevels;
- LLScriptIdentifier *mEdges;
-};
-
-class LLScriptLinkMessageEvent : public LLScriptEvent
-{
-public:
- LLScriptLinkMessageEvent(S32 line, S32 col, LLScriptIdentifier *sender, LLScriptIdentifier *num, LLScriptIdentifier *str, LLScriptIdentifier *id)
- : LLScriptEvent(line, col, LSTT_LINK_MESSAGE), mSender(sender), mNum(num), mStr(str), mID(id)
- {
- }
-
- ~LLScriptLinkMessageEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mSender;
- LLScriptIdentifier *mNum;
- LLScriptIdentifier *mStr;
- LLScriptIdentifier *mID;
-};
-
-class LLScriptRemoteEvent : public LLScriptEvent
-{
-public:
- LLScriptRemoteEvent(S32 line, S32 col, LLScriptIdentifier *type, LLScriptIdentifier *channel, LLScriptIdentifier *message_id, LLScriptIdentifier *sender, LLScriptIdentifier *int_val, LLScriptIdentifier *str_val)
- : LLScriptEvent(line, col, LSTT_REMOTE_DATA), mType(type), mChannel(channel), mMessageID(message_id), mSender(sender), mIntVal(int_val), mStrVal(str_val)
- {
- }
-
- ~LLScriptRemoteEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mType;
- LLScriptIdentifier *mChannel;
- LLScriptIdentifier *mMessageID;
- LLScriptIdentifier *mSender;
- LLScriptIdentifier *mIntVal;
- LLScriptIdentifier *mStrVal;
-};
-
-class LLScriptHTTPResponseEvent : public LLScriptEvent
-{
-public:
- LLScriptHTTPResponseEvent(S32 line, S32 col,
- LLScriptIdentifier *request_id,
- LLScriptIdentifier *status,
- LLScriptIdentifier *metadata,
- LLScriptIdentifier *body)
- : LLScriptEvent(line, col, LSTT_HTTP_RESPONSE),
- mRequestId(request_id), mStatus(status), mMetadata(metadata), mBody(body)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass,
- LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope,
- LSCRIPTType &type, LSCRIPTType basetype, U64 &count,
- LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap,
- S32 stacksize, LLScriptScopeEntry *entry,
- S32 entrycount, LLScriptLibData **ldata);
-
- S32 getSize();
-
- LLScriptIdentifier *mRequestId;
- LLScriptIdentifier *mStatus;
- LLScriptIdentifier *mMetadata;
- LLScriptIdentifier *mBody;
-};
-
-class LLScriptHTTPRequestEvent : public LLScriptEvent
-{
-public:
- LLScriptHTTPRequestEvent(S32 line, S32 col,
- LLScriptIdentifier *request_id,
- LLScriptIdentifier *method,
- LLScriptIdentifier *body)
- : LLScriptEvent(line, col, LSTT_HTTP_REQUEST),
- mRequestId(request_id), mMethod(method), mBody(body)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass,
- LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope,
- LSCRIPTType &type, LSCRIPTType basetype, U64 &count,
- LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap,
- S32 stacksize, LLScriptScopeEntry *entry,
- S32 entrycount, LLScriptLibData **ldata);
-
- S32 getSize();
-
- LLScriptIdentifier *mRequestId;
- LLScriptIdentifier *mMethod;
- LLScriptIdentifier *mBody;
-};
-
-class LLScriptRezEvent : public LLScriptEvent
-{
-public:
- LLScriptRezEvent(S32 line, S32 col, LLScriptIdentifier *start_param)
- : LLScriptEvent(line, col, LSTT_REZ), mStartParam(start_param)
- {
- }
- ~LLScriptRezEvent() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mStartParam;
-};
-
-class LLScriptNoSensorEvent : public LLScriptEvent
-{
-public:
- LLScriptNoSensorEvent(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_NO_SENSOR)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- ~LLScriptNoSensorEvent() {}
-};
-
-class LLScriptAtTarget : public LLScriptEvent
-{
-public:
- LLScriptAtTarget(S32 line, S32 col, LLScriptIdentifier *tnumber, LLScriptIdentifier *tpos, LLScriptIdentifier *ourpos)
- : LLScriptEvent(line, col, LSTT_AT_TARGET), mTargetNumber(tnumber), mTargetPosition(tpos), mOurPosition(ourpos)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- ~LLScriptAtTarget() {}
-
- LLScriptIdentifier *mTargetNumber;
- LLScriptIdentifier *mTargetPosition;
- LLScriptIdentifier *mOurPosition;
-};
-
-class LLScriptNotAtTarget : public LLScriptEvent
-{
-public:
- LLScriptNotAtTarget(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_NOT_AT_TARGET)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- ~LLScriptNotAtTarget() {}
-};
-
-class LLScriptAtRotTarget : public LLScriptEvent
-{
-public:
- LLScriptAtRotTarget(S32 line, S32 col, LLScriptIdentifier *tnumber, LLScriptIdentifier *trot, LLScriptIdentifier *ourrot)
- : LLScriptEvent(line, col, LSTT_AT_ROT_TARGET), mTargetNumber(tnumber), mTargetRotation(trot), mOurRotation(ourrot)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- ~LLScriptAtRotTarget() {}
-
- LLScriptIdentifier *mTargetNumber;
- LLScriptIdentifier *mTargetRotation;
- LLScriptIdentifier *mOurRotation;
-};
-
-class LLScriptNotAtRotTarget : public LLScriptEvent
-{
-public:
- LLScriptNotAtRotTarget(S32 line, S32 col)
- : LLScriptEvent(line, col, LSTT_NOT_AT_ROT_TARGET)
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- ~LLScriptNotAtRotTarget() {}
-};
-
-class LLScriptMoneyEvent : public LLScriptEvent
-{
-public:
- LLScriptMoneyEvent(S32 line, S32 col, LLScriptIdentifier *name, LLScriptIdentifier *amount)
- : LLScriptEvent(line, col, LSTT_MONEY), mName(name), mAmount(amount)
- {
- }
-
- ~LLScriptMoneyEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mName;
- LLScriptIdentifier *mAmount;
-};
-
-class LLScriptEmailEvent : public LLScriptEvent
-{
-public:
- LLScriptEmailEvent(S32 line, S32 col, LLScriptIdentifier *time, LLScriptIdentifier *address, LLScriptIdentifier *subject, LLScriptIdentifier *body, LLScriptIdentifier *number)
- : LLScriptEvent(line, col, LSTT_EMAIL), mTime(time), mAddress(address), mSubject(subject), mBody(body), mNumber(number)
- {
- }
-
- ~LLScriptEmailEvent()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mTime;
- LLScriptIdentifier *mAddress;
- LLScriptIdentifier *mSubject;
- LLScriptIdentifier *mBody;
- LLScriptIdentifier *mNumber;
-};
-
-
-class LLScriptExpression : public LLScriptFilePosition
-{
-public:
- LLScriptExpression(S32 line, S32 col, LSCRIPTExpressionType type)
- : LLScriptFilePosition(line, col), mType(type), mNextp(NULL), mLeftType(LST_NULL), mRightType(LST_NULL), mReturnType(LST_NULL)
- {
- }
-
- void addExpression(LLScriptExpression *expression);
-
- virtual ~LLScriptExpression()
- {
- // don't delete next pointer because we're going to store allocation lists and delete from those
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTExpressionType mType;
- LLScriptExpression *mNextp;
- LSCRIPTType mLeftType, mRightType, mReturnType;
-
-};
-
-class LLScriptForExpressionList : public LLScriptExpression
-{
-public:
- LLScriptForExpressionList(S32 line, S32 col, LLScriptExpression *first, LLScriptExpression *second)
- : LLScriptExpression(line, col, LET_FOR_EXPRESSION_LIST), mFirstp(first), mSecondp(second)
- {
- }
-
- ~LLScriptForExpressionList()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mFirstp;
- LLScriptExpression *mSecondp;
-};
-
-class LLScriptFuncExpressionList : public LLScriptExpression
-{
-public:
- LLScriptFuncExpressionList(S32 line, S32 col, LLScriptExpression *first, LLScriptExpression *second)
- : LLScriptExpression(line, col, LET_FUNC_EXPRESSION_LIST), mFirstp(first), mSecondp(second)
- {
- }
-
- ~LLScriptFuncExpressionList()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mFirstp;
- LLScriptExpression *mSecondp;
-};
-
-class LLScriptListExpressionList : public LLScriptExpression
-{
-public:
- LLScriptListExpressionList(S32 line, S32 col, LLScriptExpression *first, LLScriptExpression *second)
- : LLScriptExpression(line, col, LET_LIST_EXPRESSION_LIST), mFirstp(first), mSecondp(second)
- {
- }
-
- ~LLScriptListExpressionList()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mFirstp;
- LLScriptExpression *mSecondp;
-};
-
-class LLScriptLValue : public LLScriptExpression
-{
-public:
- LLScriptLValue(S32 line, S32 col, LLScriptIdentifier *identifier, LLScriptIdentifier *accessor)
- : LLScriptExpression(line, col, LET_LVALUE), mOffset(0), mIdentifier(identifier), mAccessor(accessor)
- {
- }
-
- ~LLScriptLValue()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- S32 mOffset;
- LLScriptIdentifier *mIdentifier;
- LLScriptIdentifier *mAccessor;
-};
-
-class LLScriptAssignment : public LLScriptExpression
-{
-public:
- LLScriptAssignment(S32 line, S32 col, LLScriptExpression *lvalue, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_ASSIGNMENT), mLValue(lvalue), mRightSide(rightside)
- {
- }
-
- ~LLScriptAssignment()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLValue;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptAddAssignment : public LLScriptExpression
-{
-public:
- LLScriptAddAssignment(S32 line, S32 col, LLScriptExpression *lvalue, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_ADD_ASSIGN), mLValue(lvalue), mRightSide(rightside)
- {
- }
-
- ~LLScriptAddAssignment()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLValue;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptSubAssignment : public LLScriptExpression
-{
-public:
- LLScriptSubAssignment(S32 line, S32 col, LLScriptExpression *lvalue, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_SUB_ASSIGN), mLValue(lvalue), mRightSide(rightside)
- {
- }
-
- ~LLScriptSubAssignment()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLValue;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptMulAssignment : public LLScriptExpression
-{
-public:
- LLScriptMulAssignment(S32 line, S32 col, LLScriptExpression *lvalue, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_MUL_ASSIGN), mLValue(lvalue), mRightSide(rightside)
- {
- }
-
- ~LLScriptMulAssignment()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLValue;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptDivAssignment : public LLScriptExpression
-{
-public:
- LLScriptDivAssignment(S32 line, S32 col, LLScriptExpression *lvalue, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_DIV_ASSIGN), mLValue(lvalue), mRightSide(rightside)
- {
- }
-
- ~LLScriptDivAssignment()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLValue;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptModAssignment : public LLScriptExpression
-{
-public:
- LLScriptModAssignment(S32 line, S32 col, LLScriptExpression *lvalue, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_MOD_ASSIGN), mLValue(lvalue), mRightSide(rightside)
- {
- }
-
- ~LLScriptModAssignment()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLValue;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptEquality : public LLScriptExpression
-{
-public:
- LLScriptEquality(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_EQUALITY), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptEquality()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptNotEquals : public LLScriptExpression
-{
-public:
- LLScriptNotEquals(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_NOT_EQUALS), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptNotEquals()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptLessEquals : public LLScriptExpression
-{
-public:
- LLScriptLessEquals(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_LESS_EQUALS), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptLessEquals()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptGreaterEquals : public LLScriptExpression
-{
-public:
- LLScriptGreaterEquals(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_GREATER_EQUALS), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptGreaterEquals()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptLessThan : public LLScriptExpression
-{
-public:
- LLScriptLessThan(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_LESS_THAN), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptLessThan()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptGreaterThan : public LLScriptExpression
-{
-public:
- LLScriptGreaterThan(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_GREATER_THAN), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptGreaterThan()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptPlus : public LLScriptExpression
-{
-public:
- LLScriptPlus(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_PLUS), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptPlus()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptMinus : public LLScriptExpression
-{
-public:
- LLScriptMinus(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_MINUS), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptMinus()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptTimes : public LLScriptExpression
-{
-public:
- LLScriptTimes(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_TIMES), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptTimes()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptDivide : public LLScriptExpression
-{
-public:
- LLScriptDivide(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_DIVIDE), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptDivide()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptMod : public LLScriptExpression
-{
-public:
- LLScriptMod(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_MOD), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptMod()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptBitAnd : public LLScriptExpression
-{
-public:
- LLScriptBitAnd(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_BIT_AND), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptBitAnd()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptBitOr : public LLScriptExpression
-{
-public:
- LLScriptBitOr(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_BIT_OR), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptBitOr()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptBitXor : public LLScriptExpression
-{
-public:
- LLScriptBitXor(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_BIT_XOR), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptBitXor()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptBooleanAnd : public LLScriptExpression
-{
-public:
- LLScriptBooleanAnd(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_BOOLEAN_AND), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptBooleanAnd()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptBooleanOr : public LLScriptExpression
-{
-public:
- LLScriptBooleanOr(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_BOOLEAN_OR), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptBooleanOr()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptShiftLeft : public LLScriptExpression
-{
-public:
- LLScriptShiftLeft(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_SHIFT_LEFT), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptShiftLeft()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptShiftRight : public LLScriptExpression
-{
-public:
- LLScriptShiftRight(S32 line, S32 col, LLScriptExpression *leftside, LLScriptExpression *rightside)
- : LLScriptExpression(line, col, LET_SHIFT_RIGHT), mLeftSide(leftside), mRightSide(rightside)
- {
- }
-
- ~LLScriptShiftRight()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mLeftSide;
- LLScriptExpression *mRightSide;
-};
-
-class LLScriptParenthesis : public LLScriptExpression
-{
-public:
- LLScriptParenthesis(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_PARENTHESIS), mExpression(expression)
- {
- }
-
- ~LLScriptParenthesis()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptUnaryMinus : public LLScriptExpression
-{
-public:
- LLScriptUnaryMinus(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_UNARY_MINUS), mExpression(expression)
- {
- }
-
- ~LLScriptUnaryMinus()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptBooleanNot : public LLScriptExpression
-{
-public:
- LLScriptBooleanNot(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_BOOLEAN_NOT), mExpression(expression)
- {
- }
-
- ~LLScriptBooleanNot()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptBitNot : public LLScriptExpression
-{
-public:
- LLScriptBitNot(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_BIT_NOT), mExpression(expression)
- {
- }
-
- ~LLScriptBitNot()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptPreIncrement : public LLScriptExpression
-{
-public:
- LLScriptPreIncrement(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_PRE_INCREMENT), mExpression(expression)
- {
- }
-
- ~LLScriptPreIncrement()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptPreDecrement : public LLScriptExpression
-{
-public:
- LLScriptPreDecrement(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_PRE_DECREMENT), mExpression(expression)
- {
- }
-
- ~LLScriptPreDecrement()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptTypeCast : public LLScriptExpression
-{
-public:
- LLScriptTypeCast(S32 line, S32 col, LLScriptType *type, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_CAST), mType(type), mExpression(expression)
- {
- }
-
- ~LLScriptTypeCast()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptType *mType;
- LLScriptExpression *mExpression;
-};
-
-class LLScriptVectorInitializer : public LLScriptExpression
-{
-public:
- LLScriptVectorInitializer(S32 line, S32 col, LLScriptExpression *expression1,
- LLScriptExpression *expression2,
- LLScriptExpression *expression3)
- : LLScriptExpression(line, col, LET_VECTOR_INITIALIZER),
- mExpression1(expression1),
- mExpression2(expression2),
- mExpression3(expression3)
- {
- }
-
- ~LLScriptVectorInitializer()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression1;
- LLScriptExpression *mExpression2;
- LLScriptExpression *mExpression3;
-};
-
-class LLScriptQuaternionInitializer : public LLScriptExpression
-{
-public:
- LLScriptQuaternionInitializer(S32 line, S32 col, LLScriptExpression *expression1,
- LLScriptExpression *expression2,
- LLScriptExpression *expression3,
- LLScriptExpression *expression4)
- : LLScriptExpression(line, col, LET_VECTOR_INITIALIZER),
- mExpression1(expression1),
- mExpression2(expression2),
- mExpression3(expression3),
- mExpression4(expression4)
- {
- }
-
- ~LLScriptQuaternionInitializer()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression1;
- LLScriptExpression *mExpression2;
- LLScriptExpression *mExpression3;
- LLScriptExpression *mExpression4;
-};
-
-class LLScriptListInitializer : public LLScriptExpression
-{
-public:
- LLScriptListInitializer(S32 line, S32 col, LLScriptExpression *expressionlist)
- : LLScriptExpression(line, col, LET_LIST_INITIALIZER), mExpressionList(expressionlist)
- {
- }
-
- ~LLScriptListInitializer()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpressionList;
-};
-
-class LLScriptPostIncrement : public LLScriptExpression
-{
-public:
- LLScriptPostIncrement(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_POST_INCREMENT), mExpression(expression)
- {
- }
-
- ~LLScriptPostIncrement()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptPostDecrement : public LLScriptExpression
-{
-public:
- LLScriptPostDecrement(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_POST_DECREMENT), mExpression(expression)
- {
- }
-
- ~LLScriptPostDecrement()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptFunctionCall : public LLScriptExpression
-{
-public:
- LLScriptFunctionCall(S32 line, S32 col, LLScriptIdentifier *identifier, LLScriptExpression *expressionlist)
- : LLScriptExpression(line, col, LET_FUNCTION_CALL), mIdentifier(identifier), mExpressionList(expressionlist)
- {
- }
-
- ~LLScriptFunctionCall()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mIdentifier;
- LLScriptExpression *mExpressionList;
-};
-
-class LLScriptPrint : public LLScriptExpression
-{
-public:
- LLScriptPrint(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptExpression(line, col, LET_PRINT), mExpression(expression)
- {
- }
-
- ~LLScriptPrint()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptConstantExpression : public LLScriptExpression
-{
-public:
- LLScriptConstantExpression(S32 line, S32 col, LLScriptConstant *constant)
- : LLScriptExpression(line, col, LET_CONSTANT), mConstant(constant)
- {
- }
-
- ~LLScriptConstantExpression()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptConstant *mConstant;
-};
-
-// statement
-typedef enum e_lscript_statement_types
-{
- LSSMT_NULL,
- LSSMT_SEQUENCE,
- LSSMT_NOOP,
- LSSMT_STATE_CHANGE,
- LSSMT_JUMP,
- LSSMT_LABEL,
- LSSMT_RETURN,
- LSSMT_EXPRESSION,
- LSSMT_IF,
- LSSMT_IF_ELSE,
- LSSMT_FOR,
- LSSMT_DO_WHILE,
- LSSMT_WHILE,
- LSSMT_DECLARATION,
- LSSMT_COMPOUND_STATEMENT,
- LSSMT_EOF
-} LSCRIPTStatementType;
-
-class LLScriptStatement : public LLScriptFilePosition
-{
-public:
- LLScriptStatement(S32 line, S32 col, LSCRIPTStatementType type)
- : LLScriptFilePosition(line, col), mType(type), mNextp(NULL), mStatementScope(NULL), mAllowDeclarations(TRUE)
- {
- }
-
- virtual ~LLScriptStatement()
- {
- delete mStatementScope;
- }
-
- void addStatement(LLScriptStatement *event);
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTStatementType mType;
- LLScriptStatement *mNextp;
- LLScriptScope *mStatementScope;
- BOOL mAllowDeclarations;
-};
-
-class LLScriptStatementSequence : public LLScriptStatement
-{
-public:
- LLScriptStatementSequence(S32 line, S32 col, LLScriptStatement *first, LLScriptStatement *second)
- : LLScriptStatement(line, col, LSSMT_SEQUENCE), mFirstp(first), mSecondp(second)
- {
- }
-
- ~LLScriptStatementSequence()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptStatement *mFirstp;
- LLScriptStatement *mSecondp;
-};
-
-class LLScriptNOOP : public LLScriptStatement
-{
-public:
- LLScriptNOOP(S32 line, S32 col)
- : LLScriptStatement(line, col, LSSMT_NOOP)
- {
- }
-
- ~LLScriptNOOP() {}
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-};
-
-class LLScriptStateChange : public LLScriptStatement
-{
-public:
- LLScriptStateChange(S32 line, S32 col, LLScriptIdentifier *identifier)
- : LLScriptStatement(line, col, LSSMT_STATE_CHANGE), mIdentifier(identifier), mReturnType(LST_NULL)
- {
- }
-
- ~LLScriptStateChange()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mIdentifier;
- LSCRIPTType mReturnType;
-};
-
-class LLScriptJump : public LLScriptStatement
-{
-public:
- LLScriptJump(S32 line, S32 col, LLScriptIdentifier *identifier)
- : LLScriptStatement(line, col, LSSMT_JUMP), mIdentifier(identifier)
- {
- }
-
- ~LLScriptJump()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mIdentifier;
-};
-
-class LLScriptLabel : public LLScriptStatement
-{
-public:
- LLScriptLabel(S32 line, S32 col, LLScriptIdentifier *identifier)
- : LLScriptStatement(line, col, LSSMT_LABEL), mIdentifier(identifier)
- {
- }
-
- ~LLScriptLabel()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptIdentifier *mIdentifier;
-};
-
-class LLScriptReturn : public LLScriptStatement
-{
-public:
- LLScriptReturn(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptStatement(line, col, LSSMT_RETURN), mExpression(expression), mType(LST_NULL)
- {
- }
-
- ~LLScriptReturn()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
- LSCRIPTType mType;
-};
-
-class LLScriptExpressionStatement : public LLScriptStatement
-{
-public:
- LLScriptExpressionStatement(S32 line, S32 col, LLScriptExpression *expression)
- : LLScriptStatement(line, col, LSSMT_EXPRESSION), mExpression(expression)
- {
- }
-
- ~LLScriptExpressionStatement()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
-};
-
-class LLScriptIf : public LLScriptStatement
-{
-public:
- LLScriptIf(S32 line, S32 col, LLScriptExpression *expression, LLScriptStatement *statement)
- : LLScriptStatement(line, col, LSSMT_IF), mType(LST_NULL), mExpression(expression), mStatement(statement)
- {
- }
-
- ~LLScriptIf()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTType mType;
- LLScriptExpression *mExpression;
- LLScriptStatement *mStatement;
-};
-
-class LLScriptIfElse : public LLScriptStatement
-{
-public:
- LLScriptIfElse(S32 line, S32 col, LLScriptExpression *expression, LLScriptStatement *statement1, LLScriptStatement *statement2)
- : LLScriptStatement(line, col, LSSMT_IF_ELSE), mExpression(expression), mStatement1(statement1), mStatement2(statement2), mType(LST_NULL)
- {
- }
-
- ~LLScriptIfElse()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
- LLScriptStatement *mStatement1;
- LLScriptStatement *mStatement2;
- LSCRIPTType mType;
-};
-
-class LLScriptFor : public LLScriptStatement
-{
-public:
- LLScriptFor(S32 line, S32 col, LLScriptExpression *sequence, LLScriptExpression *expression, LLScriptExpression *expressionlist, LLScriptStatement *statement)
- : LLScriptStatement(line, col, LSSMT_FOR), mSequence(sequence), mExpression(expression), mExpressionList(expressionlist), mStatement(statement), mType(LST_NULL)
- {
- }
-
- ~LLScriptFor()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mSequence;
- LLScriptExpression *mExpression;
- LLScriptExpression *mExpressionList;
- LLScriptStatement *mStatement;
- LSCRIPTType mType;
-};
-
-class LLScriptDoWhile : public LLScriptStatement
-{
-public:
- LLScriptDoWhile(S32 line, S32 col, LLScriptStatement *statement, LLScriptExpression *expression)
- : LLScriptStatement(line, col, LSSMT_DO_WHILE), mStatement(statement), mExpression(expression), mType(LST_NULL)
- {
- }
-
- ~LLScriptDoWhile()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptStatement *mStatement;
- LLScriptExpression *mExpression;
- LSCRIPTType mType;
-};
-
-class LLScriptWhile : public LLScriptStatement
-{
-public:
- LLScriptWhile(S32 line, S32 col, LLScriptExpression *expression, LLScriptStatement *statement)
- : LLScriptStatement(line, col, LSSMT_WHILE), mExpression(expression), mStatement(statement), mType(LST_NULL)
- {
- }
-
- ~LLScriptWhile()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptExpression *mExpression;
- LLScriptStatement *mStatement;
- LSCRIPTType mType;
-};
-
-// local variables
-class LLScriptDeclaration : public LLScriptStatement
-{
-public:
- LLScriptDeclaration(S32 line, S32 col, LLScriptType *type, LLScriptIdentifier *identifier, LLScriptExpression *expression)
- : LLScriptStatement(line, col, LSSMT_DECLARATION), mType(type), mIdentifier(identifier), mExpression(expression)
- {
- }
-
- ~LLScriptDeclaration()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptType *mType;
- LLScriptIdentifier *mIdentifier;
- LLScriptExpression *mExpression;
-};
-
-class LLScriptCompoundStatement : public LLScriptStatement
-{
-public:
- LLScriptCompoundStatement(S32 line, S32 col, LLScriptStatement *statement)
- : LLScriptStatement(line, col, LSSMT_COMPOUND_STATEMENT), mStatement(statement)
- {
- }
-
- ~LLScriptCompoundStatement()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptStatement *mStatement;
-};
-
-class LLScriptEventHandler : public LLScriptFilePosition
-{
-public:
- LLScriptEventHandler(S32 line, S32 col, LLScriptEvent *event, LLScriptStatement *statement)
- : LLScriptFilePosition(line, col), mEventp(event), mStatement(statement), mNextp(NULL), mEventScope(NULL), mbNeedTrailingReturn(FALSE), mScopeEntry(NULL), mStackSpace(0)
- {
- }
-
- ~LLScriptEventHandler()
- {
- delete mEventScope;
- delete mScopeEntry;
- }
-
- void addEvent(LLScriptEventHandler *event);
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptEvent *mEventp;
- LLScriptStatement *mStatement;
- LLScriptEventHandler *mNextp;
- LLScriptScope *mEventScope;
- BOOL mbNeedTrailingReturn;
- LLScriptScopeEntry *mScopeEntry;
-
- S32 mStackSpace;
-
-};
-
-
-// global functions
-class LLScriptFunctionDec : public LLScriptFilePosition
-{
-public:
- LLScriptFunctionDec(S32 line, S32 col, LLScriptType *type, LLScriptIdentifier *identifier)
- : LLScriptFilePosition(line, col), mType(type), mIdentifier(identifier), mNextp(NULL)
- {
- }
-
- ~LLScriptFunctionDec()
- {
- }
-
- void addFunctionParameter(LLScriptFunctionDec *dec);
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptType *mType;
- LLScriptIdentifier *mIdentifier;
- LLScriptFunctionDec *mNextp;
-};
-
-class LLScriptGlobalFunctions : public LLScriptFilePosition
-{
-public:
- LLScriptGlobalFunctions(S32 line, S32 col, LLScriptType *type,
- LLScriptIdentifier *identifier,
- LLScriptFunctionDec *parameters,
- LLScriptStatement *statements)
- : LLScriptFilePosition(line, col), mType(type), mIdentifier(identifier), mParameters(parameters), mStatements(statements), mNextp(NULL), mFunctionScope(NULL), mbNeedTrailingReturn(FALSE)
- {
- }
-
- void addGlobalFunction(LLScriptGlobalFunctions *global);
-
- ~LLScriptGlobalFunctions()
- {
- delete mFunctionScope;
- }
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LLScriptType *mType;
- LLScriptIdentifier *mIdentifier;
- LLScriptFunctionDec *mParameters;
- LLScriptStatement *mStatements;
- LLScriptGlobalFunctions *mNextp;
- LLScriptScope *mFunctionScope;
- BOOL mbNeedTrailingReturn;
-
-};
-
-typedef enum e_lscript_state_type
-{
- LSSTYPE_NULL,
- LSSTYPE_DEFAULT,
- LSSTYPE_USER,
- LSSTYPE_EOF
-} LSCRIPTStateType;
-
-// info on state
-class LLScriptState : public LLScriptFilePosition
-{
-public:
- LLScriptState(S32 line, S32 col, LSCRIPTStateType type, LLScriptIdentifier *identifier, LLScriptEventHandler *event)
- : LLScriptFilePosition(line, col), mType(type), mIdentifier(identifier), mEvent(event), mNextp(NULL), mStateScope(NULL)
- {
- }
-
- void addState(LLScriptState *state);
-
- ~LLScriptState()
- {
- }
-
- void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- LSCRIPTStateType mType;
- LLScriptIdentifier *mIdentifier;
- LLScriptEventHandler *mEvent;
- LLScriptState *mNextp;
- LLScriptScope *mStateScope;
-};
-
-class LLScritpGlobalStorage : public LLScriptFilePosition
-{
-public:
-
- LLScritpGlobalStorage(LLScriptGlobalVariable *var)
- : LLScriptFilePosition(0, 0), mGlobal(var), mbGlobalFunction(FALSE), mNextp(NULL)
- {
- }
-
- LLScritpGlobalStorage(LLScriptGlobalFunctions *func)
- : LLScriptFilePosition(0, 0), mGlobal(func), mbGlobalFunction(TRUE), mNextp(NULL)
- {
- }
-
- ~LLScritpGlobalStorage()
- {
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
- {
- }
-
- S32 getSize()
- {
- return 0;
- }
-
- void addGlobal(LLScritpGlobalStorage *global)
- {
- if (mNextp)
- {
- global->mNextp = mNextp;
- }
- mNextp = global;
- }
-
- LLScriptFilePosition *mGlobal;
- BOOL mbGlobalFunction;
- LLScritpGlobalStorage *mNextp;
-};
-
-// top level container for entire script
-class LLScriptScript : public LLScriptFilePosition
-{
-public:
- LLScriptScript(LLScritpGlobalStorage *globals,
- LLScriptState *states);
-
- ~LLScriptScript()
- {
- delete mGlobalScope;
- }
-
- void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
- S32 getSize();
-
- void setBytecodeDest(const char* dst_filename);
-
- void setClassName(const char* class_name);
- const char* getClassName() {return mClassName;}
-
- LLScriptState *mStates;
- LLScriptScope *mGlobalScope;
- LLScriptGlobalVariable *mGlobals;
- LLScriptGlobalFunctions *mGlobalFunctions;
- BOOL mGodLike;
-
-private:
- std::string mBytecodeDest;
- char mClassName[MAX_STRING];
-};
-
-class LLScriptAllocationManager
-{
-public:
- LLScriptAllocationManager() {}
- ~LLScriptAllocationManager()
- {
- deleteAllocations();
- }
-
- void addAllocation(LLScriptFilePosition *ptr)
- {
- mAllocationList.push_front(ptr);
- }
-
- void deleteAllocations()
- {
- delete_and_clear(mAllocationList);
- }
-
- std::list<LLScriptFilePosition*> mAllocationList;
-};
-
-extern LLScriptAllocationManager *gAllocationManager;
-extern LLScriptScript *gScriptp;
-
-#endif
diff --git a/indra/lscript/lscript_compile/lscript_typecheck.cpp b/indra/lscript/lscript_compile/lscript_typecheck.cpp
deleted file mode 100755
index c685621538e5a450cf49979b8b496a19e6939707..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_typecheck.cpp
+++ /dev/null
@@ -1,586 +0,0 @@
-/**
- * @file lscript_typecheck.cpp
- * @brief typechecks script
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lscript_tree.h"
-
-/*
- LScript automatic type casting
-
- LST_INTEGER -> LST_INTEGER
-
- LST_FLOATINGPOINT -> LST_FLOATINGPOINT
- LST_INTEGER -> LST_FLOATINGPOINT
-
- LST_FLOATINGPOINT -> LST_STRING
- LST_INTEGER -> LST_STRING
- LST_STRING -> LST_STRING
- LST_VECTOR -> LST_STRING
- LST_QUATERNION -> LST_STRING
- LST_LIST -> LST_STRING
-
- LST_VECTOR -> LST_VECTOR
-
- LST_QUATERNION -> LST_QUATERNION
-
- LST_FLOATINGPOINT -> LST_LIST
- LST_INTEGER -> LST_LIST
- LST_STRING -> LST_LIST
- LST_VECTOR -> LST_LIST
- LST_QUATERNION -> LST_LIST
- LST_LIST -> LST_LIST
-*/
-
-LSCRIPTType implicit_casts(LSCRIPTType left_side, LSCRIPTType right_side)
-{
- switch(left_side)
- {
- // shouldn't be doing an operation on void types
- case LST_NULL:
- switch(right_side)
- {
- case LST_NULL:
- return LST_NULL;
- default:
- return LST_UNDEFINED;
- }
- // shouldn't be doing an operation on undefined types
- case LST_UNDEFINED:
- return LST_UNDEFINED;
- // only integers can become integers
- case LST_INTEGER:
- switch(right_side)
- {
- case LST_INTEGER:
- return LST_INTEGER;
- default:
- return LST_UNDEFINED;
- }
- // only integers and floats can become floats
- case LST_FLOATINGPOINT:
- switch(right_side)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- return LST_FLOATINGPOINT;
- default:
- return LST_UNDEFINED;
- }
- // only strings and keys can become strings
- case LST_STRING:
- switch(right_side)
- {
- case LST_STRING:
- case LST_KEY:
- return LST_STRING;
- default:
- return LST_UNDEFINED;
- }
- // only strings and keys can become keys
- case LST_KEY:
- switch(right_side)
- {
- case LST_STRING:
- case LST_KEY:
- return LST_KEY;
- default:
- return LST_UNDEFINED;
- }
- // only vectors can become vectors
- case LST_VECTOR:
- switch(right_side)
- {
- case LST_VECTOR:
- return LST_VECTOR;
- default:
- return LST_UNDEFINED;
- }
- // only quaternions can become quaternions
- case LST_QUATERNION:
- switch(right_side)
- {
- case LST_QUATERNION:
- return LST_QUATERNION;
- default:
- return LST_UNDEFINED;
- }
- // only lists can become lists
- case LST_LIST:
- switch(right_side)
- {
- case LST_LIST:
- return LST_LIST;
- default:
- return LST_UNDEFINED;
- }
- default:
- return LST_UNDEFINED;
- }
-}
-
-LSCRIPTType promote(LSCRIPTType left_side, LSCRIPTType right_side)
-{
- LSCRIPTType type;
- type = implicit_casts(left_side, right_side);
- if (type != LST_UNDEFINED)
- {
- return type;
- }
- type = implicit_casts(right_side, left_side);
- if (type != LST_UNDEFINED)
- {
- return type;
- }
- return LST_UNDEFINED;
-}
-
-BOOL legal_assignment(LSCRIPTType left_side, LSCRIPTType right_side)
-{
- // this is to prevent cascading errors
- if ( (left_side == LST_UNDEFINED)
- ||(right_side == LST_UNDEFINED))
- {
- return TRUE;
- }
-
- if (implicit_casts(left_side, right_side) != LST_UNDEFINED)
- {
- return TRUE;
- }
- else
- {
- return FALSE;
- }
-}
-
-BOOL legal_casts(LSCRIPTType cast, LSCRIPTType base)
-{
- switch(base)
- {
- // shouldn't be doing an operation on void types
- case LST_NULL:
- return FALSE;
- // shouldn't be doing an operation on undefined types
- case LST_UNDEFINED:
- return FALSE;
- case LST_INTEGER:
- switch(cast)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- case LST_STRING:
- case LST_LIST:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- case LST_FLOATINGPOINT:
- switch(cast)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- case LST_STRING:
- case LST_LIST:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- case LST_STRING:
- switch(cast)
- {
- case LST_INTEGER:
- case LST_FLOATINGPOINT:
- case LST_STRING:
- case LST_KEY:
- case LST_VECTOR:
- case LST_QUATERNION:
- case LST_LIST:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- case LST_KEY:
- switch(cast)
- {
- case LST_STRING:
- case LST_KEY:
- case LST_LIST:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- case LST_VECTOR:
- switch(cast)
- {
- case LST_VECTOR:
- case LST_STRING:
- case LST_LIST:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- case LST_QUATERNION:
- switch(cast)
- {
- case LST_QUATERNION:
- case LST_STRING:
- case LST_LIST:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- // lists can only be cast to lists and strings
- case LST_LIST:
- switch(cast)
- {
- case LST_LIST:
- case LST_STRING:
- return TRUE;
- break;
- default:
- return FALSE;
- break;
- }
- break;
- default:
- return FALSE;
- break;
- }
-}
-
-LSCRIPTType gSupportedExpressionArray[LET_EOF][LST_EOF][LST_EOF];
-
-void init_supported_expressions(void)
-{
- S32 i, j, k;
- // zero out, then set the ones that matter
- for (i = 0; i < LET_EOF; i++)
- {
- for (j = 0; j < LST_EOF; j++)
- {
- for (k = 0; k < LST_EOF; k++)
- {
- gSupportedExpressionArray[i][j][k] = LST_NULL;
- }
- }
- }
-
- // LET_ASSIGNMENT
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_INTEGER][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_STRING][LST_STRING] = LST_STRING;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_KEY][LST_KEY] = LST_KEY;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_INTEGER] = LST_LIST;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_FLOATINGPOINT] = LST_LIST;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_STRING] = LST_LIST;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_KEY] = LST_LIST;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_VECTOR] = LST_LIST;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_QUATERNION] = LST_LIST;
- gSupportedExpressionArray[LET_ASSIGNMENT][LST_LIST][LST_LIST] = LST_LIST;
-
- // LET_ADD_ASSIGN
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_STRING][LST_STRING] = LST_STRING;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_INTEGER] = LST_LIST;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_FLOATINGPOINT] = LST_LIST;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_STRING] = LST_LIST;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_KEY] = LST_LIST;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_VECTOR] = LST_LIST;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_QUATERNION] = LST_LIST;
- gSupportedExpressionArray[LET_ADD_ASSIGN][LST_LIST][LST_LIST] = LST_LIST;
-
- // LET_SUB_ASSIGN
- gSupportedExpressionArray[LET_SUB_ASSIGN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_SUB_ASSIGN][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_SUB_ASSIGN][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_SUB_ASSIGN][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_SUB_ASSIGN][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
-
- // LET_MUL_ASSIGN
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_INTEGER][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_VECTOR][LST_INTEGER] = LST_VECTOR;
- //gSupportedExpressionArray[LET_MUL_ASSIGN][LST_INTEGER][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_VECTOR][LST_FLOATINGPOINT] = LST_VECTOR;
- //gSupportedExpressionArray[LET_MUL_ASSIGN][LST_FLOATINGPOINT][LST_VECTOR] = LST_VECTOR;
- //gSupportedExpressionArray[LET_MUL_ASSIGN][LST_VECTOR][LST_VECTOR] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_VECTOR][LST_QUATERNION] = LST_VECTOR;
- gSupportedExpressionArray[LET_MUL_ASSIGN][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
-
- // LET_DIV_ASSIGN
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_VECTOR][LST_INTEGER] = LST_VECTOR;
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_VECTOR][LST_FLOATINGPOINT] = LST_VECTOR;
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_VECTOR][LST_QUATERNION] = LST_VECTOR;
- gSupportedExpressionArray[LET_DIV_ASSIGN][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
-
- // LET_MOD_ASSIGN
- gSupportedExpressionArray[LET_MOD_ASSIGN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_MOD_ASSIGN][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
-
- // LET_EQUALITY
- gSupportedExpressionArray[LET_EQUALITY][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_INTEGER][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_FLOATINGPOINT][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_STRING][LST_STRING] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_STRING][LST_KEY] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_KEY][LST_STRING] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_KEY][LST_KEY] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_VECTOR][LST_VECTOR] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_QUATERNION][LST_QUATERNION] = LST_INTEGER;
- gSupportedExpressionArray[LET_EQUALITY][LST_LIST][LST_LIST] = LST_INTEGER;
-
- // LET_NOT_EQUALS
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_INTEGER][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_FLOATINGPOINT][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_STRING][LST_STRING] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_STRING][LST_KEY] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_KEY][LST_STRING] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_KEY][LST_KEY] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_VECTOR][LST_VECTOR] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_QUATERNION][LST_QUATERNION] = LST_INTEGER;
- gSupportedExpressionArray[LET_NOT_EQUALS][LST_LIST][LST_LIST] = LST_INTEGER;
-
- // LET_LESS_EQUALS
- gSupportedExpressionArray[LET_LESS_EQUALS][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_LESS_EQUALS][LST_INTEGER][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_LESS_EQUALS][LST_FLOATINGPOINT][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_LESS_EQUALS][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_INTEGER;
-
- // LET_GREATER_EQUALS
- gSupportedExpressionArray[LET_GREATER_EQUALS][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_GREATER_EQUALS][LST_INTEGER][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_GREATER_EQUALS][LST_FLOATINGPOINT][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_GREATER_EQUALS][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_INTEGER;
-
- // LET_LESS_THAN
- gSupportedExpressionArray[LET_LESS_THAN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_LESS_THAN][LST_INTEGER][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_LESS_THAN][LST_FLOATINGPOINT][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_LESS_THAN][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_INTEGER;
-
- // LET_GREATER_THAN
- gSupportedExpressionArray[LET_GREATER_THAN][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_GREATER_THAN][LST_INTEGER][LST_FLOATINGPOINT] = LST_INTEGER;
- gSupportedExpressionArray[LET_GREATER_THAN][LST_FLOATINGPOINT][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_GREATER_THAN][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_INTEGER;
-
- // LET_PLUS
- gSupportedExpressionArray[LET_PLUS][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_PLUS][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_PLUS][LST_INTEGER][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_PLUS][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_PLUS][LST_STRING][LST_STRING] = LST_STRING;
- gSupportedExpressionArray[LET_PLUS][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_PLUS][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_INTEGER] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_FLOATINGPOINT] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_STRING] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_KEY] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_VECTOR] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_QUATERNION] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_INTEGER][LST_LIST] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_FLOATINGPOINT][LST_LIST] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_STRING][LST_LIST] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_KEY][LST_LIST] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_VECTOR][LST_LIST] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_QUATERNION][LST_LIST] = LST_LIST;
- gSupportedExpressionArray[LET_PLUS][LST_LIST][LST_LIST] = LST_LIST;
-
- // LET_MINUS
- gSupportedExpressionArray[LET_MINUS][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_MINUS][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MINUS][LST_INTEGER][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MINUS][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_MINUS][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_MINUS][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
-
- // LET_TIMES
- gSupportedExpressionArray[LET_TIMES][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_TIMES][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_TIMES][LST_INTEGER][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_TIMES][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_TIMES][LST_VECTOR][LST_INTEGER] = LST_VECTOR;
- gSupportedExpressionArray[LET_TIMES][LST_INTEGER][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_TIMES][LST_VECTOR][LST_FLOATINGPOINT] = LST_VECTOR;
- gSupportedExpressionArray[LET_TIMES][LST_FLOATINGPOINT][LST_VECTOR] = LST_VECTOR;
- gSupportedExpressionArray[LET_TIMES][LST_VECTOR][LST_VECTOR] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_TIMES][LST_VECTOR][LST_QUATERNION] = LST_VECTOR;
- gSupportedExpressionArray[LET_TIMES][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
-
- // LET_DIVIDE
- gSupportedExpressionArray[LET_DIVIDE][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_DIVIDE][LST_INTEGER][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_DIVIDE][LST_FLOATINGPOINT][LST_INTEGER] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_DIVIDE][LST_FLOATINGPOINT][LST_FLOATINGPOINT] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_DIVIDE][LST_VECTOR][LST_INTEGER] = LST_VECTOR;
- gSupportedExpressionArray[LET_DIVIDE][LST_VECTOR][LST_FLOATINGPOINT] = LST_VECTOR;
- gSupportedExpressionArray[LET_DIVIDE][LST_VECTOR][LST_QUATERNION] = LST_VECTOR;
- gSupportedExpressionArray[LET_DIVIDE][LST_QUATERNION][LST_QUATERNION] = LST_QUATERNION;
-
- // LET_MOD
- gSupportedExpressionArray[LET_MOD][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
- gSupportedExpressionArray[LET_MOD][LST_VECTOR][LST_VECTOR] = LST_VECTOR;
-
- // LET_BIT_AND
- gSupportedExpressionArray[LET_BIT_AND][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_BIT_OR
- gSupportedExpressionArray[LET_BIT_OR][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_BIT_XOR
- gSupportedExpressionArray[LET_BIT_XOR][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_BOOLEAN_AND
- gSupportedExpressionArray[LET_BOOLEAN_AND][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_BOOLEAN_OR
- gSupportedExpressionArray[LET_BOOLEAN_OR][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_SHIFT_LEFT
- gSupportedExpressionArray[LET_SHIFT_LEFT][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_SHIFT_RIGHT
- gSupportedExpressionArray[LET_SHIFT_RIGHT][LST_INTEGER][LST_INTEGER] = LST_INTEGER;
-
- // LET_PARENTHESIS
- gSupportedExpressionArray[LET_PARENTHESIS][LST_INTEGER][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_PARENTHESIS][LST_FLOATINGPOINT][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_PARENTHESIS][LST_STRING][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_PARENTHESIS][LST_LIST][LST_NULL] = LST_INTEGER;
-
- // LET_UNARY_MINUS
- gSupportedExpressionArray[LET_UNARY_MINUS][LST_INTEGER][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_UNARY_MINUS][LST_FLOATINGPOINT][LST_NULL] = LST_FLOATINGPOINT;
- gSupportedExpressionArray[LET_UNARY_MINUS][LST_VECTOR][LST_NULL] = LST_VECTOR;
- gSupportedExpressionArray[LET_UNARY_MINUS][LST_QUATERNION][LST_NULL] = LST_QUATERNION;
-
- // LET_BOOLEAN_NOT
- gSupportedExpressionArray[LET_BOOLEAN_NOT][LST_INTEGER][LST_NULL] = LST_INTEGER;
-
- // LET_BIT_NOT
- gSupportedExpressionArray[LET_BIT_NOT][LST_INTEGER][LST_NULL] = LST_INTEGER;
-
- // LET_PRE_INCREMENT
- gSupportedExpressionArray[LET_PRE_INCREMENT][LST_INTEGER][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_PRE_INCREMENT][LST_FLOATINGPOINT][LST_NULL] = LST_FLOATINGPOINT;
-
- // LET_PRE_DECREMENT
- gSupportedExpressionArray[LET_PRE_DECREMENT][LST_INTEGER][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_PRE_DECREMENT][LST_FLOATINGPOINT][LST_NULL] = LST_FLOATINGPOINT;
-
- // LET_POST_INCREMENT
- gSupportedExpressionArray[LET_POST_INCREMENT][LST_INTEGER][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_POST_INCREMENT][LST_FLOATINGPOINT][LST_NULL] = LST_FLOATINGPOINT;
-
- // LET_POST_DECREMENT
- gSupportedExpressionArray[LET_POST_DECREMENT][LST_INTEGER][LST_NULL] = LST_INTEGER;
- gSupportedExpressionArray[LET_POST_DECREMENT][LST_FLOATINGPOINT][LST_NULL] = LST_FLOATINGPOINT;
-}
-
-BOOL legal_binary_expression(LSCRIPTType &result, LSCRIPTType left_side, LSCRIPTType right_side, LSCRIPTExpressionType expression)
-{
- if ( (left_side == LST_UNDEFINED)
- ||(right_side == LST_UNDEFINED))
- {
- result = LST_UNDEFINED;
- return TRUE;
- }
-
- if ( (left_side == LST_NULL)
- ||(right_side == LST_NULL))
- {
- result = LST_UNDEFINED;
- return FALSE;
- }
-
- result = gSupportedExpressionArray[expression][left_side][right_side];
- if (result)
- return TRUE;
- else
- {
- result = LST_UNDEFINED;
- return FALSE;
- }
-}
-
-BOOL legal_unary_expression(LSCRIPTType &result, LSCRIPTType left_side, LSCRIPTExpressionType expression)
-{
- if (left_side == LST_UNDEFINED)
- {
- result = LST_UNDEFINED;
- return TRUE;
- }
-
- if (left_side == LST_NULL)
- {
- result = LST_UNDEFINED;
- return FALSE;
- }
-
- result = gSupportedExpressionArray[expression][left_side][LST_NULL];
- if (result)
- return TRUE;
- else
- {
- result = LST_UNDEFINED;
- return FALSE;
- }
-}
diff --git a/indra/lscript/lscript_compile/lscript_typecheck.h b/indra/lscript/lscript_compile/lscript_typecheck.h
deleted file mode 100755
index 74f723506f7bf39e32aba9b1b1f0405747f8ee5f..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/lscript_typecheck.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file lscript_typecheck.h
- * @brief typechecks script
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_TYPECHECK_H
-#define LL_LSCRIPT_TYPECHECK_H
-
-#include "lscript_error.h"
-
-LSCRIPTType implicit_casts(LSCRIPTType left_side, LSCRIPTType right_side);
-BOOL legal_casts(LSCRIPTType cast, LSCRIPTType base);
-LSCRIPTType promote(LSCRIPTType left_side, LSCRIPTType right_side);
-BOOL legal_assignment(LSCRIPTType left_side, LSCRIPTType right_side);
-
-typedef enum e_lscript_expression_types
-{
- LET_NULL,
- LET_ASSIGNMENT,
- LET_ADD_ASSIGN,
- LET_SUB_ASSIGN,
- LET_MUL_ASSIGN,
- LET_DIV_ASSIGN,
- LET_MOD_ASSIGN,
- LET_EQUALITY,
- LET_NOT_EQUALS,
- LET_LESS_EQUALS,
- LET_GREATER_EQUALS,
- LET_LESS_THAN,
- LET_GREATER_THAN,
- LET_PLUS,
- LET_MINUS,
- LET_TIMES,
- LET_DIVIDE,
- LET_MOD,
- LET_BIT_AND,
- LET_BIT_OR,
- LET_BIT_XOR,
- LET_BOOLEAN_AND,
- LET_BOOLEAN_OR,
- LET_PARENTHESIS,
- LET_UNARY_MINUS,
- LET_BOOLEAN_NOT,
- LET_BIT_NOT,
- LET_PRE_INCREMENT,
- LET_PRE_DECREMENT,
- LET_CAST,
- LET_VECTOR_INITIALIZER,
- LET_QUATERNION_INITIALIZER,
- LET_LIST_INITIALIZER,
- LET_LVALUE,
- LET_POST_INCREMENT,
- LET_POST_DECREMENT,
- LET_FUNCTION_CALL,
- LET_CONSTANT,
- LET_FOR_EXPRESSION_LIST,
- LET_FUNC_EXPRESSION_LIST,
- LET_LIST_EXPRESSION_LIST,
- LET_PRINT,
- LET_SHIFT_LEFT,
- LET_SHIFT_RIGHT,
- LET_EOF
-} LSCRIPTExpressionType;
-
-BOOL legal_binary_expression(LSCRIPTType &result, LSCRIPTType left_side, LSCRIPTType right_side, LSCRIPTExpressionType expression);
-BOOL legal_unary_expression(LSCRIPTType &result, LSCRIPTType left_side, LSCRIPTExpressionType expression);
-
-void init_supported_expressions(void);
-
-/*
- LScript automatic type casting
-
- LST_INTEGER -> LST_INTEGER
-
- LST_FLOATINGPOINT -> LST_FLOATINGPOINT
- LST_INTEGER -> LST_FLOATINGPOINT
-
- LST_FLOATINGPOINT -> LST_STRING
- LST_INTEGER -> LST_STRING
- LST_STRING -> LST_STRING
- LST_VECTOR -> LST_STRING
- LST_QUATERNION -> LST_STRING
- LST_LIST -> LST_STRING
-
- LST_VECTOR -> LST_VECTOR
-
- LST_QUATERNION -> LST_QUATERNION
-
- LST_FLOATINGPOINT -> LST_LIST
- LST_INTEGER -> LST_LIST
- LST_STRING -> LST_LIST
- LST_VECTOR -> LST_LIST
- LST_QUATERNION -> LST_LIST
- LST_LIST -> LST_LIST
-*/
-
-#endif
diff --git a/indra/lscript/lscript_compile/windows/unistd.h b/indra/lscript/lscript_compile/windows/unistd.h
deleted file mode 100755
index 0b7e2581e3de354d9f0792ca4dbbb7f80cefb74c..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_compile/windows/unistd.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-/* After all that, this file is empty. */
diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h
deleted file mode 100755
index 576c2ca2b71423a088689df3d11fb9e93e3fa4c7..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/**
- * @file lscript_execute.h
- * @brief Classes to execute bytecode
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_EXECUTE_H
-#define LL_LSCRIPT_EXECUTE_H
-
-#include "stdtypes.h"
-#include "lscript_byteconvert.h"
-#include "lscript_library.h"
-#include "llstl.h"
-
-class LLTimer;
-
-// Return values for run() methods
-const U32 NO_DELETE_FLAG = 0x0000;
-const U32 DELETE_FLAG = 0x0001;
-const U32 CREDIT_MONEY_FLAG = 0x0002;
-
-// list of op code execute functions
-BOOL run_noop(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pop(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pops(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_poparg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popip(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popbp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_popslr(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_dup(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_dups(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_dupl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_dupv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_dupq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_store(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_stores(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storel(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storev(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storeq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storeg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storegs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storegl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storegv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_storegq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadlp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadvp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadqp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadgp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadgsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadglp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadgvp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_loadgqp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_push(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushgs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushgl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushgv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushgq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_puship(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushbp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushargb(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushargi(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushargf(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushargs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushargv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushargq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushe(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pushev(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pusheq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_pusharge(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_add(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_sub(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_mul(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_div(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_mod(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_eq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_neq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_leq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_geq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_less(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_greater(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_bitand(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_bitor(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_bitxor(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_booland(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_boolor(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_shl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_shr(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_neg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_bitnot(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_boolnot(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_jump(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_state(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_call(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_return(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_stacktos(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_stacktol(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_print(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
-void unknown_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void integer_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void integer_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void integer_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void float_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void float_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void float_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void string_string_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void string_key_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void key_string_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void key_key_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void vector_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void vector_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void vector_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void vector_quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void quaternion_quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-
-
-void integer_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void float_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void string_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void key_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void vector_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void quaternion_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_string_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_key_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void list_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-
-void integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-
-class LLScriptDataCollection
-{
-public:
- LLScriptDataCollection(LSCRIPTStateEventType type, LLScriptLibData *data)
- : mType(type), mData(data)
- {
- }
- LLScriptDataCollection(U8 *src, S32 &offset)
- {
- S32 i, number;
- mType = (LSCRIPTStateEventType)bytestream2integer(src, offset);
- number = bytestream2integer(src, offset);
-
- mData = new LLScriptLibData[number];
-
- for (i = 0; i < number; i++)
- {
- mData[i].set(src, offset);
- }
-
- }
-
- ~LLScriptDataCollection()
- {
- delete [] mData;
- mData = NULL;
- }
-
- S32 getSavedSize()
- {
- S32 size = 0;
- // mTyoe
- size += 4;
- // number of entries
- size += 4;
-
- S32 i = 0;
- do
- {
- size += mData[i].getSavedSize();;
- }
- while (mData[i++].mType != LST_NULL);
- return size;
- }
-
- S32 write2bytestream(U8 *dest)
- {
- S32 offset = 0;
- // mTyoe
- integer2bytestream(dest, offset, mType);
- // count number of entries
- S32 number = 0;
- while (mData[number++].mType != LST_NULL)
- ;
- integer2bytestream(dest, offset, number);
-
- // now the entries themselves
- number = 0;
- do
- {
- offset += mData[number].write2bytestream(dest + offset);
- }
- while (mData[number++].mType != LST_NULL);
- return offset;
- }
-
-
- LSCRIPTStateEventType mType;
- LLScriptLibData *mData;
-};
-const S32 MAX_EVENTS_IN_QUEUE = 64;
-
-class LLScriptEventData
-{
-public:
- LLScriptEventData() {}
- LLScriptEventData(U8 *src, S32 &offset)
- {
- S32 i, number = bytestream2integer(src, offset);
- for (i = 0; i < number; i++)
- {
- mEventDataList.push_front(new LLScriptDataCollection(src, offset));
- }
- }
-
- void set(U8 *src, S32 &offset)
- {
- S32 i, number = bytestream2integer(src, offset);
- for (i = 0; i < number; i++)
- {
- mEventDataList.push_front(new LLScriptDataCollection(src, offset));
- }
- }
-
- ~LLScriptEventData()
- {
- delete_and_clear(mEventDataList);
- }
-
- void addEventData(LLScriptDataCollection *data)
- {
- if (mEventDataList.size() < MAX_EVENTS_IN_QUEUE)
- mEventDataList.push_back(data);
- else
- delete data;
- }
- LLScriptDataCollection *getNextEvent(LSCRIPTStateEventType type)
- {
- for (std::list<LLScriptDataCollection*>::iterator it = mEventDataList.begin(), end_it = mEventDataList.end();
- it != end_it;
- ++it)
- {
- LLScriptDataCollection* temp = *it;
- if (temp->mType == type)
- {
- mEventDataList.erase(it);
- return temp;
- }
- }
- return NULL;
- }
- LLScriptDataCollection *getNextEvent()
- {
- LLScriptDataCollection *temp;
- temp = mEventDataList.front();
- if (temp)
- {
- mEventDataList.pop_front();
- return temp;
- }
- return NULL;
- }
- void removeEventType(LSCRIPTStateEventType type)
- {
- for (std::list<LLScriptDataCollection*>::iterator it = mEventDataList.begin(), end_it = mEventDataList.end();
- it != end_it;
- ++it)
- {
- if ((*it)->mType == type)
- {
- delete *it;
- mEventDataList.erase(it);
- }
- }
- }
-
- S32 getSavedSize()
- {
- S32 size = 0;
- // number in linked list
- size += 4;
- for (std::list<LLScriptDataCollection*>::iterator it = mEventDataList.begin(), end_it = mEventDataList.end();
- it != end_it;
- ++it)
- {
- size += (*it)->getSavedSize();
- }
- return size;
- }
-
- S32 write2bytestream(U8 *dest)
- {
- S32 offset = 0;
- // number in linked list
- S32 number = mEventDataList.size();
- integer2bytestream(dest, offset, number);
- for (std::list<LLScriptDataCollection*>::iterator it = mEventDataList.begin(), end_it = mEventDataList.end();
- it != end_it;
- ++it)
- {
- offset += (*it)->write2bytestream(dest + offset);
- }
- return offset;
- }
-
- std::list<LLScriptDataCollection*> mEventDataList;
-};
-
-class LLScriptExecute
-{
-public:
- LLScriptExecute();
- virtual ~LLScriptExecute() = 0;
- virtual S32 getVersion() const = 0;
- virtual void deleteAllEvents() = 0;
- virtual void addEvent(LLScriptDataCollection* event) = 0;
- virtual U32 getEventCount() = 0;
- virtual void removeEventType(LSCRIPTStateEventType event_type) = 0;
- virtual S32 getFaults() = 0;
- virtual void setFault(LSCRIPTRunTimeFaults fault) = 0;
- virtual U32 getFreeMemory() = 0;
- virtual S32 getParameter() = 0;
- virtual void setParameter(S32 value) = 0;
- virtual F32 getSleep() const = 0;
- virtual void setSleep(F32 value) = 0;
- virtual F32 getEnergy() const = 0;
- virtual void setEnergy(F32 value) = 0;
- virtual U64 getCurrentEvents() = 0;
- virtual void setCurrentEvents(U64 value) = 0;
- virtual U64 getEventHandlers() = 0;
- virtual void setEventHandlers(U64 value) = 0;
- virtual U64 getCurrentHandler() = 0;
- virtual void setCurrentHandler(U64 value) = 0;
- virtual BOOL isFinished() const = 0;
- virtual BOOL isStateChangePending() const = 0;
- virtual S32 writeState(U8 **dest, U32 header_size, U32 footer_size) = 0; // Allocate memory for header, state and footer return size of state.
- virtual U32 getEventsSavedSize() = 0; // Returns 0 if events are written with state.
- virtual S32 writeEvents(U8 *dest) = 0; // Must write and return exactly the number of bytes returned by getEventsSavedSize.
- virtual void readEvents(U8* src, S32& offset) = 0;
- virtual S32 readState(U8 *src) = 0; // Returns number of bytes read.
- virtual void reset();
- virtual const U8* getBytecode() const = 0;
- virtual U32 getBytecodeSize() const = 0;
- virtual bool isMono() const = 0;
- virtual void error() {;} // Processing that must be performed when error flag is set and so run is not called.
-
- virtual U32 getUsedMemory() = 0;
-
- // Run current event handler for a maximum of time_slice seconds.
- // Updates current handler and current events registers.
- virtual void resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice) = 0;
-
- // Run handler for event for a maximum of time_slice seconds.
- // Updates current handler and current events registers.
- virtual void callEventHandler(LSCRIPTStateEventType event, const LLUUID &id, F32 time_slice) = 0;;
-
- // Run handler for next queued event for maximum of time_slice seconds.
- // Updates current handler and current events registers.
- // Removes processed event from queue.
- virtual void callNextQueuedEventHandler(U64 event_register, const LLUUID &id, F32 time_slice) = 0;
-
- // Run handler for event for a maximum of time_slice seconds.
- // Updates current handler and current events registers.
- // Removes processed event from queue.
- virtual void callQueuedEventHandler(LSCRIPTStateEventType event, const LLUUID &id, F32 time_slice) = 0;
-
- // Switch to next state.
- // Returns new set of handled events.
- virtual U64 nextState() = 0;
-
- // Returns time taken.
- virtual F32 runQuanta(BOOL b_print, const LLUUID &id,
- const char **errorstr,
- F32 quanta,
- U32& events_processed, LLTimer& timer);
-
- // NOTE: babbage: this must be used on occasions where another script may already be executing. Only 2 levels of nesting are allowed.
- // Provided to support bizarre detach behaviour only. Do not use.
- virtual F32 runNested(BOOL b_print, const LLUUID &id,
- const char **errorstr,
- F32 quanta,
- U32& events_processed, LLTimer& timer);
-
- // Run smallest possible amount of code: an instruction for LSL2, a segment
- // between save tests for Mono
- void runInstructions(BOOL b_print, const LLUUID &id,
- const char **errorstr,
- U32& events_processed,
- F32 quanta);
-
- bool isYieldDue() const;
-
- void setReset(BOOL b) {mReset = b;}
- BOOL getReset() const { return mReset; }
-
- // Called when the script is scheduled to be run from newsim/LLScriptData
- virtual void startRunning() = 0;
-
- // Called when the script is scheduled to be stopped from newsim/LLScriptData
- virtual void stopRunning() = 0;
-
- // A timer is regularly checked to see if script takes too long, but we
- // don't do it every opcode due to performance hits.
- static void setTimerCheckSkip( S32 value ) { sTimerCheckSkip = value; }
- static S32 getTimerCheckSkip() { return sTimerCheckSkip; }
-
-private:
-
- BOOL mReset;
-
- static S32 sTimerCheckSkip; // Number of times to skip the timer check for performance reasons
-};
-
-class LLScriptExecuteLSL2 : public LLScriptExecute
-{
-public:
- LLScriptExecuteLSL2(LLFILE *fp);
- LLScriptExecuteLSL2(const U8* bytecode, U32 bytecode_size);
- virtual ~LLScriptExecuteLSL2();
-
- virtual S32 getVersion() const {return get_register(mBuffer, LREG_VN);}
- virtual void deleteAllEvents() {delete_and_clear(mEventData.mEventDataList);}
- virtual void addEvent(LLScriptDataCollection* event);
- virtual U32 getEventCount() {return mEventData.mEventDataList.size();}
- virtual void removeEventType(LSCRIPTStateEventType event_type);
- virtual S32 getFaults() {return get_register(mBuffer, LREG_FR);}
- virtual void setFault(LSCRIPTRunTimeFaults fault) {set_fault(mBuffer, fault);}
- virtual U32 getFreeMemory();
- virtual S32 getParameter();
- virtual void setParameter(S32 value);
- virtual F32 getSleep() const;
- virtual void setSleep(F32 value);
- virtual F32 getEnergy() const;
- virtual void setEnergy(F32 value);
- virtual U64 getCurrentEvents() {return get_event_register(mBuffer, LREG_CE, getMajorVersion());}
- virtual void setCurrentEvents(U64 value) {return set_event_register(mBuffer, LREG_CE, value, getMajorVersion());}
- virtual U64 getEventHandlers() {return get_event_register(mBuffer, LREG_ER, getMajorVersion());}
- virtual void setEventHandlers(U64 value) {set_event_register(mBuffer, LREG_ER, value, getMajorVersion());}
- virtual U64 getCurrentHandler();
- virtual void setCurrentHandler(U64 value) {return set_event_register(mBuffer, LREG_IE, value, getMajorVersion());}
- virtual BOOL isFinished() const {return get_register(mBuffer, LREG_IP) == 0;}
- virtual BOOL isStateChangePending() const {return get_register(mBuffer, LREG_CS) != get_register(mBuffer, LREG_NS);}
- virtual S32 writeState(U8 **dest, U32 header_size, U32 footer_size); // Not including Events.
- virtual U32 getEventsSavedSize() {return mEventData.getSavedSize();}
- virtual S32 writeEvents(U8 *dest) {return mEventData.write2bytestream(dest);}
- virtual void readEvents(U8* src, S32& offset) {mEventData.set(src, offset);}
- virtual S32 writeBytecode(U8 **dest);
- virtual S32 readState(U8 *src);
- virtual void reset();
- virtual const U8* getBytecode() const {return mBytecode;}
- virtual U32 getBytecodeSize() const {return mBytecodeSize;}
- virtual bool isMono() const {return false;}
- virtual U32 getUsedMemory();
- // Run current event handler for a maximum of time_slice seconds.
- // Updates current handler and current events registers.
- virtual void resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice);
-
- // Run handler for event for a maximum of time_slice seconds.
- // Updates current handler and current events registers.
- virtual void callEventHandler(LSCRIPTStateEventType event, const LLUUID &id, F32 time_slice);
-
- // Run handler for next queued event for maximum of time_slice seconds.
- // Updates current handler and current events registers.
- // Removes processed event from queue.
- virtual void callNextQueuedEventHandler(U64 event_register, const LLUUID &id, F32 time_slice);
-
- // Run handler for event for a maximum of time_slice seconds.
- // Updates current handler and current events registers.
- // Removes processed event from queue.
- virtual void callQueuedEventHandler(LSCRIPTStateEventType event, const LLUUID &id, F32 time_slice);
-
- // Switch to next state.
- // Returns new set of handled events.
- virtual U64 nextState();
-
- void init();
-
- BOOL (*mExecuteFuncs[0x100])(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
-
- U32 mInstructionCount;
- U8 *mBuffer;
- LLScriptEventData mEventData;
- U8* mBytecode; // Initial state and bytecode.
- U32 mBytecodeSize;
-
-private:
- S32 getMajorVersion() const;
- void recordBoundaryError( const LLUUID &id );
- void setStateEventOpcoodeStartSafely( S32 state, LSCRIPTStateEventType event, const LLUUID &id );
-
- // Called when the script is scheduled to be run from newsim/LLScriptData
- virtual void startRunning();
-
- // Called when the script is scheduled to be stopped from newsim/LLScriptData
- virtual void stopRunning();
-};
-
-#endif
diff --git a/indra/lscript/lscript_execute/CMakeLists.txt b/indra/lscript/lscript_execute/CMakeLists.txt
deleted file mode 100755
index 49605982a825fbe7347a42944421b1b9d4243752..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- cmake -*-
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LScript)
-
-include_directories(
- ${LLCOMMON_INCLUDE_DIRS}
- ${LLMATH_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}
- )
-include_directories(SYSTEM
- ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
- )
-
-set(lscript_execute_SOURCE_FILES
- llscriptresource.cpp
- llscriptresourceconsumer.cpp
- llscriptresourcepool.cpp
- lscript_execute.cpp
- lscript_heapruntime.cpp
- lscript_readlso.cpp
- )
-
-set(lscript_execute_HEADER_FILES
- CMakeLists.txt
-
- ../llscriptresource.h
- ../llscriptresourceconsumer.h
- ../llscriptresourcepool.h
- ../lscript_execute.h
- ../lscript_rt_interface.h
- lscript_heapruntime.h
- lscript_readlso.h
- )
-
-set_source_files_properties(${lscript_execute_HEADER_FILES}
- PROPERTIES HEADER_FILE_ONLY TRUE)
-
-list(APPEND lscript_execute_SOURCE_FILES ${lscript_execute_HEADER_FILES})
-
-add_library (lscript_execute ${lscript_execute_SOURCE_FILES})
diff --git a/indra/lscript/lscript_execute/llscriptresource.cpp b/indra/lscript/lscript_execute/llscriptresource.cpp
deleted file mode 100755
index 2c6811b226adb5373bfc9f691eacd6197a914de7..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/llscriptresource.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * @file llscriptresource.cpp
- * @brief LLScriptResource class implementation for managing limited resources
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "llscriptresource.h"
-#include "llerror.h"
-
-LLScriptResource::LLScriptResource()
-: mTotal(0),
- mUsed(0)
-{
-}
-
-bool LLScriptResource::request(S32 amount /* = 1 */)
-{
- if (mUsed + amount <= mTotal)
- {
- mUsed += amount;
- return true;
- }
-
- return false;
-}
-
-bool LLScriptResource::release(S32 amount /* = 1 */)
-{
- if (mUsed >= amount)
- {
- mUsed -= amount;
- return true;
- }
-
- return false;
-}
-
-S32 LLScriptResource::getAvailable() const
-{
- if (mUsed > mTotal)
- {
- // It is possible after a parcel ownership change for more than total to be used
- // In this case the user of this class just wants to know
- // whether or not they can use a resource
- return 0;
- }
- return (mTotal - mUsed);
-}
-
-void LLScriptResource::setTotal(S32 amount)
-{
- // This may cause this resource to be over spent
- // such that more are in use than total allowed
- // Until those resources are released getAvailable will return 0.
- mTotal = amount;
-}
-
-S32 LLScriptResource::getTotal() const
-{
- return mTotal;
-}
-
-S32 LLScriptResource::getUsed() const
-{
- return mUsed;
-}
-
-bool LLScriptResource::isOverLimit() const
-{
- return (mUsed > mTotal);
-}
diff --git a/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp b/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
deleted file mode 100755
index 0ce5eb7dab52c2971cacf5b67d277497192cca1b..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file llscriptresourceconsumer.cpp
- * @brief An interface for a script resource consumer.
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "llscriptresourceconsumer.h"
-
-#include "llscriptresourcepool.h"
-
-LLScriptResourceConsumer::LLScriptResourceConsumer()
- : mScriptResourcePool(&LLScriptResourcePool::null)
-{ }
-
-// Get the resource pool this consumer is currently using.
-// virtual
-LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool()
-{
- return *mScriptResourcePool;
-}
-
-// Get the resource pool this consumer is currently using.
-// virtual
-const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const
-{
- return *mScriptResourcePool;
-}
-
-// virtual
-void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& new_pool)
-{
- mScriptResourcePool = &new_pool;
-}
-
-bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool)
-{
- if (&new_pool == &LLScriptResourcePool::null)
- {
- LL_WARNS() << "New pool is null" << LL_ENDL;
- }
-
- if (isInPool(new_pool))
- {
- return true;
- }
-
- if (!canUseScriptResourcePool(new_pool))
- {
- return false;
- }
-
- S32 used_urls = getUsedPublicURLs();
-
- getScriptResourcePool().getPublicURLResource().release( used_urls );
- setScriptResourcePool(new_pool);
- getScriptResourcePool().getPublicURLResource().request( used_urls );
-
- return true;
-}
-
-bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool)
-{
- if (isInPool(resource_pool))
- {
- return true;
- }
-
- if (resource_pool.getPublicURLResource().getAvailable() < getUsedPublicURLs())
- {
- return false;
- }
-
- return true;
-}
-
-bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool)
-{
- const LLScriptResourcePool& current_pool = getScriptResourcePool();
- if ( &resource_pool == ¤t_pool )
- {
- // This consumer is already in this pool
- return true;
- }
- return false;
-}
-
diff --git a/indra/lscript/lscript_execute/llscriptresourcepool.cpp b/indra/lscript/lscript_execute/llscriptresourcepool.cpp
deleted file mode 100755
index 6bdc2bbd4832a464ea3f698272d0c79168f3db68..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/llscriptresourcepool.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @file llscriptresourcepool.cpp
- * @brief Collection of limited script resources
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "llscriptresourcepool.h"
-
-LLScriptResourcePool LLScriptResourcePool::null;
-
-LLScriptResourcePool::LLScriptResourcePool()
-{
-
-}
-
-LLScriptResource& LLScriptResourcePool::getPublicURLResource()
-{
- return mLSLPublicURLs;
-}
-
-const LLScriptResource& LLScriptResourcePool::getPublicURLResource() const
-{
- return mLSLPublicURLs;
-}
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp
deleted file mode 100755
index 5eb7ffc5a91bf038568675fe0e7e451ac93d9852..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/lscript_execute.cpp
+++ /dev/null
@@ -1,4318 +0,0 @@
-/**
- * @file lscript_execute.cpp
- * @brief classes to execute bytecode
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include <algorithm>
-#include <sstream>
-
-#include "lscript_execute.h"
-#include "lltimer.h"
-#include "lscript_readlso.h"
-#include "lscript_library.h"
-#include "lscript_heapruntime.h"
-#include "lscript_alloc.h"
-
-
-// Static
-const S32 DEFAULT_SCRIPT_TIMER_CHECK_SKIP = 4;
-S32 LLScriptExecute::sTimerCheckSkip = DEFAULT_SCRIPT_TIMER_CHECK_SKIP;
-
-void (*binary_operations[LST_EOF][LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-void (*unary_operations[LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
-
-const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] = /*Flawfinder: ignore*/
-{
- "Invalid", // LSRF_INVALID,
- "Math Error", // LSRF_MATH,
- "Stack-Heap Collision", // LSRF_STACK_HEAP_COLLISION,
- "Bounds Check Error", // LSRF_BOUND_CHECK_ERROR,
- "Heap Error", // LSRF_HEAP_ERROR,
- "Version Mismatch", // LSRF_VERSION_MISMATCH,
- "Missing Inventory", // LSRF_MISSING_INVENTORY,
- "Hit Sandbox Limit", // LSRF_SANDBOX,
- "Chat Overrun", // LSRF_CHAT_OVERRUN,
- "Too Many Listens", // LSRF_TOO_MANY_LISTENS,
- "Lists may not contain lists", // LSRF_NESTING_LISTS,
- "CLI Exception" // LSRF_CLI
-};
-
-void LLScriptExecuteLSL2::startRunning() {}
-void LLScriptExecuteLSL2::stopRunning() {}
-
-const char* URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
-const char* URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
-
-// HTTP Requests to LSL scripts will time out after 25 seconds.
-const U64 LSL_HTTP_REQUEST_TIMEOUT_USEC = 25 * USEC_PER_SEC;
-
-LLScriptExecuteLSL2::LLScriptExecuteLSL2(LLFILE *fp)
-{
- U8 sizearray[4];
- size_t filesize;
- S32 pos = 0;
- if (fread(&sizearray, 1, 4, fp) != 4)
- {
- LL_WARNS() << "Short read" << LL_ENDL;
- filesize = 0;
- } else {
- filesize = bytestream2integer(sizearray, pos);
- }
- mBuffer = new U8[filesize];
- fseek(fp, 0, SEEK_SET);
- if (fread(mBuffer, 1, filesize, fp) != filesize)
- {
- LL_WARNS() << "Short read" << LL_ENDL;
- }
- fclose(fp);
-
- init();
-}
-
-LLScriptExecuteLSL2::LLScriptExecuteLSL2(const U8* bytecode, U32 bytecode_size)
-{
- mBuffer = new U8[TOP_OF_MEMORY];
- memset(mBuffer + bytecode_size, 0, TOP_OF_MEMORY - bytecode_size);
- S32 src_offset = 0;
- S32 dest_offset = 0;
- bytestream2bytestream(mBuffer, dest_offset, bytecode, src_offset, bytecode_size);
- mBytecodeSize = bytecode_size;
- mBytecode = new U8[mBytecodeSize];
- memcpy(mBytecode, bytecode, mBytecodeSize);
- init();
-}
-
-LLScriptExecute::~LLScriptExecute() {}
-LLScriptExecuteLSL2::~LLScriptExecuteLSL2()
-{
- delete[] mBuffer;
- delete[] mBytecode;
-}
-
-void LLScriptExecuteLSL2::init()
-{
- S32 i, j;
-
- mInstructionCount = 0;
-
- for (i = 0; i < 256; i++)
- {
- mExecuteFuncs[i] = run_noop;
- }
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_NOOP]] = run_noop;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POP]] = run_pop;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPS]] = run_pops;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPL]] = run_popl;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPV]] = run_popv;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPQ]] = run_popq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPARG]] = run_poparg;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPIP]] = run_popip;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPBP]] = run_popbp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPSP]] = run_popsp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_POPSLR]] = run_popslr;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_DUP]] = run_dup;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_DUPS]] = run_dups;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_DUPL]] = run_dupl;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_DUPV]] = run_dupv;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_DUPQ]] = run_dupq;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STORE]] = run_store;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STORES]] = run_stores;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREL]] = run_storel;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREV]] = run_storev;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREQ]] = run_storeq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREG]] = run_storeg;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREGL]] = run_storegl;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREGS]] = run_storegs;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREGV]] = run_storegv;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STOREGQ]] = run_storegq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADP]] = run_loadp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADSP]] = run_loadsp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADLP]] = run_loadlp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADVP]] = run_loadvp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADQP]] = run_loadqp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADGP]] = run_loadgp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADGSP]] = run_loadgsp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADGLP]] = run_loadglp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADGVP]] = run_loadgvp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LOADGQP]] = run_loadgqp;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSH]] = run_push;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHS]] = run_pushs;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHL]] = run_pushl;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHV]] = run_pushv;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHQ]] = run_pushq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHG]] = run_pushg;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHGS]] = run_pushgs;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHGL]] = run_pushgl;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHGV]] = run_pushgv;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHGQ]] = run_pushgq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHIP]] = run_puship;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHSP]] = run_pushsp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHBP]] = run_pushbp;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGB]] = run_pushargb;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGI]] = run_pushargi;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGF]] = run_pushargf;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGS]] = run_pushargs;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGV]] = run_pushargv;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGQ]] = run_pushargq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHE]] = run_pushe;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHEV]] = run_pushev;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHEQ]] = run_pusheq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PUSHARGE]] = run_pusharge;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_ADD]] = run_add;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_SUB]] = run_sub;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_MUL]] = run_mul;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_DIV]] = run_div;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_MOD]] = run_mod;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_EQ]] = run_eq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_NEQ]] = run_neq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LEQ]] = run_leq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_GEQ]] = run_geq;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_LESS]] = run_less;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_GREATER]] = run_greater;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BITAND]] = run_bitand;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BITOR]] = run_bitor;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BITXOR]] = run_bitxor;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BOOLAND]] = run_booland;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BOOLOR]] = run_boolor;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_SHL]] = run_shl;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_SHR]] = run_shr;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_NEG]] = run_neg;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BITNOT]] = run_bitnot;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_BOOLNOT]] = run_boolnot;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_JUMP]] = run_jump;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_JUMPIF]] = run_jumpif;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_JUMPNIF]] = run_jumpnif;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STATE]] = run_state;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_CALL]] = run_call;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_RETURN]] = run_return;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_CAST]] = run_cast;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STACKTOS]] = run_stacktos;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_STACKTOL]] = run_stacktol;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_PRINT]] = run_print;
-
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_CALLLIB]] = run_calllib;
- mExecuteFuncs[LSCRIPTOpCodes[LOPC_CALLLIB_TWO_BYTE]] = run_calllib_two_byte;
-
- for (i = 0; i < LST_EOF; i++)
- {
- for (j = 0; j < LST_EOF; j++)
- {
- binary_operations[i][j] = unknown_operation;
- }
- }
-
- binary_operations[LST_INTEGER][LST_INTEGER] = integer_integer_operation;
- binary_operations[LST_INTEGER][LST_FLOATINGPOINT] = integer_float_operation;
- binary_operations[LST_INTEGER][LST_VECTOR] = integer_vector_operation;
-
- binary_operations[LST_FLOATINGPOINT][LST_INTEGER] = float_integer_operation;
- binary_operations[LST_FLOATINGPOINT][LST_FLOATINGPOINT] = float_float_operation;
- binary_operations[LST_FLOATINGPOINT][LST_VECTOR] = float_vector_operation;
-
- binary_operations[LST_STRING][LST_STRING] = string_string_operation;
- binary_operations[LST_STRING][LST_KEY] = string_key_operation;
-
- binary_operations[LST_KEY][LST_STRING] = key_string_operation;
- binary_operations[LST_KEY][LST_KEY] = key_key_operation;
-
- binary_operations[LST_VECTOR][LST_INTEGER] = vector_integer_operation;
- binary_operations[LST_VECTOR][LST_FLOATINGPOINT] = vector_float_operation;
- binary_operations[LST_VECTOR][LST_VECTOR] = vector_vector_operation;
- binary_operations[LST_VECTOR][LST_QUATERNION] = vector_quaternion_operation;
-
- binary_operations[LST_QUATERNION][LST_QUATERNION] = quaternion_quaternion_operation;
-
- binary_operations[LST_INTEGER][LST_LIST] = integer_list_operation;
- binary_operations[LST_FLOATINGPOINT][LST_LIST] = float_list_operation;
- binary_operations[LST_STRING][LST_LIST] = string_list_operation;
- binary_operations[LST_KEY][LST_LIST] = key_list_operation;
- binary_operations[LST_VECTOR][LST_LIST] = vector_list_operation;
- binary_operations[LST_QUATERNION][LST_LIST] = quaternion_list_operation;
- binary_operations[LST_LIST][LST_INTEGER] = list_integer_operation;
- binary_operations[LST_LIST][LST_FLOATINGPOINT] = list_float_operation;
- binary_operations[LST_LIST][LST_STRING] = list_string_operation;
- binary_operations[LST_LIST][LST_KEY] = list_key_operation;
- binary_operations[LST_LIST][LST_VECTOR] = list_vector_operation;
- binary_operations[LST_LIST][LST_QUATERNION] = list_quaternion_operation;
- binary_operations[LST_LIST][LST_LIST] = list_list_operation;
-
- for (i = 0; i < LST_EOF; i++)
- {
- unary_operations[i] = unknown_operation;
- }
-
- unary_operations[LST_INTEGER] = integer_operation;
- unary_operations[LST_FLOATINGPOINT] = float_operation;
- unary_operations[LST_VECTOR] = vector_operation;
- unary_operations[LST_QUATERNION] = quaternion_operation;
-
-}
-
-
-// Utility routine for when there's a boundary error parsing bytecode
-void LLScriptExecuteLSL2::recordBoundaryError( const LLUUID &id )
-{
- set_fault(mBuffer, LSRF_BOUND_CHECK_ERROR);
- LL_WARNS() << "Script boundary error for ID " << id << LL_ENDL;
-}
-
-
-// set IP to the event handler with some error checking
-void LLScriptExecuteLSL2::setStateEventOpcoodeStartSafely( S32 state, LSCRIPTStateEventType event, const LLUUID &id )
-{
- S32 opcode_start = get_state_event_opcoode_start( mBuffer, state, event );
- if ( opcode_start == -1 )
- {
- recordBoundaryError( id );
- }
- else
- {
- set_ip( mBuffer, opcode_start );
- }
-}
-
-
-
-
-S32 lscript_push_variable(LLScriptLibData *data, U8 *buffer);
-
-void LLScriptExecuteLSL2::resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice)
-{
- // call opcode run function pointer with buffer and IP
- mInstructionCount++;
- S32 value = get_register(mBuffer, LREG_IP);
- S32 tvalue = value;
- S32 opcode = safe_instruction_bytestream2byte(mBuffer, tvalue);
- mExecuteFuncs[opcode](mBuffer, value, b_print, id);
- set_ip(mBuffer, value);
- add_register_fp(mBuffer, LREG_ESR, -0.1f);
- // lsa_print_heap(mBuffer);
-
- if (b_print)
- {
- lsa_print_heap(mBuffer);
- printf("ip: 0x%X\n", get_register(mBuffer, LREG_IP));
- printf("sp: 0x%X\n", get_register(mBuffer, LREG_SP));
- printf("bp: 0x%X\n", get_register(mBuffer, LREG_BP));
- printf("hr: 0x%X\n", get_register(mBuffer, LREG_HR));
- printf("hp: 0x%X\n", get_register(mBuffer, LREG_HP));
- }
-
- // NOTE: Babbage: all mExecuteFuncs return false.
-}
-
-void LLScriptExecuteLSL2::callEventHandler(LSCRIPTStateEventType event, const LLUUID &id, F32 time_slice)
-{
- S32 major_version = getMajorVersion();
- // push a zero to be popped
- lscript_push(mBuffer, 0);
- // push sp as current bp
- S32 sp = get_register(mBuffer, LREG_SP);
- lscript_push(mBuffer, sp);
-
- // Update current handler and current events registers.
- set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
- U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
- current_events &= ~LSCRIPTStateBitField[event];
- set_event_register(mBuffer, LREG_CE, current_events, major_version);
-
- // now, push any additional stack space
- U32 current_state = get_register(mBuffer, LREG_CS);
- S32 additional_size = get_event_stack_size(mBuffer, current_state, event);
- lscript_pusharge(mBuffer, additional_size);
-
- // now set the bp correctly
- sp = get_register(mBuffer, LREG_SP);
- sp += additional_size;
- set_bp(mBuffer, sp);
-
- // set IP to the function
- S32 opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
- set_ip(mBuffer, opcode_start);
-}
-
-//void callStateExitHandler()
-//{
-// // push a zero to be popped
-// lscript_push(mBuffer, 0);
-// // push sp as current bp
-// S32 sp = get_register(mBuffer, LREG_SP);
-// lscript_push(mBuffer, sp);
-//
-// // now, push any additional stack space
-// S32 additional_size = get_event_stack_size(mBuffer, current_state, LSTT_STATE_EXIT);
-// lscript_pusharge(mBuffer, additional_size);
-//
-// sp = get_register(mBuffer, LREG_SP);
-// sp += additional_size;
-// set_bp(mBuffer, sp);
-//
-// // set IP to the event handler
-// S32 opcode_start = get_state_event_opcoode_start(mBuffer, current_state, LSTT_STATE_EXIT);
-// set_ip(mBuffer, opcode_start);
-//}
-//
-//void callStateEntryHandler()
-//{
-// // push a zero to be popped
-// lscript_push(mBuffer, 0);
-// // push sp as current bp
-// S32 sp = get_register(mBuffer, LREG_SP);
-// lscript_push(mBuffer, sp);
-//
-// event = return_first_event((S32)LSCRIPTStateBitField[LSTT_STATE_ENTRY]);
-// set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
-// current_events &= ~LSCRIPTStateBitField[event];
-// set_event_register(mBuffer, LREG_CE, current_events, major_version);
-//
-// // now, push any additional stack space
-// S32 additional_size = get_event_stack_size(mBuffer, current_state, event) - size;
-// lscript_pusharge(mBuffer, additional_size);
-//
-// // now set the bp correctly
-// sp = get_register(mBuffer, LREG_SP);
-// sp += additional_size + size;
-// set_bp(mBuffer, sp);
-// // set IP to the function
-// S32 opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
-// set_ip(mBuffer, opcode_start);
-//}
-
-void LLScriptExecuteLSL2::callQueuedEventHandler(LSCRIPTStateEventType event, const LLUUID &id, F32 time_slice)
-{
- S32 major_version = getMajorVersion();
-
- for (std::list<LLScriptDataCollection*>::iterator it = mEventData.mEventDataList.begin(), end_it = mEventData.mEventDataList.end();
- it != end_it;
- ++it)
- {
- LLScriptDataCollection* eventdata = *it;
-
- if (eventdata->mType == event)
- {
- // push a zero to be popped
- lscript_push(mBuffer, 0);
- // push sp as current bp
- S32 sp = get_register(mBuffer, LREG_SP);
- lscript_push(mBuffer, sp);
-
- // Update current handler and current events registers.
- set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
- U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
- current_events &= ~LSCRIPTStateBitField[event];
- set_event_register(mBuffer, LREG_CE, current_events, major_version);
-
- // push any arguments that need to be pushed onto the stack
- // last piece of data will be type LST_NULL
- LLScriptLibData *data = eventdata->mData;
- U32 size = 0;
- while (data->mType)
- {
- size += lscript_push_variable(data, mBuffer);
- data++;
- }
- // now, push any additional stack space
- U32 current_state = get_register(mBuffer, LREG_CS);
- S32 additional_size = get_event_stack_size(mBuffer, current_state, event) - size;
- lscript_pusharge(mBuffer, additional_size);
-
- // now set the bp correctly
- sp = get_register(mBuffer, LREG_SP);
- sp += additional_size + size;
- set_bp(mBuffer, sp);
-
- // set IP to the function
- S32 opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
- set_ip(mBuffer, opcode_start);
-
- delete *it;
- mEventData.mEventDataList.erase(it);
- break;
- }
- }
-}
-
-void LLScriptExecuteLSL2::callNextQueuedEventHandler(U64 event_register, const LLUUID &id, F32 time_slice)
-{
- S32 major_version = getMajorVersion();
- LLScriptDataCollection* eventdata = mEventData.getNextEvent();
- if (eventdata)
- {
- LSCRIPTStateEventType event = eventdata->mType;
-
- // make sure that we can actually handle this one
- if (LSCRIPTStateBitField[event] & event_register)
- {
- // push a zero to be popped
- lscript_push(mBuffer, 0);
- // push sp as current bp
- S32 sp = get_register(mBuffer, LREG_SP);
- lscript_push(mBuffer, sp);
-
- // Update current handler and current events registers.
- set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
- U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
- current_events &= ~LSCRIPTStateBitField[event];
- set_event_register(mBuffer, LREG_CE, current_events, major_version);
-
- // push any arguments that need to be pushed onto the stack
- // last piece of data will be type LST_NULL
- LLScriptLibData *data = eventdata->mData;
- U32 size = 0;
- while (data->mType)
- {
- size += lscript_push_variable(data, mBuffer);
- data++;
- }
-
- // now, push any additional stack space
- U32 current_state = get_register(mBuffer, LREG_CS);
- S32 additional_size = get_event_stack_size(mBuffer, current_state, event) - size;
- lscript_pusharge(mBuffer, additional_size);
-
- // now set the bp correctly
- sp = get_register(mBuffer, LREG_SP);
- sp += additional_size + size;
- set_bp(mBuffer, sp);
-
- // set IP to the function
- S32 opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
- set_ip(mBuffer, opcode_start);
- }
- else
- {
- LL_WARNS() << "Somehow got an event that we're not registered for!" << LL_ENDL;
- }
- delete eventdata;
- }
-}
-
-U64 LLScriptExecuteLSL2::nextState()
-{
- // copy NS to CS
- S32 next_state = get_register(mBuffer, LREG_NS);
- set_register(mBuffer, LREG_CS, next_state);
-
- // copy new state's handled events into ER (SR + CS*4 + 4)
- return get_handled_events(mBuffer, next_state);
-}
-
-//virtual
-void LLScriptExecuteLSL2::addEvent(LLScriptDataCollection* event)
-{
- mEventData.addEventData(event);
-}
-
-//virtual
-void LLScriptExecuteLSL2::removeEventType(LSCRIPTStateEventType event_type)
-{
- mEventData.removeEventType(event_type);
-}
-
-//virtual
-F32 LLScriptExecuteLSL2::getSleep() const
-{
- return get_register_fp(mBuffer, LREG_SLR);
-}
-
-//virtual
-void LLScriptExecuteLSL2::setSleep(F32 value)
-{
- set_register_fp(mBuffer, LREG_SLR, value);
-}
-
-//virtual
-U64 LLScriptExecuteLSL2::getCurrentHandler()
-{
- return get_event_register(mBuffer, LREG_IE, getMajorVersion());
-}
-
-//virtual
-F32 LLScriptExecuteLSL2::getEnergy() const
-{
- return get_register_fp(mBuffer, LREG_ESR);
-}
-
-//virtual
-void LLScriptExecuteLSL2::setEnergy(F32 value)
-{
- set_register_fp(mBuffer, LREG_ESR, value);
-}
-
-//virtual
-U32 LLScriptExecuteLSL2::getFreeMemory()
-{
- return get_register(mBuffer, LREG_SP) - get_register(mBuffer, LREG_HP);
-}
-
-//virtual
-S32 LLScriptExecuteLSL2::getParameter()
-{
- return get_register(mBuffer, LREG_PR);
-}
-
-//virtual
-void LLScriptExecuteLSL2::setParameter(S32 value)
-{
- set_register(mBuffer, LREG_PR, value);
-}
-
-
-S32 LLScriptExecuteLSL2::writeState(U8 **dest, U32 header_size, U32 footer_size)
-{
- // data format:
- // 4 bytes of size of Registers, Name and Description, and Global Variables
- // Registers, Name and Description, and Global Variables data
- // 4 bytes of size of Heap
- // Heap data
- // 4 bytes of stack size
- // Stack data
-
- S32 registers_size = get_register(mBuffer, LREG_GFR);
-
- if (get_register(mBuffer, LREG_HP) > TOP_OF_MEMORY)
- reset_hp_to_safe_spot(mBuffer);
-
- S32 heap_size = get_register(mBuffer, LREG_HP) - get_register(mBuffer, LREG_HR);
- S32 stack_size = get_register(mBuffer, LREG_TM) - get_register(mBuffer, LREG_SP);
- S32 total_size = registers_size + LSCRIPTDataSize[LST_INTEGER] +
- heap_size + LSCRIPTDataSize[LST_INTEGER] +
- stack_size + LSCRIPTDataSize[LST_INTEGER];
-
- // actually allocate data
- delete[] *dest;
- *dest = new U8[header_size + total_size + footer_size];
- memset(*dest, 0, header_size + total_size + footer_size);
- S32 dest_offset = header_size;
- S32 src_offset = 0;
-
- // registers
- integer2bytestream(*dest, dest_offset, registers_size);
-
- // LL_INFOS() << "Writing CE: " << getCurrentEvents() << LL_ENDL;
- bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, registers_size);
-
- // heap
- integer2bytestream(*dest, dest_offset, heap_size);
-
- src_offset = get_register(mBuffer, LREG_HR);
- bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, heap_size);
-
- // stack
- integer2bytestream(*dest, dest_offset, stack_size);
-
- src_offset = get_register(mBuffer, LREG_SP);
- bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, stack_size);
-
- return total_size;
-}
-
-S32 LLScriptExecuteLSL2::writeBytecode(U8 **dest)
-{
- // data format:
- // registers through top of heap
- // Heap data
- S32 total_size = get_register(mBuffer, LREG_HP);
-
- // actually allocate data
- delete [] *dest;
- *dest = new U8[total_size];
- S32 dest_offset = 0;
- S32 src_offset = 0;
-
- bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, total_size);
-
- return total_size;
-}
-
-S32 LLScriptExecuteLSL2::readState(U8 *src)
-{
- // first, blitz heap and stack
- S32 hr = get_register(mBuffer, LREG_HR);
- S32 tm = get_register(mBuffer, LREG_TM);
- memset(mBuffer + hr, 0, tm - hr);
-
- S32 src_offset = 0;
- S32 dest_offset = 0;
- S32 size;
-
- // read register size
- size = bytestream2integer(src, src_offset);
-
- // copy data into register area
- bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
-// LL_INFOS() << "Read CE: " << getCurrentEvents() << LL_ENDL;
- if (get_register(mBuffer, LREG_TM) != TOP_OF_MEMORY)
- {
- LL_WARNS() << "Invalid state. Top of memory register does not match"
- << " constant." << LL_ENDL;
- reset_hp_to_safe_spot(mBuffer);
- return -1;
- }
-
- // read heap size
- size = bytestream2integer(src, src_offset);
-
- // set dest offset
- dest_offset = get_register(mBuffer, LREG_HR);
-
- if (dest_offset + size > TOP_OF_MEMORY)
- {
- reset_hp_to_safe_spot(mBuffer);
- return -1;
- }
-
- // copy data into heap area
- bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
-
- // read stack size
- size = bytestream2integer(src, src_offset);
-
- // set dest offset
- dest_offset = get_register(mBuffer, LREG_SP);
-
- if (dest_offset + size > TOP_OF_MEMORY)
- {
- reset_hp_to_safe_spot(mBuffer);
- return -1;
- }
-
- // copy data into heap area
- bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
-
- // Return offset to first byte after read data.
- return src_offset;
-}
-
-void LLScriptExecuteLSL2::reset()
-{
- LLScriptExecute::reset();
-
- const U8 *src = getBytecode();
- S32 size = getBytecodeSize();
-
- if (!src)
- return;
-
- // first, blitz heap and stack
- S32 hr = get_register(mBuffer, LREG_HR);
- S32 tm = get_register(mBuffer, LREG_TM);
- memset(mBuffer + hr, 0, tm - hr);
-
- S32 dest_offset = 0;
- S32 src_offset = 0;
-
- bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
-}
-
-S32 LLScriptExecuteLSL2::getMajorVersion() const
-{
- S32 version = getVersion();
- S32 major_version = 0;
- if (version == LSL2_VERSION1_END_NUMBER){
- major_version = 1;
- }
- else if (version == LSL2_VERSION_NUMBER)
- {
- major_version = 2;
- }
- return major_version;
-}
-
-U32 LLScriptExecuteLSL2::getUsedMemory()
-{
- return getBytecodeSize();
-}
-
-LLScriptExecute::LLScriptExecute() :
- mReset(FALSE)
-{
-}
-
-void LLScriptExecute::reset()
-{
- mReset = FALSE;
-}
-
-bool LLScriptExecute::isYieldDue() const
-{
- if(mReset)
- {
- return true;
- }
-
- if(getSleep() > 0.f)
- {
- return true;
- }
-
- if(isFinished())
- {
- return true;
- }
-
- // State changes can occur within a single time slice,
- // but LLScriptData's clean up is required. Yield here
- // to allow LLScriptData to perform cleanup and then call
- // runQuanta again.
- if(isStateChangePending())
- {
- return true;
- }
-
- return false;
-}
-
-// Run smallest number of instructions possible:
-// a single instruction for LSL2, a segment between save tests for Mono
-void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id,
- const char **errorstr,
- U32& events_processed,
- F32 quanta)
-{
- // is there a fault?
- // if yes, print out message and exit
- S32 value = getVersion();
- if ( (value != LSL2_VERSION1_END_NUMBER) && (value != LSL2_VERSION_NUMBER) )
- {
- setFault(LSRF_VERSION_MISMATCH);
- }
- value = getFaults();
- if (value > LSRF_INVALID && value < LSRF_EOF)
- {
- if (b_print)
- {
- printf("Error!\n");
- }
- *errorstr = LSCRIPTRunTimeFaultStrings[value];
- return;
- }
- else
- {
- *errorstr = NULL;
- }
-
- if (! isFinished())
- {
- resumeEventHandler(b_print, id, quanta);
- return;
- }
- else
- {
- // make sure that IE is zero
- setCurrentHandler(0);
-
- // if no, we're in a state and waiting for an event
- U64 current_events = getCurrentEvents();
- U64 event_register = getEventHandlers();
-
- // check NS to see if need to switch states (NS != CS)
- if (isStateChangePending())
- {
- // ok, blow away any pending events
- deleteAllEvents();
-
- // if yes, check state exit flag is set
- if (current_events & LSCRIPTStateBitField[LSTT_STATE_EXIT])
- {
- // if yes, clear state exit flag
- setCurrentHandler(LSCRIPTStateBitField[LSTT_STATE_EXIT]);
- current_events &= ~LSCRIPTStateBitField[LSTT_STATE_EXIT];
- setCurrentEvents(current_events);
-
- // check state exit event handler
- // if there is a handler, call it
- if (event_register & LSCRIPTStateBitField[LSTT_STATE_EXIT])
- {
- ++events_processed;
- callEventHandler(LSTT_STATE_EXIT, id, quanta);
- return;
- }
- }
-
- // if no handler or no state exit flag switch to new state
- // set state entry flag and clear other CE flags
- current_events = LSCRIPTStateBitField[LSTT_STATE_ENTRY];
- setCurrentEvents(current_events);
-
- U64 handled_events = nextState();
- setEventHandlers(handled_events);
- }
-
- // try to get next event from stack
- BOOL b_done = FALSE;
- LSCRIPTStateEventType event = LSTT_NULL;
-
- current_events = getCurrentEvents();
- event_register = getEventHandlers();
-
- // first, check to see if state_entry or onrez are raised and handled
- if ((current_events & LSCRIPTStateBitField[LSTT_STATE_ENTRY])
- &&(current_events & event_register))
- {
- ++events_processed;
- callEventHandler(LSTT_STATE_ENTRY, id, quanta);
- b_done = TRUE;
- }
- else if ((current_events & LSCRIPTStateBitField[LSTT_REZ])
- &&(current_events & event_register))
- {
- ++events_processed;
- callQueuedEventHandler(LSTT_REZ, id, quanta);
- b_done = TRUE;
- }
-
- if (!b_done)
- {
- // Call handler for next queued event.
- if(getEventCount() > 0)
- {
- ++events_processed;
- callNextQueuedEventHandler(event_register, id, quanta);
- }
- else
- {
- // if no data waiting, do it the old way:
- U64 handled_current = current_events & event_register;
- if (handled_current)
- {
- event = return_first_event((S32)handled_current);
- ++events_processed;
- callEventHandler(event, id, quanta);
- }
- }
- b_done = TRUE;
- }
- }
-}
-
-// Run for a single timeslice, or until a yield or state transition is due
-F32 LLScriptExecute::runQuanta(BOOL b_print, const LLUUID &id, const char **errorstr, F32 quanta, U32& events_processed, LLTimer& timer)
-{
- S32 timer_checks = 0;
- F32 inloop = 0;
-
- // Loop while not finished, yield not due and time remaining
- // NOTE: Default implementation does not do adaptive timer skipping
- // to preserve current LSL behaviour and not break scripts that rely
- // on current execution speed.
- while(true)
- {
- runInstructions(b_print, id, errorstr,
- events_processed, quanta);
-
- if(isYieldDue())
- {
- break;
- }
- else if(timer_checks++ >= LLScriptExecute::sTimerCheckSkip)
- {
- inloop = timer.getElapsedTimeF32();
- if(inloop > quanta)
- {
- break;
- }
- timer_checks = 0;
- }
- }
- if (inloop == 0.0f)
- {
- inloop = timer.getElapsedTimeF32();
- }
- return inloop;
-}
-
-F32 LLScriptExecute::runNested(BOOL b_print, const LLUUID &id, const char **errorstr, F32 quanta, U32& events_processed, LLTimer& timer)
-{
- return LLScriptExecute::runQuanta(b_print, id, errorstr, quanta, events_processed, timer);
-}
-
-BOOL run_noop(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tNOOP\n", offset);
- offset++;
- return FALSE;
-}
-
-BOOL run_pop(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOP\n", offset);
- offset++;
- lscript_poparg(buffer, LSCRIPTDataSize[LST_INTEGER]);
- return FALSE;
-}
-
-BOOL run_pops(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPS\n", offset);
- offset++;
- S32 address = lscript_pop_int(buffer);
- if (address)
- lsa_decrease_ref_count(buffer, address);
- return FALSE;
-}
-
-BOOL run_popl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPL\n", offset);
- offset++;
- S32 address = lscript_pop_int(buffer);
- if (address)
- lsa_decrease_ref_count(buffer, address);
- return FALSE;
-}
-
-BOOL run_popv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPV\n", offset);
- offset++;
- lscript_poparg(buffer, LSCRIPTDataSize[LST_VECTOR]);
- return FALSE;
-}
-
-BOOL run_popq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPQ\n", offset);
- offset++;
- lscript_poparg(buffer, LSCRIPTDataSize[LST_QUATERNION]);
- return FALSE;
-}
-
-BOOL run_poparg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPARG ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
- lscript_poparg(buffer, arg);
- return FALSE;
-}
-
-BOOL run_popip(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPIP\n", offset);
- offset++;
- offset = lscript_pop_int(buffer);
- return FALSE;
-}
-
-BOOL run_popbp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPBP\n", offset);
- offset++;
- S32 bp = lscript_pop_int(buffer);
- set_bp(buffer, bp);
- return FALSE;
-}
-
-BOOL run_popsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPSP\n", offset);
- offset++;
- S32 sp = lscript_pop_int(buffer);
- set_sp(buffer, sp);
- return FALSE;
-}
-
-BOOL run_popslr(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPOPSLR\n", offset);
- offset++;
- S32 slr = lscript_pop_int(buffer);
- set_register(buffer, LREG_SLR, slr);
- return FALSE;
-}
-
-BOOL run_dup(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tDUP\n", offset);
- offset++;
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_dups(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tDUPS\n", offset);
- offset++;
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
- lscript_push(buffer, value);
- lsa_increase_ref_count(buffer, value);
- return FALSE;
-}
-
-BOOL run_dupl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tDUPL\n", offset);
- offset++;
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
- lscript_push(buffer, value);
- lsa_increase_ref_count(buffer, value);
- return FALSE;
-}
-
-BOOL run_dupv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tDUPV\n", offset);
- offset++;
- S32 sp = get_register(buffer, LREG_SP);
- LLVector3 value;
- bytestream2vector(value, buffer, sp);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_dupq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tDUPV\n", offset);
- offset++;
- S32 sp = get_register(buffer, LREG_SP);
- LLQuaternion value;
- bytestream2quaternion(value, buffer, sp);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_store(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTORE ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_stores(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTORES ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
-
- S32 address = lscript_local_get(buffer, arg);
-
- lscript_local_store(buffer, arg, value);
- lsa_increase_ref_count(buffer, value);
- if (address)
- lsa_decrease_ref_count(buffer, address);
- return FALSE;
-}
-
-BOOL run_storel(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREL ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
-
- S32 address = lscript_local_get(buffer, arg);
-
- lscript_local_store(buffer, arg, value);
- lsa_increase_ref_count(buffer, value);
- if (address)
- lsa_decrease_ref_count(buffer, address);
- return FALSE;
-}
-
-BOOL run_storev(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREV ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLVector3 value;
- S32 sp = get_register(buffer, LREG_SP);
- bytestream2vector(value, buffer, sp);
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_storeq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREQ ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLQuaternion value;
- S32 sp = get_register(buffer, LREG_SP);
- bytestream2quaternion(value, buffer, sp);
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_storeg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREG ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_storegs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGS ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
-
- S32 address = lscript_global_get(buffer, arg);
-
- lscript_global_store(buffer, arg, value);
-
- lsa_increase_ref_count(buffer, value);
- if (address)
- lsa_decrease_ref_count(buffer, address);
- return FALSE;
-}
-
-BOOL run_storegl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGL ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 sp = get_register(buffer, LREG_SP);
- S32 value = bytestream2integer(buffer, sp);
-
- S32 address = lscript_global_get(buffer, arg);
-
- lscript_global_store(buffer, arg, value);
-
- lsa_increase_ref_count(buffer, value);
- if (address)
- lsa_decrease_ref_count(buffer, address);
- return FALSE;
-}
-
-BOOL run_storegv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGV ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLVector3 value;
- S32 sp = get_register(buffer, LREG_SP);
- bytestream2vector(value, buffer, sp);
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_storegq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGQ ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLQuaternion value;
- S32 sp = get_register(buffer, LREG_SP);
- bytestream2quaternion(value, buffer, sp);
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_pop_int(buffer);
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTORESP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_pop_int(buffer);
-
- S32 address = lscript_local_get(buffer, arg);
- if (address)
- lsa_decrease_ref_count(buffer, address);
-
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadlp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTORELP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_pop_int(buffer);
-
- S32 address = lscript_local_get(buffer, arg);
- if (address)
- lsa_decrease_ref_count(buffer, address);
-
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadvp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREVP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLVector3 value;
- lscript_pop_vector(buffer, value);
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadqp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREQP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLQuaternion value;
- lscript_pop_quaternion(buffer, value);
- lscript_local_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadgp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_pop_int(buffer);
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadgsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGSP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
- S32 value = lscript_pop_int(buffer);
-
- S32 address = lscript_global_get(buffer, arg);
- if (address)
- lsa_decrease_ref_count(buffer, address);
-
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadglp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGLP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_pop_int(buffer);
-
- S32 address = lscript_global_get(buffer, arg);
- if (address)
- lsa_decrease_ref_count(buffer, address);
-
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadgvp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGVP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLVector3 value;
- lscript_pop_vector(buffer, value);
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_loadgqp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTOREGQP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLQuaternion value;
- lscript_pop_quaternion(buffer, value);
- lscript_global_store(buffer, arg, value);
- return FALSE;
-}
-
-BOOL run_push(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSH ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_local_get(buffer, arg);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHS ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_local_get(buffer, arg);
- lscript_push(buffer, value);
- lsa_increase_ref_count(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHL ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_local_get(buffer, arg);
- lscript_push(buffer, value);
- lsa_increase_ref_count(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHV ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLVector3 value;
- lscript_local_get(buffer, arg, value);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHQ ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLQuaternion value;
- lscript_local_get(buffer, arg, value);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHG ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_global_get(buffer, arg);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushgs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHGS ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_global_get(buffer, arg);
- lscript_push(buffer, value);
- lsa_increase_ref_count(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushgl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHGL ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- S32 value = lscript_global_get(buffer, arg);
- lscript_push(buffer, value);
- lsa_increase_ref_count(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushgv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHGV ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLVector3 value;
- lscript_global_get(buffer, arg, value);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_pushgq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHGQ ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("0x%X\n", arg);
- LLQuaternion value;
- lscript_global_get(buffer, arg, value);
- lscript_push(buffer, value);
- return FALSE;
-}
-
-BOOL run_puship(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHIP\n", offset);
- offset++;
- lscript_push(buffer, offset);
- return FALSE;
-}
-
-BOOL run_pushbp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHBP\n", offset);
- offset++;
- lscript_push(buffer, get_register(buffer, LREG_BP));
- return FALSE;
-}
-
-BOOL run_pushsp(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHSP\n", offset);
- offset++;
- lscript_push(buffer, get_register(buffer, LREG_SP));
- return FALSE;
-}
-
-BOOL run_pushargb(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHGARGB ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- if (b_print)
- printf("%d\n", (U32)arg);
- lscript_push(buffer, arg);
- return FALSE;
-}
-
-BOOL run_pushargi(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHARGI ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
- lscript_push(buffer, arg);
- return FALSE;
-}
-
-BOOL run_pushargf(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHARGF ", offset);
- offset++;
- F32 arg = safe_instruction_bytestream2float(buffer, offset);
- if (b_print)
- printf("%f\n", arg);
- lscript_push(buffer, arg);
- return FALSE;
-}
-
-BOOL run_pushargs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHARGS ", offset);
- S32 toffset = offset;
- safe_instruction_bytestream_count_char(buffer, toffset);
- S32 size = toffset - offset;
- char *arg = new char[size];
- offset++;
- safe_instruction_bytestream2char(arg, buffer, offset, size);
- if (b_print)
- printf("%s\n", arg);
- S32 address = lsa_heap_add_data(buffer, new LLScriptLibData(arg), get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- delete [] arg;
- return FALSE;
-}
-
-BOOL run_pushargv(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHARGV ", offset);
- offset++;
- LLVector3 arg;
- safe_instruction_bytestream2vector(arg, buffer, offset);
- if (b_print)
- printf("< %f, %f, %f >\n", arg.mV[VX], arg.mV[VY], arg.mV[VZ]);
- lscript_push(buffer, arg);
- return FALSE;
-}
-BOOL run_pushargq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHARGQ ", offset);
- offset++;
- LLQuaternion arg;
- safe_instruction_bytestream2quaternion(arg, buffer, offset);
- if (b_print)
- printf("< %f, %f, %f, %f >\n", arg.mQ[VX], arg.mQ[VY], arg.mQ[VZ], arg.mQ[VS]);
- lscript_push(buffer, arg);
- return FALSE;
-}
-BOOL run_pushe(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHE\n", offset);
- offset++;
- lscript_pusharge(buffer, LSCRIPTDataSize[LST_INTEGER]);
- return FALSE;
-}
-BOOL run_pushev(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHEV\n", offset);
- offset++;
- lscript_pusharge(buffer, LSCRIPTDataSize[LST_VECTOR]);
- return FALSE;
-}
-BOOL run_pusheq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHEQ\n", offset);
- offset++;
- lscript_pusharge(buffer, LSCRIPTDataSize[LST_QUATERNION]);
- return FALSE;
-}
-BOOL run_pusharge(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPUSHARGE ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
- lscript_pusharge(buffer, arg);
- return FALSE;
-}
-
-void print_type(U8 type)
-{
- if (type == LSCRIPTTypeByte[LST_INTEGER])
- {
- printf("integer");
- }
- else if (type == LSCRIPTTypeByte[LST_FLOATINGPOINT])
- {
- printf("float");
- }
- else if (type == LSCRIPTTypeByte[LST_STRING])
- {
- printf("string");
- }
- else if (type == LSCRIPTTypeByte[LST_KEY])
- {
- printf("key");
- }
- else if (type == LSCRIPTTypeByte[LST_VECTOR])
- {
- printf("vector");
- }
- else if (type == LSCRIPTTypeByte[LST_QUATERNION])
- {
- printf("quaternion");
- }
- else if (type == LSCRIPTTypeByte[LST_LIST])
- {
- printf("list");
- }
-}
-
-void unknown_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- printf("Unknown arithmetic operation!\n");
-}
-
-void integer_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 result = 0;
-
- switch(opcode)
- {
- case LOPC_ADD:
- result = lside + rside;
- break;
- case LOPC_SUB:
- result = lside - rside;
- break;
- case LOPC_MUL:
- result = lside * rside;
- break;
- case LOPC_DIV:
- if (rside){
- if( ( rside == -1 ) || ( rside == (S32) 0xffffffff ) )// division by -1 can have funny results: multiplication is OK: SL-31252
- {
- result = -1 * lside;
- }
- else
- {
- result = lside / rside;
- }
- }
- else
- set_fault(buffer, LSRF_MATH);
- break;
- case LOPC_MOD:
- if (rside)
- {
- if (rside == -1 || rside == 1 ) // mod(1) = mod(-1) = 0: SL-31252
- {
- result = 0;
- }
- else
- {
- result = lside % rside;
- }
- }
- else
- set_fault(buffer, LSRF_MATH);
- break;
- case LOPC_EQ:
- result = (lside == rside);
- break;
- case LOPC_NEQ:
- result = (lside != rside);
- break;
- case LOPC_LEQ:
- result = (lside <= rside);
- break;
- case LOPC_GEQ:
- result = (lside >= rside);
- break;
- case LOPC_LESS:
- result = (lside < rside);
- break;
- case LOPC_GREATER:
- result = (lside > rside);
- break;
- case LOPC_BITAND:
- result = (lside & rside);
- break;
- case LOPC_BITOR:
- result = (lside | rside);
- break;
- case LOPC_BITXOR:
- result = (lside ^ rside);
- break;
- case LOPC_BOOLAND:
- result = (lside && rside);
- break;
- case LOPC_BOOLOR:
- result = (lside || rside);
- break;
- case LOPC_SHL:
- result = (lside << rside);
- break;
- case LOPC_SHR:
- result = (lside >> rside);
- break;
- default:
- break;
- }
- lscript_push(buffer, result);
-}
-
-void integer_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- F32 rside = lscript_pop_float(buffer);
- S32 resulti = 0;
- F32 resultf = 0;
-
- switch(opcode)
- {
- case LOPC_ADD:
- resultf = lside + rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_SUB:
- resultf = lside - rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_MUL:
- resultf = lside * rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_DIV:
- if (rside)
- resultf = lside / rside;
- else
- set_fault(buffer, LSRF_MATH);
- lscript_push(buffer, resultf);
- break;
- case LOPC_EQ:
- resulti = (lside == rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = (lside != rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_LEQ:
- resulti = (lside <= rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_GEQ:
- resulti = (lside >= rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_LESS:
- resulti = (lside < rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_GREATER:
- resulti = (lside > rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void integer_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- LLVector3 rside;
- lscript_pop_vector(buffer, rside);
-
- switch(opcode)
- {
- case LOPC_MUL:
- rside *= (F32)lside;
- lscript_push(buffer, rside);
- break;
- default:
- break;
- }
-}
-
-void float_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- F32 lside = lscript_pop_float(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 resulti = 0;
- F32 resultf = 0;
-
- switch(opcode)
- {
- case LOPC_ADD:
- resultf = lside + rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_SUB:
- resultf = lside - rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_MUL:
- resultf = lside * rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_DIV:
- if (rside)
- resultf = lside / rside;
- else
- set_fault(buffer, LSRF_MATH);
- lscript_push(buffer, resultf);
- break;
- case LOPC_EQ:
- resulti = (lside == rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = (lside != rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_LEQ:
- resulti = (lside <= rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_GEQ:
- resulti = (lside >= rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_LESS:
- resulti = (lside < rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_GREATER:
- resulti = (lside > rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void float_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- F32 lside = lscript_pop_float(buffer);
- F32 rside = lscript_pop_float(buffer);
- F32 resultf = 0;
- S32 resulti = 0;
-
- switch(opcode)
- {
- case LOPC_ADD:
- resultf = lside + rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_SUB:
- resultf = lside - rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_MUL:
- resultf = lside * rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_DIV:
- if (rside)
- resultf = lside / rside;
- else
- set_fault(buffer, LSRF_MATH);
- lscript_push(buffer, resultf);
- break;
- case LOPC_EQ:
- resulti = (lside == rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = (lside != rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_LEQ:
- resulti = (lside <= rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_GEQ:
- resulti = (lside >= rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_LESS:
- resulti = (lside < rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_GREATER:
- resulti = (lside > rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void float_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- F32 lside = lscript_pop_float(buffer);
- LLVector3 rside;
- lscript_pop_vector(buffer, rside);
-
- switch(opcode)
- {
- case LOPC_MUL:
- rside *= lside;
- lscript_push(buffer, rside);
- break;
- default:
- break;
- }
-}
-
-void string_string_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 resulti;
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- address = lsa_cat_strings(buffer, lside, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- break;
- case LOPC_EQ:
- resulti = !lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void string_key_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 resulti;
-
- switch(opcode)
- {
- case LOPC_NEQ:
- resulti = lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_EQ:
- resulti = !lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void key_string_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 resulti;
-
- switch(opcode)
- {
- case LOPC_NEQ:
- resulti = lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_EQ:
- resulti = !lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void key_key_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 resulti;
-
- switch(opcode)
- {
- case LOPC_EQ:
- resulti = !lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = lsa_cmp_strings(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void vector_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLVector3 lside;
- lscript_pop_vector(buffer, lside);
- S32 rside = lscript_pop_int(buffer);
-
- switch(opcode)
- {
- case LOPC_MUL:
- lside *= (F32)rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_DIV:
- if (rside)
- lside *= (1.f/rside);
- else
- set_fault(buffer, LSRF_MATH);
- lscript_push(buffer, lside);
- break;
- default:
- break;
- }
-}
-
-void vector_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLVector3 lside;
- lscript_pop_vector(buffer, lside);
- F32 rside = lscript_pop_float(buffer);
-
- switch(opcode)
- {
- case LOPC_MUL:
- lside *= rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_DIV:
- if (rside)
- lside *= (1.f/rside);
- else
- set_fault(buffer, LSRF_MATH);
- lscript_push(buffer, lside);
- break;
- default:
- break;
- }
-}
-
-void vector_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLVector3 lside;
- lscript_pop_vector(buffer, lside);
- LLVector3 rside;
- lscript_pop_vector(buffer, rside);
- S32 resulti = 0;
- F32 resultf = 0.f;
-
- switch(opcode)
- {
- case LOPC_ADD:
- lside += rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_SUB:
- lside -= rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_MUL:
- resultf = lside * rside;
- lscript_push(buffer, resultf);
- break;
- case LOPC_MOD:
- lside = lside % rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_EQ:
- resulti = (lside == rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = (lside != rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void vector_quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLVector3 lside;
- lscript_pop_vector(buffer, lside);
- LLQuaternion rside;
- lscript_pop_quaternion(buffer, rside);
-
- switch(opcode)
- {
- case LOPC_MUL:
- lside = lside * rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_DIV:
- lside = lside * rside.conjQuat();
- lscript_push(buffer, lside);
- break;
- default:
- break;
- }
-}
-
-void quaternion_quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLQuaternion lside;
- lscript_pop_quaternion(buffer, lside);
- LLQuaternion rside;
- lscript_pop_quaternion(buffer, rside);
- S32 resulti = 0;
-
- switch(opcode)
- {
- case LOPC_ADD:
- lside = lside + rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_SUB:
- lside = lside - rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_MUL:
- lside *= rside;
- lscript_push(buffer, lside);
- break;
- case LOPC_DIV:
- lside = lside * rside.conjQuat();
- lscript_push(buffer, lside);
- break;
- case LOPC_EQ:
- resulti = (lside == rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = (lside != rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-void integer_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(lside);
- address = lsa_preadd_lists(buffer, list, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- list->mListp = NULL;
- delete list;
- }
- break;
- default:
- break;
- }
-}
-
-void float_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- F32 lside = lscript_pop_float(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(lside);
- address = lsa_preadd_lists(buffer, list, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- list->mListp = NULL;
- delete list;
- }
- break;
- default:
- break;
- }
-}
-
-void string_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *string = lsa_get_data(buffer, lside, TRUE);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = string;
- address = lsa_preadd_lists(buffer, list, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- list->mListp = NULL;
- delete list;
- }
- break;
- default:
- break;
- }
-}
-
-void key_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *key = lsa_get_data(buffer, lside, TRUE);
- // need to convert key to key, since it comes out like a string
- if (key->mType == LST_STRING)
- {
- key->mKey = key->mString;
- key->mString = NULL;
- key->mType = LST_KEY;
- }
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = key;
- address = lsa_preadd_lists(buffer, list, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- list->mListp = NULL;
- delete list;
- }
- break;
- default:
- break;
- }
-}
-
-void vector_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLVector3 lside;
- lscript_pop_vector(buffer, lside);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(lside);
- address = lsa_preadd_lists(buffer, list, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- list->mListp = NULL;
- delete list;
- }
- break;
- default:
- break;
- }
-}
-
-void quaternion_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLQuaternion lside;
- lscript_pop_quaternion(buffer, lside);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(lside);
- address = lsa_preadd_lists(buffer, list, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- list->mListp = NULL;
- delete list;
- }
- break;
- default:
- break;
- }
-}
-
-void list_integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(rside);
- address = lsa_postadd_lists(buffer, lside, list, get_max_heap_size(buffer));
- list->mListp = NULL;
- delete list;
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
-}
-
-void list_float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- F32 rside = lscript_pop_float(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(rside);
- address = lsa_postadd_lists(buffer, lside, list, get_max_heap_size(buffer));
- list->mListp = NULL;
- delete list;
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
-}
-
-void list_string_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *string = lsa_get_data(buffer, rside, TRUE);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = string;
- address = lsa_postadd_lists(buffer, lside, list, get_max_heap_size(buffer));
- list->mListp = NULL;
- delete list;
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
-}
-
-void list_key_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *key = lsa_get_data(buffer, rside, TRUE);
- // need to convert key to key, since it comes out like a string
- if (key->mType == LST_STRING)
- {
- key->mKey = key->mString;
- key->mString = NULL;
- key->mType = LST_KEY;
- }
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = key;
- address = lsa_postadd_lists(buffer, lside, list, get_max_heap_size(buffer));
- list->mListp = NULL;
- delete list;
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
-}
-
-void list_vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- LLVector3 rside;
- lscript_pop_vector(buffer, rside);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(rside);
- address = lsa_postadd_lists(buffer, lside, list, get_max_heap_size(buffer));
- list->mListp = NULL;
- delete list;
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
-}
-
-void list_quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- LLQuaternion rside;
- lscript_pop_quaternion(buffer, rside);
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- {
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(rside);
- address = lsa_postadd_lists(buffer, lside, list, get_max_heap_size(buffer));
- list->mListp = NULL;
- delete list;
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
-}
-
-void list_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 rside = lscript_pop_int(buffer);
- S32 resulti;
- S32 address;
-
- switch(opcode)
- {
- case LOPC_ADD:
- address = lsa_cat_lists(buffer, lside, rside, get_max_heap_size(buffer));
- lscript_push(buffer, address);
- break;
- case LOPC_EQ:
- resulti = !lsa_cmp_lists(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- case LOPC_NEQ:
- resulti = lsa_cmp_lists(buffer, lside, rside);
- lscript_push(buffer, resulti);
- break;
- default:
- break;
- }
-}
-
-static U8 safe_op_index(U8 index)
-{
- if(index >= LST_EOF)
- {
- // Operations on LST_NULL will always be unknown_operation.
- index = LST_NULL;
- }
- return index;
-}
-
-BOOL run_add(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tADD ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_ADD);
- return FALSE;
-}
-
-BOOL run_sub(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSUB ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_SUB);
- return FALSE;
-}
-BOOL run_mul(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tMUL ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_MUL);
- return FALSE;
-}
-BOOL run_div(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tDIV ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_DIV);
- return FALSE;
-}
-BOOL run_mod(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tMOD ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_MOD);
- return FALSE;
-}
-
-BOOL run_eq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tEQ ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_EQ);
- return FALSE;
-}
-BOOL run_neq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tNEQ ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_NEQ);
- return FALSE;
-}
-BOOL run_leq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tLEQ ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_LEQ);
- return FALSE;
-}
-BOOL run_geq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tGEQ ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_GEQ);
- return FALSE;
-}
-BOOL run_less(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tLESS ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_LESS);
- return FALSE;
-}
-BOOL run_greater(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tGREATER ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 arg1 = safe_op_index(arg >> 4);
- U8 arg2 = safe_op_index(arg & 0xf);
- if (b_print)
- {
- print_type(arg1);
- printf(", ");
- print_type(arg2);
- printf("\n");
- }
- binary_operations[arg1][arg2](buffer, LOPC_GREATER);
- return FALSE;
-}
-
-BOOL run_bitand(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBITAND\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_BITAND);
- return FALSE;
-}
-BOOL run_bitor(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBITOR\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_BITOR);
- return FALSE;
-}
-BOOL run_bitxor(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBITXOR\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_BITXOR);
- return FALSE;
-}
-BOOL run_booland(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBOOLAND\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_BOOLAND);
- return FALSE;
-}
-BOOL run_boolor(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBOOLOR\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_BOOLOR);
- return FALSE;
-}
-
-BOOL run_shl(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSHL\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_SHL);
- return FALSE;
-}
-BOOL run_shr(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSHR\n", offset);
- offset++;
- binary_operations[LST_INTEGER][LST_INTEGER](buffer, LOPC_SHR);
- return FALSE;
-}
-
-void integer_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- S32 lside = lscript_pop_int(buffer);
- S32 result = 0;
-
- switch(opcode)
- {
- case LOPC_NEG:
- result = -lside;
- break;
- case LOPC_BITNOT:
- result = ~lside;
- break;
- case LOPC_BOOLNOT:
- result = !lside;
- break;
- default:
- break;
- }
- lscript_push(buffer, result);
-}
-
-void float_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- F32 lside = lscript_pop_float(buffer);
- F32 result = 0;
-
- switch(opcode)
- {
- case LOPC_NEG:
- result = -lside;
- lscript_push(buffer, result);
- break;
- default:
- break;
- }
-}
-
-void vector_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLVector3 lside;
- lscript_pop_vector(buffer, lside);
- LLVector3 result;
-
- switch(opcode)
- {
- case LOPC_NEG:
- result = -lside;
- lscript_push(buffer, result);
- break;
- default:
- break;
- }
-}
-
-void quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
-{
- LLQuaternion lside;
- lscript_pop_quaternion(buffer, lside);
- LLQuaternion result;
-
- switch(opcode)
- {
- case LOPC_NEG:
- result = -lside;
- lscript_push(buffer, result);
- break;
- default:
- break;
- }
-}
-
-BOOL run_neg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tNEG ", offset);
- offset++;
- U8 arg = safe_op_index(safe_instruction_bytestream2byte(buffer, offset));
- if (b_print)
- {
- print_type(arg);
- printf("\n");
- }
- unary_operations[arg](buffer, LOPC_NEG);
- return FALSE;
-}
-
-BOOL run_bitnot(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBITNOT\n", offset);
- offset++;
- unary_operations[LST_INTEGER](buffer, LOPC_BITNOT);
- return FALSE;
-}
-
-BOOL run_boolnot(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tBOOLNOT\n", offset);
- offset++;
- unary_operations[LST_INTEGER](buffer, LOPC_BOOLNOT);
- return FALSE;
-}
-
-BOOL run_jump(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tJUMP ", offset);
- offset++;
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
- offset += arg;
- return FALSE;
-}
-
-BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tJUMPIF ", offset);
- offset++;
- U8 type = safe_instruction_bytestream2byte(buffer, offset);
- if (b_print)
- {
- print_type(type);
- printf(", ");
- }
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
-
- if (type == LST_INTEGER)
- {
- S32 test = lscript_pop_int(buffer);
- if (test)
- {
- offset += arg;
- }
- }
- else if (type == LST_FLOATINGPOINT)
- {
- F32 test = lscript_pop_float(buffer);
- if (test)
- {
- offset += arg;
- }
- }
- else if (type == LST_VECTOR)
- {
- LLVector3 test;
- lscript_pop_vector(buffer, test);
- if (!test.isExactlyZero())
- {
- offset += arg;
- }
- }
- else if (type == LST_QUATERNION)
- {
- LLQuaternion test;
- lscript_pop_quaternion(buffer, test);
- if (!test.isIdentity())
- {
- offset += arg;
- }
- }
- else if (type == LST_STRING)
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to
- // local variables can result in lack of initialization and
- // function clean up of ref counts isn't based on scope (a
- // mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *sdata = new char[size];
- bytestream2char(sdata, buffer, string, size);
- if (strlen(sdata)) /*Flawfinder: ignore*/
- {
- offset += arg;
- }
- delete [] sdata;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- else if (type == LST_KEY)
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to
- // local variables can result in lack of initialization and
- // function clean up of ref counts isn't based on scope (a
- // mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *sdata = new char[size];
- bytestream2char(sdata, buffer, string, size);
- if (strlen(sdata)) /*Flawfinder: ignore*/
- {
- LLUUID id;
- if (id.set(sdata) && id.notNull())
- offset += arg;
- }
- delete [] sdata;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- else if (type == LST_LIST)
- {
- S32 base_address = lscript_pop_int(buffer);
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- if (safe_heap_check_address(buffer, address + SIZEOF_SCRIPT_ALLOC_ENTRY, 1))
- {
- LLScriptLibData *list = lsa_get_list_ptr(buffer, base_address, TRUE);
- if (list && list->getListLength())
- {
- offset += arg;
- }
- delete list;
- }
- }
- }
- return FALSE;
-}
-
-BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tJUMPNIF ", offset);
- offset++;
- U8 type = safe_instruction_bytestream2byte(buffer, offset);
- if (b_print)
- {
- print_type(type);
- printf(", ");
- }
- S32 arg = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", arg);
-
- if (type == LST_INTEGER)
- {
- S32 test = lscript_pop_int(buffer);
- if (!test)
- {
- offset += arg;
- }
- }
- else if (type == LST_FLOATINGPOINT)
- {
- F32 test = lscript_pop_float(buffer);
- if (!test)
- {
- offset += arg;
- }
- }
- else if (type == LST_VECTOR)
- {
- LLVector3 test;
- lscript_pop_vector(buffer, test);
- if (test.isExactlyZero())
- {
- offset += arg;
- }
- }
- else if (type == LST_QUATERNION)
- {
- LLQuaternion test;
- lscript_pop_quaternion(buffer, test);
- if (test.isIdentity())
- {
- offset += arg;
- }
- }
- else if (type == LST_STRING)
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to
- // local variables can result in lack of initialization and
- // function clean up of ref counts isn't based on scope (a
- // mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *sdata = new char[size];
- bytestream2char(sdata, buffer, string, size);
- if (!strlen(sdata)) /*Flawfinder: ignore*/
- {
- offset += arg;
- }
- delete [] sdata;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- else if (type == LST_KEY)
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to
- // local variables can result in lack of initialization and
- // function clean up of ref counts isn't based on scope (a
- // mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *sdata = new char[size];
- bytestream2char(sdata, buffer, string, size);
- if (strlen(sdata)) /*Flawfinder: ignore*/
- {
- LLUUID id;
- if (!id.set(sdata) || id.isNull())
- offset += arg;
- }
- else
- {
- offset += arg;
- }
- delete [] sdata;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- else if (type == LST_LIST)
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to
- // local variables can result in lack of initialization and
- // function clean up of ref counts isn't based on scope (a
- // mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- if (safe_heap_check_address(buffer, address + SIZEOF_SCRIPT_ALLOC_ENTRY, 1))
- {
- LLScriptLibData *list = lsa_get_list_ptr(buffer, base_address, TRUE);
- if (!list || !list->getListLength())
- {
- offset += arg;
- }
- delete list;
- }
- }
- }
- return FALSE;
-}
-
-BOOL run_state(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tSTATE ", offset);
- offset++;
- S32 state = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", state);
-
- S32 bp = lscript_pop_int(buffer);
- set_bp(buffer, bp);
-
- offset = lscript_pop_int(buffer);
-
- S32 major_version = 0;
- S32 value = get_register(buffer, LREG_VN);
- if (value == LSL2_VERSION1_END_NUMBER)
- {
- major_version = 1;
- }
- else if (value == LSL2_VERSION_NUMBER)
- {
- major_version = 2;
- }
-
- S32 current_state = get_register(buffer, LREG_CS);
- if (state != current_state)
- {
- U64 ce = get_event_register(buffer, LREG_CE, major_version);
- ce |= LSCRIPTStateBitField[LSTT_STATE_EXIT];
- set_event_register(buffer, LREG_CE, ce, major_version);
- }
- set_register(buffer, LREG_NS, state);
- return FALSE;
-}
-
-BOOL run_call(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tCALL ", offset);
- offset++;
- S32 func = safe_instruction_bytestream2integer(buffer, offset);
- if (b_print)
- printf("%d\n", func);
-
- lscript_local_store(buffer, -8, offset);
-
- S32 minimum = get_register(buffer, LREG_GFR);
- S32 maximum = get_register(buffer, LREG_SR);
- S32 lookup = minimum + func*4 + 4;
- S32 function;
-
- if ( (lookup >= minimum)
- &&(lookup < maximum))
- {
- function = bytestream2integer(buffer, lookup) + minimum;
- if ( (lookup >= minimum)
- &&(lookup < maximum))
- {
- offset = function;
- offset += bytestream2integer(buffer, function);
- }
- else
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- }
- }
- else
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- }
- return FALSE;
-}
-
-BOOL run_return(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tRETURN\n", offset);
- offset++;
-
- // SEC-53: babbage: broken instructions may allow inbalanced pushes and
- // pops which can cause caller BP and return IP to be corrupted, so restore
- // SP from BP before popping caller BP and IP.
- S32 bp = get_register(buffer, LREG_BP);
- set_sp(buffer, bp);
-
- bp = lscript_pop_int(buffer);
- set_bp(buffer, bp);
- offset = lscript_pop_int(buffer);
- return FALSE;
-}
-
-
-
-BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- char caststr[1024]; /*Flawfinder: ignore*/
- if (b_print)
- printf("[0x%X]\tCAST ", offset);
- offset++;
- U8 arg = safe_instruction_bytestream2byte(buffer, offset);
- U8 from = arg >> 4;
- U8 to = arg & 0xf;
- if (b_print)
- {
- print_type(from);
- printf(", ");
- print_type(to);
- printf("\n");
- }
-
- switch(from)
- {
- case LST_INTEGER:
- {
- switch(to)
- {
- case LST_INTEGER:
- break;
- case LST_FLOATINGPOINT:
- {
- S32 source = lscript_pop_int(buffer);
- F32 dest = (F32)source;
- lscript_push(buffer, dest);
- }
- break;
- case LST_STRING:
- {
- S32 address, source = lscript_pop_int(buffer);
- snprintf(caststr, sizeof(caststr), "%d", source); /* Flawfinder: ignore */
- address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- case LST_LIST:
- {
- S32 address, source = lscript_pop_int(buffer);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(source);
- address = lsa_heap_add_data(buffer, list, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
- }
- break;
- case LST_FLOATINGPOINT:
- {
- switch(to)
- {
- case LST_INTEGER:
- {
- F32 source = lscript_pop_float(buffer);
- S32 dest = (S32)source;
- lscript_push(buffer, dest);
- }
- break;
- case LST_FLOATINGPOINT:
- break;
- case LST_STRING:
- {
- S32 address;
- F32 source = lscript_pop_float(buffer);
- snprintf(caststr, sizeof(caststr), "%f", source); /* Flawfinder: ignore */
- address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- case LST_LIST:
- {
- S32 address;
- F32 source = lscript_pop_float(buffer);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(source);
- address = lsa_heap_add_data(buffer, list, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
- }
- break;
- case LST_STRING:
- {
- switch(to)
- {
- case LST_INTEGER:
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *arg = new char[size];
- bytestream2char(arg, buffer, string, size);
- // S32 length = strlen(arg);
- S32 dest;
- S32 base;
-
- // Check to see if this is a hexidecimal number.
- if ( (arg[0] == '0') &&
- (arg[1] == 'x' || arg[1] == 'X') )
- {
- // Let strtoul do a hex conversion.
- base = 16;
- }
- else
- {
- // Force base-10, so octal is never used.
- base = 10;
- }
-
- dest = strtoul(arg, NULL, base);
-
- lscript_push(buffer, dest);
- delete [] arg;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- break;
- case LST_FLOATINGPOINT:
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *arg = new char[size];
- bytestream2char(arg, buffer, string, size);
- F32 dest = (F32)atof(arg);
-
-
- lscript_push(buffer, dest);
- delete [] arg;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- break;
- case LST_STRING:
- break;
- case LST_LIST:
- {
- S32 saddress = lscript_pop_int(buffer);
- LLScriptLibData *string = lsa_get_data(buffer, saddress, TRUE);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = string;
- S32 address = lsa_heap_add_data(buffer, list, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- case LST_VECTOR:
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *arg = new char[size];
- bytestream2char(arg, buffer, string, size);
- LLVector3 vec;
- S32 num = sscanf(arg, "<%f, %f, %f>", &vec.mV[VX], &vec.mV[VY], &vec.mV[VZ]);
- if (num != 3)
- {
- vec = LLVector3::zero;
- }
- lscript_push(buffer, vec);
- delete [] arg;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- break;
- case LST_QUATERNION:
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *arg = new char[size];
- bytestream2char(arg, buffer, string, size);
- LLQuaternion quat;
- S32 num = sscanf(arg, "<%f, %f, %f, %f>", &quat.mQ[VX], &quat.mQ[VY], &quat.mQ[VZ], &quat.mQ[VW]);
- if (num != 4)
- {
- quat = LLQuaternion::DEFAULT;
-
- }
- lscript_push(buffer, quat);
- delete [] arg;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- break;
- default:
- break;
- }
- }
- break;
- case LST_KEY:
- {
- switch(to)
- {
- case LST_KEY:
- break;
- case LST_STRING:
- break;
- case LST_LIST:
- {
- S32 saddress = lscript_pop_int(buffer);
- LLScriptLibData *string = lsa_get_data(buffer, saddress, TRUE);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = string;
- S32 address = lsa_heap_add_data(buffer, list, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
- }
- break;
- case LST_VECTOR:
- {
- switch(to)
- {
- case LST_VECTOR:
- break;
- case LST_STRING:
- {
- S32 address;
- LLVector3 source;
- lscript_pop_vector(buffer, source);
- snprintf(caststr, sizeof(caststr), "<%5.5f, %5.5f, %5.5f>", source.mV[VX], source.mV[VY], source.mV[VZ]); /* Flawfinder: ignore */
- address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- case LST_LIST:
- {
- S32 address;
- LLVector3 source;
- lscript_pop_vector(buffer, source);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(source);
- address = lsa_heap_add_data(buffer, list, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
- }
- break;
- case LST_QUATERNION:
- {
- switch(to)
- {
- case LST_QUATERNION:
- break;
- case LST_STRING:
- {
- S32 address;
- LLQuaternion source;
- lscript_pop_quaternion(buffer, source);
- snprintf(caststr, sizeof(caststr), "<%5.5f, %5.5f, %5.5f, %5.5f>", source.mQ[VX], source.mQ[VY], source.mQ[VZ], source.mQ[VS]); /* Flawfinder: ignore */
- address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- case LST_LIST:
- {
- S32 address;
- LLQuaternion source;
- lscript_pop_quaternion(buffer, source);
- LLScriptLibData *list = new LLScriptLibData;
- list->mType = LST_LIST;
- list->mListp = new LLScriptLibData(source);
- address = lsa_heap_add_data(buffer, list, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- }
- break;
- default:
- break;
- }
- }
- break;
- case LST_LIST:
- {
- switch(to)
- {
- case LST_LIST:
- break;
- case LST_STRING:
- {
- S32 address = lscript_pop_int(buffer);
- LLScriptLibData *list = lsa_get_data(buffer, address, TRUE);
- LLScriptLibData *list_root = list;
-
- std::ostringstream dest;
- while (list)
- {
- list->print(dest, FALSE);
- list = list->mListp;
- }
- delete list_root;
- char *tmp = strdup(dest.str().c_str());
- LLScriptLibData *string = new LLScriptLibData(tmp);
- free(tmp);
- tmp = NULL;
- S32 destaddress = lsa_heap_add_data(buffer, string, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, destaddress);
- }
- break;
- default:
- break;
- }
- }
- break;
- default:
- break;
- }
- return FALSE;
-}
-
-BOOL run_stacktos(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- offset++;
- S32 length = lscript_pop_int(buffer);
- S32 i;
- char *arg = new char[length];
- S32 fault;
- for (i = 0; i < length; i++)
- {
- fault = get_register(buffer, LREG_FR);
- if (fault)
- break;
-
- arg[length - i - 1] = lscript_pop_char(buffer);
- }
- S32 address = lsa_heap_add_data(buffer, new LLScriptLibData(arg), get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- delete [] arg;
- return FALSE;
-}
-
-void lscript_stacktol_pop_variable(LLScriptLibData *data, U8 *buffer, char type)
-{
- S32 address, string;
- S32 base_address;
-
- switch(type)
- {
- case LST_INTEGER:
- data->mType = LST_INTEGER;
- data->mInteger = lscript_pop_int(buffer);
- break;
- case LST_FLOATINGPOINT:
- data->mType = LST_FLOATINGPOINT;
- data->mFP = lscript_pop_float(buffer);
- break;
- case LST_KEY:
- data->mType = LST_KEY;
-
- base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- address = base_address + get_register(buffer, LREG_HR) - 1;
-
- if (address)
- {
- string = address + SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- data->mKey = new char[size];
- bytestream2char(data->mKey, buffer, string, size);
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- else
- {
- data->mKey = new char[1];
- data->mKey[0] = 0;
- }
- break;
- case LST_STRING:
- data->mType = LST_STRING;
-
- base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- address = base_address + get_register(buffer, LREG_HR) - 1;
-
- if (address)
- {
- string = address + SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- data->mString = new char[size];
- bytestream2char(data->mString, buffer, string, size);
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- else
- {
- data->mString = new char[1];
- data->mString[0] = 0;
- }
- break;
- case LST_VECTOR:
- data->mType = LST_VECTOR;
- lscript_pop_vector(buffer, data->mVec);
- break;
- case LST_QUATERNION:
- data->mType = LST_QUATERNION;
- lscript_pop_quaternion(buffer, data->mQuat);
- break;
- case LST_LIST:
- data->mType = LST_LIST;
- address = lscript_pop_int(buffer);
- data->mListp = lsa_get_data(buffer, address, TRUE);
- break;
- }
-}
-
-BOOL run_stacktol(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- offset++;
- S32 length = safe_instruction_bytestream2integer(buffer, offset);
- S32 i;
- S32 fault;
-
- S8 type;
-
- LLScriptLibData *data = new LLScriptLibData, *tail;
- data->mType = LST_LIST;
-
- for (i = 0; i < length; i++)
- {
- fault = get_register(buffer, LREG_FR);
- if (fault)
- break;
-
- type = lscript_pop_char(buffer);
-
- tail = new LLScriptLibData;
-
- lscript_stacktol_pop_variable(tail, buffer, type);
-
- tail->mListp = data->mListp;
- data->mListp = tail;
- }
- S32 address = lsa_heap_add_data(buffer,data, get_max_heap_size(buffer), TRUE);
- lscript_push(buffer, address);
- return FALSE;
-}
-
-BOOL run_print(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- if (b_print)
- printf("[0x%X]\tPRINT ", offset);
- offset++;
- U8 type = safe_instruction_bytestream2byte(buffer, offset);
- if (b_print)
- {
- print_type(type);
- printf("\n");
- }
- switch(type)
- {
- case LST_INTEGER:
- {
- S32 source = lscript_pop_int(buffer);
- printf("%d\n", source);
- }
- break;
- case LST_FLOATINGPOINT:
- {
- F32 source = lscript_pop_float(buffer);
- printf("%f\n", source);
- }
- break;
- case LST_STRING:
- {
- S32 base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- S32 address = base_address + get_register(buffer, LREG_HR) - 1;
-
- if (address)
- {
- S32 string = address;
- string += SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- char *arg = new char[size];
- bytestream2char(arg, buffer, string, size);
- printf("%s\n", arg);
- delete [] arg;
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- }
- break;
- case LST_VECTOR:
- {
- LLVector3 source;
- lscript_pop_vector(buffer, source);
- printf("< %f, %f, %f >\n", source.mV[VX], source.mV[VY], source.mV[VZ]);
- }
- break;
- case LST_QUATERNION:
- {
- LLQuaternion source;
- lscript_pop_quaternion(buffer, source);
- printf("< %f, %f, %f, %f >\n", source.mQ[VX], source.mQ[VY], source.mQ[VZ], source.mQ[VS]);
- }
- break;
- case LST_LIST:
- {
- S32 base_address = lscript_pop_int(buffer);
- LLScriptLibData *data = lsa_get_data(buffer, base_address, TRUE);
- LLScriptLibData *print = data;
-
- printf("list\n");
-
- while (print)
- {
- switch(print->mType)
- {
- case LST_INTEGER:
- {
- printf("%d\n", print->mInteger);
- }
- break;
- case LST_FLOATINGPOINT:
- {
- printf("%f\n", print->mFP);
- }
- break;
- case LST_STRING:
- {
- printf("%s\n", print->mString);
- }
- break;
- case LST_KEY:
- {
- printf("%s\n", print->mKey);
- }
- break;
- case LST_VECTOR:
- {
- printf("< %f, %f, %f >\n", print->mVec.mV[VX], print->mVec.mV[VY], print->mVec.mV[VZ]);
- }
- break;
- case LST_QUATERNION:
- {
- printf("< %f, %f, %f, %f >\n", print->mQuat.mQ[VX], print->mQuat.mQ[VY], print->mQuat.mQ[VZ], print->mQuat.mQ[VS]);
- }
- break;
- default:
- break;
- }
- print = print->mListp;
- }
- delete data;
- }
- break;
- default:
- break;
- }
- return FALSE;
-}
-
-
-void lscript_run(const std::string& filename, BOOL b_debug)
-{
- LLTimer timer;
-
- const char *error;
- LLScriptExecuteLSL2 *execute = NULL;
-
- if (filename.empty())
- {
- LL_ERRS() << "filename is NULL" << LL_ENDL;
- // Just reporting error is likely not enough. Need
- // to check how to abort or error out gracefully
- // from this function. XXXTBD
- }
- LLFILE* file = LLFile::fopen(filename, "r"); /* Flawfinder: ignore */
- if(file)
- {
- execute = new LLScriptExecuteLSL2(file);
- fclose(file);
- }
- if (execute)
- {
- timer.reset();
- F32 time_slice = 3600.0f; // 1 hr.
- U32 events_processed = 0;
-
- do {
- LLTimer timer2;
- execute->runQuanta(b_debug, LLUUID::null, &error,
- time_slice, events_processed, timer2);
- } while (!execute->isFinished());
-
- F32 time = timer.getElapsedTimeF32();
- F32 ips = execute->mInstructionCount / time;
- LL_INFOS() << execute->mInstructionCount << " instructions in " << time << " seconds" << LL_ENDL;
- LL_INFOS() << ips/1000 << "K instructions per second" << LL_ENDL;
- printf("ip: 0x%X\n", get_register(execute->mBuffer, LREG_IP));
- printf("sp: 0x%X\n", get_register(execute->mBuffer, LREG_SP));
- printf("bp: 0x%X\n", get_register(execute->mBuffer, LREG_BP));
- printf("hr: 0x%X\n", get_register(execute->mBuffer, LREG_HR));
- printf("hp: 0x%X\n", get_register(execute->mBuffer, LREG_HP));
- delete execute;
- fclose(file);
- }
-}
-
-void lscript_pop_variable(LLScriptLibData *data, U8 *buffer, char type)
-{
- S32 address, string;
- S32 base_address;
-
- switch(type)
- {
- case 'i':
- data->mType = LST_INTEGER;
- data->mInteger = lscript_pop_int(buffer);
- break;
- case 'f':
- data->mType = LST_FLOATINGPOINT;
- data->mFP = lscript_pop_float(buffer);
- break;
- case 'k':
- data->mType = LST_KEY;
- data->mKey = NULL;
-
- base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- address = base_address + get_register(buffer, LREG_HR) - 1;
-
- if (address)
- {
- string = address + SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- data->mKey = new char[size];
- bytestream2char(data->mKey, buffer, string, size);
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- if (data->mKey == NULL)
- {
- data->mKey = new char[1];
- data->mKey[0] = 0;
- }
- break;
- case 's':
- data->mType = LST_STRING;
- data->mString = NULL;
-
- base_address = lscript_pop_int(buffer);
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- address = base_address + get_register(buffer, LREG_HR) - 1;
-
- if (address)
- {
- string = address + SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (safe_heap_check_address(buffer, string, 1))
- {
- S32 toffset = string;
- safe_heap_bytestream_count_char(buffer, toffset);
- S32 size = toffset - string;
- data->mString = new char[size];
- bytestream2char(data->mString, buffer, string, size);
- }
- lsa_decrease_ref_count(buffer, base_address);
- }
- if (data->mString == NULL)
- {
- data->mString = new char[1];
- data->mString[0] = 0;
- }
- break;
- case 'l':
- {
- S32 base_address = lscript_pop_int(buffer);
- data->mType = LST_LIST;
- data->mListp = lsa_get_list_ptr(buffer, base_address, TRUE);
- }
- break;
- case 'v':
- data->mType = LST_VECTOR;
- lscript_pop_vector(buffer, data->mVec);
- break;
- case 'q':
- data->mType = LST_QUATERNION;
- lscript_pop_quaternion(buffer, data->mQuat);
- break;
- }
-}
-
-void lscript_push_return_variable(LLScriptLibData *data, U8 *buffer)
-{
- S32 address;
- switch(data->mType)
- {
- case LST_INTEGER:
- lscript_local_store(buffer, -12, data->mInteger);
- break;
- case LST_FLOATINGPOINT:
- lscript_local_store(buffer, -12, data->mFP);
- break;
- case LST_KEY:
- address = lsa_heap_add_data(buffer, data, get_max_heap_size(buffer), FALSE);
- lscript_local_store(buffer, -12, address);
- break;
- case LST_STRING:
- address = lsa_heap_add_data(buffer, data, get_max_heap_size(buffer), FALSE);
- lscript_local_store(buffer, -12, address);
- break;
- case LST_LIST:
- address = lsa_heap_add_data(buffer, data, get_max_heap_size(buffer), FALSE);
- lscript_local_store(buffer, -12, address);
- break;
- case LST_VECTOR:
- lscript_local_store(buffer, -20, data->mVec);
- break;
- case LST_QUATERNION:
- lscript_local_store(buffer, -24, data->mQuat);
- break;
- default:
- break;
- }
-}
-
-S32 lscript_push_variable(LLScriptLibData *data, U8 *buffer)
-{
- S32 address;
- switch(data->mType)
- {
- case LST_INTEGER:
- lscript_push(buffer, data->mInteger);
- break;
- case LST_FLOATINGPOINT:
- lscript_push(buffer, data->mFP);
- return 4;
- break;
- case LST_KEY:
- address = lsa_heap_add_data(buffer, data, get_max_heap_size(buffer), FALSE);
- lscript_push(buffer, address);
- return 4;
- break;
- case LST_STRING:
- address = lsa_heap_add_data(buffer, data, get_max_heap_size(buffer), FALSE);
- lscript_push(buffer, address);
- return 4;
- break;
- case LST_LIST:
- address = lsa_heap_add_data(buffer, data, get_max_heap_size(buffer), FALSE);
- lscript_push(buffer, address);
- return 4;
- break;
- case LST_VECTOR:
- lscript_push(buffer, data->mVec);
- return 12;
- break;
- case LST_QUATERNION:
- lscript_push(buffer, data->mQuat);
- return 16;
- break;
- default:
- break;
- }
- return 4;
-}
-
-
-// Shared code for run_calllib() and run_calllib_two_byte()
-BOOL run_calllib_common(U8 *buffer, S32 &offset, const LLUUID &id, U16 arg)
-{
- if (arg >= gScriptLibrary.mFunctions.size())
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- return FALSE;
- }
- LLScriptLibraryFunction const & function = gScriptLibrary.mFunctions[arg];
-
- // pull out the arguments and the return values
- LLScriptLibData *arguments = NULL;
- LLScriptLibData *returnvalue = NULL;
-
- S32 i, number;
-
- if (function.mReturnType)
- {
- returnvalue = new LLScriptLibData;
- }
-
- if (function.mArgs)
- {
- number = (S32)strlen(function.mArgs); //Flawfinder: ignore
- arguments = new LLScriptLibData[number];
- }
- else
- {
- number = 0;
- }
-
- for (i = number - 1; i >= 0; i--)
- {
- lscript_pop_variable(&arguments[i], buffer, function.mArgs[i]);
- }
-
- // Actually execute the function call
- function.mExecFunc(returnvalue, arguments, id);
-
- add_register_fp(buffer, LREG_ESR, -(function.mEnergyUse));
- add_register_fp(buffer, LREG_SLR, function.mSleepTime);
-
- if (returnvalue)
- {
- returnvalue->mType = char2type(*function.mReturnType);
- lscript_push_return_variable(returnvalue, buffer);
- }
-
- delete [] arguments;
- delete returnvalue;
-
- // reset the BP after calling the library files
- S32 bp = lscript_pop_int(buffer);
- set_bp(buffer, bp);
-
- // pop off the spot for the instruction pointer
- lscript_poparg(buffer, 4);
- return FALSE;
-}
-
-
-BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- offset++;
- U16 arg = (U16) safe_instruction_bytestream2byte(buffer, offset);
- if (b_print &&
- arg < gScriptLibrary.mFunctions.size())
- {
- printf("[0x%X]\tCALLLIB ", offset);
- LLScriptLibraryFunction const & function = gScriptLibrary.mFunctions[arg];
- printf("%d (%s)\n", (U32)arg, function.mName);
- //printf("%s\n", function.mDesc);
- }
- return run_calllib_common(buffer, offset, id, arg);
-}
-
-BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
-{
- offset++;
- U16 arg = safe_instruction_bytestream2u16(buffer, offset);
- if (b_print &&
- arg < gScriptLibrary.mFunctions.size())
- {
- printf("[0x%X]\tCALLLIB ", (offset-1));
- LLScriptLibraryFunction const & function = gScriptLibrary.mFunctions[arg];
- printf("%d (%s)\n", (U32)arg, function.mName);
- //printf("%s\n", function.mDesc);
- }
- return run_calllib_common(buffer, offset, id, arg);
-}
diff --git a/indra/lscript/lscript_execute/lscript_heapruntime.cpp b/indra/lscript/lscript_execute/lscript_heapruntime.cpp
deleted file mode 100755
index 749857753d437862286dcca14d2a41d5ba21f9eb..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/lscript_heapruntime.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-/**
- * @file lscript_heapruntime.cpp
- * @brief classes to manage script heap at runtime
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#if 0
-
-#include "linden_common.h"
-
-#include "lscript_heapruntime.h"
-#include "lscript_execute.h"
-
-
-/*
- String Heap Format
- Byte Description
- 0x0 - 0xnn Single byte string including null terminator
-
- List Heap Format
- Byte Description
- 0x0 Next Entry Type
- 0: End of list
- 1: Integer
- 2: Floating point
- 3: String
- 4: Vector
- 5: Quaternion
- 6: List
- 0x1 - 0x4 Integer, Floating Point, String Address, List Address
- or
- 0x1 - 0xd Vector
- or
- 0x1 - 0x11 Quaternion
- . . .
-
- Heap Block Format
- Byte Description
- 0x0 - 0x3 Offset to Next Block
- 0x4 - 0x7 Object Reference Count
- 0x8 Block Type
- 0: Empty
- 3: String
- 6: List
- 0x9 - 0xM Object Data
-
- Heap Management
-
- Adding Data
-
- 1) Set last empty spot to zero.
- 2) Go to start of the heap (HR).
- 3) Get next 4 bytes of offset.
- 4) If zero, we've reached the end of used memory. If empty spot is zero go to step 9. Otherwise set base offset to 0 and go to step 9.
- 5) Skip 4 bytes.
- 6) Get next 1 byte of entry type.
- 7) If zero, this spot is empty. If empty spot is zero, set empty spot to this address and go to step 9. Otherwise, coalesce with last empty spot and then go to step 9.
- 8) Skip forward by offset and go to step 3.
- 9) If the spot is empty, check to see if the size needed == offset - 9.
- 10) If it does, let's drop our data into this spot. Set reference count to 1. Set entry type appropriately and copy the data in.
- 11) If size needed < offset - 9 then we can stick in data and add in an empty block.
- 12) Otherwise, we need to keep looking. Go to step 3.
-
- Increasing reference counts
-
- Decreasing reference counts
- 1) Set entry type to 0.
- 2) If offset is non-zero and the next entry is empty, coalesce. Go to step 2.
-
- What increases reference count:
- Initial creation sets reference count to 1.
- Storing the reference increases reference count by 1.
- Pushing the reference increases reference count by 1.
- Duplicating the reference increases reference count by 1.
-
- What decreases the reference count:
- Popping the reference decreases reference count by 1.
- */
-
-
-LLScriptHeapRunTime::LLScriptHeapRunTime()
-: mLastEmpty(0), mBuffer(NULL), mCurrentPosition(0), mStackPointer(0), mHeapRegister(0), mbPrint(FALSE)
-{
-}
-
-LLScriptHeapRunTime::~LLScriptHeapRunTime()
-{
-}
-
-S32 LLScriptHeapRunTime::addData(char *string)
-{
- if (!mBuffer)
- return 0;
-
- S32 size = strlen(string) + 1;
- S32 block_offset = findOpenBlock(size + HEAP_BLOCK_HEADER_SIZE);
-
- if (mCurrentPosition)
- {
- S32 offset = mCurrentPosition;
- if (offset + block_offset + HEAP_BLOCK_HEADER_SIZE + LSCRIPTDataSize[LST_INTEGER] >= mStackPointer)
- {
- set_fault(mBuffer, LSRF_STACK_HEAP_COLLISION);
- return 0;
- }
- // cool, we've found a spot!
- // set offset
- integer2bytestream(mBuffer, offset, block_offset);
- // set reference count
- integer2bytestream(mBuffer, offset, 1);
- // set type
- *(mBuffer + offset++) = LSCRIPTTypeByte[LST_STRING];
- // plug in data
- char2bytestream(mBuffer, offset, string);
- if (mbPrint)
- printf("0x%X created ref count %d\n", mCurrentPosition - mHeapRegister, 1);
-
- // now, zero out next offset to prevent "trouble"
- // offset = mCurrentPosition + size + HEAP_BLOCK_HEADER_SIZE;
- // integer2bytestream(mBuffer, offset, 0);
- }
- return mCurrentPosition;
-}
-
-S32 LLScriptHeapRunTime::addData(U8 *list)
-{
- if (!mBuffer)
- return 0;
- return 0;
-}
-
-S32 LLScriptHeapRunTime::catStrings(S32 address1, S32 address2)
-{
- if (!mBuffer)
- return 0;
-
- S32 dataaddress1 = address1 + 2*LSCRIPTDataSize[LST_INTEGER] + 1;
- S32 dataaddress2 = address2 + 2*LSCRIPTDataSize[LST_INTEGER] + 1;
-
- S32 toffset1 = dataaddress1;
- safe_heap_bytestream_count_char(mBuffer, toffset1);
-
- S32 toffset2 = dataaddress2;
- safe_heap_bytestream_count_char(mBuffer, toffset2);
-
- // calculate new string size
- S32 size1 = toffset1 - dataaddress1;
- S32 size2 = toffset2 - dataaddress2;
- S32 newbuffer = size1 + size2 - 1;
-
- char *temp = new char[newbuffer];
-
- // get the strings
- bytestream2char(temp, mBuffer, dataaddress1);
- bytestream2char(temp + size1 - 1, mBuffer, dataaddress2);
-
- decreaseRefCount(address1);
- decreaseRefCount(address2);
-
- S32 retaddress = addData(temp);
-
- return retaddress;
-}
-
-S32 LLScriptHeapRunTime::cmpStrings(S32 address1, S32 address2)
-{
- if (!mBuffer)
- return 0;
-
- S32 dataaddress1 = address1 + 2*LSCRIPTDataSize[LST_INTEGER] + 1;
- S32 dataaddress2 = address2 + 2*LSCRIPTDataSize[LST_INTEGER] + 1;
-
- S32 toffset1 = dataaddress1;
- safe_heap_bytestream_count_char(mBuffer, toffset1);
-
- S32 toffset2 = dataaddress2;
- safe_heap_bytestream_count_char(mBuffer, toffset2);
-
- // calculate new string size
- S32 size1 = toffset1 - dataaddress1;
- S32 size2 = toffset2 - dataaddress2;
-
- if (size1 != size2)
- {
- return llmin(size1, size2);
- }
- else
- {
- return strncmp((char *)(mBuffer + dataaddress1), (char *)(mBuffer + dataaddress2), size1);
- }
-}
-
-void LLScriptHeapRunTime::removeData(S32 address)
-{
- if (!mBuffer)
- return;
-
- S32 toffset = address;
- // read past offset (relying on function side effect
- bytestream2integer(mBuffer, toffset);
-
- // make sure that reference count is 0
- integer2bytestream(mBuffer, toffset, 0);
- // show the block as empty
- *(mBuffer + toffset) = 0;
-
- // now, clean up the heap
- S32 clean = mHeapRegister;
- S32 tclean;
- S32 clean_offset;
-
- S32 nclean;
- S32 tnclean;
- S32 next_offset;
-
- U8 type;
- U8 ntype;
-
- for(;;)
- {
- tclean = clean;
- clean_offset = bytestream2integer(mBuffer, tclean);
- // is this block, empty?
- tclean += LSCRIPTDataSize[LST_INTEGER];
- type = *(mBuffer + tclean);
-
- if (!clean_offset)
- {
- if (!type)
- {
- // we're done! if our block is empty, we can pull in the HP and zero out our offset
- set_register(mBuffer, LREG_HP, clean);
- }
- return;
- }
-
-
- if (!type)
- {
- // if we're empty, try to coalesce with the next one
- nclean = clean + clean_offset;
- tnclean = nclean;
- next_offset = bytestream2integer(mBuffer, tnclean);
- tnclean += LSCRIPTDataSize[LST_INTEGER];
- ntype = *(mBuffer + tnclean);
-
- if (!next_offset)
- {
- // we're done! if our block is empty, we can pull in the HP and zero out our offset
- tclean = clean;
- integer2bytestream(mBuffer, tclean, 0);
- set_register(mBuffer, LREG_HP, clean);
- return;
- }
-
- if (!ntype)
- {
- // hooray! we can coalesce
- tclean = clean;
- integer2bytestream(mBuffer, tclean, clean_offset + next_offset);
- // don't skip forward so that we can keep coalescing on next pass through the loop
- }
- else
- {
- clean += clean_offset;
- }
- }
- else
- {
- // if not, move on to the next block
- clean += clean_offset;
- }
- }
-}
-
-void LLScriptHeapRunTime::coalesce(S32 address1, S32 address2)
-{
- // we need to bump the base offset by the second block's
- S32 toffset = address1;
- S32 offset1 = bytestream2integer(mBuffer, toffset);
- offset1 += bytestream2integer(mBuffer, address2);
-
- integer2bytestream(mBuffer, address1, offset1);
-}
-
-void LLScriptHeapRunTime::split(S32 address1, S32 size)
-{
- S32 toffset = address1;
- S32 oldoffset = bytestream2integer(mBuffer, toffset);
-
- // add new offset and zero out reference count and block used
- S32 newoffset = oldoffset - size;
- S32 newblockpos = address1 + size;
-
- // set new offset
- integer2bytestream(mBuffer, newblockpos, newoffset);
- // zero out reference count
- integer2bytestream(mBuffer, newblockpos, 0);
- // mark as empty
- *(mBuffer + newblockpos) = 0;
-
- // now, change the offset of the original block
- integer2bytestream(mBuffer, address1, size + HEAP_BLOCK_HEADER_SIZE);
-}
-
-/*
-
- For reference count changes, strings are easy. For lists, we'll need to go through the lists reducing
- the reference counts for any included strings and lists
-
- */
-
-void LLScriptHeapRunTime::increaseRefCount(S32 address)
-{
- if (!mBuffer)
- return;
-
- if (!address)
- {
- // unused temp string entry
- return;
- }
-
- // get current reference count
- S32 toffset = address + 4;
- S32 count = bytestream2integer(mBuffer, toffset);
-
- count++;
-
- if (mbPrint)
- printf("0x%X inc ref count %d\n", address - mHeapRegister, count);
-
- // see which type it is
- U8 type = *(mBuffer + toffset);
-
- if (type == LSCRIPTTypeByte[LST_STRING])
- {
- toffset = address + 4;
- integer2bytestream(mBuffer, toffset, count);
- }
- // TO DO: put list stuff here!
- else
- {
- set_fault(mBuffer, LSRF_HEAP_ERROR);
- }
-}
-
-void LLScriptHeapRunTime::decreaseRefCount(S32 address)
-{
- if (!mBuffer)
- return;
-
- if (!address)
- {
- // unused temp string entry
- return;
- }
-
- // get offset
- S32 toffset = address;
- // read past offset (rely on function side effect)
- bytestream2integer(mBuffer, toffset);
-
- // get current reference count
- S32 count = bytestream2integer(mBuffer, toffset);
-
- // see which type it is
- U8 type = *(mBuffer + toffset);
-
- if (type == LSCRIPTTypeByte[LST_STRING])
- {
- count--;
-
- if (mbPrint)
- printf("0x%X dec ref count %d\n", address - mHeapRegister, count);
-
- toffset = address + 4;
- integer2bytestream(mBuffer, toffset, count);
- if (!count)
- {
- // we can blow this one away
- removeData(address);
- }
- }
- // TO DO: put list stuff here!
- else
- {
- set_fault(mBuffer, LSRF_HEAP_ERROR);
- }
-}
-
-// if we're going to assign a variable, we need to decrement the reference count of what we were pointing at (if anything)
-void LLScriptHeapRunTime::releaseLocal(S32 address)
-{
- S32 hr = get_register(mBuffer, LREG_HR);
- address = lscript_local_get(mBuffer, address);
- if ( (address >= hr)
- &&(address < hr + get_register(mBuffer, LREG_HP)))
- {
- decreaseRefCount(address);
- }
-}
-
-void LLScriptHeapRunTime::releaseGlobal(S32 address)
-{
- // NOTA BENE: Global strings are referenced relative to the HR while local strings aren't
- S32 hr = get_register(mBuffer, LREG_HR);
- address = lscript_global_get(mBuffer, address) + hr;
- if ( (address >= hr)
- &&(address < hr + get_register(mBuffer, LREG_HP)))
- {
- decreaseRefCount(address);
- }
-}
-
-
-// we know the following function has "unreachable code"
-// don't remind us every friggin' time we compile. . .
-
-#if defined(_MSC_VER)
-# pragma warning(disable: 4702) // unreachable code
-#endif
-
-S32 LLScriptHeapRunTime::findOpenBlock(S32 size)
-{
- S32 offset;
- S32 toffset;
- U8 blocktype;
-
- while(1)
- {
- if (mCurrentPosition + size >= mStackPointer)
- {
- set_fault(mBuffer, LSRF_STACK_HEAP_COLLISION);
- mCurrentPosition = 0;
- }
-
- toffset = mCurrentPosition;
- offset = bytestream2integer(mBuffer, toffset);
- if (!offset)
- {
- // we've reached the end of Heap, return this location if we'll fit
- // do we need to coalesce with last empty space?
- if (mLastEmpty)
- {
- // ok, that everything from mLastEmpty to us is empty, so we don't need a block
- // zero out the last empty's offset and return it
- mCurrentPosition = mLastEmpty;
- integer2bytestream(mBuffer, mLastEmpty, 0);
- mLastEmpty = 0;
- }
- // now, zero out next offset to prevent "trouble"
- offset = mCurrentPosition + size;
- integer2bytestream(mBuffer, offset, 0);
-
- // set HP to appropriate value
- set_register(mBuffer, LREG_HP, mCurrentPosition + size);
- return size;
- }
-
- // ok, is this slot empty?
- toffset += LSCRIPTDataSize[LST_INTEGER];
-
- blocktype = *(mBuffer + toffset++);
-
- if (!blocktype)
- {
- // Empty block, do we need to coalesce?
- if (mLastEmpty)
- {
- coalesce(mLastEmpty, mCurrentPosition);
- mCurrentPosition = mLastEmpty;
- toffset = mCurrentPosition;
- offset = bytestream2integer(mBuffer, toffset);
- }
-
- // do we fit in this block?
- if (offset >= size)
- {
- // do we need to split the block? (only split if splitting will leave > HEAP_BLOCK_SPLIT_THRESHOLD bytes of free space)
- if (offset - HEAP_BLOCK_SPLIT_THRESHOLD >= size)
- {
- split(mCurrentPosition, size);
- return size;
- }
- else
- return offset;
- }
- }
- // nothing found, keep looking
- mCurrentPosition += offset;
- }
- // fake return to prevent warnings
- mCurrentPosition = 0;
- return 0;
-}
-
-LLScriptHeapRunTime gRunTime;
-#endif
diff --git a/indra/lscript/lscript_execute/lscript_heapruntime.h b/indra/lscript/lscript_execute/lscript_heapruntime.h
deleted file mode 100755
index 0e924a20369b1b4d938dd729c2af526c7b6d445e..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/lscript_heapruntime.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file lscript_heapruntime.h
- * @brief classes to manage script heap at runtime
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#if 0
-
-#ifndef LL_LSCRIPT_HEAPRUNTIME_H
-#define LL_LSCRIPT_HEAPRUNTIME_H
-
-#include "lscript_byteconvert.h"
-
-
-const S32 HEAP_BLOCK_HEADER_SIZE = 9;
-const S32 HEAP_BLOCK_SPLIT_THRESHOLD = 16;
-
-
-#endif
-#endif
diff --git a/indra/lscript/lscript_execute/lscript_readlso.cpp b/indra/lscript/lscript_execute/lscript_readlso.cpp
deleted file mode 100755
index abcb28e998a3df1b0ed361cf3a5e68a389ac3407..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ /dev/null
@@ -1,1585 +0,0 @@
-/**
- * @file lscript_readlso.cpp
- * @brief classes to read lso file
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lscript_readlso.h"
-#include "lscript_library.h"
-#include "lscript_alloc.h"
-
-LLScriptLSOParse::LLScriptLSOParse(LLFILE *fp)
-{
- U8 sizearray[4];
- size_t filesize;
- S32 pos = 0;
- if (fread(&sizearray, 1, 4, fp) != 4)
- {
- LL_WARNS() << "Short read" << LL_ENDL;
- filesize = 0;
- } else {
- filesize = bytestream2integer(sizearray, pos);
- }
- mRawData = new U8[filesize];
- fseek(fp, 0, SEEK_SET);
- if (fread(mRawData, 1, filesize, fp) != filesize)
- {
- LL_WARNS() << "Short read" << LL_ENDL;
- }
-
- initOpCodePrinting();
-}
-
-LLScriptLSOParse::LLScriptLSOParse(U8 *buffer)
-{
- mRawData = buffer;
- initOpCodePrinting();
-}
-
-LLScriptLSOParse::~LLScriptLSOParse()
-{
- delete [] mRawData;
-}
-
-void LLScriptLSOParse::printData(LLFILE *fp)
-{
-
-
-
- printNameDesc(fp);
-
- printRegisters(fp);
-
- printGlobals(fp);
-
- printGlobalFunctions(fp);
-
- printStates(fp);
-
- printHeap(fp);
-}
-
-void LLScriptLSOParse::printNameDesc(LLFILE *fp)
-{
- fprintf(fp, "=============================\n\n");
-}
-
-S32 gMajorVersion = 0;
-
-void LLScriptLSOParse::printRegisters(LLFILE *fp)
-{
- // print out registers first
- S32 i;
-
- fprintf(fp, "=============================\n");
- fprintf(fp, "Registers\n");
- fprintf(fp, "=============================\n");
- S32 version = get_register(mRawData, LREG_VN);
- if (version == LSL2_VERSION1_END_NUMBER)
- {
- gMajorVersion = LSL2_MAJOR_VERSION_ONE;
- }
- else if (version == LSL2_VERSION_NUMBER)
- {
- gMajorVersion = LSL2_MAJOR_VERSION_TWO;
- }
- for (i = LREG_IP; i < LREG_EOF; i++)
- {
- if (i < LREG_NCE)
- {
- fprintf(fp, "%s: 0x%X\n", gLSCRIPTRegisterNames[i], get_register(mRawData, (LSCRIPTRegisters)i));
- }
- else if (gMajorVersion == LSL2_MAJOR_VERSION_TWO)
- {
- U64 data = get_register_u64(mRawData, (LSCRIPTRegisters)i);
- fprintf(fp, "%s: 0x%X%X\n", gLSCRIPTRegisterNames[i], (U32)(data>>32), (U32)(data & 0xFFFFFFFF));
- }
- }
- fprintf(fp, "=============================\n\n");
-}
-
-void LLScriptLSOParse::printGlobals(LLFILE *fp)
-{
- // print out registers first
- S32 varoffset;
- S32 ivalue;
- F32 fpvalue;
- LLVector3 vvalue;
- LLQuaternion qvalue;
- char name[256]; /*Flawfinder: ignore*/
- U8 type;
-
- S32 global_v_offset = get_register(mRawData, LREG_GVR);
- S32 global_f_offset = get_register(mRawData, LREG_GFR);
-
- fprintf(fp, "=============================\n");
- fprintf(fp, "[0x%X] Global Variables\n", global_v_offset);
- fprintf(fp, "=============================\n");
-
-
- while (global_v_offset < global_f_offset)
- {
-
- // get offset to skip past name
- varoffset = global_v_offset;
- bytestream2integer(mRawData, global_v_offset);
- // get typeexport
- type = *(mRawData + global_v_offset++);
-
- // set name
- bytestream2char(name, mRawData, global_v_offset, sizeof(name));
-
- switch(type)
- {
- case LST_INTEGER:
- ivalue = bytestream2integer(mRawData, global_v_offset);
- fprintf(fp, "[0x%X] integer %s = %d\n", varoffset, name, ivalue);
- break;
- case LST_FLOATINGPOINT:
- fpvalue = bytestream2float(mRawData, global_v_offset);
- fprintf(fp, "[0x%X] integer %s = %f\n", varoffset, name, fpvalue);
- break;
- case LST_STRING:
- ivalue = bytestream2integer(mRawData, global_v_offset);
- fprintf(fp, "[0x%X] string %s = 0x%X\n", varoffset, name, ivalue + get_register(mRawData, LREG_HR) - 1);
- break;
- case LST_KEY:
- ivalue = bytestream2integer(mRawData, global_v_offset);
- fprintf(fp, "[0x%X] key %s = 0x%X\n", varoffset, name, ivalue + get_register(mRawData, LREG_HR) - 1);
- break;
- case LST_VECTOR:
- bytestream2vector(vvalue, mRawData, global_v_offset);
- fprintf(fp, "[0x%X] vector %s = < %f, %f, %f >\n", varoffset, name, vvalue.mV[VX], vvalue.mV[VY], vvalue.mV[VZ]);
- break;
- case LST_QUATERNION:
- bytestream2quaternion(qvalue, mRawData, global_v_offset);
- fprintf(fp, "[0x%X] quaternion %s = < %f, %f, %f, %f >\n", varoffset, name, qvalue.mQ[VX], qvalue.mQ[VY], qvalue.mQ[VZ], qvalue.mQ[VS]);
- break;
- case LST_LIST:
- ivalue = bytestream2integer(mRawData, global_v_offset);
- fprintf(fp, "[0x%X] list %s = 0x%X\n", varoffset, name, ivalue + get_register(mRawData, LREG_HR) - 1);
- break;
- default:
- break;
- }
- }
-
- fprintf(fp, "=============================\n\n");
-}
-
-void LLScriptLSOParse::printGlobalFunctions(LLFILE *fp)
-{
- // print out registers first
- S32 i, offset;
-// LLVector3 vvalue; unused
-// LLQuaternion qvalue; unused
- char name[256]; /*Flawfinder: ignore*/
- U8 type;
-
- offset = get_register(mRawData, LREG_GFR);
- S32 start_of_state = get_register(mRawData, LREG_SR);
- if (start_of_state == offset)
- return;
-
- S32 global_f_offset = get_register(mRawData, LREG_GFR);
-
- fprintf(fp, "=============================\n");
- fprintf(fp, "[0x%X] Global Functions\n", global_f_offset);
- fprintf(fp, "=============================\n");
-
-
- S32 num_functions = bytestream2integer(mRawData, offset);
- S32 orig_function_offset;
- S32 function_offset;
- S32 next_function_offset = 0;
- S32 function_number = 0;
- S32 opcode_start;
- S32 opcode_end;
-
- for (i = 0; i < num_functions; i++)
- {
- // jump to function
- // if this is the first function
- if (i == 0)
- {
- if (i < num_functions - 1)
- {
- function_offset = bytestream2integer(mRawData, offset);
- next_function_offset = bytestream2integer(mRawData, offset);
- function_offset += global_f_offset;
- opcode_end = next_function_offset + global_f_offset;
- }
- else
- {
- function_offset = bytestream2integer(mRawData, offset);
- function_offset += global_f_offset;
- opcode_end = get_register(mRawData, LREG_SR);
- }
- }
- else if (i < num_functions - 1)
- {
- function_offset = next_function_offset;
- next_function_offset = bytestream2integer(mRawData, offset);
- function_offset += global_f_offset;
- opcode_end = next_function_offset + global_f_offset;
- }
- else
- {
- function_offset = next_function_offset;
- function_offset += global_f_offset;
- opcode_end = get_register(mRawData, LREG_SR);
- }
- orig_function_offset = function_offset;
- // where do the opcodes start
- opcode_start = bytestream2integer(mRawData, function_offset);
- opcode_start += orig_function_offset;
- bytestream2char(name, mRawData, function_offset, sizeof(name));
- // get return type
- type = *(mRawData + function_offset++);
- fprintf(fp, "[Function #%d] [0x%X] %s\n", function_number, orig_function_offset, name);
- fprintf(fp, "\tReturn Type: %s\n", LSCRIPTTypeNames[type]);
- type = *(mRawData + function_offset++);
- S32 pcount = 0;
- while (type)
- {
- bytestream2char(name, mRawData, function_offset, sizeof(name));
- fprintf(fp, "\tParameter #%d: %s %s\n", pcount++, LSCRIPTTypeNames[type], name);
- type = *(mRawData + function_offset++);
- }
- fprintf(fp, "\t\tOpCodes: 0x%X - 0x%X\n", opcode_start, opcode_end);
- printOpCodeRange(fp, opcode_start, opcode_end, 2);
- function_number++;
- }
-
- fprintf(fp, "=============================\n\n");
-}
-
-void LLScriptLSOParse::printStates(LLFILE *fp)
-{
- // print out registers first
- S32 i, offset;
- U32 j, k;
-// LLVector3 vvalue; unused
-// LLQuaternion qvalue; unused
- char name[256]; /*Flawfinder: ignore*/
-
- S32 state_offset = get_register(mRawData, LREG_SR);
-
- fprintf(fp, "=============================\n");
- fprintf(fp, "[0x%X] States\n", state_offset);
- fprintf(fp, "=============================\n");
-
- offset = state_offset;
- S32 num_states = bytestream2integer(mRawData, offset);
- S32 state_info_offset;
- S32 event_jump_table;
- U64 event_handlers;
- S32 event_offset;
- S32 original_event_offset;
- S32 opcode_start;
- S32 worst_case_opcode_end;
- S32 opcode_end;
- S32 stack_size;
- S32 read_ahead;
- S32 first_jump = 0;
-
- for (i = 0; i < num_states; i++)
- {
- state_info_offset = bytestream2integer(mRawData, offset);
- if (gMajorVersion == LSL2_MAJOR_VERSION_TWO)
- event_handlers = bytestream2u64(mRawData, offset);
- else
- event_handlers = bytestream2integer(mRawData, offset);
- if (!first_jump)
- {
- first_jump = state_info_offset;
- }
- read_ahead = offset;
- if (offset < first_jump + state_offset)
- {
- worst_case_opcode_end = bytestream2integer(mRawData, read_ahead) + state_offset;
- }
- else
- {
- worst_case_opcode_end = get_register(mRawData, LREG_HR);
- }
- state_info_offset += state_offset;
- fprintf(fp, "[0x%X] ", state_info_offset);
- state_info_offset += LSCRIPTDataSize[LST_INTEGER];
- bytestream2char(name, mRawData, state_info_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
-
- event_jump_table = state_info_offset;
-
- // run run through the handlers
- for (j = LSTT_STATE_BEGIN; j < LSTT_STATE_END; j++)
- {
- if (event_handlers & LSCRIPTStateBitField[j])
- {
- event_offset = bytestream2integer(mRawData, state_info_offset);
- stack_size = bytestream2integer(mRawData, state_info_offset);
-
- read_ahead = event_jump_table;
-
- S32 temp_end;
-
- opcode_end = worst_case_opcode_end;
- (void)opcode_end;
-
- for (k = LSTT_STATE_BEGIN; k < LSTT_STATE_END; k++)
- {
- if (event_handlers & LSCRIPTStateBitField[k])
- {
- temp_end = bytestream2integer(mRawData, read_ahead);
- bytestream2integer(mRawData, read_ahead);
- if ( (temp_end < opcode_end)
- &&(temp_end > event_offset))
- {
- opcode_end = temp_end;
- }
- }
- }
-
- if (event_offset)
- {
- event_offset += event_jump_table;
- if (opcode_end < worst_case_opcode_end)
- opcode_end += event_jump_table;
- original_event_offset = event_offset;
-
- fprintf(fp, "\t[0x%X] ", event_offset);
-
- opcode_start = bytestream2integer(mRawData, event_offset);
- opcode_start += original_event_offset;
-
- switch(j)
- {
- case LSTT_STATE_ENTRY: // LSTT_STATE_ENTRY
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_STATE_EXIT: // LSTT_STATE_EXIT
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_TOUCH_START: // LSTT_TOUCH_START
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_TOUCH: // LSTT_TOUCH
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_TOUCH_END: // LSTT_TOUCH_END
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_COLLISION_START: // LSTT_COLLISION_START
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_COLLISION: // LSTT_COLLISION
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_COLLISION_END: // LSTT_COLLISION_END
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_LAND_COLLISION_START: // LSTT_LAND_COLLISION_START
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_LAND_COLLISION: // LSTT_LAND_COLLISION
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_LAND_COLLISION_END: // LSTT_LAND_COLLISION_END
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_INVENTORY: // LSTT_INVENTORY
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- break;
- case LSTT_ATTACH: // LSTT_ATTACH
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- break;
- case LSTT_DATASERVER: // LSTT_DATASERVER
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- break;
- case LSTT_TIMER: // LSTT_TIMER
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_MOVING_START: // LSTT_MOVING_START
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_MOVING_END: // LSTT_MOVING_END
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_CHAT: // LSTT_CHAT
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- break;
- case LSTT_OBJECT_REZ: // LSTT_OBJECT_REZ
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- break;
- case LSTT_REMOTE_DATA: // LSTT_REMOTE_DATA
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- break;
- case LSTT_REZ: // LSTT_REZ
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_SENSOR: // LSTT_SENSOR
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- break;
- case LSTT_NO_SENSOR: // LSTT_NO_SENSOR
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_CONTROL: // LSTT_CONTROL
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- break;
- case LSTT_LINK_MESSAGE: // LSTT_LINK_MESSAGE
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- break;
- case LSTT_MONEY: // LSTT_MONEY
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- break;
- case LSTT_EMAIL: // LSTT_EMAIL
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- break;
- case LSTT_AT_TARGET: // LSTT_AT_TARGET
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tvector %s\n", name);
- break;
- case LSTT_NOT_AT_TARGET: // LSTT_NOT_AT_TARGET
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_AT_ROT_TARGET: // LSTT_AT_ROT_TARGET
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tquaternion %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tquaternion %s\n", name);
- break;
- case LSTT_NOT_AT_ROT_TARGET: // LSTT_NOT_AT_TARGET
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- break;
- case LSTT_RTPERMISSIONS: // LSTT_RTPERMISSIONS
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- break;
- case LSTT_HTTP_RESPONSE: // LSTT_REMOTE_DATA ?!?!?!
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tinteger %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tlist %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- break;
- case LSTT_HTTP_REQUEST: // LSTT_HTTP_REQUEST
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "%s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tkey %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- bytestream2char(name, mRawData, event_offset, sizeof(name));
- fprintf(fp, "\t\tstring %s\n", name);
- break;
- default:
- break;
- }
- fprintf(fp, "\t\tStack Size: %d\n", stack_size);
- fprintf(fp, "\t\t\tOpCodes: 0x%X - 0x%X\n", opcode_start, opcode_end);
- printOpCodeRange(fp, opcode_start, opcode_end, 3);
- }
- }
- }
- }
- fprintf(fp, "=============================\n\n");
-}
-
-void LLScriptLSOParse::printHeap(LLFILE *fp)
-{
- // print out registers first
-
- S32 heap_offset = get_register(mRawData, LREG_HR);
- S32 heap_pointer = get_register(mRawData, LREG_HP);
- fprintf(fp, "=============================\n");
- fprintf(fp, "[0x%X - 0x%X] Heap\n", heap_offset, heap_pointer);
- fprintf(fp, "=============================\n");
-
- lsa_fprint_heap(mRawData, fp);
-
- fprintf(fp, "=============================\n\n");
-}
-
-void lso_print_tabs(LLFILE *fp, S32 tabs)
-{
- S32 i;
- for (i = 0; i < tabs; i++)
- {
- fprintf(fp, "\t");
- }
-}
-
-void LLScriptLSOParse::printOpCodes(LLFILE *fp, S32 &offset, S32 tabs)
-{
- U8 opcode = *(mRawData + offset);
- mPrintOpCodes[opcode](fp, mRawData, offset, tabs);
-}
-
-void LLScriptLSOParse::printOpCodeRange(LLFILE *fp, S32 start, S32 end, S32 tabs)
-{
- while (start < end)
- {
- printOpCodes(fp, start, tabs);
- }
-}
-
-void LLScriptLSOParse::initOpCodePrinting()
-{
- S32 i;
- for (i = 0; i < 256; i++)
- {
- mPrintOpCodes[i] = print_noop;
- }
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_NOOP]] = print_noop;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POP]] = print_pop;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPS]] = print_pops;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPL]] = print_popl;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPV]] = print_popv;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPQ]] = print_popq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPARG]] = print_poparg;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPIP]] = print_popip;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPBP]] = print_popbp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPSP]] = print_popsp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_POPSLR]] = print_popslr;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_DUP]] = print_dup;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_DUPS]] = print_dups;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_DUPL]] = print_dupl;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_DUPV]] = print_dupv;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_DUPQ]] = print_dupq;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STORE]] = print_store;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STORES]] = print_stores;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREL]] = print_storel;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREV]] = print_storev;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREQ]] = print_storeq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREG]] = print_storeg;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREGS]] = print_storegs;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREGL]] = print_storegl;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREGV]] = print_storegv;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STOREGQ]] = print_storegq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADP]] = print_loadp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADSP]] = print_loadsp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADLP]] = print_loadlp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADVP]] = print_loadvp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADQP]] = print_loadqp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADGP]] = print_loadgp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADGSP]] = print_loadgsp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADGLP]] = print_loadglp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADGVP]] = print_loadgvp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LOADGQP]] = print_loadgqp;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSH]] = print_push;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHS]] = print_pushs;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHL]] = print_pushl;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHV]] = print_pushv;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHQ]] = print_pushq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHG]] = print_pushg;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHGS]] = print_pushgs;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHGL]] = print_pushgl;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHGV]] = print_pushgv;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHGQ]] = print_pushgq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHIP]] = print_puship;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHSP]] = print_pushsp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHBP]] = print_pushbp;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGB]] = print_pushargb;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGI]] = print_pushargi;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGF]] = print_pushargf;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGS]] = print_pushargs;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGV]] = print_pushargv;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGQ]] = print_pushargq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHE]] = print_pushe;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHEV]] = print_pushev;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHEQ]] = print_pusheq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PUSHARGE]] = print_pusharge;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_ADD]] = print_add;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_SUB]] = print_sub;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_MUL]] = print_mul;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_DIV]] = print_div;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_MOD]] = print_mod;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_EQ]] = print_eq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_NEQ]] = print_neq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LEQ]] = print_leq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_GEQ]] = print_geq;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_LESS]] = print_less;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_GREATER]] = print_greater;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BITAND]] = print_bitand;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BITOR]] = print_bitor;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BITXOR]] = print_bitxor;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BOOLAND]] = print_booland;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BOOLOR]] = print_boolor;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_SHL]] = print_shl;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_SHR]] = print_shr;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_NEG]] = print_neg;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BITNOT]] = print_bitnot;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_BOOLNOT]] = print_boolnot;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_JUMP]] = print_jump;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_JUMPIF]] = print_jumpif;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_JUMPNIF]] = print_jumpnif;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STATE]] = print_state;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_CALL]] = print_call;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_RETURN]] = print_return;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_CAST]] = print_cast;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STACKTOS]] = print_stacktos;
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_STACKTOL]] = print_stacktol;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_PRINT]] = print_print;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_CALLLIB]] = print_calllib;
-
- mPrintOpCodes[LSCRIPTOpCodes[LOPC_CALLLIB_TWO_BYTE]] = print_calllib_two_byte;
-}
-
-void print_noop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tNOOP\n", offset++);
-}
-
-void print_pop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOP\n", offset++);
-}
-
-void print_pops(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPS\n", offset++);
-}
-
-void print_popl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPL\n", offset++);
-}
-
-void print_popv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPV\n", offset++);
-}
-
-void print_popq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPQ\n", offset++);
-}
-
-void print_poparg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPARG ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_popip(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPIP\n", offset++);
-}
-
-void print_popbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPBP\n", offset++);
-}
-
-void print_popsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPSP\n", offset++);
-}
-
-void print_popslr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPOPSLR\n", offset++);
-}
-
-void print_dup(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tDUP\n", offset++);
-}
-
-void print_dups(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tDUPS\n", offset++);
-}
-
-void print_dupl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tDUPL\n", offset++);
-}
-
-void print_dupv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tDUPV\n", offset++);
-}
-
-void print_dupq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tDUPQ\n", offset++);
-}
-
-void print_store(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTORE $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_stores(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTORES $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_storel(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREL $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_storev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREV $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_storeq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREQ $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_storeg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREG ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_storegs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGS ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_storegl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGL ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_storegv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGV ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_storegq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGQ ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_loadp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREP $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_loadsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREPS $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_loadlp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREPL $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_loadvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREVP $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_loadqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREQP $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_loadgp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGP ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_loadgsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGSP ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_loadglp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGLP ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_loadgvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGVP ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_loadgqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTOREGQP ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_push(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSH $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_pushs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHS $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_pushl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHL $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_pushv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHV $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_pushq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHQ $BP + ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_pushg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHG ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_pushgs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHGS ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_pushgl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHGL ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_pushgv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHGV ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_pushgq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHGQ ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR));
-}
-
-void print_puship(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHIP\n", offset++);
-}
-
-void print_pushbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHBP\n", offset++);
-}
-
-void print_pushsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHSP\n", offset++);
-}
-
-void print_pushargb(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGB ", offset++);
- arg = *(buffer + offset++);
- fprintf(fp, "%d\n", (U32)arg);
-}
-
-void print_pushargi(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGI ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_pushargf(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- F32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGF ", offset++);
- arg = bytestream2float(buffer, offset);
- fprintf(fp, "%f\n", arg);
-}
-
-void print_pushargs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- char arg[1024]; /*Flawfinder: ignore*/
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGS ", offset++);
- bytestream2char(arg, buffer, offset, sizeof(arg));
- fprintf(fp, "%s\n", arg);
-}
-
-void print_pushargv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- LLVector3 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGV ", offset++);
- bytestream2vector(arg, buffer, offset);
- fprintf(fp, "< %f, %f, %f >\n", arg.mV[VX], arg.mV[VY], arg.mV[VZ]);
-}
-
-void print_pushargq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- LLQuaternion arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGV ", offset++);
- bytestream2quaternion(arg, buffer, offset);
- fprintf(fp, "< %f, %f, %f, %f >\n", arg.mQ[VX], arg.mQ[VY], arg.mQ[VZ], arg.mQ[VS]);
-}
-
-void print_pushe(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHE\n", offset++);
-}
-
-void print_pushev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHEV\n", offset++);
-}
-
-void print_pusheq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHEQ\n", offset++);
-}
-
-void print_pusharge(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPUSHARGE ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-
-void print_add(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tADD ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_sub(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSUB ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_mul(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tMUL ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_div(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tDIV ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_mod(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tMOD ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_eq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tEQ ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_neq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tNEQ ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_leq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tLEQ ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_geq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tGEQ ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_less(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tLESS ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_greater(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tGREATER ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-
-void print_bitand(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBITAND\n", offset++);
-}
-
-void print_bitor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBITOR\n", offset++);
-}
-
-void print_bitxor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBITXOR\n", offset++);
-}
-
-void print_booland(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBOOLAND\n", offset++);
-}
-
-void print_boolor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBOOLOR\n", offset++);
-}
-
-void print_shl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSHL\n", offset++);
-}
-
-void print_shr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSHR\n", offset++);
-}
-
-
-void print_neg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 type;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tNEG ", offset++);
- type = *(buffer + offset++);
- fprintf(fp, "%s\n", LSCRIPTTypeNames[type]);
-}
-
-void print_bitnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBITNOT\n", offset++);
-}
-
-void print_boolnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tBOOLNOT\n", offset++);
-}
-
-void print_jump(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tJUMP ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_jumpif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- U8 type;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tJUMPIF ", offset++);
- type = *(buffer + offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%s, %d\n", LSCRIPTTypeNames[type], arg);
-}
-
-void print_jumpnif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- U8 type;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tJUMPNIF ", offset++);
- type = *(buffer + offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%s, %d\n", LSCRIPTTypeNames[type], arg);
-}
-
-void print_state(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTATE ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_call(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tCALL ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_return(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tRETURN\n", offset++);
-}
-
-void print_cast(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 types;
- U8 type1;
- U8 type2;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tCAST ", offset++);
- types = *(buffer + offset++);
- type1 = types >> 4;
- type2 = types & 0xf;
- fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]);
-}
-
-void print_stacktos(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTACKTOS ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_stacktol(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- S32 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tSTACKTOL ", offset++);
- arg = bytestream2integer(buffer, offset);
- fprintf(fp, "%d\n", arg);
-}
-
-void print_print(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tPRINT ", offset++);
- U8 type = *(buffer + offset++);
- fprintf(fp, "%s\n", LSCRIPTTypeNames[type]);
-}
-
-void print_calllib(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U8 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tCALLLIB ", offset++);
- arg = *(buffer + offset++);
- fprintf(fp, "%d (%s)\n", (U32)arg, gScriptLibrary.mFunctions[arg].mName);
-}
-
-
-void print_calllib_two_byte(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs)
-{
- U16 arg;
- lso_print_tabs(fp, tabs);
- fprintf(fp, "[0x%X]\tCALLLIB_TWO_BYTE ", offset++);
- arg = bytestream2u16(buffer, offset);
- fprintf(fp, "%d (%s)\n", (U32)arg, gScriptLibrary.mFunctions[arg].mName);
-}
-
diff --git a/indra/lscript/lscript_execute/lscript_readlso.h b/indra/lscript/lscript_execute/lscript_readlso.h
deleted file mode 100755
index f3b2b66746a0f92c23c51e57db76921dedad91af..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_execute/lscript_readlso.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * @file lscript_readlso.h
- * @brief classes to read lso file
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_READLSO_H
-#define LL_LSCRIPT_READLSO_H
-
-#include "lscript_byteconvert.h"
-
-// list of op code print functions
-void print_noop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pops(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_poparg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popip(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_popslr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_dup(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_dups(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_dupl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_dupv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_dupq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_store(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_stores(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storel(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storeq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storeg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storegs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storegl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storegv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_storegq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadlp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadgp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadgsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadglp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadgvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_loadgqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_push(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushgl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushgs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushgv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushgq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_puship(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushargb(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushargi(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushargf(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushargs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushargv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushargq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushe(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pushev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pusheq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_pusharge(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_add(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_sub(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_mul(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_div(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_mod(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_eq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_neq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_leq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_geq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_less(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_greater(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_bitand(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_bitor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_bitxor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_booland(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_boolor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_shl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_shr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_neg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_bitnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_boolnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_jump(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_jumpif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_jumpnif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_state(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_call(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_return(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_cast(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_stacktos(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_stacktol(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_print(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-void print_calllib(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-void print_calllib_two_byte(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-
-class LLScriptLSOParse
-{
-public:
- LLScriptLSOParse(LLFILE *fp);
- LLScriptLSOParse(U8 *buffer);
- ~LLScriptLSOParse();
-
- void initOpCodePrinting();
-
- void printData(LLFILE *fp);
- void printNameDesc(LLFILE *fp);
- void printRegisters(LLFILE *fp);
- void printGlobals(LLFILE *fp);
- void printGlobalFunctions(LLFILE *fp);
- void printStates(LLFILE *fp);
- void printHeap(LLFILE *fp);
- void printOpCodes(LLFILE *fp, S32 &offset, S32 tabs);
- void printOpCodeRange(LLFILE *fp, S32 start, S32 end, S32 tabs);
-
- U8 *mRawData;
- void (*mPrintOpCodes[0x100])(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs);
-};
-
-
-void lso_print_tabs(LLFILE *fp, S32 tabs);
-
-#endif
diff --git a/indra/lscript/lscript_export.h b/indra/lscript/lscript_export.h
deleted file mode 100755
index 2043dd4558c49e149b51aeac42918d025318f7ad..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_export.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file lscript_export.h
- * @brief Export interface class
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_EXPORT_H
-#define LL_LSCRIPT_EXPORT_H
-
-#include "lscript_library.h"
-
-
-
-#endif
diff --git a/indra/lscript/lscript_library.h b/indra/lscript/lscript_library.h
deleted file mode 100755
index f3dbb091962abb1ac8eb0a0da3cee2fb5beeb1c4..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_library.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/**
- * @file lscript_library.h
- * @brief External library interface
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_LIBRARY_H
-#define LL_LSCRIPT_LIBRARY_H
-
-#include "lscript_byteformat.h"
-#include "v3math.h"
-#include "llquaternion.h"
-#include "lluuid.h"
-#include "lscript_byteconvert.h"
-
-class LLScriptLibData;
-
-class LLScriptLibraryFunction
-{
-public:
- LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only = FALSE);
- ~LLScriptLibraryFunction();
-
- F32 mEnergyUse;
- F32 mSleepTime;
- void (*mExecFunc)(LLScriptLibData *, LLScriptLibData *, const LLUUID &);
- const char *mName;
- const char *mReturnType;
- const char *mArgs;
- BOOL mGodOnly;
-};
-
-class LLScriptLibrary
-{
-public:
- LLScriptLibrary();
- ~LLScriptLibrary();
-
- void init();
-
- void addFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only = FALSE);
- void assignExec(const char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &));
-
- std::vector<LLScriptLibraryFunction> mFunctions;
-};
-
-
-
-class LLScriptLibData
-{
-public:
- // TODO: Change this to a union
- LSCRIPTType mType;
- S32 mInteger;
- F32 mFP;
- char *mKey;
- char *mString;
- LLVector3 mVec;
- LLQuaternion mQuat;
- LLScriptLibData *mListp;
-
- friend bool operator<=(const LLScriptLibData &a, const LLScriptLibData &b)
- {
- if (a.mType == b.mType)
- {
- if (a.mType == LST_INTEGER)
- {
- return a.mInteger <= b.mInteger;
- }
- if (a.mType == LST_FLOATINGPOINT)
- {
- return a.mFP <= b.mFP;
- }
- if (a.mType == LST_STRING)
- {
- return strcmp(a.mString, b.mString) <= 0;
- }
- if (a.mType == LST_KEY)
- {
- return strcmp(a.mKey, b.mKey) <= 0;
- }
- if (a.mType == LST_VECTOR)
- {
- return a.mVec.magVecSquared() <= b.mVec.magVecSquared();
- }
- }
- return TRUE;
- }
-
- friend bool operator==(const LLScriptLibData &a, const LLScriptLibData &b)
- {
- if (a.mType == b.mType)
- {
- if (a.mType == LST_INTEGER)
- {
- return a.mInteger == b.mInteger;
- }
- if (a.mType == LST_FLOATINGPOINT)
- {
- return a.mFP == b.mFP;
- }
- if (a.mType == LST_STRING)
- {
- return !strcmp(a.mString, b.mString);
- }
- if (a.mType == LST_KEY)
- {
- return !strcmp(a.mKey, b.mKey);
- }
- if (a.mType == LST_VECTOR)
- {
- return a.mVec == b.mVec;
- }
- if (a.mType == LST_QUATERNION)
- {
- return a.mQuat == b.mQuat;
- }
- }
- return FALSE;
- }
-
- S32 getListLength() const
- {
- const LLScriptLibData *data = this;
- S32 retval = 0;
- while (data->mListp)
- {
- retval++;
- data = data->mListp;
- }
- return retval;
- }
-
- BOOL checkForMultipleLists()
- {
- LLScriptLibData *data = this;
- while (data->mListp)
- {
- data = data->mListp;
- if (data->mType == LST_LIST)
- return TRUE;
- }
- return FALSE;
- }
-
- S32 getSavedSize()
- {
- S32 size = 0;
- // mType
- size += 4;
-
- switch(mType)
- {
- case LST_INTEGER:
- size += 4;
- break;
- case LST_FLOATINGPOINT:
- size += 4;
- break;
- case LST_KEY:
- size += (S32)strlen(mKey) + 1; /*Flawfinder: ignore*/
- break;
- case LST_STRING:
- size += (S32)strlen(mString) + 1; /*Flawfinder: ignore*/
- break;
- case LST_LIST:
- break;
- case LST_VECTOR:
- size += 12;
- break;
- case LST_QUATERNION:
- size += 16;
- break;
- default:
- break;
- }
- return size;
- }
-
- S32 write2bytestream(U8 *dest)
- {
- S32 offset = 0;
- integer2bytestream(dest, offset, mType);
- switch(mType)
- {
- case LST_INTEGER:
- integer2bytestream(dest, offset, mInteger);
- break;
- case LST_FLOATINGPOINT:
- float2bytestream(dest, offset, mFP);
- break;
- case LST_KEY:
- char2bytestream(dest, offset, mKey);
- break;
- case LST_STRING:
- char2bytestream(dest, offset, mString);
- break;
- case LST_LIST:
- break;
- case LST_VECTOR:
- vector2bytestream(dest, offset, mVec);
- break;
- case LST_QUATERNION:
- quaternion2bytestream(dest, offset, mQuat);
- break;
- default:
- break;
- }
- return offset;
- }
-
- LLScriptLibData() : mType(LST_NULL), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
- {
- }
-
- LLScriptLibData(const LLScriptLibData &data) : mType(data.mType), mInteger(data.mInteger), mFP(data.mFP), mKey(NULL), mString(NULL), mVec(data.mVec), mQuat(data.mQuat), mListp(NULL)
- {
- if (data.mKey)
- {
- mKey = new char[strlen(data.mKey) + 1]; /* Flawfinder: ignore */
- if (mKey == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mKey, data.mKey); /* Flawfinder: ignore */
- }
- if (data.mString)
- {
- mString = new char[strlen(data.mString) + 1]; /* Flawfinder: ignore */
- if (mString == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mString, data.mString); /* Flawfinder: ignore */
- }
- }
-
- LLScriptLibData(U8 *src, S32 &offset) : mListp(NULL)
- {
- static char temp[TOP_OF_MEMORY]; /* Flawfinder: ignore */
- mType = (LSCRIPTType)bytestream2integer(src, offset);
- switch(mType)
- {
- case LST_INTEGER:
- mInteger = bytestream2integer(src, offset);
- break;
- case LST_FLOATINGPOINT:
- mFP = bytestream2float(src, offset);
- break;
- case LST_KEY:
- {
- bytestream2char(temp, src, offset, sizeof(temp));
- mKey = new char[strlen(temp) + 1]; /* Flawfinder: ignore */
- if (mKey == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mKey, temp); /* Flawfinder: ignore */
- }
- break;
- case LST_STRING:
- {
- bytestream2char(temp, src, offset, sizeof(temp));
- mString = new char[strlen(temp) + 1]; /* Flawfinder: ignore */
- if (mString == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mString, temp); /* Flawfinder: ignore */
- }
- break;
- case LST_LIST:
- break;
- case LST_VECTOR:
- bytestream2vector(mVec, src, offset);
- break;
- case LST_QUATERNION:
- bytestream2quaternion(mQuat, src, offset);
- break;
- default:
- break;
- }
- }
-
- void set(U8 *src, S32 &offset)
- {
- static char temp[TOP_OF_MEMORY]; /* Flawfinder: ignore */
- mType = (LSCRIPTType)bytestream2integer(src, offset);
- switch(mType)
- {
- case LST_INTEGER:
- mInteger = bytestream2integer(src, offset);
- break;
- case LST_FLOATINGPOINT:
- mFP = bytestream2float(src, offset);
- break;
- case LST_KEY:
- {
- bytestream2char(temp, src, offset, sizeof(temp));
- mKey = new char[strlen(temp) + 1]; /* Flawfinder: ignore */
- if (mKey == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mKey, temp); /* Flawfinder: ignore */
- }
- break;
- case LST_STRING:
- {
- bytestream2char(temp, src, offset, sizeof(temp));
- mString = new char[strlen(temp) + 1]; /* Flawfinder: ignore */
- if (mString == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mString, temp); /* Flawfinder: ignore */
- }
- break;
- case LST_LIST:
- break;
- case LST_VECTOR:
- bytestream2vector(mVec, src, offset);
- break;
- case LST_QUATERNION:
- bytestream2quaternion(mQuat, src, offset);
- break;
- default:
- break;
- }
- }
-
- void print(std::ostream &s, BOOL b_prepend_comma);
- void print_separator(std::ostream& ostr, BOOL b_prepend_sep, char* sep);
-
- void setFromCSV(const char *src)
- {
- mType = LST_STRING;
- mString = new char[strlen(src) + 1]; /* Flawfinder: ignore */
- if (mString == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mString, src); /* Flawfinder: ignore */
- }
-
- LLScriptLibData(S32 integer) : mType(LST_INTEGER), mInteger(integer), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
- {
- }
-
- LLScriptLibData(F32 fp) : mType(LST_FLOATINGPOINT), mInteger(0), mFP(fp), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
- {
- }
-
- LLScriptLibData(const LLUUID &id) : mType(LST_KEY), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
- {
- std::string idstr;
- id.toString(idstr);
- mKey = new char[idstr.length()+1];
- LLStringUtil::copy(mKey,idstr.c_str(),idstr.length()+1);
- }
-
- LLScriptLibData(const char *string) : mType(LST_STRING), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
- {
- if (!string)
- {
- mString = new char[1];
- mString[0] = 0;
- }
- else
- {
- mString = new char[strlen(string) + 1]; /* Flawfinder: ignore */
- if (mString == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- return;
- }
- strcpy(mString, string); /* Flawfinder: ignore */
- }
- }
-
- LLScriptLibData(const LLVector3 &vec) : mType(LST_VECTOR), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(vec), mQuat(), mListp(NULL)
- {
- }
-
- LLScriptLibData(const LLQuaternion &quat) : mType(LST_QUATERNION), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(quat), mListp(NULL)
- {
- }
-
- ~LLScriptLibData()
- {
- delete mListp;
- delete [] mKey;
- delete [] mString;
- }
-
-};
-
-extern LLScriptLibrary gScriptLibrary;
-
-#endif
diff --git a/indra/lscript/lscript_library/CMakeLists.txt b/indra/lscript/lscript_library/CMakeLists.txt
deleted file mode 100755
index 5af850c41bc2df07b7b125fd0a5020d141cc6539..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_library/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- cmake -*-
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LScript)
-
-set(lscript_library_SOURCE_FILES
- lscript_alloc.cpp
- lscript_export.cpp
- lscript_library.cpp
- )
-
-set(lscript_library_HEADER_FILES
- CMakeLists.txt
-
- ../lscript_library.h
- ../lscript_export.h
- )
-
-set_source_files_properties(${lscript_library_HEADER_FILES}
- PROPERTIES HEADER_FILE_ONLY TRUE)
-
-list(APPEND lscript_library_SOURCE_FILES ${lscript_library_HEADER_FILES})
-
-include_directories(
- ${LLCOMMON_INCLUDE_DIRS}
- ${LLMATH_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}
- )
-include_directories(SYSTEM
- ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
- )
-
-add_library (lscript_library ${lscript_library_SOURCE_FILES})
diff --git a/indra/lscript/lscript_library/lscript_alloc.cpp b/indra/lscript/lscript_library/lscript_alloc.cpp
deleted file mode 100755
index 62ba029e8aaf44bb5b7698be8a23c8c212819206..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_library/lscript_alloc.cpp
+++ /dev/null
@@ -1,1136 +0,0 @@
-/**
- * @file lscript_alloc.cpp
- * @brief general heap management for scripting system
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-// #define at top of file accelerates gcc compiles
-// Under gcc 2.9, the manual is unclear if comments can appear above #ifndef
-// Under gcc 3, the manual explicitly states comments can appear above the #ifndef
-
-#include "linden_common.h"
-#include "lscript_alloc.h"
-#include "llrand.h"
-
-// supported data types
-
-// basic types
-// integer 4 bytes of integer data
-// float 4 bytes of float data
-// string data null terminated 1 byte string
-// key data null terminated 1 byte string
-// vector data 12 bytes of 3 floats
-// quaternion data 16 bytes of 4 floats
-
-// list type
-// list data 4 bytes of number of entries followed by pointer
-
-// string pointer 4 bytes of address of string data on the heap (only used in list data)
-// key pointer 4 bytes of address of key data on the heap (only used in list data)
-
-// heap format
-//
-// 4 byte offset to next block (in bytes)
-// 1 byte of type of variable or empty
-// 2 bytes of reference count
-// nn bytes of data
-
-void reset_hp_to_safe_spot(const U8 *buffer)
-{
- set_register((U8 *)buffer, LREG_HP, TOP_OF_MEMORY);
-}
-
-// create a heap from the HR to TM
-BOOL lsa_create_heap(U8 *heap_start, S32 size)
-{
- LLScriptAllocEntry entry(size, LST_NULL);
-
- S32 position = 0;
-
- alloc_entry2bytestream(heap_start, position, entry);
-
- return TRUE;
-}
-
-S32 lsa_heap_top(U8 *heap_start, S32 maxtop)
-{
- S32 offset = 0;
- LLScriptAllocEntry entry;
- bytestream2alloc_entry(entry, heap_start, offset);
-
- while (offset + entry.mSize < maxtop)
- {
- offset += entry.mSize;
- bytestream2alloc_entry(entry, heap_start, offset);
- }
- return offset + entry.mSize;
-}
-
-
-// adding to heap
-// if block is empty
-// if block is at least block size + 4 larger than data
-// split block
-// insert data into first part
-// return address
-// else
-// insert data into block
-// return address
-// else
-// if next block is >= SP
-// set Stack-Heap collision
-// return NULL
-// if next block is empty
-// merge next block with current block
-// go to start of algorithm
-// else
-// move to next block
-// go to start of algorithm
-
-S32 lsa_heap_add_data(U8 *buffer, LLScriptLibData *data, S32 heapsize, BOOL b_delete)
-{
- if (get_register(buffer, LREG_FR))
- return 1;
- LLScriptAllocEntry entry, nextentry;
- S32 hr = get_register(buffer, LREG_HR);
- S32 hp = get_register(buffer, LREG_HP);
- S32 current_offset, next_offset, offset = hr;
- S32 size = 0;
-
- switch(data->mType)
- {
- case LST_INTEGER:
- size = 4;
- break;
- case LST_FLOATINGPOINT:
- size = 4;
- break;
- case LST_KEY:
- // NOTE: babbage: defensive as some library calls set data to NULL
- size = data->mKey ? (S32)strlen(data->mKey) + 1 : 1; /*Flawfinder: ignore*/
- break;
- case LST_STRING:
- // NOTE: babbage: defensive as some library calls set data to NULL
- size = data->mString ? (S32)strlen(data->mString) + 1 : 1; /*Flawfinder: ignore*/
- break;
- case LST_LIST:
- // list data 4 bytes of number of entries followed by number of pointer
- size = 4 + 4*data->getListLength();
- if (data->checkForMultipleLists())
- {
- set_fault(buffer, LSRF_NESTING_LISTS);
- }
- break;
- case LST_VECTOR:
- size = 12;
- break;
- case LST_QUATERNION:
- size = 16;
- break;
- default:
- break;
- }
-
- current_offset = offset;
- bytestream2alloc_entry(entry, buffer, offset);
-
- do
- {
- hp = get_register(buffer, LREG_HP);
- if (!entry.mType)
- {
- if (entry.mSize >= size + SIZEOF_SCRIPT_ALLOC_ENTRY + 4)
- {
- offset = current_offset;
- lsa_split_block(buffer, offset, size, entry);
- entry.mType = data->mType;
- entry.mSize = size;
- entry.mReferenceCount = 1;
- offset = current_offset;
- alloc_entry2bytestream(buffer, offset, entry);
- lsa_insert_data(buffer, offset, data, entry, heapsize);
- hp = get_register(buffer, LREG_HP);
- S32 new_hp = current_offset + size + 2*SIZEOF_SCRIPT_ALLOC_ENTRY;
- if (new_hp >= hr + heapsize)
- {
- break;
- }
- if (new_hp > hp)
- {
- set_register(buffer, LREG_HP, new_hp);
- hp = get_register(buffer, LREG_HP);
- }
- if (b_delete)
- delete data;
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- if (current_offset <= hp)
- return current_offset - hr + 1;
- else
- return hp - hr + 1;
- }
- else if (entry.mSize >= size)
- {
- entry.mType = data->mType;
- entry.mReferenceCount = 1;
- offset = current_offset;
- alloc_entry2bytestream(buffer, offset, entry);
- lsa_insert_data(buffer, offset, data, entry, heapsize);
- hp = get_register(buffer, LREG_HP);
- if (b_delete)
- delete data;
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- return current_offset - hr + 1;
- }
- }
- offset += entry.mSize;
- if (offset < hr + heapsize)
- {
- next_offset = offset;
- bytestream2alloc_entry(nextentry, buffer, offset);
- if (!nextentry.mType && !entry.mType)
- {
- entry.mSize += nextentry.mSize + SIZEOF_SCRIPT_ALLOC_ENTRY;
- offset = current_offset;
- alloc_entry2bytestream(buffer, offset, entry);
- }
- else
- {
- current_offset = next_offset;
- entry = nextentry;
- }
-
- // this works whether we are bumping out or coming in
- S32 new_hp = current_offset + size + 2*SIZEOF_SCRIPT_ALLOC_ENTRY;
-
- // make sure we aren't about to be stupid
- if (new_hp >= hr + heapsize)
- {
- break;
- }
- if (new_hp > hp)
- {
- set_register(buffer, LREG_HP, new_hp);
- hp = get_register(buffer, LREG_HP);
- }
- }
- else
- {
- break;
- }
- } while (1);
- set_fault(buffer, LSRF_STACK_HEAP_COLLISION);
- reset_hp_to_safe_spot(buffer);
- if (b_delete)
- delete data;
- return 0;
-}
-
-// split block
-// set offset to point to new block
-// set offset of new block to point to original offset - block size - data size
-// set new block to empty
-// set new block reference count to 0
-void lsa_split_block(U8 *buffer, S32 &offset, S32 size, LLScriptAllocEntry &entry)
-{
- if (get_register(buffer, LREG_FR))
- return;
- LLScriptAllocEntry newentry;
-
- newentry.mSize = entry.mSize - SIZEOF_SCRIPT_ALLOC_ENTRY - size;
- entry.mSize -= newentry.mSize + SIZEOF_SCRIPT_ALLOC_ENTRY;
-
- alloc_entry2bytestream(buffer, offset, entry);
- S32 orig_offset = offset + size;
- alloc_entry2bytestream(buffer, orig_offset, newentry);
-}
-
-// insert data
-// if data is non-list type
-// set type to basic type, set reference count to 1, copy data, return address
-// else
-// set type to list data type, set reference count to 1
-// save length of list
-// for each list entry
-// insert data
-// return address
-
-void lsa_insert_data(U8 *buffer, S32 &offset, LLScriptLibData *data, LLScriptAllocEntry &entry, S32 heapsize)
-{
- if (get_register(buffer, LREG_FR))
- return;
- if (data->mType != LST_LIST)
- {
- switch(data->mType)
- {
- case LST_INTEGER:
- integer2bytestream(buffer, offset, data->mInteger);
- break;
- case LST_FLOATINGPOINT:
- float2bytestream(buffer, offset, data->mFP);
- break;
- case LST_KEY:
- char2bytestream(buffer, offset, data->mKey ? data->mKey : "");
- break;
- case LST_STRING:
- char2bytestream(buffer, offset, data->mString ? data->mString : "");
- break;
- case LST_VECTOR:
- vector2bytestream(buffer, offset, data->mVec);
- break;
- case LST_QUATERNION:
- quaternion2bytestream(buffer, offset, data->mQuat);
- break;
- default:
- break;
- }
- }
- else
- {
- // store length of list
- integer2bytestream(buffer, offset, data->getListLength());
- data = data->mListp;
- while(data)
- {
- // store entry and then store address if valid
- S32 address = lsa_heap_add_data(buffer, data, heapsize, FALSE);
- integer2bytestream(buffer, offset, address);
- data = data->mListp;
- }
- }
-}
-
-S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
-{
- S32 offset = 0;
- S32 size = 0;
-
- LLScriptAllocEntry entry;
-
- if (!data)
- {
- entry.mType = LST_NULL;
- entry.mReferenceCount = 0;
- entry.mSize = MAX_HEAP_SIZE;
- size = SIZEOF_SCRIPT_ALLOC_ENTRY;
- *buffer = new U8[size];
- alloc_entry2bytestream(*buffer, offset, entry);
- return size;
- }
-
- entry.mType = data->mType;
- entry.mReferenceCount = 1;
-
- if (data->mType != LST_LIST)
- {
- if ( (data->mType != LST_STRING)
- &&(data->mType != LST_KEY))
- {
- size = LSCRIPTDataSize[data->mType];
- }
- else
- {
- if (data->mType == LST_STRING)
- {
- if (data->mString)
- {
- size = (S32)strlen(data->mString) + 1; /*Flawfinder: ignore*/
- }
- else
- {
- size = 1;
- }
- }
- if (data->mType == LST_KEY)
- {
- if (data->mKey)
- {
- size = (S32)strlen(data->mKey) + 1; /*Flawfinder: ignore*/
- }
- else
- {
- size = 1;
- }
- }
- }
- entry.mSize = size;
- size += SIZEOF_SCRIPT_ALLOC_ENTRY;
- *buffer = new U8[size];
- alloc_entry2bytestream(*buffer, offset, entry);
-
- switch(data->mType)
- {
- case LST_INTEGER:
- integer2bytestream(*buffer, offset, data->mInteger);
- break;
- case LST_FLOATINGPOINT:
- float2bytestream(*buffer, offset, data->mFP);
- break;
- case LST_KEY:
- if (data->mKey)
- char2bytestream(*buffer, offset, data->mKey);
- else
- byte2bytestream(*buffer, offset, 0);
- break;
- case LST_STRING:
- if (data->mString)
- char2bytestream(*buffer, offset, data->mString);
- else
- byte2bytestream(*buffer, offset, 0);
- break;
- case LST_VECTOR:
- vector2bytestream(*buffer, offset, data->mVec);
- break;
- case LST_QUATERNION:
- quaternion2bytestream(*buffer, offset, data->mQuat);
- break;
- default:
- break;
- }
- }
- else
- {
- U8 *listbuf;
- S32 length = data->getListLength();
- size = 4 * length + 4;
- entry.mSize = size;
-
- size += SIZEOF_SCRIPT_ALLOC_ENTRY;
- *buffer = new U8[size];
-
- alloc_entry2bytestream(*buffer, offset, entry);
- // store length of list
- integer2bytestream(*buffer, offset, length);
- data = data->mListp;
- while(data)
- {
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- integer2bytestream(*buffer, offset, size + base_offset + 1);
-
- S32 listsize = lsa_create_data_block(&listbuf, data, base_offset + size);
- if (listsize)
- {
- U8 *tbuff = new U8[size + listsize];
- if (tbuff == NULL)
- {
- LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
- }
- memcpy(tbuff, *buffer, size); /*Flawfinder: ignore*/
- memcpy(tbuff + size, listbuf, listsize); /*Flawfinder: ignore*/
- size += listsize;
- delete [] *buffer;
- delete [] listbuf;
- *buffer = tbuff;
- }
- data = data->mListp;
- }
- }
- return size;
-}
-
-// increase reference count
-// increase reference count by 1
-
-void lsa_increase_ref_count(U8 *buffer, S32 offset)
-{
- if (get_register(buffer, LREG_FR))
- return;
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- offset += get_register(buffer, LREG_HR) - 1;
- if ( (offset < get_register(buffer, LREG_HR))
- ||(offset >= get_register(buffer, LREG_HP)))
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- return;
- }
- S32 orig_offset = offset;
- LLScriptAllocEntry entry;
- bytestream2alloc_entry(entry, buffer, offset);
-
- entry.mReferenceCount++;
-
- alloc_entry2bytestream(buffer, orig_offset, entry);
-}
-
-// decrease reference count
-// decrease reference count by 1
-// if reference count == 0
-// set type to empty
-
-void lsa_decrease_ref_count(U8 *buffer, S32 offset)
-{
- if (get_register(buffer, LREG_FR))
- return;
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- offset += get_register(buffer, LREG_HR) - 1;
- if ( (offset < get_register(buffer, LREG_HR))
- ||(offset >= get_register(buffer, LREG_HP)))
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- return;
- }
- S32 orig_offset = offset;
- LLScriptAllocEntry entry;
- bytestream2alloc_entry(entry, buffer, offset);
-
- entry.mReferenceCount--;
-
- if (entry.mReferenceCount < 0)
- {
- entry.mReferenceCount = 0;
- set_fault(buffer, LSRF_HEAP_ERROR);
- }
- else if (!entry.mReferenceCount)
- {
- if (entry.mType == LST_LIST)
- {
- S32 i, num = bytestream2integer(buffer, offset);
- for (i = 0; i < num; i++)
- {
- S32 list_offset = bytestream2integer(buffer, offset);
- lsa_decrease_ref_count(buffer, list_offset);
- }
- }
- entry.mType = LST_NULL;
- }
-
- alloc_entry2bytestream(buffer, orig_offset, entry);
-}
-
-char gLSAStringRead[TOP_OF_MEMORY]; /*Flawfinder: ignore*/
-
-
-LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref)
-{
- if (get_register(buffer, LREG_FR))
- return (new LLScriptLibData);
- S32 orig_offset = offset;
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- offset += get_register(buffer, LREG_HR) - 1;
- if ( (offset < get_register(buffer, LREG_HR))
- ||(offset >= get_register(buffer, LREG_HP)))
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- return (new LLScriptLibData);
- }
- LLScriptAllocEntry entry;
- bytestream2alloc_entry(entry, buffer, offset);
-
- LLScriptLibData *retval = new LLScriptLibData;
-
- if (!entry.mType)
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- return retval;
- }
-
- retval->mType = (LSCRIPTType)entry.mType;
- if (entry.mType != LST_LIST)
- {
- switch(entry.mType)
- {
- case LST_INTEGER:
- retval->mInteger = bytestream2integer(buffer, offset);
- break;
- case LST_FLOATINGPOINT:
- retval->mFP = bytestream2float(buffer, offset);
- break;
- case LST_KEY:
- bytestream2char(gLSAStringRead, buffer, offset, sizeof(gLSAStringRead)); // global sring buffer? for real? :(
- retval->mKey = new char[strlen(gLSAStringRead) + 1]; /*Flawfinder: ignore*/
- strcpy(retval->mKey, gLSAStringRead); /*Flawfinder: ignore*/
- break;
- case LST_STRING:
- bytestream2char(gLSAStringRead, buffer, offset, sizeof(gLSAStringRead));
- retval->mString = new char[strlen(gLSAStringRead) + 1]; /*Flawfinder: ignore*/
- strcpy(retval->mString, gLSAStringRead); /*Flawfinder: ignore*/
- break;
- case LST_VECTOR:
- bytestream2vector(retval->mVec, buffer, offset);
- break;
- case LST_QUATERNION:
- bytestream2quaternion(retval->mQuat, buffer, offset);
- break;
- default:
- break;
- }
- }
- else
- {
- // get length of list
- S32 i, length = bytestream2integer(buffer, offset);
- LLScriptLibData *tip = retval;
-
- for (i = 0; i < length; i++)
- {
- S32 address = bytestream2integer(buffer, offset);
- tip->mListp = lsa_get_data(buffer, address, FALSE);
- tip = tip->mListp;
- }
- }
- if (retval->checkForMultipleLists())
- {
- set_fault(buffer, LSRF_NESTING_LISTS);
- }
- if (b_dec_ref)
- {
- lsa_decrease_ref_count(buffer, orig_offset);
- }
- return retval;
-}
-
-LLScriptLibData *lsa_get_list_ptr(U8 *buffer, S32 &offset, BOOL b_dec_ref)
-{
- if (get_register(buffer, LREG_FR))
- return (new LLScriptLibData);
- S32 orig_offset = offset;
- // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
- // and function clean up of ref counts isn't based on scope (a mistake, I know)
- offset += get_register(buffer, LREG_HR) - 1;
- if ( (offset < get_register(buffer, LREG_HR))
- ||(offset >= get_register(buffer, LREG_HP)))
- {
- set_fault(buffer, LSRF_BOUND_CHECK_ERROR);
- return (new LLScriptLibData);
- }
- LLScriptAllocEntry entry;
- bytestream2alloc_entry(entry, buffer, offset);
-
- if (!entry.mType)
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- return NULL;
- }
-
- LLScriptLibData base, *tip = &base;
-
- if (entry.mType != LST_LIST)
- {
- return NULL;
- }
- else
- {
- // get length of list
- S32 i, length = bytestream2integer(buffer, offset);
-
- for (i = 0; i < length; i++)
- {
- S32 address = bytestream2integer(buffer, offset);
- tip->mListp = lsa_get_data(buffer, address, FALSE);
- tip = tip->mListp;
- }
- }
- if (b_dec_ref)
- {
- lsa_decrease_ref_count(buffer, orig_offset);
- }
- tip = base.mListp;
- base.mListp = NULL;
- return tip;
-}
-
-S32 lsa_cat_strings(U8 *buffer, S32 offset1, S32 offset2, S32 heapsize)
-{
- if (get_register(buffer, LREG_FR))
- return 0;
- LLScriptLibData *string1;
- LLScriptLibData *string2;
- if (offset1 != offset2)
- {
- string1 = lsa_get_data(buffer, offset1, TRUE);
- string2 = lsa_get_data(buffer, offset2, TRUE);
- }
- else
- {
- string1 = lsa_get_data(buffer, offset1, TRUE);
- string2 = lsa_get_data(buffer, offset2, TRUE);
- }
-
- if ( (!string1)
- ||(!string2))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete string1;
- delete string2;
- return 0;
- }
-
- char *test1 = NULL, *test2 = NULL;
-
- if (string1->mType == LST_STRING)
- {
- test1 = string1->mString;
- }
- else if (string1->mType == LST_KEY)
- {
- test1 = string1->mKey;
- }
- if (string2->mType == LST_STRING)
- {
- test2 = string2->mString;
- }
- else if (string2->mType == LST_KEY)
- {
- test2 = string2->mKey;
- }
-
- if ( (!test1)
- ||(!test2))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete string1;
- delete string2;
- return 0;
- }
-
- S32 size = (S32)strlen(test1) + (S32)strlen(test2) + 1; /*Flawfinder: ignore*/
-
- LLScriptLibData *string3 = new LLScriptLibData;
- string3->mType = LST_STRING;
- string3->mString = new char[size];
- strcpy(string3->mString, test1); /*Flawfinder: ignore*/
- strcat(string3->mString, test2); /*Flawfinder: ignore*/
-
- delete string1;
- delete string2;
-
- return lsa_heap_add_data(buffer, string3, heapsize, TRUE);
-}
-
-S32 lsa_cmp_strings(U8 *buffer, S32 offset1, S32 offset2)
-{
- if (get_register(buffer, LREG_FR))
- return 0;
- LLScriptLibData *string1;
- LLScriptLibData *string2;
-
- string1 = lsa_get_data(buffer, offset1, TRUE);
- string2 = lsa_get_data(buffer, offset2, TRUE);
-
- if ( (!string1)
- ||(!string2))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete string1;
- delete string2;
- return 0;
- }
-
- char *test1 = NULL, *test2 = NULL;
-
- if (string1->mType == LST_STRING)
- {
- test1 = string1->mString;
- }
- else if (string1->mType == LST_KEY)
- {
- test1 = string1->mKey;
- }
- if (string2->mType == LST_STRING)
- {
- test2 = string2->mString;
- }
- else if (string2->mType == LST_KEY)
- {
- test2 = string2->mKey;
- }
-
- if ( (!test1)
- ||(!test2))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete string1;
- delete string2;
- return 0;
- }
- S32 retval = strcmp(test1, test2);
-
- delete string1;
- delete string2;
-
- return retval;
-}
-
-void lsa_print_heap(U8 *buffer)
-{
- S32 offset = get_register(buffer, LREG_HR);
- S32 readoffset;
- S32 ivalue;
- F32 fpvalue;
- LLVector3 vvalue;
- LLQuaternion qvalue;
- char string[4096]; /*Flawfinder: ignore*/
-
- LLScriptAllocEntry entry;
-
- bytestream2alloc_entry(entry, buffer, offset);
-
- printf("HP: [0x%X]\n", get_register(buffer, LREG_HP));
- printf("==========\n");
-
- while (offset + entry.mSize < MAX_HEAP_SIZE)
- {
- printf("[0x%X] ", offset);
- printf("%s ", LSCRIPTTypeNames[entry.mType]);
- printf("Ref Count: %d ", entry.mReferenceCount);
- printf("Size: %d = ", entry.mSize);
-
- readoffset = offset;
-
- switch(entry.mType)
- {
- case LST_INTEGER:
- ivalue = bytestream2integer(buffer, readoffset);
- printf("%d\n", ivalue);
- break;
- case LST_FLOATINGPOINT:
- fpvalue = bytestream2float(buffer, readoffset);
- printf("%f\n", fpvalue);
- break;
- case LST_STRING:
- bytestream2char(string, buffer, readoffset, sizeof(string));
- printf("%s\n", string);
- break;
- case LST_KEY:
- bytestream2char(string, buffer, readoffset, sizeof(string));
- printf("%s\n", string);
- break;
- case LST_VECTOR:
- bytestream2vector(vvalue, buffer, readoffset);
- printf("< %f, %f, %f >\n", vvalue.mV[VX], vvalue.mV[VY], vvalue.mV[VZ]);
- break;
- case LST_QUATERNION:
- bytestream2quaternion(qvalue, buffer, readoffset);
- printf("< %f, %f, %f, %f >\n", qvalue.mQ[VX], qvalue.mQ[VY], qvalue.mQ[VZ], qvalue.mQ[VS]);
- break;
- case LST_LIST:
- ivalue = bytestream2integer(buffer, readoffset);
- printf("%d\n", ivalue);
- break;
- default:
- printf("\n");
- break;
- }
- offset += entry.mSize;
- bytestream2alloc_entry(entry, buffer, offset);
- }
- printf("[0x%X] ", offset);
- printf("%s ", LSCRIPTTypeNames[entry.mType]);
- printf("Ref Count: %d ", entry.mReferenceCount);
- printf("Size: %d\n", entry.mSize);
- printf("==========\n");
-}
-
-void lsa_fprint_heap(U8 *buffer, LLFILE *fp)
-{
- S32 offset = get_register(buffer, LREG_HR);
- S32 readoffset;
- S32 ivalue;
- F32 fpvalue;
- LLVector3 vvalue;
- LLQuaternion qvalue;
- char string[4096]; /*Flawfinder: ignore*/
-
- LLScriptAllocEntry entry;
-
- bytestream2alloc_entry(entry, buffer, offset);
-
- while (offset + entry.mSize < MAX_HEAP_SIZE)
- {
- fprintf(fp, "[0x%X] ", offset);
- fprintf(fp, "%s ", LSCRIPTTypeNames[entry.mType]);
- fprintf(fp, "Ref Count: %d ", entry.mReferenceCount);
- fprintf(fp, "Size: %d = ", entry.mSize);
-
- readoffset = offset;
-
- switch(entry.mType)
- {
- case LST_INTEGER:
- ivalue = bytestream2integer(buffer, readoffset);
- fprintf(fp, "%d\n", ivalue);
- break;
- case LST_FLOATINGPOINT:
- fpvalue = bytestream2float(buffer, readoffset);
- fprintf(fp, "%f\n", fpvalue);
- break;
- case LST_STRING:
- bytestream2char(string, buffer, readoffset, sizeof(string));
- fprintf(fp, "%s\n", string);
- break;
- case LST_KEY:
- bytestream2char(string, buffer, readoffset, sizeof(string));
- fprintf(fp, "%s\n", string);
- break;
- case LST_VECTOR:
- bytestream2vector(vvalue, buffer, readoffset);
- fprintf(fp, "< %f, %f, %f >\n", vvalue.mV[VX], vvalue.mV[VY], vvalue.mV[VZ]);
- break;
- case LST_QUATERNION:
- bytestream2quaternion(qvalue, buffer, readoffset);
- fprintf(fp, "< %f, %f, %f, %f >\n", qvalue.mQ[VX], qvalue.mQ[VY], qvalue.mQ[VZ], qvalue.mQ[VS]);
- break;
- case LST_LIST:
- ivalue = bytestream2integer(buffer, readoffset);
- fprintf(fp, "%d\n", ivalue);
- break;
- default:
- fprintf(fp, "\n");
- break;
- }
- offset += entry.mSize;
- bytestream2alloc_entry(entry, buffer, offset);
- }
- fprintf(fp, "[0x%X] ", offset);
- fprintf(fp, "%s ", LSCRIPTTypeNames[entry.mType]);
- fprintf(fp, "Ref Count: %d ", entry.mReferenceCount);
- fprintf(fp, "Size: %d", entry.mSize);
- fprintf(fp, "\n");
-}
-
-S32 lsa_cat_lists(U8 *buffer, S32 offset1, S32 offset2, S32 heapsize)
-{
- if (get_register(buffer, LREG_FR))
- return 0;
- LLScriptLibData *list1;
- LLScriptLibData *list2;
- if (offset1 != offset2)
- {
- list1 = lsa_get_data(buffer, offset1, TRUE);
- list2 = lsa_get_data(buffer, offset2, TRUE);
- }
- else
- {
- list1 = lsa_get_data(buffer, offset1, TRUE);
- list2 = lsa_get_data(buffer, offset2, TRUE);
- }
-
- if ( (!list1)
- ||(!list2))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list1;
- delete list2;
- return 0;
- }
-
- if ( (list1->mType != LST_LIST)
- ||(list2->mType != LST_LIST))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list1;
- delete list2;
- return 0;
- }
-
- LLScriptLibData *runner = list1;
-
- while (runner->mListp)
- {
- runner = runner->mListp;
- }
-
- runner->mListp = list2->mListp;
-
- list2->mListp = NULL;
-
- delete list2;
-
- return lsa_heap_add_data(buffer, list1, heapsize, TRUE);
-}
-
-
-S32 lsa_cmp_lists(U8 *buffer, S32 offset1, S32 offset2)
-{
- if (get_register(buffer, LREG_FR))
- return 0;
- LLScriptLibData *list1;
- LLScriptLibData *list2;
- if (offset1 != offset2)
- {
- list1 = lsa_get_data(buffer, offset1, TRUE);
- list2 = lsa_get_data(buffer, offset2, TRUE);
- }
- else
- {
- list1 = lsa_get_data(buffer, offset1, FALSE);
- list2 = lsa_get_data(buffer, offset2, TRUE);
- }
-
- if ( (!list1)
- ||(!list2))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list1;
- delete list2;
- return 0;
- }
-
- if ( (list1->mType != LST_LIST)
- ||(list2->mType != LST_LIST))
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list1;
- delete list2;
- return 0;
- }
-
- S32 length1 = list1->getListLength();
- S32 length2 = list2->getListLength();
- delete list1;
- delete list2;
- return length1 - length2;
-}
-
-
-S32 lsa_preadd_lists(U8 *buffer, LLScriptLibData *data, S32 offset2, S32 heapsize)
-{
- if (get_register(buffer, LREG_FR))
- return 0;
- LLScriptLibData *list2 = lsa_get_data(buffer, offset2, TRUE);
-
- if (!list2)
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list2;
- return 0;
- }
-
- if (list2->mType != LST_LIST)
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list2;
- return 0;
- }
-
- LLScriptLibData *runner = data->mListp;
-
- while (runner->mListp)
- {
- runner = runner->mListp;
- }
-
-
- runner->mListp = list2->mListp;
- list2->mListp = data->mListp;
-
- return lsa_heap_add_data(buffer, list2, heapsize, TRUE);
-}
-
-
-S32 lsa_postadd_lists(U8 *buffer, S32 offset1, LLScriptLibData *data, S32 heapsize)
-{
- if (get_register(buffer, LREG_FR))
- return 0;
- LLScriptLibData *list1 = lsa_get_data(buffer, offset1, TRUE);
-
- if (!list1)
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list1;
- return 0;
- }
-
- if (list1->mType != LST_LIST)
- {
- set_fault(buffer, LSRF_HEAP_ERROR);
- delete list1;
- return 0;
- }
-
- LLScriptLibData *runner = list1;
-
- while (runner->mListp)
- {
- runner = runner->mListp;
- }
-
- runner->mListp = data->mListp;
-
- return lsa_heap_add_data(buffer, list1, heapsize, TRUE);
-}
-
-
-LLScriptLibData* lsa_randomize(LLScriptLibData* src, S32 stride)
-{
- S32 number = src->getListLength();
- if (number <= 0)
- {
- return NULL;
- }
- if (stride <= 0)
- {
- stride = 1;
- }
- if(number % stride)
- {
- LLScriptLibData* retval = src->mListp;
- src->mListp = NULL;
- return retval;
- }
- S32 buckets = number / stride;
-
- // Copy everything into a special vector for sorting;
- std::vector<LLScriptLibData*> sort_array;
- sort_array.reserve(number);
- LLScriptLibData* temp = src->mListp;
- while(temp)
- {
- sort_array.push_back(temp);
- temp = temp->mListp;
- }
-
- // We cannot simply call random_shuffle or similar algorithm since
- // we need to obey the stride. So, we iterate over what we have
- // and swap each with a random other segment.
- S32 index = 0;
- S32 ii = 0;
- for(; ii < number; ii += stride)
- {
- index = ll_rand(buckets) * stride;
- for(S32 jj = 0; jj < stride; ++jj)
- {
- std::swap(sort_array[ii + jj], sort_array[index + jj]);
- }
- }
-
- // copy the pointers back out
- ii = 1;
- temp = sort_array[0];
- while (ii < number)
- {
- temp->mListp = sort_array[ii++];
- temp = temp->mListp;
- }
- temp->mListp = NULL;
-
- src->mListp = NULL;
-
- LLScriptLibData* ret_value = sort_array[0];
- return ret_value;
-}
diff --git a/indra/lscript/lscript_library/lscript_export.cpp b/indra/lscript/lscript_library/lscript_export.cpp
deleted file mode 100755
index 0ed85e3686b5c295c49941e24ac2e8794fd5fdcf..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_library/lscript_export.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file lscript_export.cpp
- * @brief export interface class
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp
deleted file mode 100755
index 84ce94eead1861810b7832fdf4d6bb30435e3ee0..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_library/lscript_library.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-/**
- * @file lscript_library.cpp
- * @brief external library interface
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-
-// ## ## ### ######## ## ## #### ## ## ###### #### ####
-// ## ## ## ## ## ## ## ### ## ## ### ## ## ## #### ####
-// ## ## ## ## ## ## ## #### ## ## #### ## ## #### ####
-// ## ## ## ## ## ######## ## ## ## ## ## ## ## ## #### ## ##
-// ## ## ## ######### ## ## ## #### ## ## #### ## ##
-// ## ## ## ## ## ## ## ## ### ## ## ### ## ## #### ####
-// ### ### ## ## ## ## ## ## #### ## ## ###### #### ####
-//
-// When adding functions, they <b>MUST</b> be appended to the end of
-// the init() method. The init() associates the name with a number,
-// which is then serialized into the bytecode. Inserting a new
-// function in the middle will lead to many sim crashes. Phoenix 2006-04-10.
-
-#include "linden_common.h"
-
-#include "lscript_library.h"
-
-LLScriptLibrary::LLScriptLibrary()
-{
- init();
-}
-
-LLScriptLibrary::~LLScriptLibrary()
-{
-}
-
-void dummy_func(LLScriptLibData *retval, LLScriptLibData *args, const LLUUID &id)
-{
-}
-
-void LLScriptLibrary::init()
-{
- // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST.
- // Otherwise the bytecode numbers for each call will be wrong, and all
- // existing scripts will crash.
-
- // energy, sleep, dummy_func, name, return type, parameters, gods-only
- addFunction(10.f, 0.f, dummy_func, "llSin", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llCos", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llTan", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llAtan2", "f", "ff");
- addFunction(10.f, 0.f, dummy_func, "llSqrt", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llPow", "f", "ff");
- addFunction(10.f, 0.f, dummy_func, "llAbs", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llFabs", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llFrand", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llFloor", "i", "f");
- addFunction(10.f, 0.f, dummy_func, "llCeil", "i", "f");
- addFunction(10.f, 0.f, dummy_func, "llRound", "i", "f");
- addFunction(10.f, 0.f, dummy_func, "llVecMag", "f", "v");
- addFunction(10.f, 0.f, dummy_func, "llVecNorm", "v", "v");
- addFunction(10.f, 0.f, dummy_func, "llVecDist", "f", "vv");
- addFunction(10.f, 0.f, dummy_func, "llRot2Euler", "v", "q");
- addFunction(10.f, 0.f, dummy_func, "llEuler2Rot", "q", "v");
- addFunction(10.f, 0.f, dummy_func, "llAxes2Rot", "q", "vvv");
- addFunction(10.f, 0.f, dummy_func, "llRot2Fwd", "v", "q");
- addFunction(10.f, 0.f, dummy_func, "llRot2Left", "v", "q");
- addFunction(10.f, 0.f, dummy_func, "llRot2Up", "v", "q");
- addFunction(10.f, 0.f, dummy_func, "llRotBetween", "q", "vv");
- addFunction(10.f, 0.f, dummy_func, "llWhisper", NULL, "is");
- addFunction(10.f, 0.f, dummy_func, "llSay", NULL, "is");
- addFunction(10.f, 0.f, dummy_func, "llShout", NULL, "is");
- addFunction(10.f, 0.f, dummy_func, "llListen", "i", "isks");
- addFunction(10.f, 0.f, dummy_func, "llListenControl", NULL, "ii");
- addFunction(10.f, 0.f, dummy_func, "llListenRemove", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llSensor", NULL, "skiff");
- addFunction(10.f, 0.f, dummy_func, "llSensorRepeat", NULL, "skifff");
- addFunction(10.f, 0.f, dummy_func, "llSensorRemove", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llDetectedName", "s", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedKey", "k", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedOwner", "k", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedType", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedPos", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedVel", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedGrab", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedRot", "q", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedGroup", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedLinkNumber", "i", "i");
- addFunction(0.f, 0.f, dummy_func, "llDie", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llGround", "f", "v");
- addFunction(10.f, 0.f, dummy_func, "llCloud", "f", "v");
- addFunction(10.f, 0.f, dummy_func, "llWind", "v", "v");
- addFunction(10.f, 0.f, dummy_func, "llSetStatus", NULL, "ii");
- addFunction(10.f, 0.f, dummy_func, "llGetStatus", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llSetScale", NULL, "v");
- addFunction(10.f, 0.f, dummy_func, "llGetScale", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetColor", NULL, "vi");
- addFunction(10.f, 0.f, dummy_func, "llGetAlpha", "f", "i");
- addFunction(10.f, 0.f, dummy_func, "llSetAlpha", NULL, "fi");
- addFunction(10.f, 0.f, dummy_func, "llGetColor", "v", "i");
- addFunction(10.f, 0.2f, dummy_func, "llSetTexture", NULL, "si");
- addFunction(10.f, 0.2f, dummy_func, "llScaleTexture", NULL, "ffi");
- addFunction(10.f, 0.2f, dummy_func, "llOffsetTexture", NULL, "ffi");
- addFunction(10.f, 0.2f, dummy_func, "llRotateTexture", NULL, "fi");
- addFunction(10.f, 0.f, dummy_func, "llGetTexture", "s", "i");
- addFunction(10.f, 0.2f, dummy_func, "llSetPos", NULL, "v");
- addFunction(10.f, 0.f, dummy_func, "llGetPos", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetLocalPos", "v", NULL);
- addFunction(10.f, 0.2f, dummy_func, "llSetRot", NULL, "q");
- addFunction(10.f, 0.f, dummy_func, "llGetRot", "q", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetLocalRot", "q", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetForce", NULL, "vi");
- addFunction(10.f, 0.f, dummy_func, "llGetForce", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llTarget", "i", "vf");
- addFunction(10.f, 0.f, dummy_func, "llTargetRemove", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llRotTarget", "i", "qf");
- addFunction(10.f, 0.f, dummy_func, "llRotTargetRemove", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llMoveToTarget", NULL, "vf");
- addFunction(10.f, 0.f, dummy_func, "llStopMoveToTarget", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llApplyImpulse", NULL, "vi");
- addFunction(10.f, 0.f, dummy_func, "llApplyRotationalImpulse", NULL, "vi");
- addFunction(10.f, 0.f, dummy_func, "llSetTorque", NULL, "vi");
- addFunction(10.f, 0.f, dummy_func, "llGetTorque", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetForceAndTorque", NULL, "vvi");
- addFunction(10.f, 0.f, dummy_func, "llGetVel", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetAccel", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetOmega", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetTimeOfDay", "f", "");
- addFunction(10.f, 0.f, dummy_func, "llGetWallclock", "f", "");
- addFunction(10.f, 0.f, dummy_func, "llGetTime", "f", NULL);
- addFunction(10.f, 0.f, dummy_func, "llResetTime", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetAndResetTime", "f", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSound", NULL, "sfii");
- addFunction(10.f, 0.f, dummy_func, "llPlaySound", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llLoopSound", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llLoopSoundMaster", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llLoopSoundSlave", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llPlaySoundSlave", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llTriggerSound", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llStopSound", NULL, "");
- addFunction(10.f, 1.f, dummy_func, "llPreloadSound", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llGetSubString", "s", "sii");
- addFunction(10.f, 0.f, dummy_func, "llDeleteSubString", "s", "sii");
- addFunction(10.f, 0.f, dummy_func, "llInsertString", "s", "sis");
- addFunction(10.f, 0.f, dummy_func, "llToUpper", "s", "s");
- addFunction(10.f, 0.f, dummy_func, "llToLower", "s", "s");
- addFunction(10.f, 0.f, dummy_func, "llGiveMoney", "i", "ki");
- addFunction(10.f, 0.1f, dummy_func, "llMakeExplosion", NULL, "iffffsv");
- addFunction(10.f, 0.1f, dummy_func, "llMakeFountain", NULL, "iffffisvf");
- addFunction(10.f, 0.1f, dummy_func, "llMakeSmoke", NULL, "iffffsv");
- addFunction(10.f, 0.1f, dummy_func, "llMakeFire", NULL, "iffffsv");
- addFunction(200.f, 0.1f, dummy_func, "llRezObject", NULL, "svvqi");
- addFunction(10.f, 0.f, dummy_func, "llLookAt", NULL, "vff");
- addFunction(10.f, 0.f, dummy_func, "llStopLookAt", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetTimerEvent", NULL, "f");
- addFunction(0.f, 0.f, dummy_func, "llSleep", NULL, "f");
- addFunction(10.f, 0.f, dummy_func, "llGetMass", "f", NULL);
- addFunction(10.f, 0.f, dummy_func, "llCollisionFilter", NULL, "ski");
- addFunction(10.f, 0.f, dummy_func, "llTakeControls", NULL, "iii");
- addFunction(10.f, 0.f, dummy_func, "llReleaseControls", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llAttachToAvatar", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llDetachFromAvatar", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llTakeCamera", NULL, "k");
- addFunction(10.f, 0.f, dummy_func, "llReleaseCamera", NULL, "k");
- addFunction(10.f, 0.f, dummy_func, "llGetOwner", "k", NULL);
- addFunction(10.f, 2.f, dummy_func, "llInstantMessage", NULL, "ks");
- addFunction(10.f, 20.f, dummy_func, "llEmail", NULL, "sss");
- addFunction(10.f, 0.f, dummy_func, "llGetNextEmail", NULL, "ss");
- addFunction(10.f, 0.f, dummy_func, "llGetKey", "k", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetBuoyancy", NULL, "f");
- addFunction(10.f, 0.f, dummy_func, "llSetHoverHeight", NULL, "fif");
- addFunction(10.f, 0.f, dummy_func, "llStopHover", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llMinEventDelay", NULL, "f");
- addFunction(10.f, 0.f, dummy_func, "llSoundPreload", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llRotLookAt", NULL, "qff");
- addFunction(10.f, 0.f, dummy_func, "llStringLength", "i", "s");
- addFunction(10.f, 0.f, dummy_func, "llStartAnimation", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llStopAnimation", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llPointAt", NULL, "v");
- addFunction(10.f, 0.f, dummy_func, "llStopPointAt", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llTargetOmega", NULL, "vff");
- addFunction(10.f, 0.f, dummy_func, "llGetStartParameter", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGodLikeRezObject", NULL, "kv", TRUE);
- addFunction(10.f, 0.f, dummy_func, "llRequestPermissions", NULL, "ki");
- addFunction(10.f, 0.f, dummy_func, "llGetPermissionsKey", "k", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetPermissions", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetLinkNumber", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetLinkColor", NULL, "ivi");
- addFunction(10.f, 1.f, dummy_func, "llCreateLink", NULL, "ki");
- addFunction(10.f, 0.f, dummy_func, "llBreakLink", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llBreakAllLinks", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetLinkKey", "k", "i");
- addFunction(10.f, 0.f, dummy_func, "llGetLinkName", "s", "i");
- addFunction(10.f, 0.f, dummy_func, "llGetInventoryNumber", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llGetInventoryName", "s", "ii");
- addFunction(10.f, 0.f, dummy_func, "llSetScriptState", NULL, "si");
- addFunction(10.f, 0.f, dummy_func, "llGetEnergy", "f", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGiveInventory", NULL, "ks");
- addFunction(10.f, 0.f, dummy_func, "llRemoveInventory", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llSetText", NULL, "svf");
- addFunction(10.f, 0.f, dummy_func, "llWater", "f", "v");
- addFunction(10.f, 0.f, dummy_func, "llPassTouches", NULL, "i");
- addFunction(10.f, 0.1f, dummy_func, "llRequestAgentData", "k", "ki");
- addFunction(10.f, 1.f, dummy_func, "llRequestInventoryData", "k", "s");
- addFunction(10.f, 0.f, dummy_func, "llSetDamage", NULL, "f");
- addFunction(100.f, 5.f, dummy_func, "llTeleportAgentHome", NULL, "k");
- addFunction(10.f, 0.f, dummy_func, "llModifyLand", NULL, "ii");
- addFunction(10.f, 0.f, dummy_func, "llCollisionSound", NULL, "sf");
- addFunction(10.f, 0.f, dummy_func, "llCollisionSprite", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llGetAnimation", "s", "k");
- addFunction(10.f, 0.f, dummy_func, "llResetScript", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llMessageLinked", NULL, "iisk");
- addFunction(10.f, 0.f, dummy_func, "llPushObject", NULL, "kvvi");
- addFunction(10.f, 0.f, dummy_func, "llPassCollisions", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llGetScriptName", "s", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetNumberOfSides", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llAxisAngle2Rot", "q", "vf");
- addFunction(10.f, 0.f, dummy_func, "llRot2Axis", "v", "q");
- addFunction(10.f, 0.f, dummy_func, "llRot2Angle", "f", "q");
- addFunction(10.f, 0.f, dummy_func, "llAcos", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llAsin", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llAngleBetween", "f", "qq");
- addFunction(10.f, 0.f, dummy_func, "llGetInventoryKey", "k", "s");
- addFunction(10.f, 0.f, dummy_func, "llAllowInventoryDrop", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llGetSunDirection", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetTextureOffset", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llGetTextureScale", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llGetTextureRot", "f", "i");
- addFunction(10.f, 0.f, dummy_func, "llSubStringIndex", "i", "ss");
- addFunction(10.f, 0.f, dummy_func, "llGetOwnerKey", "k", "k");
- addFunction(10.f, 0.f, dummy_func, "llGetCenterOfMass", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llListSort", "l", "lii");
- addFunction(10.f, 0.f, dummy_func, "llGetListLength", "i", "l");
- addFunction(10.f, 0.f, dummy_func, "llList2Integer", "i", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2Float", "f", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2String", "s", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2Key", "k", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2Vector", "v", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2Rot", "q", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2List", "l", "lii");
- addFunction(10.f, 0.f, dummy_func, "llDeleteSubList", "l", "lii");
- addFunction(10.f, 0.f, dummy_func, "llGetListEntryType", "i", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2CSV", "s", "l");
- addFunction(10.f, 0.f, dummy_func, "llCSV2List", "l", "s");
- addFunction(10.f, 0.f, dummy_func, "llListRandomize", "l", "li");
- addFunction(10.f, 0.f, dummy_func, "llList2ListStrided", "l", "liii");
- addFunction(10.f, 0.f, dummy_func, "llGetRegionCorner", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llListInsertList", "l", "lli");
- addFunction(10.f, 0.f, dummy_func, "llListFindList", "i", "ll");
- addFunction(10.f, 0.f, dummy_func, "llGetObjectName", "s", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetObjectName", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llGetDate", "s", NULL);
- addFunction(10.f, 0.f, dummy_func, "llEdgeOfWorld", "i", "vv");
- addFunction(10.f, 0.f, dummy_func, "llGetAgentInfo", "i", "k");
- addFunction(10.f, 0.1f, dummy_func, "llAdjustSoundVolume", NULL, "f");
- addFunction(10.f, 0.f, dummy_func, "llSetSoundQueueing", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llSetSoundRadius", NULL, "f");
- addFunction(10.f, 0.f, dummy_func, "llKey2Name", "s", "k");
- addFunction(10.f, 0.f, dummy_func, "llSetTextureAnim", NULL, "iiiifff");
- addFunction(10.f, 0.f, dummy_func, "llTriggerSoundLimited", NULL, "sfvv");
- addFunction(10.f, 0.f, dummy_func, "llEjectFromLand", NULL, "k");
- addFunction(10.f, 0.f, dummy_func, "llParseString2List", "l", "sll");
- addFunction(10.f, 0.f, dummy_func, "llOverMyLand", "i", "k");
- addFunction(10.f, 0.f, dummy_func, "llGetLandOwnerAt", "k", "v");
- addFunction(10.f, 0.1f, dummy_func, "llGetNotecardLine", "k", "si");
- addFunction(10.f, 0.f, dummy_func, "llGetAgentSize", "v", "k");
- addFunction(10.f, 0.f, dummy_func, "llSameGroup", "i", "k");
- addFunction(10.f, 0.f, dummy_func, "llUnSit", NULL, "k");
- addFunction(10.f, 0.f, dummy_func, "llGroundSlope", "v", "v");
- addFunction(10.f, 0.f, dummy_func, "llGroundNormal", "v", "v");
- addFunction(10.f, 0.f, dummy_func, "llGroundContour", "v", "v");
- addFunction(10.f, 0.f, dummy_func, "llGetAttached", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetFreeMemory", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetRegionName", "s", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetRegionTimeDilation", "f", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetRegionFPS", "f", NULL);
-
- addFunction(10.f, 0.f, dummy_func, "llParticleSystem", NULL, "l");
- addFunction(10.f, 0.f, dummy_func, "llGroundRepel", NULL, "fif");
- addFunction(10.f, 3.f, dummy_func, "llGiveInventoryList", NULL, "ksl");
-
-// script calls for vehicle action
- addFunction(10.f, 0.f, dummy_func, "llSetVehicleType", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llSetVehicleFloatParam", NULL, "if");
- addFunction(10.f, 0.f, dummy_func, "llSetVehicleVectorParam", NULL, "iv");
- addFunction(10.f, 0.f, dummy_func, "llSetVehicleRotationParam", NULL, "iq");
- addFunction(10.f, 0.f, dummy_func, "llSetVehicleFlags", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llRemoveVehicleFlags", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llSitTarget", NULL, "vq");
- addFunction(10.f, 0.f, dummy_func, "llAvatarOnSitTarget", "k", NULL);
- addFunction(10.f, 0.1f, dummy_func, "llAddToLandPassList", NULL, "kf");
- addFunction(10.f, 0.f, dummy_func, "llSetTouchText", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llSetSitText", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llSetCameraEyeOffset", NULL, "v");
- addFunction(10.f, 0.f, dummy_func, "llSetCameraAtOffset", NULL, "v");
-
- addFunction(10.f, 0.f, dummy_func, "llDumpList2String", "s", "ls");
- addFunction(10.f, 0.f, dummy_func, "llScriptDanger", "i", "v");
- addFunction(10.f, 1.f, dummy_func, "llDialog", NULL, "ksli");
- addFunction(10.f, 0.f, dummy_func, "llVolumeDetect", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llResetOtherScript", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llGetScriptState", "i", "s");
- addFunction(10.f, 3.f, dummy_func, "llRemoteLoadScript", NULL, "ksii");
-
- addFunction(10.f, 0.2f, dummy_func, "llSetRemoteScriptAccessPin", NULL, "i");
- addFunction(10.f, 3.f, dummy_func, "llRemoteLoadScriptPin", NULL, "ksiii");
-
- addFunction(10.f, 1.f, dummy_func, "llOpenRemoteDataChannel", NULL, NULL);
- addFunction(10.f, 3.f, dummy_func, "llSendRemoteData", "k", "ksis");
- addFunction(10.f, 3.f, dummy_func, "llRemoteDataReply", NULL, "kksi");
- addFunction(10.f, 1.f, dummy_func, "llCloseRemoteDataChannel", NULL, "k");
-
- addFunction(10.f, 0.f, dummy_func, "llMD5String", "s", "si");
- addFunction(10.f, 0.2f, dummy_func, "llSetPrimitiveParams", NULL, "l");
- addFunction(10.f, 0.f, dummy_func, "llStringToBase64", "s", "s");
- addFunction(10.f, 0.f, dummy_func, "llBase64ToString", "s", "s");
- addFunction(10.f, 0.3f, dummy_func, "llXorBase64Strings", "s", "ss");
- addFunction(10.f, 0.f, dummy_func, "llRemoteDataSetRegion", NULL, NULL);
- addFunction(10.f, 0.f, dummy_func, "llLog10", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llLog", "f", "f");
- addFunction(10.f, 0.f, dummy_func, "llGetAnimationList", "l", "k");
- addFunction(10.f, 2.f, dummy_func, "llSetParcelMusicURL", NULL, "s");
-
- addFunction(10.f, 0.f, dummy_func, "llGetRootPosition", "v", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetRootRotation", "q", NULL);
-
- addFunction(10.f, 0.f, dummy_func, "llGetObjectDesc", "s", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetObjectDesc", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llGetCreator", "k", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetTimestamp", "s", NULL);
- addFunction(10.f, 0.f, dummy_func, "llSetLinkAlpha", NULL, "ifi");
- addFunction(10.f, 0.f, dummy_func, "llGetNumberOfPrims", "i", NULL);
- addFunction(10.f, 0.1f, dummy_func, "llGetNumberOfNotecardLines", "k", "s");
-
- addFunction(10.f, 0.f, dummy_func, "llGetBoundingBox", "l", "k");
- addFunction(10.f, 0.f, dummy_func, "llGetGeometricCenter", "v", NULL);
- addFunction(10.f, 0.2f, dummy_func, "llGetPrimitiveParams", "l", "l");
- addFunction(10.f, 0.0f, dummy_func, "llIntegerToBase64", "s", "i");
- addFunction(10.f, 0.0f, dummy_func, "llBase64ToInteger", "i", "s");
- addFunction(10.f, 0.f, dummy_func, "llGetGMTclock", "f", "");
- addFunction(10.f, 10.f, dummy_func, "llGetSimulatorHostname", "s", "");
-
- addFunction(10.f, 0.2f, dummy_func, "llSetLocalRot", NULL, "q");
-
- addFunction(10.f, 0.f, dummy_func, "llParseStringKeepNulls", "l", "sll");
- addFunction(200.f, 0.1f, dummy_func, "llRezAtRoot", NULL, "svvqi");
-
- addFunction(10.f, 0.f, dummy_func, "llGetObjectPermMask", "i", "i", FALSE);
- addFunction(10.f, 0.f, dummy_func, "llSetObjectPermMask", NULL, "ii", TRUE);
-
- addFunction(10.f, 0.f, dummy_func, "llGetInventoryPermMask", "i", "si", FALSE);
- addFunction(10.f, 0.f, dummy_func, "llSetInventoryPermMask", NULL, "sii", TRUE);
- addFunction(10.f, 0.f, dummy_func, "llGetInventoryCreator", "k", "s", FALSE);
- addFunction(10.f, 0.f, dummy_func, "llOwnerSay", NULL, "s");
- addFunction(10.f, 1.f, dummy_func, "llRequestSimulatorData", "k", "si");
- addFunction(10.f, 0.f, dummy_func, "llForceMouselook", NULL, "i");
- addFunction(10.f, 0.f, dummy_func, "llGetObjectMass", "f", "k");
- addFunction(10.f, 0.f, dummy_func, "llListReplaceList", "l", "llii");
- addFunction(10.f, 10.f, dummy_func, "llLoadURL", NULL, "kss");
-
- addFunction(10.f, 2.f, dummy_func, "llParcelMediaCommandList", NULL, "l");
- addFunction(10.f, 2.f, dummy_func, "llParcelMediaQuery", "l", "l");
-
- addFunction(10.f, 1.f, dummy_func, "llModPow", "i", "iii");
-
- addFunction(10.f, 0.f, dummy_func, "llGetInventoryType", "i", "s");
- addFunction(10.f, 0.f, dummy_func, "llSetPayPrice", NULL, "il");
- addFunction(10.f, 0.f, dummy_func, "llGetCameraPos", "v", "");
- addFunction(10.f, 0.f, dummy_func, "llGetCameraRot", "q", "");
-
- addFunction(10.f, 20.f, dummy_func, "llSetPrimURL", NULL, "s");
- addFunction(10.f, 20.f, dummy_func, "llRefreshPrimURL", NULL, "");
- addFunction(10.f, 0.f, dummy_func, "llEscapeURL", "s", "s");
- addFunction(10.f, 0.f, dummy_func, "llUnescapeURL", "s", "s");
-
- addFunction(10.f, 1.f, dummy_func, "llMapDestination", NULL, "svv");
- addFunction(10.f, 0.1f, dummy_func, "llAddToLandBanList", NULL, "kf");
- addFunction(10.f, 0.1f, dummy_func, "llRemoveFromLandPassList", NULL, "k");
- addFunction(10.f, 0.1f, dummy_func, "llRemoveFromLandBanList", NULL, "k");
-
- addFunction(10.f, 0.f, dummy_func, "llSetCameraParams", NULL, "l");
- addFunction(10.f, 0.f, dummy_func, "llClearCameraParams", NULL, NULL);
-
- addFunction(10.f, 0.f, dummy_func, "llListStatistics", "f", "il");
- addFunction(10.f, 0.f, dummy_func, "llGetUnixTime", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llGetParcelFlags", "i", "v");
- addFunction(10.f, 0.f, dummy_func, "llGetRegionFlags", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llXorBase64StringsCorrect", "s", "ss");
-
- addFunction(10.f, 0.f, dummy_func, "llHTTPRequest", "k", "sls");
-
- addFunction(10.f, 0.1f, dummy_func, "llResetLandBanList", NULL, NULL);
- addFunction(10.f, 0.1f, dummy_func, "llResetLandPassList", NULL, NULL);
-
- addFunction(10.f, 0.f, dummy_func, "llGetObjectPrimCount", "i", "k");
- addFunction(10.f, 2.0f, dummy_func, "llGetParcelPrimOwners", "l", "v");
- addFunction(10.f, 0.f, dummy_func, "llGetParcelPrimCount", "i", "vii");
- addFunction(10.f, 0.f, dummy_func, "llGetParcelMaxPrims", "i", "vi");
- addFunction(10.f, 0.f, dummy_func, "llGetParcelDetails", "l", "vl");
-
-
- addFunction(10.f, 0.2f, dummy_func, "llSetLinkPrimitiveParams", NULL, "il");
- addFunction(10.f, 0.2f, dummy_func, "llSetLinkTexture", NULL, "isi");
-
-
- addFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si");
- addFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is");
- addFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl");
- addFunction(10.f, 0.f, dummy_func, "llSetClickAction", NULL, "i");
-
- addFunction(10.f, 0.f, dummy_func, "llGetRegionAgentCount", "i", NULL);
- addFunction(10.f, 1.f, dummy_func, "llTextBox", NULL, "ksi");
- addFunction(10.f, 0.f, dummy_func, "llGetAgentLanguage", "s", "k");
- addFunction(10.f, 0.f, dummy_func, "llDetectedTouchUV", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedTouchFace", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedTouchPos", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedTouchNormal", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedTouchBinormal", "v", "i");
- addFunction(10.f, 0.f, dummy_func, "llDetectedTouchST", "v", "i");
-
- addFunction(10.f, 0.f, dummy_func, "llSHA1String", "s", "s");
-
- addFunction(10.f, 0.f, dummy_func, "llGetFreeURLs", "i", NULL);
- addFunction(10.f, 0.f, dummy_func, "llRequestURL", "k", NULL);
- addFunction(10.f, 0.f, dummy_func, "llRequestSecureURL", "k", NULL);
- addFunction(10.f, 0.f, dummy_func, "llReleaseURL", NULL, "s");
- addFunction(10.f, 0.f, dummy_func, "llHTTPResponse", NULL, "kis");
- addFunction(10.f, 0.f, dummy_func, "llGetHTTPHeader", "s", "ks");
-
- // Prim media (see lscript_prim_media.h)
- addFunction(10.f, 1.0f, dummy_func, "llSetPrimMediaParams", "i", "il");
- addFunction(10.f, 1.0f, dummy_func, "llGetPrimMediaParams", "l", "il");
- addFunction(10.f, 1.0f, dummy_func, "llClearPrimMedia", "i", "i");
- addFunction(10.f, 0.f, dummy_func, "llSetLinkPrimitiveParamsFast", NULL, "il");
- addFunction(10.f, 0.f, dummy_func, "llGetLinkPrimitiveParams", "l", "il");
- addFunction(10.f, 0.f, dummy_func, "llLinkParticleSystem", NULL, "il");
- addFunction(10.f, 0.f, dummy_func, "llSetLinkTextureAnim", NULL, "iiiiifff");
-
- addFunction(10.f, 0.f, dummy_func, "llGetLinkNumberOfSides", "i", "i");
-
- // IDEVO Name lookup calls, see lscript_avatar_names.h
- addFunction(10.f, 0.f, dummy_func, "llGetUsername", "s", "k");
- addFunction(10.f, 0.f, dummy_func, "llRequestUsername", "k", "k");
- addFunction(10.f, 0.f, dummy_func, "llGetDisplayName", "s", "k");
- addFunction(10.f, 0.f, dummy_func, "llRequestDisplayName", "k", "k");
-
- addFunction(10.f, 0.f, dummy_func, "llGetEnv", "s", "s");
- addFunction(10.f, 0.f, dummy_func, "llRegionSayTo", NULL, "kis");
-
- // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
-
- // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST.
- // Otherwise the bytecode numbers for each call will be wrong, and all
- // existing scripts will crash.
-}
-
-LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only)
- : mEnergyUse(eu), mSleepTime(st), mExecFunc(exec_func), mName(name), mReturnType(ret_type), mArgs(args), mGodOnly(god_only)
-{
-}
-
-LLScriptLibraryFunction::~LLScriptLibraryFunction()
-{
-}
-
-void LLScriptLibrary::addFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only)
-{
- LLScriptLibraryFunction func(eu, st, exec_func, name, ret_type, args, god_only);
- mFunctions.push_back(func);
-}
-
-void LLScriptLibrary::assignExec(const char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &))
-{
- for (std::vector<LLScriptLibraryFunction>::iterator i = mFunctions.begin();
- i != mFunctions.end(); ++i)
- {
- if (!strcmp(name, i->mName))
- {
- i->mExecFunc = exec_func;
- return;
- }
- }
-
- LL_ERRS() << "Unknown LSL function in assignExec: " << name << LL_ENDL;
-}
-
-void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
-{
- char tmp[1024]; /*Flawfinder: ignore*/
- if (b_prepend_comma)
- {
- s << ", ";
- }
- switch (mType)
- {
- case LST_INTEGER:
- s << mInteger;
- break;
- case LST_FLOATINGPOINT:
- snprintf(tmp, 1024, "%f", mFP); /* Flawfinder: ignore */
- s << tmp;
- break;
- case LST_KEY:
- s << mKey;
- break;
- case LST_STRING:
- s << mString;
- break;
- case LST_VECTOR:
- snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], /* Flawfinder: ignore */
- mVec.mV[VY], mVec.mV[VZ]);
- s << tmp;
- break;
- case LST_QUATERNION:
- snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], /* Flawfinder: ignore */
- mQuat.mQ[VZ], mQuat.mQ[VS]);
- s << tmp;
- break;
- default:
- break;
- }
-}
-
-void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, char* sep)
-{
- if (b_prepend_sep)
- {
- ostr << sep;
- }
- //print(ostr, FALSE);
- {
- char tmp[1024]; /* Flawfinder: ignore */
- switch (mType)
- {
- case LST_INTEGER:
- ostr << mInteger;
- break;
- case LST_FLOATINGPOINT:
- snprintf(tmp, 1024, "%f", mFP); /* Flawfinder: ignore */
- ostr << tmp;
- break;
- case LST_KEY:
- ostr << mKey;
- break;
- case LST_STRING:
- ostr << mString;
- break;
- case LST_VECTOR:
- snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], /* Flawfinder: ignore */
- mVec.mV[VY], mVec.mV[VZ]);
- ostr << tmp;
- break;
- case LST_QUATERNION:
- snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], /* Flawfinder: ignore */
- mQuat.mQ[VZ], mQuat.mQ[VS]);
- ostr << tmp;
- break;
- default:
- break;
- }
- }
-}
-
-
-LLScriptLibrary gScriptLibrary;
diff --git a/indra/lscript/lscript_rt_interface.h b/indra/lscript/lscript_rt_interface.h
deleted file mode 100755
index cdf2c5bbd785407c900ab89e286ec5e76c93cfd1..0000000000000000000000000000000000000000
--- a/indra/lscript/lscript_rt_interface.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file lscript_rt_interface.h
- * @brief Interface between compiler library and applications
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LSCRIPT_RT_INTERFACE_H
-#define LL_LSCRIPT_RT_INTERFACE_H
-
-BOOL lscript_compile(char *filename, BOOL compile_to_mono, BOOL is_god_like = FALSE);
-BOOL lscript_compile(const char* src_filename, const char* dst_filename,
- const char* err_filename, BOOL compile_to_mono, const char* class_name, BOOL is_god_like = FALSE);
-void lscript_run(const std::string& filename, BOOL b_debug);
-
-
-#endif
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/mac_crash_logger/Info.plist b/indra/mac_crash_logger/Info.plist
old mode 100755
new mode 100644
diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp
old mode 100755
new mode 100644
diff --git a/indra/mac_crash_logger/llcrashloggermac.h b/indra/mac_crash_logger/llcrashloggermac.h
old mode 100755
new mode 100644
diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.h b/indra/mac_crash_logger/llcrashloggermacdelegate.h
old mode 100755
new mode 100644
diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.mm b/indra/mac_crash_logger/llcrashloggermacdelegate.mm
old mode 100755
new mode 100644
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/winmmshim/forwarding_api.cpp b/indra/media_plugins/winmmshim/forwarding_api.cpp
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/winmmshim/forwarding_api.h b/indra/media_plugins/winmmshim/forwarding_api.h
old mode 100755
new mode 100644
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
old mode 100755
new mode 100644
index 3960ec56336205f2f8a559cf65871e7610934b2e..19a4026ff483173106cbe91bfb6082b6e6f39b3f
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -35,7 +35,6 @@ include(LLUI)
include(LLVFS)
include(LLWindow)
include(LLXML)
-include(LScript)
include(Linking)
include(NDOF)
include(NVAPI)
@@ -81,8 +80,6 @@ include_directories(
${LLVFS_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
${LLLOGIN_INCLUDE_DIRS}
${UPDATER_INCLUDE_DIRS}
${LIBS_PREBUILT_DIR}/include/collada
@@ -126,6 +123,7 @@ set(viewer_SOURCE_FILES
llavatarlist.cpp
llavatarlistitem.cpp
llavatarrenderinfoaccountant.cpp
+ llavatarrendernotifier.cpp
llavatarpropertiesprocessor.cpp
llblockedlistitem.cpp
llblocklist.cpp
@@ -221,6 +219,7 @@ set(viewer_SOURCE_FILES
llfloaterconversationlog.cpp
llfloaterconversationpreview.cpp
llfloaterdeleteenvpreset.cpp
+ llfloaterdeleteprefpreset.cpp
llfloaterdestinations.cpp
llfloatereditdaycycle.cpp
llfloatereditsky.cpp
@@ -240,7 +239,6 @@ set(viewer_SOURCE_FILES
llfloatergroupinvite.cpp
llfloatergroups.cpp
llfloaterhandler.cpp
- llfloaterhardwaresettings.cpp
llfloaterhelpbrowser.cpp
llfloaterhoverheight.cpp
llfloaterhud.cpp
@@ -254,6 +252,7 @@ set(viewer_SOURCE_FILES
llfloaterlagmeter.cpp
llfloaterland.cpp
llfloaterlandholdings.cpp
+ llfloaterloadprefpreset.cpp
llfloatermarketplacelistings.cpp
llfloatermap.cpp
llfloatermediasettings.cpp
@@ -278,6 +277,7 @@ set(viewer_SOURCE_FILES
llfloaterregioninfo.cpp
llfloaterreporter.cpp
llfloaterregionrestarting.cpp
+ llfloatersaveprefpreset.cpp
llfloatersceneloadstats.cpp
llfloaterscriptdebug.cpp
llfloaterscriptedprefs.cpp
@@ -457,6 +457,7 @@ set(viewer_SOURCE_FILES
llpanelplaceprofile.cpp
llpanelplaces.cpp
llpanelplacestab.cpp
+ llpanelpresetspulldown.cpp
llpanelprimmediacontrols.cpp
llpanelprofile.cpp
llpanelsnapshot.cpp
@@ -496,6 +497,7 @@ set(viewer_SOURCE_FILES
llplacesfolderview.cpp
llpopupview.cpp
llpostcard.cpp
+ llpresetsmanager.cpp
llpreview.cpp
llpreviewanim.cpp
llpreviewgesture.cpp
@@ -735,6 +737,7 @@ set(viewer_HEADER_FILES
llavatarlistitem.h
llavatarpropertiesprocessor.h
llavatarrenderinfoaccountant.h
+ llavatarrendernotifier.h
llblockedlistitem.h
llblocklist.h
llbox.h
@@ -828,6 +831,7 @@ set(viewer_HEADER_FILES
llfloatercolorpicker.h
llfloaterconversationlog.h
llfloaterconversationpreview.h
+ llfloaterdeleteprefpreset.h
llfloaterdeleteenvpreset.h
llfloaterdestinations.h
llfloatereditdaycycle.h
@@ -848,7 +852,6 @@ set(viewer_HEADER_FILES
llfloatergroupinvite.h
llfloatergroups.h
llfloaterhandler.h
- llfloaterhardwaresettings.h
llfloaterhelpbrowser.h
llfloaterhoverheight.h
llfloaterhud.h
@@ -865,6 +868,7 @@ set(viewer_HEADER_FILES
llfloaterlagmeter.h
llfloaterland.h
llfloaterlandholdings.h
+ llfloaterloadprefpreset.h
llfloatermap.h
llfloatermarketplacelistings.h
llfloatermediasettings.h
@@ -889,6 +893,7 @@ set(viewer_HEADER_FILES
llfloaterregioninfo.h
llfloaterreporter.h
llfloaterregionrestarting.h
+ llfloatersaveprefpreset.h
llfloatersceneloadstats.h
llfloaterscriptdebug.h
llfloaterscriptedprefs.h
@@ -1059,6 +1064,7 @@ set(viewer_HEADER_FILES
llpanelplaceprofile.h
llpanelplaces.h
llpanelplacestab.h
+ llpanelpresetspulldown.h
llpanelprimmediacontrols.h
llpanelprofile.h
llpanelsnapshot.h
@@ -1093,6 +1099,7 @@ set(viewer_HEADER_FILES
llplacesfolderview.h
llpopupview.h
llpostcard.h
+ llpresetsmanager.h
llpreview.h
llpreviewanim.h
llpreviewgesture.h
@@ -1115,6 +1122,7 @@ set(viewer_HEADER_FILES
llscreenchannel.h
llscripteditor.h
llscriptfloater.h
+ llscriptruntimeperms.h
llscrollingpanelparam.h
llscrollingpanelparambase.h
llsearchcombobox.h
@@ -1309,16 +1317,14 @@ source_group("CMake Rules" FILES ViewerInstall.cmake)
# the viewer_version.txt file created here is for passing to viewer_manifest and autobuild
# the summary.json file is created for the benefit of the TeamCity builds, where
# it is used to provide descriptive information to the build results page
-add_custom_target(generate_viewer_version ALL
- COMMAND printf '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
- COMMAND printf '{"Type":"viewer","Version":"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}"}' > ${CMAKE_BINARY_DIR}/summary.json
- COMMENT Generating viewer_version.txt for manifest processing
- )
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt"
+ "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n")
+file(WRITE "${CMAKE_BINARY_DIR}/summary.json"
+ "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\"}\n")
set_source_files_properties(
llversioninfo.cpp tests/llversioninfo_test.cpp
PROPERTIES
- DEPENDS generate_viewer_version # dummy dependency to force recompile every time
COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake
)
@@ -1526,6 +1532,7 @@ if (WINDOWS)
oleaut32
shell32
Vfw32
+ wer
winspool
)
@@ -1675,8 +1682,6 @@ if (WINDOWS)
LINK_FLAGS_RELEASE "/FORCE:MULTIPLE /MAP\"secondlife-bin.MAP\" /OPT:REF /LARGEADDRESSAWARE"
)
- add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version)
-
if(USE_PRECOMPILED_HEADERS)
set_target_properties(
${VIEWER_BINARY_NAME}
@@ -1906,7 +1911,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
${LLXML_LIBRARIES}
- ${LSCRIPT_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LLCOMMON_LIBRARIES}
@@ -1953,8 +1957,6 @@ if (LINUX)
llcommon
)
- add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version)
-
add_custom_command(
OUTPUT ${product}.tar.bz2
COMMAND ${PYTHON_EXECUTABLE}
@@ -2038,8 +2040,6 @@ if (DARWIN)
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app/Contents/Info.plist"
)
- add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version)
-
add_custom_command(
TARGET ${VIEWER_BINARY_NAME} POST_BUILD
COMMAND ${PYTHON_EXECUTABLE}
@@ -2072,7 +2072,6 @@ if (DARWIN)
if (PACKAGE)
add_custom_target(llpackage ALL DEPENDS ${VIEWER_BINARY_NAME})
- add_dependencies(llpackage generate_viewer_version)
add_custom_command(
TARGET llpackage POST_BUILD
@@ -2155,7 +2154,7 @@ if (PACKAGE)
DEPENDS generate_breakpad_symbols.py
VERBATIM)
- add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}")
+ add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}")
add_dependencies(generate_breakpad_symbols "${VIEWER_BINARY_NAME}")
if (WINDOWS OR LINUX)
add_dependencies(generate_breakpad_symbols "${VIEWER_COPY_MANIFEST}")
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
old mode 100755
new mode 100644
diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/German.lproj/language.txt b/indra/newview/German.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
old mode 100755
new mode 100644
diff --git a/indra/newview/Info-SecondLifeVorbis.plist b/indra/newview/Info-SecondLifeVorbis.plist
old mode 100755
new mode 100644
diff --git a/indra/newview/Japanese.lproj/language.txt b/indra/newview/Japanese.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/Korean.lproj/language.txt b/indra/newview/Korean.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 7636e75650d437ffe0ab5f1e269cc6f5d3095546..d13e837c8ecbbe09e8fe5676e097167fe79812fc 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-4.0.5
+4.0.6
diff --git a/indra/newview/VertexCache.h b/indra/newview/VertexCache.h
old mode 100755
new mode 100644
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
old mode 100755
new mode 100644
diff --git a/indra/newview/VorbisFramework.h b/indra/newview/VorbisFramework.h
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/CA.pem b/indra/newview/app_settings/CA.pem
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/anim.ini b/indra/newview/app_settings/anim.ini
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/autoreplace.xml b/indra/newview/app_settings/autoreplace.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/filters/Autocontrast.xml b/indra/newview/app_settings/filters/Autocontrast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/filters/Miniature.xml b/indra/newview/app_settings/filters/Miniature.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/filters/Toycamera.xml b/indra/newview/app_settings/filters/Toycamera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/grass.xml b/indra/newview/app_settings/grass.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml
old mode 100755
new mode 100644
index 5bc2e1b7e64f2cbed20033ab50f3d7fc6eea426a..c38b3fcda4a3faf85febaba157a4745236ddd39c
--- a/indra/newview/app_settings/high_graphics.xml
+++ b/indra/newview/app_settings/high_graphics.xml
@@ -26,8 +26,10 @@
<RenderTerrainLODFactor value="2"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits-->
+ <RenderAvatarMaxNonImpostors value="20"/>
+ <RenderAvatarMaxComplexity value="350000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="1250.0"/>
<!--Default for now-->
<RenderVolumeLODFactor value="1.125"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/keys.xml b/indra/newview/app_settings/keys.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/lindenlab.pem b/indra/newview/app_settings/lindenlab.pem
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/llsd-lsl-syntax.rng b/indra/newview/app_settings/llsd-lsl-syntax.rng
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
old mode 100755
new mode 100644
index de3732f339c6d84cf6ad7bf84c3e246d366de09e..ecd7c4bc3648c599466b2d87e3b4c468033072be
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -5,7 +5,23 @@
<key>print-location</key> <boolean>false</boolean>
<key>settings</key>
<array>
- <!-- sample entry for changing settings on specific items -->
+ <!-- Suppress anything but ERROR for some very verbose components -->
+ <map>
+ <key>level</key><string>ERROR</string>
+ <key>functions</key>
+ <array>
+ </array>
+ <key>classes</key>
+ <array>
+ </array>
+ <key>files</key>
+ <array>
+ </array>
+ <key>tags</key>
+ <array>
+ <string>ShaderLoading</string>
+ </array>
+ </map>
<map>
<key>level</key><string>INFO</string>
<key>functions</key>
@@ -19,14 +35,6 @@
</array>
<key>tags</key>
<array>
- <string>AppInit</string>
- <string>Capabilities</string>
- <string>SystemInfo</string>
- <string>TextureCache</string>
- <string>AppCache</string>
- <string>Window</string>
- <string>RenderInit</string>
- <string>MediaAuth</string>
</array>
</map>
<map>
diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml
old mode 100755
new mode 100644
index ca1dae0b86d4a97030806a6deebbafbc3877bd70..df3f67a5a1a6345478e1ca0cafcd8bcf7dd39b66
--- a/indra/newview/app_settings/low_graphics.xml
+++ b/indra/newview/app_settings/low_graphics.xml
@@ -6,8 +6,6 @@
<RenderAvatarLODFactor value="0.5"/>
<!--Default for now-->
<RenderAvatarPhysicsLODFactor value="0.0"/>
- <!--Default for now-->
- <RenderAvatarMaxVisible value="3"/>
<!--NO SHADERS-->
<RenderAvatarVP value="FALSE"/>
<!--Short Range-->
@@ -28,8 +26,10 @@
<RenderTerrainLODFactor value="1.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits-->
+ <RenderAvatarMaxNonImpostors value="12"/>
+ <RenderAvatarMaxComplexity value="80000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="750.0"/>
<!--Default for now-->
<RenderVolumeLODFactor value="1.125"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml
old mode 100755
new mode 100644
index 01822fe64c9828db0af9e1b2517a0471dc0337e6..a10c02b79f21ccce113b709ecd7559d14a61a7f5
--- a/indra/newview/app_settings/mid_graphics.xml
+++ b/indra/newview/app_settings/mid_graphics.xml
@@ -26,8 +26,10 @@
<RenderTerrainLODFactor value="1.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits-->
+ <RenderAvatarMaxNonImpostors value="18"/>
+ <RenderAvatarMaxComplexity value="150000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="1000.0"/>
<!--Default for now-->
<RenderVolumeLODFactor value="1.125"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
old mode 100755
new mode 100644
index 07e4a791024ffb7f36414b9cf9dcb7d5d9f69f77..92bb0fe940e6d64210919dfc6960c2ebaec9182b
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8361,21 +8361,10 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>RenderAvatarComplexityLimit</key>
- <map>
- <key>Comment</key>
- <string>Max visual complexity of avatars in a scene</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>-1</integer>
- </map>
<key>RenderComplexityColorMin</key>
<map>
<key>Comment</key>
- <string>Max visual complexity of avatars in a scene</string>
+ <string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8391,7 +8380,7 @@
<key>RenderComplexityColorMid</key>
<map>
<key>Comment</key>
- <string>Max visual complexity of avatars in a scene</string>
+ <string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8407,7 +8396,7 @@
<key>RenderComplexityColorMax</key>
<map>
<key>Comment</key>
- <string>Max visual complexity of avatars in a scene</string>
+ <string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8423,7 +8412,7 @@
<key>RenderComplexityThreshold</key>
<map>
<key>Comment</key>
- <string>Only color objects higher than render threshold</string>
+ <string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8434,8 +8423,7 @@
<key>RenderComplexityStaticMax</key>
<map>
<key>Comment</key>
- <string>Sets a static max value for scaling of RenderComplexity
- display (-1 for dynamic scaling)</string>
+ <string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8457,13 +8445,13 @@
<key>RenderAvatarMaxVisible</key>
<map>
<key>Comment</key>
- <string>Maximum number of avatars to display at any one time</string>
+ <string>OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>12</integer>
+ <integer>0</integer>
</map>
<key>RenderAvatarPhysicsLODFactor</key>
<map>
@@ -9896,13 +9884,13 @@
<key>RenderTerrainDetail</key>
<map>
<key>Comment</key>
- <string>Detail applied to terrain texturing (0 = none, 1 or 2 = full)</string>
+ <string>Detail applied to terrain texturing (0 = none, 1 = full)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>2</integer>
+ <integer>1</integer>
</map>
<key>RenderTerrainLODFactor</key>
<map>
@@ -10028,52 +10016,65 @@
<key>RenderUseImpostors</key>
<map>
<key>Comment</key>
- <string>Whether we want to use impostors for far away avatars.</string>
+ <string>OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors and RenderAvatarMaxComplexity.</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
-
<key>RenderAutoMuteByteLimit</key>
<map>
<key>Comment</key>
- <string>Maximum bytes of attachments before an avatar is rendered as a simple impostor (0 for no limit).</string>
+ <string>OBSOLETE and UNUSED.</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>RenderAutoMuteRenderWeightLimit</key>
+ <key>RenderAvatarMaxNonImpostors</key>
<map>
<key>Comment</key>
- <string>Maximum render weight before an avatar is rendered as a simple impostor (0 to not use this limit).</string>
+ <string>Maximum number of avatars to fully render at one time;
+ over this limit uses impostor rendering (simplified rendering
+ with less frequent updates), reducing client lag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
+ <integer>12</integer>
+ </map>
+ <key>RenderAutoMuteRenderWeightLimit</key>
+ <map>
+ <key>Comment</key>
+ <string>OBSOLETE. This setting has been renamed RenderAvatarMaxNonImpostors.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
<integer>0</integer>
</map>
- <key>RenderAutoMuteSurfaceAreaLimit</key>
+ <key>ShowMyComplexityChanges</key>
<map>
<key>Comment</key>
- <string>Maximum surface area of attachments before an avatar is rendered as a simple impostor (0 to not use this limit).</string>
+ <string>How long to show notices about avatar complexity (set to zero to disable those notices)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>U32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>10</integer>
</map>
- <key>RenderAutoMuteFunctions</key>
+ <key>RenderAvatarMaxComplexity</key>
<map>
<key>Comment</key>
- <string>Developing feature to render some avatars using simple impostors or colored silhouettes. (Set to 7 for all functionality)</string>
+ <string>Maximum Avatar Complexity; above this value, the avatar is
+ rendered as a solid color outline (0 to disable this limit).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -10081,6 +10082,19 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>RenderAutoMuteSurfaceAreaLimit</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum surface area of attachments before an avatar is
+ rendered as a simple impostor (to not use this limit, set to zero
+ or set RenderAvatarMaxComplexity to zero).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>1000.0</real>
+ </map>
<key>RenderAutoMuteLogging</key>
<map>
<key>Comment</key>
@@ -10101,7 +10115,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>10.0E6</real>
</map>
<key>RenderVBOEnable</key>
@@ -10688,17 +10702,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowAdvancedGraphicsSettings</key>
- <map>
- <key>Comment</key>
- <string>Show advanced graphics settings</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>ShowAllObjectHoverTip</key>
<map>
<key>Comment</key>
@@ -15772,6 +15775,41 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>PresetGraphicActive</key>
+ <map>
+ <key>Comment</key>
+ <string>Name of currently selected preference</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string />
+ </map>
+ <key>IndirectMaxComplexity</key>
+ <map>
+ <key>Comment</key>
+ <string>Controls RenderAvatarMaxComplexity in a non-linear fashion (do
+ not set this value)</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>IndirectMaxNonImpostors</key>
+ <map>
+ <key>Comment</key>
+ <string>Controls RenderAvatarMaxNonImpostors in a non-linear fashion (do
+ not set this value)</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
</map>
</llsd>
diff --git a/indra/newview/app_settings/settings_crash_behavior.xml b/indra/newview/app_settings/settings_crash_behavior.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl b/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl b/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/attachmentShadowF.glsl b/indra/newview/app_settings/shaders/class1/deferred/attachmentShadowF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/attachmentShadowV.glsl b/indra/newview/app_settings/shaders/class1/deferred/attachmentShadowV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarAlphaNoColorV.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarAlphaNoColorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarEyesV.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarEyesV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarShadowF.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarShadowF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarShadowV.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarShadowV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/blurLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/blurLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseNoColorV.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseNoColorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl b/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/emissiveF.glsl b/indra/newview/app_settings/shaders/class1/deferred/emissiveF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl b/indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/luminanceF.glsl b/indra/newview/app_settings/shaders/class1/deferred/luminanceF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/luminanceV.glsl b/indra/newview/app_settings/shaders/class1/deferred/luminanceV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiPointLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiPointLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/normgenF.glsl b/indra/newview/app_settings/shaders/class1/deferred/normgenF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/normgenV.glsl b/indra/newview/app_settings/shaders/class1/deferred/normgenV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoTCV.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoTCV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredV.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postgiF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postgiF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskV.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowCubeV.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowCubeV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowV.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsV.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightNoFragCoordV.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightNoFragCoordV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainV.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeShadowV.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeShadowV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeV.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterV.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowV.glsl b/indra/newview/app_settings/shaders/class1/effects/glowV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainF.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterV.glsl b/indra/newview/app_settings/shaders/class1/environment/waterV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/alphamaskF.glsl b/indra/newview/app_settings/shaders/class1/interface/alphamaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/alphamaskV.glsl b/indra/newview/app_settings/shaders/class1/interface/alphamaskV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/clipF.glsl b/indra/newview/app_settings/shaders/class1/interface/clipF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/clipV.glsl b/indra/newview/app_settings/shaders/class1/interface/clipV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl b/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl b/indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/debugF.glsl b/indra/newview/app_settings/shaders/class1/interface/debugF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/debugV.glsl b/indra/newview/app_settings/shaders/class1/interface/debugV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAV.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineV.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/occlusionCubeV.glsl b/indra/newview/app_settings/shaders/class1/interface/occlusionCubeV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl b/indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/occlusionV.glsl b/indra/newview/app_settings/shaders/class1/interface/occlusionV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/onetexturenocolorF.glsl b/indra/newview/app_settings/shaders/class1/interface/onetexturenocolorF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/onetexturenocolorV.glsl b/indra/newview/app_settings/shaders/class1/interface/onetexturenocolorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingNoNormalV.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingNoNormalV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl b/indra/newview/app_settings/shaders/class1/interface/pathfindingV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl b/indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/splattexturerectV.glsl b/indra/newview/app_settings/shaders/class1/interface/splattexturerectV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl b/indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl b/indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/interface/uiV.glsl b/indra/newview/app_settings/shaders/class1/interface/uiV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightNonIndexedAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightNonIndexedAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterNonIndexedAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterNonIndexedAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFuncSpecularV.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFuncSpecularV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFuncV.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFuncV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightSpecularV.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightSpecularV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightV.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterNonIndexedF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/sumLightsSpecularV.glsl b/indra/newview/app_settings/shaders/class1/lighting/sumLightsSpecularV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpF.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl b/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightNoColorV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightNoColorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightShinySkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightShinySkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyWaterF.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightSkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/impostorF.glsl b/indra/newview/app_settings/shaders/class1/objects/impostorF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/impostorV.glsl b/indra/newview/app_settings/shaders/class1/objects/impostorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/indexedTextureF.glsl b/indra/newview/app_settings/shaders/class1/objects/indexedTextureF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/nonindexedTextureV.glsl b/indra/newview/app_settings/shaders/class1/objects/nonindexedTextureV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/previewF.glsl b/indra/newview/app_settings/shaders/class1/objects/previewF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl b/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/shinySimpleSkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl b/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl b/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleF.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleNoColorV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleNoColorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleNonIndexedV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleNonIndexedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleSkinnedV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleTexGenV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleTexGenV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/objects/treeV.glsl b/indra/newview/app_settings/shaders/class1/objects/treeV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/transform/binormalV.glsl b/indra/newview/app_settings/shaders/class1/transform/binormalV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/transform/colorV.glsl b/indra/newview/app_settings/shaders/class1/transform/colorV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/transform/normalV.glsl b/indra/newview/app_settings/shaders/class1/transform/normalV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/transform/positionV.glsl b/indra/newview/app_settings/shaders/class1/transform/positionV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/transform/texcoordV.glsl b/indra/newview/app_settings/shaders/class1/transform/texcoordV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/avatar/eyeballV.glsl b/indra/newview/app_settings/shaders/class2/avatar/eyeballV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightV.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/lighting/sumLightsSpecularV.glsl b/indra/newview/app_settings/shaders/class2/lighting/sumLightsSpecularV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class2/lighting/sumLightsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsWaterV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class2/windlight/gammaF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/skyF.glsl b/indra/newview/app_settings/shaders/class2/windlight/skyF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/skyV.glsl b/indra/newview/app_settings/shaders/class2/windlight/skyV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl b/indra/newview/app_settings/shaders/class3/avatar/avatarV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsSpecularV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl b/indra/newview/app_settings/shaders/class3/lighting/sumLightsV.glsl
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/shaders/shader_hierarchy.txt b/indra/newview/app_settings/shaders/shader_hierarchy.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/static_data.db2 b/indra/newview/app_settings/static_data.db2
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/std_bump.ini b/indra/newview/app_settings/std_bump.ini
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/trees.xml b/indra/newview/app_settings/trees.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml
old mode 100755
new mode 100644
index 71459e5470a6dddecbcaba616db74b87aebd2340..3e7fccbd5f1e2b917ba83f72d536cb17d51f2447
--- a/indra/newview/app_settings/ultra_graphics.xml
+++ b/indra/newview/app_settings/ultra_graphics.xml
@@ -26,8 +26,11 @@
<RenderTerrainLODFactor value="2.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="1.0"/>
- <!--Try Impostors-->
- <RenderUseImpostors value="TRUE"/>
+ <!--Avater Impostors and Visual Muting Limits (real defaults set
+ based on default graphics setting -->
+ <RenderAvatarMaxNonImpostors value="0"/>
+ <RenderAvatarMaxComplexity value="350000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="1500.0"/>
<!--Default for now-->
<RenderVolumeLODFactor value="2.0"/>
<!--NO SHADERS-->
diff --git a/indra/newview/app_settings/viewerart.xml b/indra/newview/app_settings/viewerart.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/clouds2.tga b/indra/newview/app_settings/windlight/clouds2.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Colder%20Tones.xml b/indra/newview/app_settings/windlight/days/Colder%20Tones.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Default.xml b/indra/newview/app_settings/windlight/days/Default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml b/indra/newview/app_settings/windlight/days/Dynamic%20Richness.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml b/indra/newview/app_settings/windlight/days/Pirate%27s%20Dream.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml b/indra/newview/app_settings/windlight/days/Psycho%20Strobe%21.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Tropicalia.xml b/indra/newview/app_settings/windlight/days/Tropicalia.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/days/Weird-O.xml b/indra/newview/app_settings/windlight/days/Weird-O.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/postprocesseffects.xml b/indra/newview/app_settings/windlight/postprocesseffects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D12AM.xml b/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D12PM.xml b/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D3AM.xml b/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D3PM.xml b/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D6AM.xml b/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D9AM.xml b/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/A%2D9PM.xml b/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Barcelona.xml b/indra/newview/app_settings/windlight/skies/Barcelona.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Blizzard.xml b/indra/newview/app_settings/windlight/skies/Blizzard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml b/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml b/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml b/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Default.xml b/indra/newview/app_settings/windlight/skies/Default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml b/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Fine%20Day.xml b/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Foggy.xml b/indra/newview/app_settings/windlight/skies/Foggy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml b/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml b/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Gelatto.xml b/indra/newview/app_settings/windlight/skies/Gelatto.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Ghost.xml b/indra/newview/app_settings/windlight/skies/Ghost.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml b/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Midday%201.xml b/indra/newview/app_settings/windlight/skies/Midday%201.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Midday%202.xml b/indra/newview/app_settings/windlight/skies/Midday%202.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Midday%203.xml b/indra/newview/app_settings/windlight/skies/Midday%203.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Midday%204.xml b/indra/newview/app_settings/windlight/skies/Midday%204.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Midday.xml b/indra/newview/app_settings/windlight/skies/Midday.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Midnight.xml b/indra/newview/app_settings/windlight/skies/Midnight.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Night.xml b/indra/newview/app_settings/windlight/skies/Night.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Pirate.xml b/indra/newview/app_settings/windlight/skies/Pirate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Purple.xml b/indra/newview/app_settings/windlight/skies/Purple.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml b/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml b/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Sunrise.xml b/indra/newview/app_settings/windlight/skies/Sunrise.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/skies/Sunset.xml b/indra/newview/app_settings/windlight/skies/Sunset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/Default.xml b/indra/newview/app_settings/windlight/water/Default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/Glassy.xml b/indra/newview/app_settings/windlight/water/Glassy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/Murky.xml b/indra/newview/app_settings/windlight/water/Murky.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/Pond.xml b/indra/newview/app_settings/windlight/water/Pond.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/Second%20Plague.xml b/indra/newview/app_settings/windlight/water/Second%20Plague.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/app_settings/windlight/water/Valdez.xml b/indra/newview/app_settings/windlight/water/Valdez.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/character/attentions.xml b/indra/newview/character/attentions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/character/attentionsN.xml b/indra/newview/character/attentionsN.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_eye.llm b/indra/newview/character/avatar_eye.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_eye_1.llm b/indra/newview/character/avatar_eye_1.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_eyelashes.llm b/indra/newview/character/avatar_eyelashes.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_hair.llm b/indra/newview/character/avatar_hair.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_hair_1.llm b/indra/newview/character/avatar_hair_1.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_hair_2.llm b/indra/newview/character/avatar_hair_2.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_hair_3.llm b/indra/newview/character/avatar_hair_3.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_hair_4.llm b/indra/newview/character/avatar_hair_4.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_hair_5.llm b/indra/newview/character/avatar_hair_5.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_head.llm b/indra/newview/character/avatar_head.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_head_1.llm b/indra/newview/character/avatar_head_1.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_head_2.llm b/indra/newview/character/avatar_head_2.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_head_3.llm b/indra/newview/character/avatar_head_3.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_head_4.llm b/indra/newview/character/avatar_head_4.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
old mode 100755
new mode 100644
index 9ec6428ee65df8a029ba00ab7d055d1bef17a5f1..7f7eaed38a13d9e945d4d740be6df4a6ad4efb78
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -10366,8 +10366,8 @@ render_pass="bump">
edit_group="hair_style"
edit_group_order="16"
name="Hair Tilt"
- label_min="Left"
- label_max="Right"
+ label_min="Hair Tilted Left"
+ label_max="Hair Tilted Right"
value_min="0"
value_max="1"
value_default=".5"
diff --git a/indra/newview/character/avatar_lower_body.llm b/indra/newview/character/avatar_lower_body.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_lower_body_1.llm b/indra/newview/character/avatar_lower_body_1.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_lower_body_2.llm b/indra/newview/character/avatar_lower_body_2.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_lower_body_3.llm b/indra/newview/character/avatar_lower_body_3.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_lower_body_4.llm b/indra/newview/character/avatar_lower_body_4.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_skirt.llm b/indra/newview/character/avatar_skirt.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_skirt_1.llm b/indra/newview/character/avatar_skirt_1.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_skirt_2.llm b/indra/newview/character/avatar_skirt_2.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_skirt_3.llm b/indra/newview/character/avatar_skirt_3.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_skirt_4.llm b/indra/newview/character/avatar_skirt_4.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_upper_body.llm b/indra/newview/character/avatar_upper_body.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_upper_body_1.llm b/indra/newview/character/avatar_upper_body_1.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_upper_body_2.llm b/indra/newview/character/avatar_upper_body_2.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_upper_body_3.llm b/indra/newview/character/avatar_upper_body_3.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/avatar_upper_body_4.llm b/indra/newview/character/avatar_upper_body_4.llm
old mode 100755
new mode 100644
diff --git a/indra/newview/character/blush_alpha.tga b/indra/newview/character/blush_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/body_skingrain.tga b/indra/newview/character/body_skingrain.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bodyfreckles_alpha.tga b/indra/newview/character/bodyfreckles_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bump_face_wrinkles.tga b/indra/newview/character/bump_face_wrinkles.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bump_head_base.tga b/indra/newview/character/bump_head_base.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bump_lowerbody_base.tga b/indra/newview/character/bump_lowerbody_base.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bump_pants_wrinkles.tga b/indra/newview/character/bump_pants_wrinkles.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bump_shirt_wrinkles.tga b/indra/newview/character/bump_shirt_wrinkles.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/bump_upperbody_base.tga b/indra/newview/character/bump_upperbody_base.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/checkerboard.tga b/indra/newview/character/checkerboard.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/eyebrows_alpha.tga b/indra/newview/character/eyebrows_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/eyeliner_alpha.tga b/indra/newview/character/eyeliner_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/eyeshadow_inner_alpha.tga b/indra/newview/character/eyeshadow_inner_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/eyeshadow_outer_alpha.tga b/indra/newview/character/eyeshadow_outer_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/eyewhite.tga b/indra/newview/character/eyewhite.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/facehair_chincurtains_alpha.tga b/indra/newview/character/facehair_chincurtains_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/facehair_moustache_alpha.tga b/indra/newview/character/facehair_moustache_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/facehair_sideburns_alpha.tga b/indra/newview/character/facehair_sideburns_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/facehair_soulpatch_alpha.tga b/indra/newview/character/facehair_soulpatch_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/freckles_alpha.tga b/indra/newview/character/freckles_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/genepool.xml b/indra/newview/character/genepool.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/character/glove_length_alpha.tga b/indra/newview/character/glove_length_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/gloves_fingers_alpha.tga b/indra/newview/character/gloves_fingers_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/head_alpha.tga b/indra/newview/character/head_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/head_color.tga b/indra/newview/character/head_color.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/head_hair.tga b/indra/newview/character/head_hair.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/head_highlights_alpha.tga b/indra/newview/character/head_highlights_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/head_shading_alpha.tga b/indra/newview/character/head_shading_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/head_skingrain.tga b/indra/newview/character/head_skingrain.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/invisible_head.tga b/indra/newview/character/invisible_head.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/jacket_length_lower_alpha.tga b/indra/newview/character/jacket_length_lower_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/jacket_length_upper_alpha.tga b/indra/newview/character/jacket_length_upper_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/jacket_open_lower_alpha.tga b/indra/newview/character/jacket_open_lower_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/jacket_open_upper_alpha.tga b/indra/newview/character/jacket_open_upper_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/lipgloss_alpha.tga b/indra/newview/character/lipgloss_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/lips_mask.tga b/indra/newview/character/lips_mask.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/lipstick_alpha.tga b/indra/newview/character/lipstick_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/lowerbody_color.tga b/indra/newview/character/lowerbody_color.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/lowerbody_highlights_alpha.tga b/indra/newview/character/lowerbody_highlights_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/lowerbody_shading_alpha.tga b/indra/newview/character/lowerbody_shading_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/nailpolish_alpha.tga b/indra/newview/character/nailpolish_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/pants_length_alpha.tga b/indra/newview/character/pants_length_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/pants_waist_alpha.tga b/indra/newview/character/pants_waist_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/rosyface_alpha.tga b/indra/newview/character/rosyface_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/rouge_alpha.tga b/indra/newview/character/rouge_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/shirt_bottom_alpha.tga b/indra/newview/character/shirt_bottom_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/shirt_collar_alpha.tga b/indra/newview/character/shirt_collar_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/shirt_collar_back_alpha.tga b/indra/newview/character/shirt_collar_back_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/shirt_sleeve_alpha.tga b/indra/newview/character/shirt_sleeve_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/shoe_height_alpha.tga b/indra/newview/character/shoe_height_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/skirt_length_alpha.tga b/indra/newview/character/skirt_length_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/skirt_slit_back_alpha.tga b/indra/newview/character/skirt_slit_back_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/skirt_slit_front_alpha.tga b/indra/newview/character/skirt_slit_front_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/skirt_slit_left_alpha.tga b/indra/newview/character/skirt_slit_left_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/skirt_slit_right_alpha.tga b/indra/newview/character/skirt_slit_right_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/underpants_trial_female.tga b/indra/newview/character/underpants_trial_female.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/underpants_trial_male.tga b/indra/newview/character/underpants_trial_male.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/undershirt_trial_female.tga b/indra/newview/character/undershirt_trial_female.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/upperbody_color.tga b/indra/newview/character/upperbody_color.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/upperbody_highlights_alpha.tga b/indra/newview/character/upperbody_highlights_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/upperbody_shading_alpha.tga b/indra/newview/character/upperbody_shading_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/character/upperbodyfreckles_alpha.tga b/indra/newview/character/upperbodyfreckles_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif b/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif b/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif b/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif b/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_NO.tif b/indra/newview/cursors_mac/UI_CURSOR_NO.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif b/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END_ADD.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END_ADD.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START_ADD.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START_ADD.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif b/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif
old mode 100755
new mode 100644
diff --git a/indra/newview/da.lproj/language.txt b/indra/newview/da.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/es.lproj/language.txt b/indra/newview/es.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
old mode 100755
new mode 100644
index 4030324ecbd414526db0f37d2ad3175116110488..be8ea2bab99ab85caceb1d4b8a0965b36f3cb7af
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,5 +1,5 @@
version 33
-// The version number above should be implemented IF AND ONLY IF some
+// The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended
// defaults. This should be as rare an event as we can manage.
@@ -31,8 +31,10 @@ RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxVisible 1 12
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderAvatarVP 1 1
+RenderAutoMuteSurfaceAreaLimit 1 1000.0
RenderCubeMap 1 1
RenderDelayVBUpdate 1 0
RenderFarClip 1 256
@@ -49,7 +51,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
RenderVBOEnable 1 1
RenderVBOMappingDisable 1 1
RenderVolumeLODFactor 1 2.0
@@ -66,12 +67,10 @@ RenderShaderLightingMaxLevel 1 3
RenderDeferred 1 1
RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
-WatchdogDisabled 1 1
RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
RenderMaxTextureIndex 1 16
-
//
// Low Graphics Settings (fixed function)
//
@@ -80,20 +79,20 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
+RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 25000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
RenderGlowResolutionPow 1 8
+RenderLocalLights 1 0
RenderMaxPartCount 1 0
RenderObjectBump 1 0
-RenderLocalLights 1 0
RenderReflectionDetail 1 0
RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0
@@ -103,7 +102,6 @@ RenderShadowDetail 1 0
WLSkyDetail 1 48
RenderFSAASamples 1 0
-
//
// Low Graphics Settings
//
@@ -112,20 +110,20 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
+RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 35000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
RenderGlowResolutionPow 1 8
+RenderLocalLights 1 0
RenderMaxPartCount 1 0
RenderObjectBump 1 0
-RenderLocalLights 1 0
RenderReflectionDetail 1 0
RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
@@ -142,6 +140,7 @@ list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
+RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
RenderAvatarVP 1 1
RenderFarClip 1 96
@@ -155,7 +154,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 1.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
@@ -172,6 +170,7 @@ list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -185,7 +184,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -202,6 +200,7 @@ list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -215,7 +214,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -232,6 +230,7 @@ list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -245,7 +244,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -262,6 +260,7 @@ list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -275,7 +274,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -285,7 +283,6 @@ RenderShadowDetail 1 2
WLSkyDetail 1 48
RenderFSAASamples 1 2
-
//
// Ultra graphics (REALLY PURTY!)
//
@@ -293,19 +290,19 @@ list Ultra
RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
+RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 256
RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9
+RenderLocalLights 1 1
RenderMaxPartCount 1 8192
RenderObjectBump 1 1
-RenderLocalLights 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 2.0
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -315,7 +312,6 @@ RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
RenderFSAASamples 1 2
-
//
// Class Unknown Hardware (unknown)
//
@@ -407,18 +403,18 @@ list safe
RenderAnisotropic 1 0
RenderAvatarCloth 0 0
RenderAvatarVP 0 0
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderObjectBump 0 0
RenderLocalLights 1 0
RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0
-RenderUseImpostors 0 0
RenderVBOEnable 1 0
RenderReflectionDetail 0 0
WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
RenderDeferredSSAO 0 0
RenderShadowDetail 0 0
-
//
// CPU based feature masks
@@ -462,37 +458,30 @@ UseOcclusion 0 0
list Intel_830M
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_845G
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_855GM
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_865G
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_900
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_915GM
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_915G
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
-RenderUseImpostors 0 0
list Intel_945GM
RenderTerrainDetail 1 0
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
old mode 100755
new mode 100644
index 6d5284c6020c8015e5995ca26d5d3abd295bc100..ca6c00951dbb9742dbbaa17964473374fc66efca
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,5 +1,5 @@
version 28
-// The version number above should be implemented IF AND ONLY IF some
+// The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended
// defaults. This should be as rare an event as we can manage.
@@ -31,8 +31,10 @@ RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxVisible 1 12
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderAvatarVP 1 1
+RenderAutoMuteSurfaceAreaLimit 1 1000.0
RenderCubeMap 1 1
RenderDelayVBUpdate 1 0
RenderFarClip 1 256
@@ -41,15 +43,14 @@ RenderFogRatio 1 4.0
RenderGamma 1 0
RenderGlowResolutionPow 1 9
RenderGround 1 1
-RenderLocalLights 1 1
RenderMaxPartCount 1 8192
RenderObjectBump 1 1
+RenderLocalLights 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
RenderVBOEnable 1 1
RenderVBOMappingDisable 1 1
RenderVolumeLODFactor 1 2.0
@@ -62,7 +63,7 @@ Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1
RenderTextureMemoryMultiple 1 1.0
RenderCompressTextures 1 1
-RenderShaderLightingMaxLevel 1 3
+RenderShaderLightingMaxLevel 1 3
RenderDeferred 1 1
RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
@@ -77,7 +78,8 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
+RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 25000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -90,8 +92,7 @@ RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 0.5
+RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
RenderDeferred 1 0
@@ -108,7 +109,8 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
+RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 35000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -121,8 +123,7 @@ RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 0.5
+RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0
RenderDeferred 1 0
@@ -138,6 +139,7 @@ list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
+RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
RenderAvatarVP 1 1
RenderFarClip 1 96
@@ -151,7 +153,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 1.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
@@ -168,6 +169,7 @@ list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -181,7 +183,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -198,6 +199,7 @@ list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -211,7 +213,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -228,6 +229,7 @@ list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -241,7 +243,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -258,6 +259,7 @@ list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -271,7 +273,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -301,7 +302,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 2.0
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -345,13 +345,13 @@ list Class3
RenderVBOEnable 1 1
//
-// Class 4 Hardware
+// Class 4 Hardware
//
list Class4
RenderVBOEnable 1 1
//
-// Class 5 Hardware
+// Class 5 Hardware
//
list Class5
RenderVBOEnable 1 1
@@ -395,17 +395,19 @@ list MapBufferRange
RenderVBOMappingDisable 1 1
-
+//
// "Default" setups for safe, low, medium, high
//
list safe
RenderAnisotropic 1 0
RenderAvatarCloth 0 0
RenderAvatarVP 0 0
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderObjectBump 0 0
+RenderLocalLights 1 0
RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0
-RenderUseImpostors 0 0
RenderVBOEnable 1 0
RenderReflectionDetail 0 0
WindLightUseAtmosShaders 0 0
@@ -413,7 +415,6 @@ RenderDeferred 0 0
RenderDeferredSSAO 0 0
RenderShadowDetail 0 0
-
//
// CPU based feature masks
//
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
old mode 100755
new mode 100644
index 628a96e988bca6c9aecf7e0b24d94ce2f246c462..ea69b088f953e547b583a47f78ca6c77dd24a2a5
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,10 +1,10 @@
version 37
-// The version number above should be implemented IF AND ONLY IF some
+// The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended
// defaults. This should be as rare an event as we can manage.
-// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
+// NOTE: This is mostly identical to featuretable.txt with a few differences
// Should be combined into one table
//
@@ -31,42 +31,42 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxVisible 1 12
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderAvatarVP 1 1
-RenderCubeMap 1 1
-RenderDelayVBUpdate 1 0
-RenderFarClip 1 256
-RenderFlexTimeFactor 1 1.0
-RenderFogRatio 1 4.0
-RenderGamma 1 0
-RenderGlowResolutionPow 1 9
-RenderGround 1 1
-RenderLocalLights 1 1
-RenderMaxPartCount 1 8192
-RenderObjectBump 1 1
-RenderReflectionDetail 1 4
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
-RenderVBOEnable 1 1
-RenderVBOMappingDisable 1 1
-RenderVolumeLODFactor 1 2.0
-UseStartScreen 1 1
-UseOcclusion 1 1
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-WLSkyDetail 1 128
+RenderAutoMuteSurfaceAreaLimit 1 1000.0
+RenderCubeMap 1 1
+RenderDelayVBUpdate 1 0
+RenderFarClip 1 256
+RenderFlexTimeFactor 1 1.0
+RenderFogRatio 1 4.0
+RenderGamma 1 0
+RenderGlowResolutionPow 1 9
+RenderGround 1 1
+RenderMaxPartCount 1 8192
+RenderObjectBump 1 1
+RenderLocalLights 1 1
+RenderReflectionDetail 1 4
+RenderTerrainDetail 1 1
+RenderTerrainLODFactor 1 2.0
+RenderTransparentWater 1 1
+RenderTreeLODFactor 1 1.0
+RenderVBOEnable 1 1
+RenderVBOMappingDisable 1 1
+RenderVolumeLODFactor 1 2.0
+UseStartScreen 1 1
+UseOcclusion 1 1
+VertexShaderEnable 1 1
+WindLightUseAtmosShaders 1 1
+WLSkyDetail 1 128
Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1
-RenderTextureMemoryMultiple 1 1
-RenderCompressTextures 1 1
+RenderTextureMemoryMultiple 1 1.0
+RenderCompressTextures 1 1
RenderShaderLightingMaxLevel 1 3
RenderDeferred 1 1
RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
-WatchdogDisabled 1 1
RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
RenderMaxTextureIndex 1 16
@@ -79,7 +79,8 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
+RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 25000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -92,7 +93,6 @@ RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 0.5
VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0
@@ -110,7 +110,8 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
+RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 35000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -123,7 +124,6 @@ RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 0.5
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
@@ -140,6 +140,7 @@ list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
+RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
RenderAvatarVP 1 1
RenderFarClip 1 96
@@ -153,7 +154,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 1.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
@@ -170,6 +170,7 @@ list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -183,7 +184,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -200,6 +200,7 @@ list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -213,7 +214,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -230,6 +230,7 @@ list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -243,7 +244,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -260,6 +260,7 @@ list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -273,7 +274,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -283,7 +283,6 @@ RenderShadowDetail 1 2
WLSkyDetail 1 48
RenderFSAASamples 1 2
-
//
// Ultra graphics (REALLY PURTY!)
//
@@ -304,7 +303,6 @@ RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
RenderTransparentWater 1 1
RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
RenderVolumeLODFactor 1 2.0
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1
@@ -319,6 +317,9 @@ RenderFSAASamples 1 2
//
list Unknown
RenderVBOEnable 1 0
+RenderShadowDetail 1 0
+RenderDeferred 1 0
+RenderDeferredSSAO 1 0
//
// Class 0 Hardware (just old)
@@ -343,6 +344,7 @@ RenderVBOEnable 1 1
//
list Class3
RenderVBOEnable 1 1
+
//
// Class 4 Hardware
//
@@ -394,11 +396,12 @@ list safe
RenderAnisotropic 1 0
RenderAvatarCloth 0 0
RenderAvatarVP 0 0
-RenderLocalLights 1 0
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderObjectBump 0 0
+RenderLocalLights 1 0
RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0
-RenderUseImpostors 0 0
RenderVBOEnable 1 0
RenderReflectionDetail 0 0
WindLightUseAtmosShaders 0 0
@@ -523,7 +526,6 @@ Disregard96DefaultDrawDistance 1 0
list NVIDIA_GeForce_8600
RenderTextureMemoryMultiple 1 1
-RenderUseImpostors 0 0
UseOcclusion 0 0
/// tweaked ATI to 96 Draw distance
diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt
deleted file mode 100755
index e7cae1abdcede63791a93515bbd9ea753fd9477c..0000000000000000000000000000000000000000
--- a/indra/newview/featuretable_solaris.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-version 15
-// The version number above should be implemented IF AND ONLY IF some
-// change has been made that is sufficiently important to justify
-// resetting the graphics preferences of all users to the recommended
-// defaults. This should be as rare an event as we can manage.
-
-// NOTE: This is mostly identical to featuretable.txt with a few differences
-// Should be combined into one table
-
-//
-// Generates lists of feature mask that can be applied on top of each other.
-//
-// // Begin comments
-// list <name>
-// Starts a feature list named <name>
-// <name> <available> <recommended>
-// <name> is the name of a feature
-// <available> is 0 or 1, whether the feature is available
-// <recommended> is an S32 which is the recommended value
-//
-// For now, the first list read sets up all of the default values
-//
-
-
-//
-// All contains everything at their default settings for high end machines
-// NOTE: All settings are set to the MIN of applied values, including 'all'!
-//
-list all
-RenderVBO 1 1
-RenderAniso 1 0
-RenderAvatarMode 1 2
-RenderAvatarVP 1 1
-RenderDistance 1 128
-RenderLighting 1 1
-RenderObjectBump 1 1
-RenderParticleCount 1 4096
-RenderRippleWater 1 1
-RenderTerrainDetail 1 2
-VertexShaderEnable 1 1
-RenderTextureMemoryMultiple 1 1.0
-UseOcclusion 1 1
-RenderCubeMap 1 1
-WatchdogDisabled 1 1
-RenderUseFBO 1 1
-
-
-//
-// Class 0 Hardware (Unknown or just old)
-//
-list Class0
-VertexShaderEnable 1 0
-RenderVBO 1 0
-RenderDistance 1 64
-RenderAvatarVP 1 0
-RenderAvatarMode 1 0
-RenderLighting 1 0
-RenderObjectBump 1 0
-RenderRippleWater 1 0
-RenderUseFBO 1 0
-
-//
-// Class 1 Hardware
-//
-list Class1
-VertexShaderEnable 1 0
-RenderVBO 1 1
-RenderDistance 1 96
-RenderAvatarVP 1 1
-RenderAvatarMode 1 0
-RenderLighting 1 0
-RenderObjectBump 1 0
-RenderRippleWater 1 0
-RenderUseFBO 1 0
-
-//
-// Class 2 Hardware (make it purty)
-//
-list Class2
-VertexShaderEnable 1 1
-RenderAvatarVP 1 1
-RenderAvatarMode 1 1
-RenderLighting 1 1
-RenderObjectBump 1 1
-RenderRippleWater 1 1
-RenderUseFBO 1 1
-
-//
-// Class 3 Hardware (make it purty)
-//
-list Class3
-VertexShaderEnable 1 1
-RenderAvatarVP 1 1
-RenderAvatarMode 1 1
-RenderLighting 1 1
-RenderObjectBump 1 1
-RenderRippleWater 1 1
-RenderUseFBO 1 1
-
-//
-// No Pixel Shaders available
-//
-list NoPixelShaders
-VertexShaderEnable 0 0
-RenderAvatarVP 0 0
-
-//
-// No Vertex Shaders available
-//
-list NoVertexShaders
-VertexShaderEnable 0 0
-RenderAvatarVP 0 0
-
-//
-// "Default" setups for safe, low, medium, high
-//
-list safe
-RenderVBO 1 0
-RenderAniso 1 0
-RenderAvatarVP 0 0
-RenderLighting 1 0
-RenderParticleCount 1 1024
-RenderTerrainDetail 1 0
-RenderCubeMap 0 0
-UseOcclusion 0 0
-RenderUseFBO 1 0
-
-
-list low
-RenderVBO 1 0
-RenderAniso 1 0
-RenderAvatarMaxVisible 1 3
-RenderLighting 1 0
-
-list medium
-RenderLighting 1 0
-
-
-//
-// CPU based feature masks
-//
-
-// 1Ghz or less (equiv)
-list CPUSlow
-RenderParticleCount 1 1024
-
-
-//
-// RAM based feature masks
-//
-list RAM256MB
-RenderObjectBump 0 0
-
-
-//
-// Graphics card based feature masks
-//
-list OpenGLPre15
-RenderVBO 1 0
-
-list Intel
-RenderVBO 1 0
-RenderAniso 1 0
-RenderLighting 1 0
-RenderTerrainDetail 1 0
-RenderCubeMap 0 0
-
-list GeForce2
-RenderVBO 1 1
-RenderAniso 1 0
-RenderLighting 1 0
-RenderParticleCount 1 2048
-RenderTerrainDetail 1 0
-
-list GeForce3
-
-list ATI
-UseOcclusion 0 0
-
-list Radeon8500
-RenderLighting 1 0
-RenderParticleCount 1 4096
-
-// Hacked to be paranoid "safe"
-list Radeon9700
-RenderParticleCount 1 4096
-
-// Hacked to be paranoid "safe"
-list MobilityRadeon9000
-RenderLighting 1 0
-RenderParticleCount 1 4096
-
-list GeForceFX
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
deleted file mode 100755
index 68e09d010e5557840220b13329d78e0051dbb5fa..0000000000000000000000000000000000000000
--- a/indra/newview/featuretable_xp.txt
+++ /dev/null
@@ -1,732 +0,0 @@
-version 32
-// The version number above should be implemented IF AND ONLY IF some
-// change has been made that is sufficiently important to justify
-// resetting the graphics preferences of all users to the recommended
-// defaults. This should be as rare an event as we can manage.
-
-// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
-// Should be combined into one table
-
-//
-// Generates lists of feature mask that can be applied on top of each other.
-//
-// // Begin comments
-// list <name>
-// Starts a feature list named <name>
-// <name> <available> <recommended>
-// <name> is the name of a feature
-// <available> is 0 or 1, whether the feature is available
-// <recommended> is an F32 which is the recommended value
-//
-// For now, the first list read sets up all of the default values
-//
-
-
-//
-// All contains everything at their default settings for high end machines
-// NOTE: All settings are set to the MIN of applied values, including 'all'!
-//
-list all
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 1
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxVisible 1 12
-RenderAvatarVP 1 1
-RenderCubeMap 1 1
-RenderDelayVBUpdate 1 0
-RenderFarClip 1 256
-RenderFlexTimeFactor 1 1.0
-RenderFogRatio 1 4.0
-RenderGamma 1 0
-RenderGlowResolutionPow 1 9
-RenderGround 1 1
-RenderLocalLights 1 1
-RenderMaxPartCount 1 8192
-RenderObjectBump 1 1
-RenderReflectionDetail 1 4
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
-RenderVBOEnable 1 1
-RenderVBOMappingDisable 1 1
-RenderVolumeLODFactor 1 2.0
-UseStartScreen 1 1
-UseOcclusion 1 1
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-WLSkyDetail 1 128
-Disregard128DefaultDrawDistance 1 1
-Disregard96DefaultDrawDistance 1 1
-RenderTextureMemoryMultiple 1 1.0
-RenderCompressTextures 1 1
-RenderShaderLightingMaxLevel 1 3
-RenderDeferred 1 1
-RenderDeferredSSAO 1 1
-RenderShadowDetail 1 2
-WatchdogDisabled 1 1
-RenderUseStreamVBO 1 1
-RenderFSAASamples 1 16
-RenderMaxTextureIndex 1 16
-
-//
-// Low Graphics Settings (fixed function)
-//
-list LowFixedFunction
-RenderAnisotropic 1 0
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 0
-RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
-RenderAvatarVP 1 0
-RenderFarClip 1 64
-RenderFlexTimeFactor 1 0
-RenderGlowResolutionPow 1 8
-RenderLocalLights 1 0
-RenderMaxPartCount 1 0
-RenderObjectBump 1 0
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 0
-RenderTerrainLODFactor 1 1
-RenderTransparentWater 1 0
-RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 0.5
-VertexShaderEnable 1 0
-WindLightUseAtmosShaders 1 0
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 0
-
-//
-// Low Graphics Settings
-//
-list Low
-RenderAnisotropic 1 0
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 0
-RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxVisible 1 3
-RenderAvatarVP 1 0
-RenderFarClip 1 64
-RenderFlexTimeFactor 1 0
-RenderGlowResolutionPow 1 8
-RenderLocalLights 1 0
-RenderMaxPartCount 1 0
-RenderObjectBump 1 0
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 0
-RenderTerrainLODFactor 1 1
-RenderTransparentWater 1 0
-RenderTreeLODFactor 1 0
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 0.5
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 0
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 0
-
-//
-// Medium Low Graphics Settings
-//
-list LowMid
-RenderAnisotropic 1 0
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 0.5
-RenderAvatarPhysicsLODFactor 1 0.75
-RenderAvatarVP 1 1
-RenderFarClip 1 96
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 8
-RenderMaxPartCount 1 2048
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 1.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 0
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 0
-
-//
-// Medium Graphics Settings (standard)
-//
-list Mid
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// Medium High Graphics Settings (deferred enabled)
-//
-list MidHigh
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 1
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// High Graphics Settings (deferred + SSAO)
-//
-list High
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 1
-RenderDeferredSSAO 1 1
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// High Ultra Graphics Settings (deferred + SSAO + shadows)
-//
-list HighUltra
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 1
-RenderDeferredSSAO 1 1
-RenderShadowDetail 1 2
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// Ultra graphics (REALLY PURTY!)
-//
-list Ultra
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 1
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 256
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderLocalLights 1 1
-RenderMaxPartCount 1 8192
-RenderObjectBump 1 1
-RenderReflectionDetail 1 4
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 1.0
-RenderUseImpostors 1 1
-RenderVolumeLODFactor 1 2.0
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-WLSkyDetail 1 128
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 2
-RenderFSAASamples 1 2
-
-//
-// Class Unknown Hardware (unknown)
-//
-list Unknown
-RenderVBOEnable 1 0
-
-//
-// Class 0 Hardware (just old)
-//
-list Class0
-RenderVBOEnable 1 1
-
-//
-// Class 1 Hardware
-//
-list Class1
-RenderVBOEnable 1 1
-
-//
-// Class 2 Hardware
-//
-list Class2
-RenderVBOEnable 1 1
-
-//
-// Class 3 Hardware
-//
-list Class3
-RenderVBOEnable 1 1
-
-//
-// Class 4 Hardware (deferred + SSAO)
-//
-list Class4
-RenderVBOEnable 1 1
-
-//
-// Class 5 Hardware
-//
-list Class5
-RenderVBOEnable 1 1
-
-//
-// VRAM > 512MB
-//
-list VRAMGT512
-RenderCompressTextures 1 0
-
-//
-// No Pixel Shaders available
-//
-list NoPixelShaders
-RenderAvatarVP 0 0
-RenderAvatarCloth 0 0
-RenderReflectionDetail 0 0
-VertexShaderEnable 0 0
-WindLightUseAtmosShaders 0 0
-RenderDeferred 0 0
-RenderDeferredSSAO 0 0
-RenderShadowDetail 0 0
-
-//
-// No Vertex Shaders available
-//
-list NoVertexShaders
-RenderAvatarVP 0 0
-RenderAvatarCloth 0 0
-RenderReflectionDetail 0 0
-VertexShaderEnable 0 0
-WindLightUseAtmosShaders 0 0
-RenderDeferred 0 0
-RenderDeferredSSAO 0 0
-RenderShadowDetail 0 0
-
-//
-// GL_ARB_map_buffer_range exists
-//
-list MapBufferRange
-RenderVBOMappingDisable 1 1
-
-
-//
-// "Default" setups for safe, low, medium, high
-//
-list safe
-RenderAnisotropic 1 0
-RenderAvatarCloth 0 0
-RenderAvatarVP 0 0
-RenderObjectBump 0 0
-RenderMaxPartCount 1 1024
-RenderTerrainDetail 1 0
-RenderUseImpostors 0 0
-RenderVBOEnable 1 0
-RenderReflectionDetail 0 0
-WindLightUseAtmosShaders 0 0
-RenderDeferred 0 0
-RenderDeferredSSAO 0 0
-RenderShadowDetail 0 0
-
-//
-// CPU based feature masks
-//
-
-// 1Ghz or less (equiv)
-list CPUSlow
-RenderMaxPartCount 1 1024
-
-//
-// RAM based feature masks
-//
-list RAM256MB
-RenderObjectBump 0 0
-
-//
-// Graphics card based feature masks
-//
-list OpenGLPre15
-RenderVBOEnable 1 0
-
-list OpenGLPre30
-RenderDeferred 0 0
-RenderMaxTextureIndex 1 1
-
-list Intel
-RenderAnisotropic 1 0
-RenderVBOEnable 1 0
-RenderFSAASamples 1 0
-
-list GeForce2
-RenderAnisotropic 1 0
-RenderMaxPartCount 1 2048
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 1
-
-list SiS
-UseOcclusion 0 0
-
-
-list Intel_830M
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_845G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_855GM
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_865G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_900
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_915GM
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_915G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 0 0
-
-list Intel_945GM
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_945G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_950
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_965
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderUseImpostors 1 0
-UseOcclusion 0 0
-
-list Intel_G33
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_G45
-WindLightUseAtmosShaders 0 0
-
-list Intel_Bear_Lake
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Broadwater
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Brookdale
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Eaglelake
-WindLightUseAtmosShaders 0 0
-
-list Intel_Montara
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Springdale
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-
-list ATI_FireGL_5200
-RenderVBOEnable 1 0
-WindLightUseAtmosShaders 0 0
-
-
-list ATI_Mobility_Radeon_7xxx
-RenderVBOEnable 0 0
-
-list ATI_Radeon_7xxx
-RenderVBOEnable 0 0
-
-list ATI_All-in-Wonder_Radeon
-RenderVBOEnable 0 0
-
-list ATI_All-in-Wonder_7500
-RenderVBOEnable 0 0
-
-list ATI_Mobility_Radeon_9600
-Disregard96DefaultDrawDistance 1 0
-
-
-/// tweaked ATI to 96 Draw distance
-
-list ATI_Radeon_9000
-Disregard96DefaultDrawDistance 1 0
-list ATI_Radeon_9200
-Disregard96DefaultDrawDistance 1 0
-list ATI_Radeon_9500
-Disregard96DefaultDrawDistance 1 0
-list ATI_Radeon_9600
-Disregard96DefaultDrawDistance 1 0
-
-/// tweaked ATI to 128 draw distance
-
-list ATI_Radeon_X300
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X400
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X500
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X600
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X700
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X1300
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-UseStartScreen 0 0
-list ATI_Radeon_X1400
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X1500
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-UseStartScreen 0 0
-list ATI_Radeon_X1600
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X1700
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Mobility_Radeon_X1xxx
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-
-list ATI_Radeon_HD_2300
-Disregard128DefaultDrawDistance 1 0
-list ATI_Radeon_HD_2400
-Disregard128DefaultDrawDistance 1 0
-list ATI_ASUS_AH24xx
-Disregard128DefaultDrawDistance 1 0
-
-
-// Avatar hardware skinning causes invisible avatars
-// on various ATI chipsets on drivers before 8.2
-
-list ATIOldDriver
-RenderAvatarVP 0 0
-RenderAvatarCloth 0 0
-RenderVBOEnable 1 0
-
-// ATI cards generally perform better when not using VBOs for streaming data
-
-list ATI
-RenderUseStreamVBO 1 0
-
-// Disable vertex buffer objects by default for ATI cards with little video memory
-list ATIVramLT256
-RenderVBOEnable 1 0
-
-/// Tweaked NVIDIA
-
-list NVIDIA_GeForce_FX_5100
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_5200
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_5500
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_5600
-Disregard96DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_FX_Go5100
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5200
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5300
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5500
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5600
-Disregard96DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_6100
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_6200
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_6500
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_6600
-Disregard128DefaultDrawDistance 1 0
-
-list NVIDIA_G73
-Disregard128DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_Go_6100
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6200
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6500
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6600
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6700
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6800
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_7000
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7100
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7200
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7300
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7400
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7500
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7600
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7700
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7800
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7900
-RenderShaderLightingMaxLevel 1 2
-
-list NVIDIA_GeForce_Go_7200
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7300
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7300_LE
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7400
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7600
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7700
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7800
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7900
-RenderShaderLightingMaxLevel 1 2
-
diff --git a/indra/newview/fonts/DejaVu-license.txt b/indra/newview/fonts/DejaVu-license.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/fonts/DejaVuSans-Bold.ttf b/indra/newview/fonts/DejaVuSans-Bold.ttf
old mode 100755
new mode 100644
diff --git a/indra/newview/fonts/DejaVuSans-BoldOblique.ttf b/indra/newview/fonts/DejaVuSans-BoldOblique.ttf
old mode 100755
new mode 100644
diff --git a/indra/newview/fonts/DejaVuSans-Oblique.ttf b/indra/newview/fonts/DejaVuSans-Oblique.ttf
old mode 100755
new mode 100644
diff --git a/indra/newview/fonts/DejaVuSans.ttf b/indra/newview/fonts/DejaVuSans.ttf
old mode 100755
new mode 100644
diff --git a/indra/newview/fonts/DejaVuSansMono.ttf b/indra/newview/fonts/DejaVuSansMono.ttf
old mode 100755
new mode 100644
diff --git a/indra/newview/fr.lproj/language.txt b/indra/newview/fr.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/groupchatlistener.cpp b/indra/newview/groupchatlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/groupchatlistener.h b/indra/newview/groupchatlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/hu.lproj/language.txt b/indra/newview/hu.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife.icns b/indra/newview/icons/beta/secondlife.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife.ico b/indra/newview/icons/beta/secondlife.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_128.png b/indra/newview/icons/beta/secondlife_128.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_16.png b/indra/newview/icons/beta/secondlife_16.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_256.BMP b/indra/newview/icons/beta/secondlife_256.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_256.png b/indra/newview/icons/beta/secondlife_256.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_32.png b/indra/newview/icons/beta/secondlife_32.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_48.png b/indra/newview/icons/beta/secondlife_48.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/beta/secondlife_512.png b/indra/newview/icons/beta/secondlife_512.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife.icns b/indra/newview/icons/project/secondlife.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife.ico b/indra/newview/icons/project/secondlife.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_128.png b/indra/newview/icons/project/secondlife_128.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_16.png b/indra/newview/icons/project/secondlife_16.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_256.BMP b/indra/newview/icons/project/secondlife_256.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_256.png b/indra/newview/icons/project/secondlife_256.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_32.png b/indra/newview/icons/project/secondlife_32.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_48.png b/indra/newview/icons/project/secondlife_48.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/project/secondlife_512.png b/indra/newview/icons/project/secondlife_512.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife.icns b/indra/newview/icons/release/secondlife.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife.ico b/indra/newview/icons/release/secondlife.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_128.png b/indra/newview/icons/release/secondlife_128.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_16.png b/indra/newview/icons/release/secondlife_16.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_256.BMP b/indra/newview/icons/release/secondlife_256.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_256.png b/indra/newview/icons/release/secondlife_256.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_32.png b/indra/newview/icons/release/secondlife_32.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_48.png b/indra/newview/icons/release/secondlife_48.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/release/secondlife_512.png b/indra/newview/icons/release/secondlife_512.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife.icns b/indra/newview/icons/test/secondlife.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife.ico b/indra/newview/icons/test/secondlife.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_128.png b/indra/newview/icons/test/secondlife_128.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_16.png b/indra/newview/icons/test/secondlife_16.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_256.BMP b/indra/newview/icons/test/secondlife_256.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_256.png b/indra/newview/icons/test/secondlife_256.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_32.png b/indra/newview/icons/test/secondlife_32.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_48.png b/indra/newview/icons/test/secondlife_48.png
old mode 100755
new mode 100644
diff --git a/indra/newview/icons/test/secondlife_512.png b/indra/newview/icons/test/secondlife_512.png
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns b/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/darwin/release-dmg/background.jpg b/indra/newview/installers/darwin/release-dmg/background.jpg
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt b/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/install_icon.BMP b/indra/newview/installers/windows/install_icon.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/language_menu.nsi b/indra/newview/installers/windows/language_menu.nsi
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/uninstall_icon.BMP b/indra/newview/installers/windows/uninstall_icon.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/it.lproj/language.txt b/indra/newview/it.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/licenses-linux.txt b/indra/newview/licenses-linux.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/licenses-mac.txt b/indra/newview/licenses-mac.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/licenses-solaris.txt b/indra/newview/licenses-solaris.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/licenses-win32.txt b/indra/newview/licenses-win32.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/linux_tools/client-readme-joystick.txt b/indra/newview/linux_tools/client-readme-joystick.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/linux_tools/client-readme-voice.txt b/indra/newview/linux_tools/client-readme-voice.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/llaccountingcost.h b/indra/newview/llaccountingcost.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llaccountingcostmanager.cpp b/indra/newview/llaccountingcostmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llaccountingcostmanager.h b/indra/newview/llaccountingcostmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
old mode 100755
new mode 100644
index b67da7c8af3f0ec42a6823aff1d7787668e5f668..d933537d2e63d5dd57c4c7bf35168bfb292bbb8b
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -61,6 +61,7 @@
#include "llpaneltopinfobar.h"
#include "llparcel.h"
#include "llrendersphere.h"
+#include "llscriptruntimeperms.h"
#include "llsdutil.h"
#include "llsky.h"
#include "llslurl.h"
@@ -89,7 +90,6 @@
#include "llwindow.h"
#include "llworld.h"
#include "llworldmap.h"
-#include "lscript_byteformat.h"
#include "stringize.h"
#include "boost/foreach.hpp"
#include "llcorehttputil.h"
@@ -4173,6 +4173,7 @@ void LLAgent::setTeleportState(ETeleportState state)
}
}
+
void LLAgent::stopCurrentAnimations()
{
// This function stops all current overriding animations on this
@@ -4211,7 +4212,7 @@ void LLAgent::stopCurrentAnimations()
if (mRegionp &&
gSavedSettings.getBOOL("RevokePermsOnStopAnimation"))
{
- U32 permissions = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRIGGER_ANIMATION] | LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS];
+ U32 permissions = SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_TRIGGER_ANIMATION].permbit | SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS].permbit;
sendRevokePermissions(mRegionp->getRegionID(), permissions);
if (gAgentAvatarp->isSitting())
{ // Also stand up, since auto-granted sit animation permission has been revoked
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentaccess.cpp b/indra/newview/llagentaccess.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentaccess.h b/indra/newview/llagentaccess.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentdata.cpp b/indra/newview/llagentdata.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentdata.h b/indra/newview/llagentdata.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentlanguage.h b/indra/newview/llagentlanguage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentlistener.h b/indra/newview/llagentlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentpicksinfo.cpp b/indra/newview/llagentpicksinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentpicksinfo.h b/indra/newview/llagentpicksinfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentpilot.h b/indra/newview/llagentpilot.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llanimstatelabels.cpp b/indra/newview/llanimstatelabels.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llanimstatelabels.h b/indra/newview/llanimstatelabels.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappcorehttp.h b/indra/newview/llappcorehttp.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
old mode 100755
new mode 100644
diff --git a/indra/newview/llappearance.h b/indra/newview/llappearance.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
old mode 100755
new mode 100644
index 45306dcff4aa9ff5f81263b5b7d6ba1fe4082b51..b6d02ea2f8111335803441c59497c605f88dc83d
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -592,7 +592,7 @@ static void settings_to_globals()
LLVOTree::sTreeFactor = gSavedSettings.getF32("RenderTreeLODFactor");
LLVOAvatar::sLODFactor = gSavedSettings.getF32("RenderAvatarLODFactor");
LLVOAvatar::sPhysicsLODFactor = gSavedSettings.getF32("RenderAvatarPhysicsLODFactor");
- LLVOAvatar::sMaxVisible = (U32)gSavedSettings.getS32("RenderAvatarMaxVisible");
+ LLVOAvatar::updateImpostorRendering(gSavedSettings.getU32("RenderAvatarMaxNonImpostors"));
LLVOAvatar::sVisibleInFirstPerson = gSavedSettings.getBOOL("FirstPersonAvatarVisible");
// clamp auto-open time to some minimum usable value
LLFolderView::sAutoOpenTime = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay"));
@@ -614,7 +614,6 @@ static void settings_modify()
LLRenderTarget::sUseFBO = gSavedSettings.getBOOL("RenderDeferred");
LLPipeline::sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
LLPipeline::sRenderDeferred = LLPipeline::sRenderBump && gSavedSettings.getBOOL("RenderDeferred");
- LLVOAvatar::sUseImpostors = gSavedSettings.getBOOL("RenderUseImpostors");
LLVOSurfacePatch::sLODFactor = gSavedSettings.getF32("RenderTerrainLODFactor");
LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
gDebugGL = gSavedSettings.getBOOL("RenderDebugGL") || gDebugSession;
@@ -3273,9 +3272,12 @@ LLSD LLAppViewer::getViewerInfo() const
version.append(LLVersionInfo::getBuild());
info["VIEWER_VERSION"] = version;
info["VIEWER_VERSION_STR"] = LLVersionInfo::getVersion();
- info["BUILD_DATE"] = __DATE__;
- info["BUILD_TIME"] = __TIME__;
info["CHANNEL"] = LLVersionInfo::getChannel();
+ std::string build_config = LLVersionInfo::getBuildConfig();
+ if (build_config != "Release")
+ {
+ info["BUILD_CONFIG"] = build_config;
+ }
// return a URL to the release notes for this viewer, such as:
// http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0.123456
@@ -3287,14 +3289,6 @@ LLSD LLAppViewer::getViewerInfo() const
info["VIEWER_RELEASE_NOTES_URL"] = url;
-#if LL_MSVC
- info["COMPILER"] = "MSVC";
- info["COMPILER_VERSION"] = _MSC_VER;
-#elif LL_GNUC
- info["COMPILER"] = "GCC";
- info["COMPILER_VERSION"] = GCC_VERSION;
-#endif
-
// Position
LLViewerRegion* region = gAgent.getRegion();
if (region)
@@ -3328,7 +3322,7 @@ LLSD LLAppViewer::getViewerInfo() const
#endif
info["OPENGL_VERSION"] = (const char*)(glGetString(GL_VERSION));
- info["LIBCURL_VERSION"] = LLCore::LLHttp::getCURLVersion();
+
info["J2C_VERSION"] = LLImageJ2C::getEngineInfo();
bool want_fullname = true;
info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : LLSD();
@@ -3421,6 +3415,10 @@ std::string LLAppViewer::getViewerInfoString() const
// Now build the various pieces
support << LLTrans::getString("AboutHeader", args);
+ if (info.has("BUILD_CONFIG"))
+ {
+ support << "\n" << LLTrans::getString("BuildConfig", args);
+ }
if (info.has("REGION"))
{
support << "\n\n" << LLTrans::getString("AboutPosition", args);
@@ -5097,7 +5095,7 @@ void LLAppViewer::idle()
}
// Update AV render info
- LLAvatarRenderInfoAccountant::idle();
+ LLAvatarRenderInfoAccountant::getInstance()->idle();
{
LL_RECORD_BLOCK_TIME(FTM_AUDIO_UPDATE);
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
old mode 100755
new mode 100644
index 54b3df0fa850e4db6ff3f5c01586d47282f4ad97..b5e674bd7b3a8eb672226bc850e6a68138f1bd02
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -1,6 +1,18 @@
/**
- * @file llappviewer.h
- * @brief The LLAppViewer class declaration
+ * @mainpage
+ *
+ * This is the sources for the Second Life Viewer;
+ * information on the open source project is at
+ * https://wiki.secondlife.com/wiki/Open_Source_Portal
+ *
+ * The Mercurial repository for the trunk version is at
+ * https://bitbucket.org/lindenlab/viewer-release
+ *
+ * @section source-license Source License
+ * @verbinclude LICENSE-source.txt
+ *
+ * @section artwork-license Artwork License
+ * @verbinclude LICENSE-logos.txt
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
@@ -22,6 +34,9 @@
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
+ *
+ * @file llappviewer.h
+ * @brief The LLAppViewer class declaration
*/
#ifndef LL_LLAPPVIEWER_H
@@ -122,6 +137,9 @@ class LLAppViewer : public LLApp
void loadNameCache();
void saveNameCache();
+ void loadExperienceCache();
+ void saveExperienceCache();
+
void removeMarkerFiles();
void removeDumpDir();
@@ -230,6 +248,7 @@ class LLAppViewer : public LLApp
void idle();
void idleShutdown();
// update avatar SLID and display name caches
+ void idleExperienceCache();
void idleNameCache();
void idleNetwork();
@@ -391,6 +410,7 @@ extern BOOL gPrintMessagesThisFrame;
extern LLUUID gSunTextureID;
extern LLUUID gMoonTextureID;
+extern LLUUID gBlackSquareID;
extern BOOL gRandomizeFramerate;
extern BOOL gPeriodicSlowFrame;
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlinux_api.h b/indra/newview/llappviewerlinux_api.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlinux_api.xml b/indra/newview/llappviewerlinux_api.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlinux_api_dbus.cpp b/indra/newview/llappviewerlinux_api_dbus.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlinux_api_dbus.h b/indra/newview/llappviewerlinux_api_dbus.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc b/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlistener.cpp b/indra/newview/llappviewerlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerlistener.h b/indra/newview/llappviewerlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 57fb84bbf139651b15fd1921fac0d798ebaf11dc..4786f83bfd1825a1c9a1d23c32bbbd75f3994d75 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -40,7 +40,7 @@
#include <fcntl.h> //_O_APPEND
#include <io.h> //_open_osfhandle()
-#include <errorrep.h> // for AddERExcludedApplicationA()
+#include <WERAPI.H> // for WerAddExcludedApplication()
#include <process.h> // _spawnl()
#include <tchar.h> // For TCHAR support
@@ -405,34 +405,15 @@ int APIENTRY WinMain(HINSTANCE hInstance,
void LLAppViewerWin32::disableWinErrorReporting()
{
- const char win_xp_string[] = "Microsoft Windows XP";
- BOOL is_win_xp = ( getOSInfo().getOSString().substr(0, strlen(win_xp_string) ) == win_xp_string ); /* Flawfinder: ignore*/
- if( is_win_xp )
- {
- // Note: we need to use run-time dynamic linking, because load-time dynamic linking will fail
- // on systems that don't have the library installed (all non-Windows XP systems)
- HINSTANCE fault_rep_dll_handle = LoadLibrary(L"faultrep.dll"); /* Flawfinder: ignore */
- if( fault_rep_dll_handle )
- {
- pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
- if( pAddERExcludedApplicationA )
- {
+ std::string executable_name = gDirUtilp->getExecutableFilename();
- // Strip the path off the name
- const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
-
- if( 0 == pAddERExcludedApplicationA( executable_name ) )
- {
- U32 error_code = GetLastError();
- LL_INFOS() << "AddERExcludedApplication() failed with error code " << error_code << LL_ENDL;
- }
- else
- {
- LL_INFOS() << "AddERExcludedApplication() success for " << executable_name << LL_ENDL;
- }
- }
- FreeLibrary( fault_rep_dll_handle );
- }
+ if( S_OK == WerAddExcludedApplication( utf8str_to_utf16str(executable_name).c_str(), FALSE ) )
+ {
+ LL_INFOS() << "WerAddExcludedApplication() succeeded for " << executable_name << LL_ENDL;
+ }
+ else
+ {
+ LL_INFOS() << "WerAddExcludedApplication() failed for " << executable_name << LL_ENDL;
}
}
@@ -513,7 +494,7 @@ bool LLAppViewerWin32::init()
{
// Platform specific initialization.
- // Turn off Windows XP Error Reporting
+ // Turn off Windows Error Reporting
// (Don't send our data to Microsoft--at least until we are Logo approved and have a way
// of getting the data back from them.)
//
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
old mode 100755
new mode 100644
index 2a137cc39b8234d66e4d55bd40081972fbecd784..d3e66289d1a4f2b1efff1b5a01be693d53358ab3
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -421,6 +421,15 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
mQuestionableCOFLinks.addTime(inv_item_id);
}
+bool LLAttachmentsMgr::isAttachmentStateComplete() const
+{
+ return mPendingAttachments.empty()
+ && mAttachmentRequests.empty()
+ && mDetachRequests.empty()
+ && mRecentlyArrivedAttachments.empty()
+ && mQuestionableCOFLinks.empty();
+}
+
// Check for attachments that are (a) linked in COF and (b) not
// attached to the avatar. This is a rotten function to have to
// include, because it runs the risk of either repeatedly spamming out
diff --git a/indra/newview/llattachmentsmgr.h b/indra/newview/llattachmentsmgr.h
old mode 100755
new mode 100644
index d56d6eb27bc2055c36fbf517f0765ba7d0233f6a..bb7d35edbcb740fab527b167831093b0f2a9acb5
--- a/indra/newview/llattachmentsmgr.h
+++ b/indra/newview/llattachmentsmgr.h
@@ -87,6 +87,8 @@ class LLAttachmentsMgr: public LLSingleton<LLAttachmentsMgr>
void onDetachRequested(const LLUUID& inv_item_id);
void onDetachCompleted(const LLUUID& inv_item_id);
+ bool isAttachmentStateComplete() const;
+
private:
class LLItemRequestTimes: public std::map<LLUUID,LLTimer>
diff --git a/indra/newview/llaudiosourcevo.cpp b/indra/newview/llaudiosourcevo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llaudiosourcevo.h b/indra/newview/llaudiosourcevo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llautoreplace.cpp b/indra/newview/llautoreplace.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llautoreplace.h b/indra/newview/llautoreplace.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 470f516db2db18afdacbd1641461d88d535e5597..5431daca32e4ffab26234f4453ecc73afa15aeca 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -30,6 +30,7 @@
#include "llviewerprecompiledheaders.h"
// associated header
#include "llavatarrenderinfoaccountant.h"
+#include "llavatarrendernotifier.h"
// STL headers
// std headers
// external library headers
@@ -49,17 +50,29 @@
static const std::string KEY_AGENTS = "agents"; // map
static const std::string KEY_WEIGHT = "weight"; // integer
+static const std::string KEY_TOO_COMPLEX = "tooComplex"; // bool
+static const std::string KEY_OVER_COMPLEXITY_LIMIT = "overlimit"; // integer
+static const std::string KEY_REPORTING_COMPLEXITY_LIMIT = "reportinglimit"; // integer
static const std::string KEY_IDENTIFIER = "identifier";
static const std::string KEY_MESSAGE = "message";
static const std::string KEY_ERROR = "error";
-
-// Send data updates about once per minute, only need per-frame resolution
-LLFrameTimer LLAvatarRenderInfoAccountant::sRenderInfoReportTimer;
-//LLCore::HttpRequest::ptr_t LLAvatarRenderInfoAccountant::sHttpRequest;
+static const F32 SECS_BETWEEN_REGION_SCANS = 5.f; // Scan the region list every 5 seconds
+static const F32 SECS_BETWEEN_REGION_REQUEST = 15.0; // Look for new avs every 15 seconds
+static const F32 SECS_BETWEEN_REGION_REPORTS = 60.0; // Update each region every 60 seconds
+
//=========================================================================
+LLAvatarRenderInfoAccountant::LLAvatarRenderInfoAccountant()
+{
+}
+
+LLAvatarRenderInfoAccountant::~LLAvatarRenderInfoAccountant()
+{
+}
+
+
void LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro(std::string url, U64 regionHandle)
{
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
@@ -77,6 +90,8 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro(std::string url, U64
return;
}
+ regionp->getRenderInfoRequestTimer().resetWithExpiry(SECS_BETWEEN_REGION_REQUEST);
+
LLSD httpResults = result["http_result"];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -91,39 +106,65 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro(std::string url, U64
const LLSD & agents = result[KEY_AGENTS];
if (agents.isMap())
{
- LLSD::map_const_iterator report_iter = agents.beginMap();
- while (report_iter != agents.endMap())
+ for (LLSD::map_const_iterator agent_iter = agents.beginMap();
+ agent_iter != agents.endMap();
+ agent_iter++
+ )
{
- LLUUID target_agent_id = LLUUID(report_iter->first);
- const LLSD & agent_info_map = report_iter->second;
+ LLUUID target_agent_id = LLUUID(agent_iter->first);
LLViewerObject* avatarp = gObjectList.findObject(target_agent_id);
- if (avatarp &&
- avatarp->isAvatar() &&
- agent_info_map.isMap())
- { // Extract the data for this avatar
-
- if (LLAvatarRenderInfoAccountant::logRenderInfo())
+ if (avatarp && avatarp->isAvatar())
+ {
+ const LLSD & agent_info_map = agent_iter->second;
+ if (agent_info_map.isMap())
{
- LL_INFOS() << "LRI: Agent " << target_agent_id
- << ": " << agent_info_map << LL_ENDL;
- }
+ LL_DEBUGS("AvatarRenderInfo") << " Agent " << target_agent_id
+ << ": " << agent_info_map << LL_ENDL;
- if (agent_info_map.has(KEY_WEIGHT))
+ if (agent_info_map.has(KEY_WEIGHT))
+ {
+ ((LLVOAvatar *) avatarp)->setReportedVisualComplexity(agent_info_map[KEY_WEIGHT].asInteger());
+ }
+ }
+ else
{
- ((LLVOAvatar *) avatarp)->setReportedVisualComplexity(agent_info_map[KEY_WEIGHT].asInteger());
+ LL_WARNS("AvatarRenderInfo") << "agent entry invalid"
+ << " agent " << target_agent_id
+ << " map " << agent_info_map
+ << LL_ENDL;
}
}
- report_iter++;
- }
+ else
+ {
+ LL_DEBUGS("AvatarRenderInfo") << "Unknown agent " << target_agent_id << LL_ENDL;
+ }
+ } // for agent_iter
+ }
+ else
+ {
+ LL_WARNS("AvatarRenderInfo") << "malformed get response '" << KEY_AGENTS << "' is not map" << LL_ENDL;
}
} // has "agents"
- else if (result.has(KEY_ERROR))
+ else
{
- const LLSD & error = result[KEY_ERROR];
- LL_WARNS() << "Avatar render info GET error: "
- << error[KEY_IDENTIFIER]
- << ": " << error[KEY_MESSAGE]
- << " from region " << regionp->getName()
+ LL_INFOS("AvatarRenderInfo") << "no '"<< KEY_AGENTS << "' key in get response" << LL_ENDL;
+ }
+
+ if ( result.has(KEY_REPORTING_COMPLEXITY_LIMIT)
+ && result.has(KEY_OVER_COMPLEXITY_LIMIT))
+ {
+ U32 reporting = result[KEY_REPORTING_COMPLEXITY_LIMIT].asInteger();
+ U32 overlimit = result[KEY_OVER_COMPLEXITY_LIMIT].asInteger();
+
+ LL_DEBUGS("AvatarRenderInfo") << "complexity limit: "<<reporting<<" reporting, "<<overlimit<<" over limit"<<LL_ENDL;
+
+ LLAvatarRenderNotifier::getInstance()->updateNotificationRegion(reporting, overlimit);
+ }
+ else
+ {
+ LL_WARNS("AvatarRenderInfo")
+ << "response is missing either '" << KEY_REPORTING_COMPLEXITY_LIMIT
+ << "' or '" << KEY_OVER_COMPLEXITY_LIMIT << "'"
<< LL_ENDL;
}
@@ -145,16 +186,14 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro(std::string url, U
return;
}
- if (logRenderInfo())
- {
- LL_INFOS("AvatarRenderInfoAccountant") << "LRI: Sending avatar render info to region " << regionp->getName()
- << " from " << url << LL_ENDL;
- }
+ LL_DEBUGS("AvatarRenderInfoAccountant")
+ << "Sending avatar render info for region " << regionp->getName()
+ << " to " << url << LL_ENDL;
+ U32 num_avs = 0;
// Build the render info to POST to the region
- LLSD report = LLSD::emptyMap();
LLSD agents = LLSD::emptyMap();
-
+
std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
while( iter != LLCharacter::sInstances.end() )
{
@@ -164,31 +203,35 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro(std::string url, U
!avatar->isDead() && // Not dead yet
avatar->getObjectHost() == regionp->getHost()) // Ensure it's on the same region
{
- avatar->calculateUpdateRenderCost(); // Make sure the numbers are up-to-date
+ avatar->calculateUpdateRenderComplexity(); // Make sure the numbers are up-to-date
LLSD info = LLSD::emptyMap();
- if (avatar->getVisualComplexity() > 0)
+ U32 avatar_complexity = avatar->getVisualComplexity();
+ if (avatar_complexity > 0)
{
- info[KEY_WEIGHT] = avatar->getVisualComplexity();
+ // the weight/complexity is unsigned, but LLSD only stores signed integers,
+ // so if it's over that (which would be ridiculously high), just store the maximum signed int value
+ info[KEY_WEIGHT] = (S32)(avatar_complexity < S32_MAX ? avatar_complexity : S32_MAX);
+ info[KEY_TOO_COMPLEX] = LLSD::Boolean(avatar->isTooComplex());
agents[avatar->getID().asString()] = info;
- if (logRenderInfo())
- {
- LL_INFOS("AvatarRenderInfoAccountant") << "LRI: Sending avatar render info for " << avatar->getID()
- << ": " << info << LL_ENDL;
- LL_INFOS("AvatarRenderInfoAccountant") << "LRI: other info geometry " << avatar->getAttachmentGeometryBytes()
- << ", area " << avatar->getAttachmentSurfaceArea()
- << LL_ENDL;
- }
+ LL_DEBUGS("AvatarRenderInfo") << "Sending avatar render info for " << avatar->getID()
+ << ": " << info << LL_ENDL;
+ num_avs++;
}
}
iter++;
}
- if (agents.size() == 0)
- return;
+ // Reset this regions timer, moving to longer intervals if there are lots of avatars around
+ regionp->getRenderInfoReportTimer().resetWithExpiry(SECS_BETWEEN_REGION_REPORTS + (2.f * num_avs));
+ if (num_avs == 0)
+ return; // nothing to report
+
+ LLSD report = LLSD::emptyMap();
report[KEY_AGENTS] = agents;
+
regionp = NULL;
LLSD result = httpAdapter->postAndSuspend(httpRequest, url, report);
@@ -208,34 +251,40 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro(std::string url, U
return;
}
- if (LLAvatarRenderInfoAccountant::logRenderInfo())
- {
- LL_INFOS("AvatarRenderInfoAccountant") << "LRI: Result for avatar weights POST for region " << regionp->getName()
- << ": " << result << LL_ENDL;
- }
-
if (result.isMap())
{
if (result.has(KEY_ERROR))
{
const LLSD & error = result[KEY_ERROR];
- LL_WARNS("AvatarRenderInfoAccountant") << "Avatar render info POST error: "
+ LL_WARNS("AvatarRenderInfoAccountant") << "POST error: "
<< error[KEY_IDENTIFIER]
<< ": " << error[KEY_MESSAGE]
<< " from region " << regionp->getName()
<< LL_ENDL;
}
+ else
+ {
+ LL_DEBUGS("AvatarRenderInfoAccountant")
+ << "POST result for region " << regionp->getName()
+ << ": " << result
+ << LL_ENDL;
+ }
+ }
+ else
+ {
+ LL_WARNS("AvatarRenderInfoAccountant") << "Malformed POST response from region '" << regionp->getName()
+ << LL_ENDL;
}
-
-
}
-// static
-// Send request for one region, no timer checks
+// Send request for avatar weights in one region
+// called when the mRenderInfoScanTimer expires (forced when entering a new region)
void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regionp)
{
std::string url = regionp->getCapability("AvatarRenderInfo");
- if (!url.empty())
+ if ( !url.empty() // we have the capability
+ && regionp->getRenderInfoReportTimer().hasExpired() // Time to make request)
+ )
{
std::string coroname =
LLCoros::instance().launch("LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro",
@@ -243,23 +292,19 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
}
}
-
-
-
-// static
-// Send request for one region, no timer checks
+// Send request for avatar weights in one region
+// called when the mRenderInfoScanTimer expires (forced when entering a new region)
void LLAvatarRenderInfoAccountant::getRenderInfoFromRegion(LLViewerRegion * regionp)
{
std::string url = regionp->getCapability("AvatarRenderInfo");
- if (!url.empty())
+ if ( !url.empty()
+ && regionp->getRenderInfoRequestTimer().hasExpired()
+ )
{
- if (logRenderInfo())
- {
- LL_INFOS() << "LRI: Requesting avatar render info for region "
- << regionp->getName()
- << " from " << url
- << LL_ENDL;
- }
+ LL_DEBUGS("AvatarRenderInfo")
+ << "Requesting avatar render info for region " << regionp->getName()
+ << " from " << url
+ << LL_ENDL;
// First send a request to get the latest data
std::string coroname =
@@ -268,107 +313,62 @@ void LLAvatarRenderInfoAccountant::getRenderInfoFromRegion(LLViewerRegion * regi
}
}
-
// static
// Called every frame - send render weight requests to every region
void LLAvatarRenderInfoAccountant::idle()
{
-// if (!LLAvatarRenderInfoAccountant::sHttpRequest)
-// sHttpRequest = LLCore::HttpRequest::ptr_t(new LLCore::HttpRequest());
-
- if (sRenderInfoReportTimer.hasExpired())
+ if (mRenderInfoScanTimer.hasExpired())
{
- const F32 SECS_BETWEEN_REGION_SCANS = 5.f; // Scan the region list every 5 seconds
- const F32 SECS_BETWEEN_REGION_REQUEST = 60.0; // Update each region every 60 seconds
-
- S32 num_avs = LLCharacter::sInstances.size();
+ LL_DEBUGS("AvatarRenderInfo") << "Scanning regions for render info updates"
+ << LL_ENDL;
- if (logRenderInfo())
- {
- LL_INFOS() << "LRI: Scanning all regions and checking for render info updates"
- << LL_ENDL;
- }
-
- // Check all regions and see if it's time to fetch/send data
+ // Check all regions
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ iter != LLWorld::getInstance()->getRegionList().end();
+ ++iter)
{
LLViewerRegion* regionp = *iter;
- if (regionp &&
- regionp->isAlive() &&
- regionp->capabilitiesReceived() && // Region has capability URLs available
- regionp->getRenderInfoRequestTimer().hasExpired()) // Time to make request
+ if ( regionp
+ && regionp->isAlive()
+ && regionp->capabilitiesReceived())
{
+ // each of these is further governed by and resets its own timer
sendRenderInfoToRegion(regionp);
getRenderInfoFromRegion(regionp);
-
- // Reset this regions timer, moving to longer intervals if there are lots of avatars around
- regionp->getRenderInfoRequestTimer().resetWithExpiry(SECS_BETWEEN_REGION_REQUEST + (2.f * num_avs));
}
}
// We scanned all the regions, reset the request timer.
- sRenderInfoReportTimer.resetWithExpiry(SECS_BETWEEN_REGION_SCANS);
- }
-
- static LLCachedControl<U32> render_auto_mute_functions(gSavedSettings, "RenderAutoMuteFunctions", 0);
- static U32 prev_render_auto_mute_functions = (U32) -1;
- if (prev_render_auto_mute_functions != render_auto_mute_functions)
- {
- prev_render_auto_mute_functions = render_auto_mute_functions;
-
- // Adjust menus
- BOOL show_items = (BOOL)(render_auto_mute_functions & 0x04);
- gMenuAvatarOther->setItemVisible( std::string("Normal"), show_items);
- gMenuAvatarOther->setItemVisible( std::string("Always use impostor"), show_items);
- gMenuAvatarOther->setItemVisible( std::string("Never use impostor"), show_items);
- gMenuAvatarOther->setItemVisible( std::string("Impostor seperator"), show_items);
-
- gMenuAttachmentOther->setItemVisible( std::string("Normal"), show_items);
- gMenuAttachmentOther->setItemVisible( std::string("Always use impostor"), show_items);
- gMenuAttachmentOther->setItemVisible( std::string("Never use impostor"), show_items);
- gMenuAttachmentOther->setItemVisible( std::string("Impostor seperator"), show_items);
-
- if (!show_items)
- { // Turning off visual muting
- for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
- iter != LLCharacter::sInstances.end(); ++iter)
- { // Make sure all AVs have the setting cleared
- LLVOAvatar* inst = (LLVOAvatar*) *iter;
- inst->setCachedVisualMute(false);
- }
- }
+ mRenderInfoScanTimer.resetWithExpiry(SECS_BETWEEN_REGION_SCANS);
}
}
+void LLAvatarRenderInfoAccountant::resetRenderInfoScanTimer()
+{
+ // this will force the next frame to rescan
+ mRenderInfoScanTimer.reset();
+}
// static
-// Make sRenderInfoReportTimer expire so the next call to idle() will scan and query a new region
-// called via LLViewerRegion::setCapabilitiesReceived() boost signals when the capabilities
+// Called via LLViewerRegion::setCapabilitiesReceived() boost signals when the capabilities
// are returned for a new LLViewerRegion, and is the earliest time to get render info
-void LLAvatarRenderInfoAccountant::expireRenderInfoReportTimer(const LLUUID& region_id)
+void LLAvatarRenderInfoAccountant::scanNewRegion(const LLUUID& region_id)
{
- if (logRenderInfo())
- {
- LL_INFOS() << "LRI: Viewer has new region capabilities, clearing global render info timer"
- << " and timer for region " << region_id
- << LL_ENDL;
- }
+ LL_INFOS("AvatarRenderInfo") << region_id << LL_ENDL;
- // Reset the global timer so it will scan regions immediately
- sRenderInfoReportTimer.reset();
+ // Reset the global timer so it will scan regions on the next call to ::idle
+ LLAvatarRenderInfoAccountant::getInstance()->resetRenderInfoScanTimer();
LLViewerRegion* regionp = LLWorld::instance().getRegionFromID(region_id);
if (regionp)
- { // Reset the region's timer so it will request data immediately
+ { // Reset the region's timers so we will:
+ // * request render info from it immediately
+ // * report on the following scan
regionp->getRenderInfoRequestTimer().reset();
+ regionp->getRenderInfoReportTimer().resetWithExpiry(SECS_BETWEEN_REGION_SCANS);
+ }
+ else
+ {
+ LL_WARNS("AvatarRenderInfo") << "unable to resolve region "<<region_id<<LL_ENDL;
}
-}
-
-// static
-bool LLAvatarRenderInfoAccountant::logRenderInfo()
-{
- return true;
-// static LLCachedControl<bool> render_mute_logging_enabled(gSavedSettings, "RenderAutoMuteLogging", false);
-// return render_mute_logging_enabled;
}
diff --git a/indra/newview/llavatarrenderinfoaccountant.h b/indra/newview/llavatarrenderinfoaccountant.h
index f7a04cca2c214922548b8bb45fb2303bfff6dfc2..870ef4f394ac44870ad4b09472bad2e883422084 100644
--- a/indra/newview/llavatarrenderinfoaccountant.h
+++ b/indra/newview/llavatarrenderinfoaccountant.h
@@ -36,30 +36,31 @@ class LLViewerRegion;
// Class to gather avatar rendering information
// that is sent to or fetched from regions.
-class LLAvatarRenderInfoAccountant
+class LLAvatarRenderInfoAccountant : public LLSingleton<LLAvatarRenderInfoAccountant>
{
-public:
+ private:
+ LOG_CLASS(LLAvatarRenderInfoAccountant);
- static void sendRenderInfoToRegion(LLViewerRegion * regionp);
- static void getRenderInfoFromRegion(LLViewerRegion * regionp);
+ public:
+ LLAvatarRenderInfoAccountant();
+ ~LLAvatarRenderInfoAccountant();
- static void expireRenderInfoReportTimer(const LLUUID& region_id);
+ void sendRenderInfoToRegion(LLViewerRegion * regionp);
+ void getRenderInfoFromRegion(LLViewerRegion * regionp);
- static void idle();
+ void idle(); // called once per frame
- static bool logRenderInfo();
+ void resetRenderInfoScanTimer();
+
+ static void scanNewRegion(const LLUUID& region_id);
-private:
- LLAvatarRenderInfoAccountant() {};
- ~LLAvatarRenderInfoAccountant() {};
-
- // Send data updates about once per minute, only need per-frame resolution
- static LLFrameTimer sRenderInfoReportTimer;
+ private:
+ // frequency of region scans,
+ // further limited by per region Request and Report timers
+ LLFrameTimer mRenderInfoScanTimer;
static void avatarRenderInfoGetCoro(std::string url, U64 regionHandle);
static void avatarRenderInfoReportCoro(std::string url, U64 regionHandle);
-
-
};
#endif /* ! defined(LL_llavatarrenderinfoaccountant_H) */
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a13e142e161dcd45fdd60c599a7f2f7ab30d0d8a
--- /dev/null
+++ b/indra/newview/llavatarrendernotifier.cpp
@@ -0,0 +1,266 @@
+/**
+ * @file llavatarrendernotifier.cpp
+ * @author andreykproductengine
+ * @date 2015-08-05
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2013&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2013, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+// Pre-compiled headers
+#include "llviewerprecompiledheaders.h"
+// STL headers
+// std headers
+// external library headers
+// other Linden headers
+#include "llagentwearables.h"
+#include "llappearancemgr.h"
+#include "llattachmentsmgr.h"
+#include "llnotifications.h"
+#include "llnotificationsutil.h"
+#include "llnotificationtemplate.h"
+#include "lltimer.h"
+#include "llvoavatarself.h"
+#include "llviewercontrol.h"
+#include "lltrans.h"
+#include "llagentcamera.h"
+// associated header
+#include "llavatarrendernotifier.h"
+
+// when change exceeds this ration, notification is shown
+static const F32 RENDER_ALLOWED_CHANGE_PCT = 0.1;
+// wait seconds before processing over limit updates after last complexity change
+static const U32 OVER_LIMIT_UPDATE_DELAY = 70;
+
+
+LLAvatarRenderNotifier::LLAvatarRenderNotifier() :
+mAgentsCount(0),
+mOverLimitAgents(0),
+mAgentComplexity(0),
+mOverLimitPct(0.0f),
+mLatestAgentsCount(0),
+mLatestOverLimitAgents(0),
+mLatestAgentComplexity(0),
+mLatestOverLimitPct(0.0f),
+mShowOverLimitAgents(false),
+mNotifyOutfitLoading(false),
+mLastCofVersion(-1),
+mLastOutfitRezStatus(-1),
+mLastSkeletonSerialNum(-1)
+{
+ mPopUpDelayTimer.resetWithExpiry(OVER_LIMIT_UPDATE_DELAY);
+}
+
+std::string LLAvatarRenderNotifier::overLimitMessage()
+{
+ static const char* everyone_now = "av_render_everyone_now";
+ static const char* not_everyone = "av_render_not_everyone";
+ static const char* over_half = "av_render_over_half";
+ static const char* most = "av_render_most_of";
+ static const char* anyone = "av_render_anyone";
+
+ std::string message;
+ if ( mLatestOverLimitPct >= 99.0 )
+ {
+ message = anyone;
+ }
+ else if ( mLatestOverLimitPct >= 75.0 )
+ {
+ message = most;
+ }
+ else if ( mLatestOverLimitPct >= 50.0 )
+ {
+ message = over_half;
+ }
+ else if ( mLatestOverLimitPct > 10.0 )
+ {
+ message = not_everyone;
+ }
+ else
+ {
+ // Will be shown only after overlimit was > 0
+ message = everyone_now;
+ }
+ return LLTrans::getString(message);
+}
+
+void LLAvatarRenderNotifier::displayNotification(bool show_over_limit)
+{
+ mAgentComplexity = mLatestAgentComplexity;
+ mShowOverLimitAgents = show_over_limit;
+ static LLCachedControl<U32> expire_delay(gSavedSettings, "ShowMyComplexityChanges", 20);
+
+ LLDate expire_date(LLDate::now().secondsSinceEpoch() + expire_delay);
+ LLSD args;
+ args["AGENT_COMPLEXITY"] = LLSD::Integer(mLatestAgentComplexity);
+ std::string notification_name;
+ if (mShowOverLimitAgents)
+ {
+ notification_name = "AgentComplexityWithVisibility";
+ args["OVERLIMIT_MSG"] = overLimitMessage();
+
+ // remember what the situation was so that we only notify when it has changed
+ mAgentsCount = mLatestAgentsCount;
+ mOverLimitAgents = mLatestOverLimitAgents;
+ mOverLimitPct = mLatestOverLimitPct;
+ }
+ else
+ {
+ // no change in visibility, just update complexity
+ notification_name = "AgentComplexity";
+ }
+
+ if (mNotificationPtr != NULL && mNotificationPtr->getName() != notification_name)
+ {
+ // since unique tag works only for same notification,
+ // old notification needs to be canceled manually
+ LLNotifications::instance().cancel(mNotificationPtr);
+ }
+
+ // log unconditionally
+ LL_WARNS("AvatarRenderInfo") << notification_name << " " << args << LL_ENDL;
+
+ if ( expire_delay // expiration of zero means do not show the notices
+ && gAgentCamera.getLastCameraMode() != CAMERA_MODE_MOUSELOOK // don't display notices in Mouselook
+ )
+ {
+ mNotificationPtr = LLNotifications::instance().add(LLNotification::Params()
+ .name(notification_name)
+ .expiry(expire_date)
+ .substitutions(args));
+ }
+}
+
+bool LLAvatarRenderNotifier::isNotificationVisible()
+{
+ return mNotificationPtr != NULL && mNotificationPtr->isActive();
+}
+
+void LLAvatarRenderNotifier::updateNotificationRegion(U32 agentcount, U32 overLimit)
+{
+ if (agentcount == 0)
+ {
+ // Data not ready
+ return;
+ }
+
+ // save current values for later use
+ mLatestAgentsCount = agentcount > overLimit ? agentcount - 1 : agentcount; // subtract self
+ mLatestOverLimitAgents = overLimit;
+ mLatestOverLimitPct = mLatestAgentsCount != 0 ? ((F32)overLimit / (F32)mLatestAgentsCount) * 100.0 : 0;
+
+ if (mAgentsCount == mLatestAgentsCount
+ && mOverLimitAgents == mLatestOverLimitAgents)
+ {
+ // no changes since last notification
+ return;
+ }
+
+ if ((mPopUpDelayTimer.hasExpired() || (isNotificationVisible() && mShowOverLimitAgents))
+ && (mOverLimitPct > 0 || mLatestOverLimitPct > 0)
+ && std::abs(mOverLimitPct - mLatestOverLimitPct) > mLatestOverLimitPct * RENDER_ALLOWED_CHANGE_PCT
+ )
+ {
+ // display in case of drop to/from zero and in case of significant (RENDER_ALLOWED_CHANGE_PCT) changes
+ displayNotification(true);
+
+ // default timeout before next notification
+ static LLCachedControl<U32> pop_up_delay(gSavedSettings, "ComplexityChangesPopUpDelay", 300);
+ mPopUpDelayTimer.resetWithExpiry(pop_up_delay);
+ }
+}
+
+void LLAvatarRenderNotifier::updateNotificationState()
+{
+ if (!isAgentAvatarValid())
+ {
+ // data not ready, nothing to show.
+ return;
+ }
+
+ // Don't use first provided COF and Sceleton versions - let them load anf 'form' first
+ if (mLastCofVersion < 0
+ && gAgentWearables.areWearablesLoaded()
+ && LLAttachmentsMgr::getInstance()->isAttachmentStateComplete())
+ {
+ // cof formed
+ mLastCofVersion = LLAppearanceMgr::instance().getCOFVersion();
+ mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum;
+ }
+ else if (mLastCofVersion >= 0
+ && (mLastCofVersion != gAgentAvatarp->mLastUpdateRequestCOFVersion
+ || mLastSkeletonSerialNum != gAgentAvatarp->mLastSkeletonSerialNum))
+ {
+ // version mismatch in comparison to previous outfit - outfit changed
+ mNotifyOutfitLoading = true;
+ mLastCofVersion = LLAppearanceMgr::instance().getCOFVersion();
+ mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum;
+ }
+
+ if (gAgentAvatarp->mLastRezzedStatus < mLastOutfitRezStatus)
+ {
+ // rez status decreased - outfit related action was initiated
+ mNotifyOutfitLoading = true;
+ }
+
+ mLastOutfitRezStatus = gAgentAvatarp->mLastRezzedStatus;
+}
+void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity)
+{
+ // save the value for use in following messages
+ mLatestAgentComplexity = agentComplexity;
+
+ if (!isAgentAvatarValid() || !gAgentWearables.areWearablesLoaded())
+ {
+ // data not ready, nothing to show.
+ return;
+ }
+
+ if (!mNotifyOutfitLoading)
+ {
+ // We should not notify about initial outfit and it's load process without reason
+ updateNotificationState();
+
+ if (mLatestOverLimitAgents > 0)
+ {
+ // Some users can't see agent already, notify user about complexity growth
+ mNotifyOutfitLoading = true;
+ }
+
+ if (!mNotifyOutfitLoading)
+ {
+ // avatar or outfit not ready
+ mAgentComplexity = mLatestAgentComplexity;
+ return;
+ }
+ }
+
+ if (mAgentComplexity != mLatestAgentComplexity)
+ {
+ // if we have an agent complexity change, we always display it and hide 'over limit'
+ displayNotification(false);
+
+ // next 'over limit' update should be displayed after delay to make sure information got updated at server side
+ mPopUpDelayTimer.resetWithExpiry(OVER_LIMIT_UPDATE_DELAY);
+ }
+}
+
diff --git a/indra/newview/llavatarrendernotifier.h b/indra/newview/llavatarrendernotifier.h
new file mode 100644
index 0000000000000000000000000000000000000000..2a2704de28550719508abf44421039b50cbbcc34
--- /dev/null
+++ b/indra/newview/llavatarrendernotifier.h
@@ -0,0 +1,84 @@
+/**
+ * @file llavatarrendernotifier.h
+ * @author andreykproductengine
+ * @date 2015-08-05
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2013&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2013, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_llavatarrendernotifier_H)
+#define LL_llavatarrendernotifier_H
+
+#include "llnotificationptr.h"
+
+class LLViewerRegion;
+
+// Class to notify user about drastic changes in agent's render weights or if other agents
+// reported that user's agent is too 'heavy' for their settings
+class LLAvatarRenderNotifier : public LLSingleton<LLAvatarRenderNotifier>
+{
+public:
+ LLAvatarRenderNotifier();
+
+ void displayNotification(bool show_over_limit);
+ bool isNotificationVisible();
+
+ void updateNotificationRegion(U32 agentcount, U32 overLimit);
+ void updateNotificationState();
+ void updateNotificationAgent(U32 agentComplexity);
+
+private:
+
+ LLNotificationPtr mNotificationPtr;
+
+ // to prevent notification from popping up too often, show it only
+ // if certain amount of time passed since previous notification
+ LLFrameTimer mPopUpDelayTimer;
+
+ // values since last notification for comparison purposes
+ U32 mAgentsCount;
+ U32 mOverLimitAgents;
+ U32 mAgentComplexity;
+ F32 mOverLimitPct;
+
+ // last reported values
+ U32 mLatestAgentsCount;
+ U32 mLatestOverLimitAgents;
+ U32 mLatestAgentComplexity;
+ F32 mLatestOverLimitPct;
+
+ bool mShowOverLimitAgents;
+ std::string overLimitMessage();
+
+ // initial outfit related variables (state control)
+ bool mNotifyOutfitLoading;
+
+ // COF (inventory folder) and Skeleton (voavatar) are used to spot changes in outfit.
+ S32 mLastCofVersion;
+ S32 mLastSkeletonSerialNum;
+ // Used to detect changes in voavatar's rezzed status.
+ // If value decreases - there were changes in outfit.
+ S32 mLastOutfitRezStatus;
+};
+
+#endif /* ! defined(LL_llavatarrendernotifier_H) */
diff --git a/indra/newview/llblockedlistitem.cpp b/indra/newview/llblockedlistitem.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llblockedlistitem.h b/indra/newview/llblockedlistitem.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llblocklist.h b/indra/newview/llblocklist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llbox.cpp b/indra/newview/llbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llbox.h b/indra/newview/llbox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llbreadcrumbview.cpp b/indra/newview/llbreadcrumbview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llbreadcrumbview.h b/indra/newview/llbreadcrumbview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llbreastmotion.cpp b/indra/newview/llbreastmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llbreastmotion.h b/indra/newview/llbreastmotion.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llbuycurrencyhtml.cpp b/indra/newview/llbuycurrencyhtml.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llbuycurrencyhtml.h b/indra/newview/llbuycurrencyhtml.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcapabilityprovider.h b/indra/newview/llcapabilityprovider.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchatmsgbox.h b/indra/newview/llchatmsgbox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llclassifiedinfo.cpp b/indra/newview/llclassifiedinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llclassifiedinfo.h b/indra/newview/llclassifiedinfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcofwearables.h b/indra/newview/llcofwearables.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommanddispatcherlistener.cpp b/indra/newview/llcommanddispatcherlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommanddispatcherlistener.h b/indra/newview/llcommanddispatcherlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommandhandler.h b/indra/newview/llcommandhandler.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommandlineparser.h b/indra/newview/llcommandlineparser.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcommunicationchannel.h b/indra/newview/llcommunicationchannel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h
old mode 100755
new mode 100644
index cee8efe9b0a3e0ef0d2007f7cccca7f5584c0b3f..46bcb9746b001b87e8ac3a078cf88108a0a2a5ce
--- a/indra/newview/llcompilequeue.h
+++ b/indra/newview/llcompilequeue.h
@@ -122,10 +122,6 @@ class LLFloaterCompileQueue : public LLFloaterScriptQueue
{
friend class LLFloaterReg;
public:
- static void onSaveBytecodeComplete(const LLUUID& asset_id,
- void* user_data,
- S32 status);
-
// remove any object in mScriptScripts with the matching uuid.
void removeItemByItemID(const LLUUID& item_id);
diff --git a/indra/newview/llconfirmationmanager.cpp b/indra/newview/llconfirmationmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llconfirmationmanager.h b/indra/newview/llconfirmationmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationloglist.h b/indra/newview/llconversationloglist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationloglistitem.cpp b/indra/newview/llconversationloglistitem.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationloglistitem.h b/indra/newview/llconversationloglistitem.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcurrencyuimanager.h b/indra/newview/llcurrencyuimanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llcylinder.cpp b/indra/newview/llcylinder.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llcylinder.h b/indra/newview/llcylinder.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldateutil.cpp b/indra/newview/lldateutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldateutil.h b/indra/newview/lldateutil.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldaycyclemanager.cpp b/indra/newview/lldaycyclemanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldaycyclemanager.h b/indra/newview/lldaycyclemanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldebugmessagebox.cpp b/indra/newview/lldebugmessagebox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldebugmessagebox.h b/indra/newview/lldebugmessagebox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldebugview.h b/indra/newview/lldebugview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldeferredsounds.cpp b/indra/newview/lldeferredsounds.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldeferredsounds.h b/indra/newview/lldeferredsounds.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldelayedgestureerror.cpp b/indra/newview/lldelayedgestureerror.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldelayedgestureerror.h b/indra/newview/lldelayedgestureerror.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldndbutton.cpp b/indra/newview/lldndbutton.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldndbutton.h b/indra/newview/lldndbutton.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldonotdisturbnotificationstorage.cpp b/indra/newview/lldonotdisturbnotificationstorage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldonotdisturbnotificationstorage.h b/indra/newview/lldonotdisturbnotificationstorage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
old mode 100755
new mode 100644
index 8bbc5292447ce96ebff8ea4abbce6382aba5afc8..4c16c542d6a947ef25a9dca4777fde1f2cfa4903
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -50,6 +50,7 @@
#include "llrendersphere.h"
#include "llviewerpartsim.h"
#include "llviewercontrol.h" // for gSavedSettings
+#include "llviewertexturelist.h"
static U32 sDataMask = LLDrawPoolAvatar::VERTEX_DATA_MASK;
static U32 sBufferUsage = GL_STREAM_DRAW_ARB;
@@ -63,6 +64,7 @@ BOOL LLDrawPoolAvatar::sSkipTransparent = FALSE;
S32 LLDrawPoolAvatar::sDiffuseChannel = 0;
F32 LLDrawPoolAvatar::sMinimumAlpha = 0.2f;
+LLUUID gBlackSquareID;
static bool is_deferred_render = false;
static bool is_post_deferred_render = false;
@@ -472,7 +474,9 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
}
BOOL impostor = avatarp->isImpostor();
- if (impostor)
+ if (impostor
+ && LLVOAvatar::AV_DO_NOT_RENDER != avatarp->getVisualMuteSettings()
+ && LLVOAvatar::AV_ALWAYS_RENDER != avatarp->getVisualMuteSettings())
{
return;
}
@@ -1246,7 +1250,9 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
BOOL impostor = avatarp->isImpostor() && !single_avatar;
- if (impostor && pass != 0)
+ if (( avatarp->isInMuteList()
+ || impostor
+ || (LLVOAvatar::AV_DO_NOT_RENDER == avatarp->getVisualMuteSettings() && !avatarp->needsImpostorUpdate()) ) && pass != 0)
{ //don't draw anything but the impostor for impostored avatars
return;
}
@@ -1263,7 +1269,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
LLVOAvatar::sNumVisibleAvatars++;
}
- if (impostor)
+ if (impostor || (LLVOAvatar::AV_DO_NOT_RENDER == avatarp->getVisualMuteSettings() && !avatarp->needsImpostorUpdate()))
{
if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && avatarp->mImpostor.isComplete())
{
@@ -1276,18 +1282,11 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
avatarp->mImpostor.bindTexture(1, specular_channel);
}
}
- avatarp->renderImpostor(LLColor4U(255,255,255,255), sDiffuseChannel);
+ avatarp->renderImpostor(avatarp->getMutedAVColor(), sDiffuseChannel);
}
return;
}
- llassert(LLPipeline::sImpostorRender || !avatarp->isVisuallyMuted());
-
- /*if (single_avatar && avatarp->mSpecialRenderMode >= 1) // 1=anim preview, 2=image preview, 3=morph view
- {
- gPipeline.enableLightsAvatarEdit(LLColor4(.5f, .5f, .5f, 1.f));
- }*/
-
if (pass == 1)
{
// render rigid meshes (eyeballs) first
@@ -1811,7 +1810,21 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
{
//order is important here LLRender::DIFFUSE_MAP should be last, becouse it change
//(gGL).mCurrTextureUnitIndex
- gGL.getTexUnit(specular_channel)->bind(face->getTexture(LLRender::SPECULAR_MAP));
+ LLViewerTexture* specular = NULL;
+ if (LLPipeline::sImpostorRender)
+ {
+ specular = LLViewerTextureManager::findFetchedTexture(gBlackSquareID, TEX_LIST_STANDARD);
+ llassert(NULL != specular);
+ }
+ else
+ {
+ specular = face->getTexture(LLRender::SPECULAR_MAP);
+ }
+ if (specular)
+ {
+ gGL.getTexUnit(specular_channel)->bind(specular);
+ }
+
gGL.getTexUnit(normal_channel)->bind(face->getTexture(LLRender::NORMAL_MAP));
gGL.getTexUnit(sDiffuseChannel)->bind(face->getTexture(LLRender::DIFFUSE_MAP), false, true);
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolbump.h b/indra/newview/lldrawpoolbump.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolground.cpp b/indra/newview/lldrawpoolground.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolground.h b/indra/newview/lldrawpoolground.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolsimple.h b/indra/newview/lldrawpoolsimple.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolsky.h b/indra/newview/lldrawpoolsky.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolterrain.h b/indra/newview/lldrawpoolterrain.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpooltree.h b/indra/newview/lldrawpooltree.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldrawpoolwlsky.h b/indra/newview/lldrawpoolwlsky.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lldynamictexture.h b/indra/newview/lldynamictexture.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llemote.h b/indra/newview/llemote.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llenvmanager.h b/indra/newview/llenvmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llestateinfomodel.cpp b/indra/newview/llestateinfomodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llestateinfomodel.h b/indra/newview/llestateinfomodel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lleventnotifier.h b/indra/newview/lleventnotifier.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llexternaleditor.h b/indra/newview/llexternaleditor.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llface.inl b/indra/newview/llface.inl
old mode 100755
new mode 100644
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
old mode 100755
new mode 100644
index ea604709aaa0e93d9fb12abcf86fc73aeb12cd1e..7f1c981a3c71a949b1b473051d3c45d9f9073bef
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -66,12 +66,9 @@ const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_mac.%s.txt";
#elif LL_LINUX
const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt";
const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_linux.%s.txt";
-#elif LL_SOLARIS
-const char FEATURE_TABLE_FILENAME[] = "featuretable_solaris.txt";
-const char FEATURE_TABLE_VER_FILENAME[] = "featuretable_solaris.%s.txt";
#else
-const char FEATURE_TABLE_FILENAME[] = "featuretable%s.txt";
-const char FEATURE_TABLE_VER_FILENAME[] = "featuretable%s.%s.txt";
+const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
+const char FEATURE_TABLE_VER_FILENAME[] = "featuretable.%s.txt";
#endif
#if 0 // consuming code in #if 0 below
@@ -98,6 +95,10 @@ void LLFeatureList::addFeature(const std::string& name, const BOOL available, co
}
LLFeatureInfo fi(name, available, level);
+ LL_DEBUGS_ONCE("RenderInit") << "Feature '" << name << "' "
+ << (available ? "" : "not " ) << "available"
+ << " at " << level
+ << LL_ENDL;
mFeatures[name] = fi;
}
@@ -119,6 +120,7 @@ F32 LLFeatureList::getRecommendedValue(const std::string& name)
{
if (mFeatures.count(name) && isFeatureAvailable(name))
{
+ LL_DEBUGS_ONCE("RenderInit") << "Setting '" << name << "' to recommended value " << mFeatures[name].mRecommendedLevel << LL_ENDL;
return mFeatures[name].mRecommendedLevel;
}
@@ -128,7 +130,7 @@ F32 LLFeatureList::getRecommendedValue(const std::string& name)
BOOL LLFeatureList::maskList(LLFeatureList &mask)
{
- //LL_INFOS() << "Masking with " << mask.mName << LL_ENDL;
+ LL_DEBUGS_ONCE() << "Masking with " << mask.mName << LL_ENDL;
//
// Lookup the specified feature mask, and overlay it on top of the
// current feature mask.
@@ -175,16 +177,14 @@ BOOL LLFeatureList::maskList(LLFeatureList &mask)
void LLFeatureList::dump()
{
LL_DEBUGS("RenderInit") << "Feature list: " << mName << LL_ENDL;
- LL_DEBUGS("RenderInit") << "--------------" << LL_ENDL;
LLFeatureInfo fi;
feature_map_t::iterator feature_it;
for (feature_it = mFeatures.begin(); feature_it != mFeatures.end(); ++feature_it)
{
fi = feature_it->second;
- LL_DEBUGS("RenderInit") << fi.mName << "\t\t" << fi.mAvailable << ":" << fi.mRecommendedLevel << LL_ENDL;
+ LL_DEBUGS("RenderInit") << "With " << mName << " feature " << fi.mName << " " << fi.mAvailable << ":" << fi.mRecommendedLevel << LL_ENDL;
}
- LL_DEBUGS("RenderInit") << LL_ENDL;
}
static const std::vector<std::string> sGraphicsLevelNames = boost::assign::list_of
@@ -274,27 +274,12 @@ bool LLFeatureManager::loadFeatureTables()
std::string filename;
std::string http_filename;
-#if LL_WINDOWS
- std::string os_string = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
- if (os_string.find("Microsoft Windows XP") == 0)
- {
- filename = llformat(FEATURE_TABLE_FILENAME, "_xp");
- http_filename = llformat(FEATURE_TABLE_VER_FILENAME, "_xp", LLVersionInfo::getVersion().c_str());
- }
- else
- {
- filename = llformat(FEATURE_TABLE_FILENAME, "");
- http_filename = llformat(FEATURE_TABLE_VER_FILENAME, "", LLVersionInfo::getVersion().c_str());
- }
-#else
filename = FEATURE_TABLE_FILENAME;
http_filename = llformat(FEATURE_TABLE_VER_FILENAME, LLVersionInfo::getVersion().c_str());
-#endif
app_path += filename;
-
- // second table is downloaded with HTTP
+ // second table is downloaded with HTTP - note that this will only be used on the run _after_ it is downloaded
std::string http_path = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, http_filename);
// use HTTP table if it exists
@@ -378,11 +363,11 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
file >> name;
if (!mMaskList.count(name))
{
- flp = new LLFeatureList(name);
- mMaskList[name] = flp;
- }
- else
- {
+ flp = new LLFeatureList(name);
+ mMaskList[name] = flp;
+ }
+ else
+ {
LL_WARNS("RenderInit") << "Overriding mask " << name << ", this is invalid!" << LL_ENDL;
parse_ok = false;
}
@@ -391,11 +376,11 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
{
if (flp)
{
- S32 available;
- F32 recommended;
- file >> available >> recommended;
- flp->addFeature(name, available, recommended);
- }
+ S32 available;
+ F32 recommended;
+ file >> available >> recommended;
+ flp->addFeature(name, available, recommended);
+ }
else
{
LL_WARNS("RenderInit") << "Specified parameter before <list> keyword!" << LL_ENDL;
@@ -579,7 +564,7 @@ void LLFeatureManager::applyRecommendedSettings()
// cap the level at 2 (high)
U32 level = llmax(GPU_CLASS_0, llmin(mGPUClass, GPU_CLASS_5));
- LL_INFOS() << "Applying Recommended Features" << LL_ENDL;
+ LL_INFOS("RenderInit") << "Applying Recommended Features for level " << level << LL_ENDL;
setGraphicsLevel(level, false);
gSavedSettings.setU32("RenderQualityPerformance", level);
@@ -786,7 +771,7 @@ void LLFeatureManager::applyBaseMasks()
if (osInfo.mMajorVer == 10 && osInfo.mMinorVer < 7)
{
maskFeatures("OSX_10_6_8");
- }
+ }
#endif
// now mask by gpu string
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfilteredwearablelist.cpp b/indra/newview/llfilteredwearablelist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfilteredwearablelist.h b/indra/newview/llfilteredwearablelist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterabout.h b/indra/newview/llfloaterabout.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterautoreplacesettings.h b/indra/newview/llfloaterautoreplacesettings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateravatar.h b/indra/newview/llfloateravatar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateravatartextures.h b/indra/newview/llfloateravatartextures.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbeacons.h b/indra/newview/llfloaterbeacons.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuycontents.h b/indra/newview/llfloaterbuycontents.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuycurrency.cpp b/indra/newview/llfloaterbuycurrency.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuycurrency.h b/indra/newview/llfloaterbuycurrency.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuycurrencyhtml.cpp b/indra/newview/llfloaterbuycurrencyhtml.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuycurrencyhtml.h b/indra/newview/llfloaterbuycurrencyhtml.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbuyland.h b/indra/newview/llfloaterbuyland.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterbvhpreview.h b/indra/newview/llfloaterbvhpreview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterchatvoicevolume.cpp b/indra/newview/llfloaterchatvoicevolume.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterchatvoicevolume.h b/indra/newview/llfloaterchatvoicevolume.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterconversationlog.cpp b/indra/newview/llfloaterconversationlog.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterconversationlog.h b/indra/newview/llfloaterconversationlog.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterdeleteenvpreset.cpp b/indra/newview/llfloaterdeleteenvpreset.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterdeleteenvpreset.h b/indra/newview/llfloaterdeleteenvpreset.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7dedbbf98430169016ec275228f84c7bcdfae203
--- /dev/null
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -0,0 +1,101 @@
+/**
+ * @file llfloaterdeleteprefpreset.cpp
+ * @brief Floater to delete a graphics / camera preset
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterdeleteprefpreset.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llfloaterpreference.h"
+#include "llnotificationsutil.h"
+#include "llpresetsmanager.h"
+#include "llviewercontrol.h"
+#include "llfloaterreg.h"
+
+LLFloaterDeletePrefPreset::LLFloaterDeletePrefPreset(const LLSD &key)
+: LLFloater(key)
+{
+}
+
+// virtual
+BOOL LLFloaterDeletePrefPreset::postBuild()
+{
+ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+ if (preferences)
+ {
+ preferences->addDependentFloater(this);
+ }
+ getChild<LLButton>("delete")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnDelete, this));
+ getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnCancel, this));
+ LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterDeletePrefPreset::onPresetsListChange, this));
+
+ return TRUE;
+}
+
+void LLFloaterDeletePrefPreset::onOpen(const LLSD& key)
+{
+ mSubdirectory = key.asString();
+ std::string floater_title = getString(std::string("title_") + mSubdirectory);
+
+ setTitle(floater_title);
+
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+
+ EDefaultOptions option = DEFAULT_HIDE;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+}
+
+void LLFloaterDeletePrefPreset::onBtnDelete()
+{
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+ std::string name = combo->getSimple();
+
+ if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
+ {
+ LLSD args;
+ args["NAME"] = name;
+ LLNotificationsUtil::add("PresetNotDeleted", args);
+ }
+
+ closeFloater();
+}
+
+void LLFloaterDeletePrefPreset::onPresetsListChange()
+{
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+ LLButton* delete_btn = getChild<LLButton>("delete");
+
+ EDefaultOptions option = DEFAULT_HIDE;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+
+ delete_btn->setEnabled(0 != combo->getItemCount());
+}
+
+void LLFloaterDeletePrefPreset::onBtnCancel()
+{
+ closeFloater();
+}
diff --git a/indra/lscript/lscript_compile/lscript_heap.h b/indra/newview/llfloaterdeleteprefpreset.h
old mode 100755
new mode 100644
similarity index 58%
rename from indra/lscript/lscript_compile/lscript_heap.h
rename to indra/newview/llfloaterdeleteprefpreset.h
index 7762a367d68394bc3f5caf3f6e81d0fbf2e72159..0ab3da7139254b255104d8d5d8e0cb895f81dc60
--- a/indra/lscript/lscript_compile/lscript_heap.h
+++ b/indra/newview/llfloaterdeleteprefpreset.h
@@ -1,10 +1,11 @@
/**
- * @file lscript_heap.h
- * @brief classes to manage script heap
+ * @file llfloaterdeleteprefpreset.h
+ * @brief Floater to delete a graphics / camera preset
+
*
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2014, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,35 +25,29 @@
* $/LicenseInfo$
*/
-#if 0
+#ifndef LL_LLFLOATERDELETEPREFPRESET_H
+#define LL_LLFLOATERDELETEPREFPRESET_H
-#ifndef LL_LSCRIPT_HEAP_H
-#define LL_LSCRIPT_HEAP_H
+#include "llfloater.h"
-#include "lscript_byteconvert.h"
-//#include "vmath.h"
-#include "v3math.h"
-#include "llquaternion.h"
+class LLComboBox;
-class LLScriptHeapEntry
+class LLFloaterDeletePrefPreset : public LLFloater
{
+
public:
- LLScriptHeapEntry(U8 *entry);
- LLScriptHeapEntry(U8 *heap, S32 offset);
- ~LLScriptHeapEntry();
-
- void addString(char *string);
-
- S32 mNext;
- U8 mType;
- S32 mRefCount;
- S32 mListOffset;
- U8 *mEntry;
- U8 *mData;
- U8 *mListEntry;
-};
+ LLFloaterDeletePrefPreset(const LLSD &key);
-#endif
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
-#endif
+ void onBtnDelete();
+ void onBtnCancel();
+
+private:
+ void onPresetsListChange();
+
+ std::string mSubdirectory;
+};
+#endif // LL_LLFLOATERDELETEPREFPRESET_H
diff --git a/indra/newview/llfloaterdestinations.cpp b/indra/newview/llfloaterdestinations.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterdestinations.h b/indra/newview/llfloaterdestinations.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatereditdaycycle.cpp b/indra/newview/llfloatereditdaycycle.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatereditdaycycle.h b/indra/newview/llfloatereditdaycycle.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatereditsky.h b/indra/newview/llfloatereditsky.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatereditwater.h b/indra/newview/llfloatereditwater.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterenvironmentsettings.cpp b/indra/newview/llfloaterenvironmentsettings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterenvironmentsettings.h b/indra/newview/llfloaterenvironmentsettings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterfonttest.cpp b/indra/newview/llfloaterfonttest.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterfonttest.h b/indra/newview/llfloaterfonttest.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergodtools.h b/indra/newview/llfloatergodtools.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergroupinvite.cpp b/indra/newview/llfloatergroupinvite.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergroupinvite.h b/indra/newview/llfloatergroupinvite.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhandler.cpp b/indra/newview/llfloaterhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhandler.h b/indra/newview/llfloaterhandler.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
deleted file mode 100755
index 62d7efc8b251a12b32b410974a62cfe9d5b78bc0..0000000000000000000000000000000000000000
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * @file llfloaterhardwaresettings.cpp
- * @brief Menu of all the different graphics hardware settings
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterhardwaresettings.h"
-
-// Viewer includes
-#include "llfloaterpreference.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "llviewertexturelist.h"
-#include "llfeaturemanager.h"
-#include "llspinctrl.h"
-#include "llstartup.h"
-#include "lltextbox.h"
-#include "llcombobox.h"
-#include "pipeline.h"
-
-// Linden library includes
-#include "llradiogroup.h"
-#include "lluictrlfactory.h"
-#include "llwindow.h"
-#include "llsliderctrl.h"
-
-LLFloaterHardwareSettings::LLFloaterHardwareSettings(const LLSD& key)
- : LLFloater(key),
-
- // these should be set on imminent refresh() call,
- // but init them anyway
- mUseVBO(0),
- mUseAniso(0),
- mFSAASamples(0),
- mGamma(0.0),
- mVideoCardMem(0),
- mFogRatio(0.0),
- mProbeHardwareOnStartup(FALSE)
-{
-}
-
-LLFloaterHardwareSettings::~LLFloaterHardwareSettings()
-{
-}
-
-void LLFloaterHardwareSettings::initCallbacks(void)
-{
-}
-
-// menu maintenance functions
-
-void LLFloaterHardwareSettings::refresh()
-{
- LLPanel::refresh();
-
- mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
- mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
- mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
- mGamma = gSavedSettings.getF32("RenderGamma");
- mVideoCardMem = gSavedSettings.getS32("TextureMemory");
- mFogRatio = gSavedSettings.getF32("RenderFogRatio");
- mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
- mCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures");
-
- getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer) mFSAASamples);
- refreshEnabledState();
-}
-
-void LLFloaterHardwareSettings::refreshEnabledState()
-{
- F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
- S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
- S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
- getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value());
- getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem.value());
-
- if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
- !gGLManager.mHasVertexBufferObject)
- {
- getChildView("vbo")->setEnabled(FALSE);
- }
-
- if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderCompressTextures") ||
- !gGLManager.mHasVertexBufferObject)
- {
- getChildView("texture compression")->setEnabled(FALSE);
- }
-
- // if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
- LLSpinCtrl* gamma_ctrl = getChild<LLSpinCtrl>("gamma");
- gamma_ctrl->setEnabled(!gPipeline.canUseWindLightShaders());
- getChildView("(brightness, lower is brighter)")->setEnabled(!gPipeline.canUseWindLightShaders());
- getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders());
-
- // anti-aliasing
- {
- LLUICtrl* fsaa_ctrl = getChild<LLUICtrl>("fsaa");
- LLTextBox* fsaa_text = getChild<LLTextBox>("antialiasing label");
- LLView* fsaa_restart = getChildView("antialiasing restart");
-
- // Enable or disable the control, the "Antialiasing:" label and the restart warning
- // based on code support for the feature on the current hardware.
-
- if (gPipeline.canUseAntiAliasing())
- {
- fsaa_ctrl->setEnabled(TRUE);
-
- // borrow the text color from the gamma control for consistency
- fsaa_text->setColor(gamma_ctrl->getEnabledTextColor());
-
- fsaa_restart->setVisible(!gSavedSettings.getBOOL("RenderDeferred"));
- }
- else
- {
- fsaa_ctrl->setEnabled(FALSE);
- fsaa_ctrl->setValue((LLSD::Integer) 0);
-
- // borrow the text color from the gamma control for consistency
- fsaa_text->setColor(gamma_ctrl->getDisabledTextColor());
-
- fsaa_restart->setVisible(FALSE);
- }
- }
-}
-
-//============================================================================
-
-BOOL LLFloaterHardwareSettings::postBuild()
-{
- childSetAction("OK", onBtnOK, this);
- childSetAction("Cancel", onBtnCancel, this);
-
-// Don't do this on Mac as their braindead GL versioning
-// sets this when 8x and 16x are indeed available
-//
-#if !LL_DARWIN
- if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
- { //remove FSAA settings above "4x"
- LLComboBox* combo = getChild<LLComboBox>("fsaa");
- combo->remove("8x");
- combo->remove("16x");
- }
-#endif
-
- refresh();
- center();
-
- // load it up
- initCallbacks();
- return TRUE;
-}
-
-
-void LLFloaterHardwareSettings::apply()
-{
- refresh();
-}
-
-
-void LLFloaterHardwareSettings::cancel()
-{
- closeFloater();
-}
-
-// static
-void LLFloaterHardwareSettings::onBtnCancel( void* userdata )
-{
- LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
- fp->cancel();
-}
-
-// static
-void LLFloaterHardwareSettings::onBtnOK( void* userdata )
-{
- LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
- fp->apply();
- fp->closeFloater(false);
-}
-
-void LLFloaterHardwareSettings::onClose(bool app_quitting)
-{
- gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
- gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
- gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
- gSavedSettings.setF32("RenderGamma", mGamma);
- gSavedSettings.setS32("TextureMemory", mVideoCardMem);
- gSavedSettings.setF32("RenderFogRatio", mFogRatio);
- gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
- gSavedSettings.setBOOL("RenderCompressTextures", mCompressTextures );
-}
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
deleted file mode 100755
index 11c27c266db39c50d1e3e04c270ffebd80e8bd85..0000000000000000000000000000000000000000
--- a/indra/newview/llfloaterhardwaresettings.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * @file llfloaterhardwaresettings.h
- * @brief Menu of all the different graphics hardware settings
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATER_HARDWARE_SETTINGS_H
-#define LL_LLFLOATER_HARDWARE_SETTINGS_H
-
-#include "llfloater.h"
-
-/// Menuing system for all of windlight's functionality
-class LLFloaterHardwareSettings : public LLFloater
-{
- friend class LLFloaterPreference;
-
-public:
-
- LLFloaterHardwareSettings(const LLSD& key);
- /*virtual*/ ~LLFloaterHardwareSettings();
-
- /*virtual*/ BOOL postBuild();
- /*virtual*/ void onClose(bool app_quitting);
-
- /// initialize all the callbacks for the menu
- void initCallbacks(void);
-
- /// OK button
- static void onBtnOK( void* userdata );
-
- /// Cancel button
- static void onBtnCancel( void* userdata );
-
- //// menu management
-
- /// show off our menu
- static void show();
-
- /// return if the menu exists or not
- static bool isOpen();
-
- /// sync up menu with parameters
- void refresh();
-
- /// Apply the changed values.
- void apply();
-
- /// don't apply the changed values
- void cancel();
-
- /// refresh the enabled values
- void refreshEnabledState();
-
-protected:
- BOOL mUseVBO;
- BOOL mUseAniso;
- BOOL mUseFBO;
- U32 mFSAASamples;
- F32 mGamma;
- S32 mVideoCardMem;
- F32 mFogRatio;
- BOOL mProbeHardwareOnStartup;
- BOOL mCompressTextures;
-
-private:
-};
-
-#endif
-
diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhelpbrowser.h b/indra/newview/llfloaterhelpbrowser.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhoverheight.cpp b/indra/newview/llfloaterhoverheight.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhoverheight.h b/indra/newview/llfloaterhoverheight.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterhud.h b/indra/newview/llfloaterhud.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimnearbychathandler.h b/indra/newview/llfloaterimnearbychathandler.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimnearbychatlistener.cpp b/indra/newview/llfloaterimnearbychatlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimnearbychatlistener.h b/indra/newview/llfloaterimnearbychatlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterinventory.h b/indra/newview/llfloaterinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterlandholdings.h b/indra/newview/llfloaterlandholdings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..403db35cc020c57c93c0df43a12fa5c6c15753f1
--- /dev/null
+++ b/indra/newview/llfloaterloadprefpreset.cpp
@@ -0,0 +1,91 @@
+/**
+ * @file llfloateloadprefpreset.cpp
+ * @brief Floater to load a graphics / camera preset
+ *
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2015, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterloadprefpreset.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llfloaterpreference.h"
+#include "llfloaterreg.h"
+#include "llpresetsmanager.h"
+#include "llviewercontrol.h"
+
+LLFloaterLoadPrefPreset::LLFloaterLoadPrefPreset(const LLSD &key)
+: LLFloater(key)
+{
+}
+
+// virtual
+BOOL LLFloaterLoadPrefPreset::postBuild()
+{ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+ if (preferences)
+ {
+ preferences->addDependentFloater(this);
+ }
+ getChild<LLButton>("ok")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnOk, this));
+ getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnCancel, this));
+ LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterLoadPrefPreset::onPresetsListChange, this));
+
+ return TRUE;
+}
+
+void LLFloaterLoadPrefPreset::onOpen(const LLSD& key)
+{
+ mSubdirectory = key.asString();
+ std::string floater_title = getString(std::string("title_") + mSubdirectory);
+
+ setTitle(floater_title);
+
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+
+ EDefaultOptions option = DEFAULT_TOP;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+}
+
+void LLFloaterLoadPrefPreset::onPresetsListChange()
+{
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+
+ EDefaultOptions option = DEFAULT_TOP;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+}
+
+void LLFloaterLoadPrefPreset::onBtnCancel()
+{
+ closeFloater();
+}
+
+void LLFloaterLoadPrefPreset::onBtnOk()
+{
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+ std::string name = combo->getSimple();
+
+ LLPresetsManager::getInstance()->loadPreset(mSubdirectory, name);
+
+ closeFloater();
+}
diff --git a/indra/lscript/llscriptresourcepool.h b/indra/newview/llfloaterloadprefpreset.h
old mode 100755
new mode 100644
similarity index 58%
rename from indra/lscript/llscriptresourcepool.h
rename to indra/newview/llfloaterloadprefpreset.h
index 4ea2556e0f4f3f4b15811dd4f102b79483796915..9471f6f1e1aade38c0a6665b815856311c6be049
--- a/indra/lscript/llscriptresourcepool.h
+++ b/indra/newview/llfloaterloadprefpreset.h
@@ -1,10 +1,11 @@
/**
- * @file llscriptresourcepool.h
- * @brief A collection of LLScriptResources
+ * @file llfloaterloadprefpreset.h
+ * @brief Floater to load a graphics / camera preset
+
*
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2015, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,28 +25,29 @@
* $/LicenseInfo$
*/
-#ifndef LL_LLSCRIPTRESOURCEPOOL_H
-#define LL_LLSCRIPTRESOURCEPOOL_H
+#ifndef LL_LLFLOATERLOADPREFPRESET_H
+#define LL_LLFLOATERLOADPREFPRESET_H
+
+#include "llfloater.h"
-#include "llscriptresource.h"
+class LLComboBox;
-// This is just a holder for LLSimResources
-class LLScriptResourcePool
+class LLFloaterLoadPrefPreset : public LLFloater
{
-public:
- LLScriptResourcePool();
- // ~LLSimResourceMgr();
- LLScriptResource& getPublicURLResource();
- const LLScriptResource& getPublicURLResource() const;
+public:
+ LLFloaterLoadPrefPreset(const LLSD &key);
- // An empty resource pool.
- static LLScriptResourcePool null;
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
-private:
- LLScriptResource mLSLPublicURLs;
-};
+ void onBtnOk();
+ void onBtnCancel();
+private:
+ void onPresetsListChange();
+ std::string mSubdirectory;
+};
-#endif
+#endif // LL_LLFLOATERLOADPREFPRESET_H
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermemleak.h b/indra/newview/llfloatermemleak.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
old mode 100755
new mode 100644
index 576d6e890fe2be4b8ff8d1fae7797b5e22141c83..ffeebfd25613a51c94479e3d30c64cc6d64b236e
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -3727,10 +3727,6 @@ BOOL LLModelPreview::render()
if (regen)
{
genBuffers(mPreviewLOD, skin_weight);
- {
- LL_INFOS() << "Vertex Buffer[" << mPreviewLOD << "]" << " is EMPTY!!!" << LL_ENDL;
- regen = TRUE;
- }
}
if (!skin_weight)
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermodeluploadbase.cpp b/indra/newview/llfloatermodeluploadbase.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatermodeluploadbase.h b/indra/newview/llfloatermodeluploadbase.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaternamedesc.h b/indra/newview/llfloaternamedesc.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaternotificationsconsole.h b/indra/newview/llfloaternotificationsconsole.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpathfindingobjects.h b/indra/newview/llfloaterpathfindingobjects.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpay.h b/indra/newview/llfloaterpay.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpostprocess.h b/indra/newview/llfloaterpostprocess.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
old mode 100755
new mode 100644
index 5571a9f39c9f82fe688fc55c59d16ee41878ef9e..36bdcf4d897e89472aad099de8f94e58749df189
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -50,7 +50,6 @@
#include "llfloaterreg.h"
#include "llfloaterabout.h"
#include "llfavoritesbar.h"
-#include "llfloaterhardwaresettings.h"
#include "llfloatersidepanelcontainer.h"
#include "llfloaterimsession.h"
#include "llkeyboard.h"
@@ -112,6 +111,11 @@
#include "lllogininstance.h" // to check if logged in yet
#include "llsdserialize.h"
+#include "llpresetsmanager.h"
+#include "llviewercontrol.h"
+#include "llpresetsmanager.h"
+#include "llfeaturemanager.h"
+#include "llviewertexturelist.h"
const F32 BANDWIDTH_UPDATER_TIMEOUT = 0.5f;
char const* const VISIBILITY_DEFAULT = "default";
@@ -120,6 +124,18 @@ char const* const VISIBILITY_HIDDEN = "hidden";
//control value for middle mouse as talk2push button
const static std::string MIDDLE_MOUSE_CV = "MiddleMouse";
+/// This must equal the maximum value set for the IndirectMaxComplexity slider in panel_preferences_graphics1.xml
+static const U32 INDIRECT_MAX_ARC_OFF = 101; // all the way to the right == disabled
+static const U32 MIN_INDIRECT_ARC_LIMIT = 1; // must match minimum of IndirectMaxComplexity in panel_preferences_graphics1.xml
+static const U32 MAX_INDIRECT_ARC_LIMIT = INDIRECT_MAX_ARC_OFF-1; // one short of all the way to the right...
+
+/// These are the effective range of values for RenderAvatarMaxComplexity
+static const F32 MIN_ARC_LIMIT = 20000.0f;
+static const F32 MAX_ARC_LIMIT = 350000.0f;
+static const F32 MIN_ARC_LOG = log(MIN_ARC_LIMIT);
+static const F32 MAX_ARC_LOG = log(MAX_ARC_LIMIT);
+static const F32 ARC_LIMIT_MAP_SCALE = (MAX_ARC_LOG - MIN_ARC_LOG) / (MAX_INDIRECT_ARC_LIMIT - MIN_INDIRECT_ARC_LIMIT);
+
class LLVoiceSetKeyDialog : public LLModalDialog
{
public:
@@ -329,9 +345,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
registered_dialog = true;
}
- mCommitCallbackRegistrar.add("Pref.Apply", boost::bind(&LLFloaterPreference::onBtnApply, this));
- mCommitCallbackRegistrar.add("Pref.Cancel", boost::bind(&LLFloaterPreference::onBtnCancel, this));
- mCommitCallbackRegistrar.add("Pref.OK", boost::bind(&LLFloaterPreference::onBtnOK, this));
+ mCommitCallbackRegistrar.add("Pref.Cancel", boost::bind(&LLFloaterPreference::onBtnCancel, this, _2));
+ mCommitCallbackRegistrar.add("Pref.OK", boost::bind(&LLFloaterPreference::onBtnOK, this, _2));
mCommitCallbackRegistrar.add("Pref.ClearCache", boost::bind(&LLFloaterPreference::onClickClearCache, this));
mCommitCallbackRegistrar.add("Pref.WebClearCache", boost::bind(&LLFloaterPreference::onClickBrowserClearCache, this));
@@ -345,8 +360,9 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.ClickEnablePopup", boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
mCommitCallbackRegistrar.add("Pref.ClickDisablePopup", boost::bind(&LLFloaterPreference::onClickDisablePopup, this));
mCommitCallbackRegistrar.add("Pref.LogPath", boost::bind(&LLFloaterPreference::onClickLogPath, this));
- mCommitCallbackRegistrar.add("Pref.HardwareSettings", boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));
mCommitCallbackRegistrar.add("Pref.HardwareDefaults", boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
+ mCommitCallbackRegistrar.add("Pref.AvatarImpostorsEnable", boost::bind(&LLFloaterPreference::onAvatarImpostorsEnable, this));
+ mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxComplexity", boost::bind(&LLFloaterPreference::updateMaxComplexity, this));
mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreference::onVertexShaderEnable, this));
mCommitCallbackRegistrar.add("Pref.WindowedMod", boost::bind(&LLFloaterPreference::onCommitWindowedMode, this));
mCommitCallbackRegistrar.add("Pref.UpdateSliderText", boost::bind(&LLFloaterPreference::refreshUI,this));
@@ -360,6 +376,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.AutoReplace", boost::bind(&LLFloaterPreference::onClickAutoReplace, this));
mCommitCallbackRegistrar.add("Pref.PermsDefault", boost::bind(&LLFloaterPreference::onClickPermsDefault, this));
mCommitCallbackRegistrar.add("Pref.SpellChecker", boost::bind(&LLFloaterPreference::onClickSpellChecker, this));
+ mCommitCallbackRegistrar.add("Pref.Advanced", boost::bind(&LLFloaterPreference::onClickAdvanced, this));
sSkin = gSavedSettings.getString("SkinCurrent");
@@ -560,12 +577,6 @@ void LLFloaterPreference::apply()
if (panel)
panel->apply();
}
- // hardware menu apply
- LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
- if (hardware_settings)
- {
- hardware_settings->apply();
- }
gViewerWindow->requestResolutionUpdate(); // for UIScaleFactor
@@ -642,13 +653,9 @@ void LLFloaterPreference::cancel()
// hide spellchecker settings folder
LLFloaterReg::hideInstance("prefs_spellchecker");
-
- // cancel hardware menu
- LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
- if (hardware_settings)
- {
- hardware_settings->cancel();
- }
+
+ // hide advancede floater
+ LLFloaterReg::hideInstance("prefs_graphics_advanced");
// reverts any changes to current skin
gSavedSettings.setString("SkinCurrent", sSkin);
@@ -671,11 +678,17 @@ void LLFloaterPreference::cancel()
LLFloaterPathfindingConsole* pPathfindingConsole = pathfindingConsoleHandle.get();
pPathfindingConsole->onRegionBoundaryCross();
}
+
+ if (!mSavedGraphicsPreset.empty())
+ {
+ gSavedSettings.setString("PresetGraphicActive", mSavedGraphicsPreset);
+ LLPresetsManager::getInstance()->triggerChangeSignal();
+ }
}
void LLFloaterPreference::onOpen(const LLSD& key)
{
-
+
// this variable and if that follows it are used to properly handle do not disturb mode response message
static bool initialized = FALSE;
// if user is logged in and we haven't initialized do not disturb mode response yet, do it
@@ -753,6 +766,19 @@ void LLFloaterPreference::onOpen(const LLSD& key)
// when the floater is opened. That will make cancel do its
// job
saveSettings();
+
+ // Make sure there is a default preference file
+ LLPresetsManager::getInstance()->createMissingDefault();
+
+ bool started = (LLStartUp::getStartupState() == STATE_STARTED);
+
+ LLButton* load_btn = findChild<LLButton>("PrefLoadButton");
+ LLButton* save_btn = findChild<LLButton>("PrefSaveButton");
+ LLButton* delete_btn = findChild<LLButton>("PrefDeleteButton");
+
+ load_btn->setEnabled(started);
+ save_btn->setEnabled(started);
+ delete_btn->setEnabled(started);
}
void LLFloaterPreference::onVertexShaderEnable()
@@ -760,6 +786,27 @@ void LLFloaterPreference::onVertexShaderEnable()
refreshEnabledGraphics();
}
+void LLFloaterPreferenceGraphicsAdvanced::onVertexShaderEnable()
+{
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if (instance)
+ {
+ instance->refresh();
+ }
+
+ refreshEnabledGraphics();
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledGraphics()
+{
+ refreshEnabledState();
+}
+
+void LLFloaterPreference::onAvatarImpostorsEnable()
+{
+ refreshEnabledGraphics();
+}
+
//static
void LLFloaterPreference::initDoNotDisturbResponse()
{
@@ -782,8 +829,22 @@ void LLFloaterPreference::updateShowFavoritesCheckbox(bool val)
void LLFloaterPreference::setHardwareDefaults()
{
+ std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
+ if (!preset_graphic_active.empty())
+ {
+ saveGraphicsPreset(preset_graphic_active);
+ saveSettings(); // save here to be able to return to the previous preset by Cancel
+ }
+
LLFeatureManager::getInstance()->applyRecommendedSettings();
+
+ // reset indirects before refresh because we may have changed what they control
+ LLAvatarComplexityControls::setIndirectControls();
+
refreshEnabledGraphics();
+ gSavedSettings.setString("PresetGraphicActive", "");
+ LLPresetsManager::getInstance()->triggerChangeSignal();
+
LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();
child_list_t::const_iterator end = tabcontainer->getChildList()->end();
@@ -792,7 +853,47 @@ void LLFloaterPreference::setHardwareDefaults()
LLView* view = *iter;
LLPanelPreference* panel = dynamic_cast<LLPanelPreference*>(view);
if (panel)
+ {
panel->setHardwareDefaults();
+ }
+ }
+}
+
+void LLFloaterPreference::getControlNames(std::vector<std::string>& names)
+{
+ LLView* view = findChild<LLView>("display");
+ LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+ if (view && advanced)
+ {
+ std::list<LLView*> stack;
+ stack.push_back(view);
+ stack.push_back(advanced);
+ while(!stack.empty())
+ {
+ // Process view on top of the stack
+ LLView* curview = stack.front();
+ stack.pop_front();
+
+ LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
+ if (ctrl)
+ {
+ LLControlVariable* control = ctrl->getControlVariable();
+ if (control)
+ {
+ std::string control_name = control->getName();
+ if (std::find(names.begin(), names.end(), control_name) == names.end())
+ {
+ names.push_back(control_name);
+ }
+ }
+ }
+
+ for (child_list_t::const_iterator iter = curview->getChildList()->begin();
+ iter != curview->getChildList()->end(); ++iter)
+ {
+ stack.push_back(*iter);
+ }
+ }
}
}
@@ -807,13 +908,8 @@ void LLFloaterPreference::onClose(bool app_quitting)
}
}
-void LLFloaterPreference::onOpenHardwareSettings()
-{
- LLFloater* floater = LLFloaterReg::showInstance("prefs_hardware_settings");
- addDependentFloater(floater, FALSE);
-}
// static
-void LLFloaterPreference::onBtnOK()
+void LLFloaterPreference::onBtnOK(const LLSD& userdata)
{
// commit any outstanding text entry
if (hasFocus())
@@ -829,7 +925,15 @@ void LLFloaterPreference::onBtnOK()
{
saveSettings();
apply();
- closeFloater(false);
+
+ if (userdata.asString() == "closeadvanced")
+ {
+ LLFloaterReg::hideInstance("prefs_graphics_advanced");
+ }
+ else
+ {
+ closeFloater(false);
+ }
//Conversation transcript and log path changed so reload conversations based on new location
if(mPriorInstantMessageLogPath.length())
@@ -871,11 +975,10 @@ void LLFloaterPreference::onBtnOK()
LLFloaterPathfindingConsole* pPathfindingConsole = pathfindingConsoleHandle.get();
pPathfindingConsole->onRegionBoundaryCross();
}
-
}
// static
-void LLFloaterPreference::onBtnApply( )
+void LLFloaterPreference::onBtnCancel(const LLSD& userdata)
{
if (hasFocus())
{
@@ -884,27 +987,18 @@ void LLFloaterPreference::onBtnApply( )
{
cur_focus->onCommit();
}
+ refresh();
}
- apply();
- saveSettings();
-
- LLPanelLogin::updateLocationSelectorsVisibility();
-}
+ cancel();
-// static
-void LLFloaterPreference::onBtnCancel()
-{
- if (hasFocus())
+ if (userdata.asString() == "closeadvanced")
{
- LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
- if (cur_focus && cur_focus->acceptsTextInput())
- {
- cur_focus->onCommit();
- }
- refresh();
+ LLFloaterReg::hideInstance("prefs_graphics_advanced");
+ }
+ else
+ {
+ closeFloater();
}
- cancel();
- closeFloater();
}
// static
@@ -917,19 +1011,18 @@ void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_
}
}
-
void LLFloaterPreference::refreshEnabledGraphics()
{
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance)
{
instance->refresh();
- //instance->refreshEnabledState();
}
- LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
- if (hardware_settings)
+
+ LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+ if (advanced)
{
- hardware_settings->refreshEnabledState();
+ advanced->refresh();
}
}
@@ -1112,23 +1205,52 @@ void LLFloaterPreference::buildPopupLists()
}
void LLFloaterPreference::refreshEnabledState()
-{
+{
+ LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
+ LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
+
+ // if vertex shaders off, disable all shader related products
+ if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") ||
+ !LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders"))
+ {
+ ctrl_wind_light->setEnabled(FALSE);
+ ctrl_wind_light->setValue(FALSE);
+ }
+ else
+ {
+ ctrl_wind_light->setEnabled(gSavedSettings.getBOOL("VertexShaderEnable"));
+ }
+
+ //Deferred/SSAO/Shadows
+ BOOL bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && gSavedSettings.getBOOL("RenderObjectBump");
+ BOOL shaders = gSavedSettings.getBOOL("WindLightUseAtmosShaders") && gSavedSettings.getBOOL("VertexShaderEnable");
+ BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
+ bumpshiny &&
+ shaders &&
+ gGLManager.mHasFramebufferObject &&
+ gSavedSettings.getBOOL("RenderAvatarVP") &&
+ (ctrl_wind_light->get()) ? TRUE : FALSE;
+
+ ctrl_deferred->setEnabled(enabled);
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
+{
LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
- LLRadioGroup* radio_reflection_detail = getChild<LLRadioGroup>("ReflectionDetailRadio");
-
+ LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
+
// Reflections
BOOL reflections = gSavedSettings.getBOOL("VertexShaderEnable")
&& gGLManager.mHasCubeMap
&& LLCubeMap::sUseCubeMaps;
ctrl_reflections->setEnabled(reflections);
+ reflections_text->setEnabled(reflections);
// Bump & Shiny
LLCheckBoxCtrl* bumpshiny_ctrl = getChild<LLCheckBoxCtrl>("BumpShiny");
bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
bumpshiny_ctrl->setEnabled(bumpshiny ? TRUE : FALSE);
- radio_reflection_detail->setEnabled(reflections);
-
// Avatar Mode
// Enable Avatar Shaders
LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
@@ -1147,43 +1269,48 @@ void LLFloaterPreference::refreshEnabledState()
if (gSavedSettings.getBOOL("VertexShaderEnable") == FALSE ||
gSavedSettings.getBOOL("RenderAvatarVP") == FALSE)
{
- ctrl_avatar_cloth->setEnabled(false);
+ ctrl_avatar_cloth->setEnabled(FALSE);
}
else
{
- ctrl_avatar_cloth->setEnabled(true);
+ ctrl_avatar_cloth->setEnabled(TRUE);
}
// Vertex Shaders
// Global Shader Enable
LLCheckBoxCtrl* ctrl_shader_enable = getChild<LLCheckBoxCtrl>("BasicShaders");
- // radio set for terrain detail mode
- LLRadioGroup* mRadioTerrainDetail = getChild<LLRadioGroup>("TerrainDetailRadio"); // can be linked with control var
-
+ LLSliderCtrl* terrain_detail = getChild<LLSliderCtrl>("TerrainDetail"); // can be linked with control var
+ LLTextBox* terrain_text = getChild<LLTextBox>("TerrainDetailText");
+
ctrl_shader_enable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
BOOL shaders = ctrl_shader_enable->get();
if (shaders)
{
- mRadioTerrainDetail->setValue(1);
- mRadioTerrainDetail->setEnabled(FALSE);
+ terrain_detail->setValue(1);
+ terrain_detail->setEnabled(FALSE);
+ terrain_text->setEnabled(FALSE);
}
else
{
- mRadioTerrainDetail->setEnabled(TRUE);
+ terrain_detail->setEnabled(TRUE);
+ terrain_text->setEnabled(TRUE);
}
// WindLight
LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
-
+ LLSliderCtrl* sky = getChild<LLSliderCtrl>("SkyMeshDetail");
+ LLTextBox* sky_text = getChild<LLTextBox>("SkyMeshDetailText");
+
// *HACK just checks to see if we can use shaders...
// maybe some cards that use shaders, but don't support windlight
ctrl_wind_light->setEnabled(ctrl_shader_enable->getEnabled() && shaders);
+ sky->setEnabled(ctrl_wind_light->get() && shaders);
+ sky_text->setEnabled(ctrl_wind_light->get() && shaders);
+
//Deferred/SSAO/Shadows
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
- LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
-
BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
((bumpshiny_ctrl && bumpshiny_ctrl->get()) ? TRUE : FALSE) &&
@@ -1193,11 +1320,11 @@ void LLFloaterPreference::refreshEnabledState()
(ctrl_wind_light->get()) ? TRUE : FALSE;
ctrl_deferred->setEnabled(enabled);
- ctrl_deferred2->setEnabled(enabled);
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
LLComboBox* ctrl_shadow = getChild<LLComboBox>("ShadowDetail");
+ LLTextBox* shadow_text = getChild<LLTextBox>("RenderShadowDetailText");
// note, okay here to get from ctrl_deferred as it's twin, ctrl_deferred2 will alway match it
enabled = enabled && LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferredSSAO") && (ctrl_deferred->get() ? TRUE : FALSE);
@@ -1210,7 +1337,33 @@ void LLFloaterPreference::refreshEnabledState()
enabled = enabled && LLFeatureManager::getInstance()->isFeatureAvailable("RenderShadowDetail");
ctrl_shadow->setEnabled(enabled);
-
+ shadow_text->setEnabled(enabled);
+
+ // Hardware settings
+ F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
+ S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
+ S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
+ getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value());
+ getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem.value());
+
+ if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
+ !gGLManager.mHasVertexBufferObject)
+ {
+ getChildView("vbo")->setEnabled(FALSE);
+ }
+
+ if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderCompressTextures") ||
+ !gGLManager.mHasVertexBufferObject)
+ {
+ getChildView("texture compression")->setEnabled(FALSE);
+ }
+
+ // if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
+ LLUICtrl* gamma_ctrl = getChild<LLUICtrl>("gamma");
+ gamma_ctrl->setEnabled(!gPipeline.canUseWindLightShaders());
+ getChildView("(brightness, lower is brighter)")->setEnabled(!gPipeline.canUseWindLightShaders());
+ getChildView("fog")->setEnabled(!gPipeline.canUseWindLightShaders());
+ getChildView("antialiasing restart")->setVisible(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred"));
// now turn off any features that are unavailable
disableUnavailableSettings();
@@ -1221,19 +1374,63 @@ void LLFloaterPreference::refreshEnabledState()
getChild<LLButton>("default_creation_permissions")->setEnabled(LLStartUp::getStartupState() < STATE_STARTED ? false : true);
}
-void LLFloaterPreference::disableUnavailableSettings()
+// static
+void LLAvatarComplexityControls::setIndirectControls()
+{
+ /*
+ * We have controls that have an indirect relationship between the control
+ * values and adjacent text and the underlying setting they influence.
+ * In each case, the control and its associated setting are named Indirect<something>
+ * This method interrogates the controlled setting and establishes the
+ * appropriate value for the indirect control. It must be called whenever the
+ * underlying setting may have changed other than through the indirect control,
+ * such as when the 'Reset all to recommended settings' button is used...
+ */
+ setIndirectMaxNonImpostors();
+ setIndirectMaxArc();
+}
+
+// static
+void LLAvatarComplexityControls::setIndirectMaxNonImpostors()
+{
+ U32 max_non_impostors = gSavedSettings.getU32("RenderAvatarMaxNonImpostors");
+ // for this one, we just need to make zero, which means off, the max value of the slider
+ U32 indirect_max_non_impostors = (0 == max_non_impostors) ? LLVOAvatar::IMPOSTORS_OFF : max_non_impostors;
+ gSavedSettings.setU32("IndirectMaxNonImpostors", indirect_max_non_impostors);
+}
+
+void LLAvatarComplexityControls::setIndirectMaxArc()
+{
+ U32 max_arc = gSavedSettings.getU32("RenderAvatarMaxComplexity");
+ U32 indirect_max_arc;
+ if (0 == max_arc)
+ {
+ // the off position is all the way to the right, so set to control max
+ indirect_max_arc = INDIRECT_MAX_ARC_OFF;
+ }
+ else
+ {
+ // This is the inverse of the calculation in updateMaxComplexity
+ indirect_max_arc = (U32)((log(max_arc) - MIN_ARC_LOG) / ARC_LIMIT_MAP_SCALE) + MIN_INDIRECT_ARC_LIMIT;
+ }
+ gSavedSettings.setU32("IndirectMaxComplexity", indirect_max_arc);
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
{
LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
+ LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
LLCheckBoxCtrl* ctrl_avatar_cloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
LLCheckBoxCtrl* ctrl_shader_enable = getChild<LLCheckBoxCtrl>("BasicShaders");
LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
- LLCheckBoxCtrl* ctrl_avatar_impostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
- LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
+ LLTextBox* shadows_text = getChild<LLTextBox>("RenderShadowDetailText");
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
+ LLSliderCtrl* sky = getChild<LLSliderCtrl>("SkyMeshDetail");
+ LLTextBox* sky_text = getChild<LLTextBox>("SkyMeshDetailText");
// if vertex shaders off, disable all shader related products
if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"))
@@ -1243,9 +1440,13 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_wind_light->setEnabled(FALSE);
ctrl_wind_light->setValue(FALSE);
-
+
+ sky->setEnabled(FALSE);
+ sky_text->setEnabled(FALSE);
+
ctrl_reflections->setEnabled(FALSE);
ctrl_reflections->setValue(0);
+ reflections_text->setEnabled(FALSE);
ctrl_avatar_vp->setEnabled(FALSE);
ctrl_avatar_vp->setValue(FALSE);
@@ -1255,6 +1456,7 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_shadows->setEnabled(FALSE);
ctrl_shadows->setValue(0);
+ shadows_text->setEnabled(FALSE);
ctrl_ssao->setEnabled(FALSE);
ctrl_ssao->setValue(FALSE);
@@ -1264,8 +1466,6 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
- ctrl_deferred2->setEnabled(FALSE);
- ctrl_deferred2->setValue(FALSE);
}
// disabled windlight
@@ -1274,9 +1474,13 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_wind_light->setEnabled(FALSE);
ctrl_wind_light->setValue(FALSE);
+ sky->setEnabled(FALSE);
+ sky_text->setEnabled(FALSE);
+
//deferred needs windlight, disable deferred
ctrl_shadows->setEnabled(FALSE);
ctrl_shadows->setValue(0);
+ shadows_text->setEnabled(FALSE);
ctrl_ssao->setEnabled(FALSE);
ctrl_ssao->setValue(FALSE);
@@ -1286,8 +1490,6 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
- ctrl_deferred2->setEnabled(FALSE);
- ctrl_deferred2->setValue(FALSE);
}
// disabled deferred
@@ -1296,6 +1498,7 @@ void LLFloaterPreference::disableUnavailableSettings()
{
ctrl_shadows->setEnabled(FALSE);
ctrl_shadows->setValue(0);
+ shadows_text->setEnabled(FALSE);
ctrl_ssao->setEnabled(FALSE);
ctrl_ssao->setValue(FALSE);
@@ -1305,8 +1508,6 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
- ctrl_deferred2->setEnabled(FALSE);
- ctrl_deferred2->setValue(FALSE);
}
// disabled deferred SSAO
@@ -1321,6 +1522,7 @@ void LLFloaterPreference::disableUnavailableSettings()
{
ctrl_shadows->setEnabled(FALSE);
ctrl_shadows->setValue(0);
+ shadows_text->setEnabled(FALSE);
}
// disabled reflections
@@ -1328,6 +1530,7 @@ void LLFloaterPreference::disableUnavailableSettings()
{
ctrl_reflections->setEnabled(FALSE);
ctrl_reflections->setValue(FALSE);
+ reflections_text->setEnabled(FALSE);
}
// disabled av
@@ -1342,6 +1545,7 @@ void LLFloaterPreference::disableUnavailableSettings()
//deferred needs AvatarVP, disable deferred
ctrl_shadows->setEnabled(FALSE);
ctrl_shadows->setValue(0);
+ shadows_text->setEnabled(FALSE);
ctrl_ssao->setEnabled(FALSE);
ctrl_ssao->setValue(FALSE);
@@ -1351,8 +1555,6 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
- ctrl_deferred2->setEnabled(FALSE);
- ctrl_deferred2->setValue(FALSE);
}
// disabled cloth
@@ -1361,18 +1563,25 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_avatar_cloth->setEnabled(FALSE);
ctrl_avatar_cloth->setValue(FALSE);
}
+}
- // disabled impostors
- if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderUseImpostors"))
+void LLFloaterPreference::refresh()
+{
+ LLPanel::refresh();
+ LLAvatarComplexityControls::setText(
+ gSavedSettings.getU32("RenderAvatarMaxComplexity"),
+ getChild<LLTextBox>("IndirectMaxComplexityText", true));
+ refreshEnabledState();
+ LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+ if (advanced)
{
- ctrl_avatar_impostors->setEnabled(FALSE);
- ctrl_avatar_impostors->setValue(FALSE);
+ advanced->refresh();
}
}
-void LLFloaterPreference::refresh()
+void LLFloaterPreferenceGraphicsAdvanced::refresh()
{
- LLPanel::refresh();
+ getChild<LLUICtrl>("fsaa")->setValue((LLSD::Integer) gSavedSettings.getU32("RenderFSAASamples"));
// sliders and their text boxes
// mPostProcess = gSavedSettings.getS32("RenderGlowResolutionPow");
@@ -1381,12 +1590,18 @@ void LLFloaterPreference::refresh()
updateSliderText(getChild<LLSliderCtrl>("FlexibleMeshDetail", true), getChild<LLTextBox>("FlexibleMeshDetailText", true));
updateSliderText(getChild<LLSliderCtrl>("TreeMeshDetail", true), getChild<LLTextBox>("TreeMeshDetailText", true));
updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail", true), getChild<LLTextBox>("AvatarMeshDetailText", true));
- updateSliderText(getChild<LLSliderCtrl>("AvatarMeshDetail2", true), getChild<LLTextBox>("AvatarMeshDetailText2", true));
updateSliderText(getChild<LLSliderCtrl>("AvatarPhysicsDetail", true), getChild<LLTextBox>("AvatarPhysicsDetailText", true));
updateSliderText(getChild<LLSliderCtrl>("TerrainMeshDetail", true), getChild<LLTextBox>("TerrainMeshDetailText", true));
updateSliderText(getChild<LLSliderCtrl>("RenderPostProcess", true), getChild<LLTextBox>("PostProcessText", true));
updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail", true), getChild<LLTextBox>("SkyMeshDetailText", true));
-
+ updateSliderText(getChild<LLSliderCtrl>("TerrainDetail", true), getChild<LLTextBox>("TerrainDetailText", true));
+ LLAvatarComplexityControls::setIndirectControls();
+ setMaxNonImpostorsText(
+ gSavedSettings.getU32("RenderAvatarMaxNonImpostors"),
+ getChild<LLTextBox>("IndirectMaxNonImpostorsText", true));
+ LLAvatarComplexityControls::setText(
+ gSavedSettings.getU32("RenderAvatarMaxComplexity"),
+ getChild<LLTextBox>("IndirectMaxComplexityText", true));
refreshEnabledState();
}
@@ -1631,6 +1846,7 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
getChildView("favorites_on_login_check")->setEnabled(TRUE);
getChildView("log_path_button")->setEnabled(TRUE);
getChildView("chat_font_size")->setEnabled(TRUE);
+ getChildView("conversation_log_combo")->setEnabled(TRUE);
}
@@ -1639,11 +1855,11 @@ void LLFloaterPreference::refreshUI()
refresh();
}
-void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+void LLFloaterPreferenceGraphicsAdvanced::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
{
if (text_box == NULL || ctrl== NULL)
return;
-
+
// get range and points when text should change
F32 value = (F32)ctrl->getValue().asReal();
F32 min = ctrl->getMinValue();
@@ -1652,7 +1868,7 @@ void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_b
llassert(range > 0);
F32 midPoint = min + range / 3.0f;
F32 highPoint = min + (2.0f * range / 3.0f);
-
+
// choose the right text
if (value < midPoint)
{
@@ -1668,6 +1884,87 @@ void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_b
}
}
+void LLFloaterPreferenceGraphicsAdvanced::updateMaxNonImpostors()
+{
+ // Called when the IndirectMaxNonImpostors control changes
+ // Responsible for fixing the slider label (IndirectMaxNonImpostorsText) and setting RenderAvatarMaxNonImpostors
+ LLSliderCtrl* ctrl = getChild<LLSliderCtrl>("IndirectMaxNonImpostors",true);
+ U32 value = ctrl->getValue().asInteger();
+
+ if (0 == value || LLVOAvatar::IMPOSTORS_OFF <= value)
+ {
+ value=0;
+ }
+ gSavedSettings.setU32("RenderAvatarMaxNonImpostors", value);
+ LLVOAvatar::updateImpostorRendering(value); // make it effective immediately
+ setMaxNonImpostorsText(value, getChild<LLTextBox>("IndirectMaxNonImpostorsText"));
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::setMaxNonImpostorsText(U32 value, LLTextBox* text_box)
+{
+ if (0 == value)
+ {
+ text_box->setText(LLTrans::getString("no_limit"));
+ }
+ else
+ {
+ text_box->setText(llformat("%d", value));
+ }
+}
+
+void LLAvatarComplexityControls::updateMax(LLSliderCtrl* slider, LLTextBox* value_label)
+{
+ // Called when the IndirectMaxComplexity control changes
+ // Responsible for fixing the slider label (IndirectMaxComplexityText) and setting RenderAvatarMaxComplexity
+ U32 indirect_value = slider->getValue().asInteger();
+ U32 max_arc;
+
+ if (INDIRECT_MAX_ARC_OFF == indirect_value)
+ {
+ // The 'off' position is when the slider is all the way to the right,
+ // which is a value of INDIRECT_MAX_ARC_OFF,
+ // so it is necessary to set max_arc to 0 disable muted avatars.
+ max_arc = 0;
+ }
+ else
+ {
+ // if this is changed, the inverse calculation in setIndirectMaxArc
+ // must be changed to match
+ max_arc = (U32)exp(MIN_ARC_LOG + (ARC_LIMIT_MAP_SCALE * (indirect_value - MIN_INDIRECT_ARC_LIMIT)));
+ }
+
+ gSavedSettings.setU32("RenderAvatarMaxComplexity", (U32)max_arc);
+ setText(max_arc, value_label);
+}
+
+void LLAvatarComplexityControls::setText(U32 value, LLTextBox* text_box)
+{
+ if (0 == value)
+ {
+ text_box->setText(LLTrans::getString("no_limit"));
+ }
+ else
+ {
+ text_box->setText(llformat("%d", value));
+ }
+}
+
+void LLFloaterPreference::updateMaxComplexity()
+{
+ // Called when the IndirectMaxComplexity control changes
+ LLAvatarComplexityControls::updateMax(
+ getChild<LLSliderCtrl>("IndirectMaxComplexity"),
+ getChild<LLTextBox>("IndirectMaxComplexityText"));
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::updateMaxComplexity()
+{
+ // Called when the IndirectMaxComplexity control changes
+ LLAvatarComplexityControls::updateMax(
+ getChild<LLSliderCtrl>("IndirectMaxComplexity"),
+ getChild<LLTextBox>("IndirectMaxComplexityText"));
+}
+
void LLFloaterPreference::onChangeMaturity()
{
U8 sim_access = gSavedSettings.getU32("PreferredMaturity");
@@ -1710,6 +2007,23 @@ void LLFloaterPreference::onClickSpellChecker()
LLFloaterReg::showInstance("prefs_spellchecker");
}
+void LLFloaterPreference::onClickAdvanced()
+{
+ LLFloaterReg::showInstance("prefs_graphics_advanced");
+
+ LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
+ for (child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();
+ iter != tabcontainer->getChildList()->end(); ++iter)
+ {
+ LLView* view = *iter;
+ LLPanelPreferenceGraphics* panel = dynamic_cast<LLPanelPreferenceGraphics*>(view);
+ if (panel)
+ {
+ panel->resetDirtyChilds();
+ }
+ }
+}
+
void LLFloaterPreference::onClickActionChange()
{
mClickActionDirty = true;
@@ -1814,6 +2128,11 @@ void LLFloaterPreference::changed()
}
+void LLFloaterPreference::saveGraphicsPreset(std::string& preset)
+{
+ mSavedGraphicsPreset = preset;
+}
+
//------------------------------Updater---------------------------------------
static bool handleBandwidthChanged(const LLSD& newvalue)
@@ -1867,6 +2186,9 @@ LLPanelPreference::LLPanelPreference()
{
mCommitCallbackRegistrar.add("Pref.setControlFalse", boost::bind(&LLPanelPreference::setControlFalse,this, _2));
mCommitCallbackRegistrar.add("Pref.updateMediaAutoPlayCheckbox", boost::bind(&LLPanelPreference::updateMediaAutoPlayCheckbox, this, _1));
+ mCommitCallbackRegistrar.add("Pref.PrefDelete", boost::bind(&LLPanelPreference::deletePreset, this, _2));
+ mCommitCallbackRegistrar.add("Pref.PrefSave", boost::bind(&LLPanelPreference::savePreset, this, _2));
+ mCommitCallbackRegistrar.add("Pref.PrefLoad", boost::bind(&LLPanelPreference::loadPreset, this, _2));
}
//virtual
@@ -1975,10 +2297,16 @@ void LLPanelPreference::apply()
void LLPanelPreference::saveSettings()
{
+ LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
+
// Save the value of all controls in the hierarchy
mSavedValues.clear();
std::list<LLView*> view_stack;
view_stack.push_back(this);
+ if (advanced)
+ {
+ view_stack.push_back(advanced);
+ }
while(!view_stack.empty())
{
// Process view on top of the stack
@@ -2084,6 +2412,28 @@ void LLPanelPreference::updateMediaAutoPlayCheckbox(LLUICtrl* ctrl)
}
}
+void LLPanelPreference::deletePreset(const LLSD& user_data)
+{
+ std::string subdirectory = user_data.asString();
+ LLFloaterReg::showInstance("delete_pref_preset", subdirectory);
+}
+
+void LLPanelPreference::savePreset(const LLSD& user_data)
+{
+ std::string subdirectory = user_data.asString();
+ LLFloaterReg::showInstance("save_pref_preset", subdirectory);
+}
+
+void LLPanelPreference::loadPreset(const LLSD& user_data)
+{
+ std::string subdirectory = user_data.asString();
+ LLFloaterReg::showInstance("load_pref_preset", subdirectory);
+}
+
+void LLPanelPreference::setHardwareDefaults()
+{
+}
+
class LLPanelPreferencePrivacy : public LLPanelPreference
{
public:
@@ -2127,25 +2477,98 @@ static LLPanelInjector<LLPanelPreferencePrivacy> t_pref_privacy("panel_preferenc
BOOL LLPanelPreferenceGraphics::postBuild()
{
+ LLFloaterReg::showInstance("prefs_graphics_advanced");
+ LLFloaterReg::hideInstance("prefs_graphics_advanced");
+
+// Don't do this on Mac as their braindead GL versioning
+// sets this when 8x and 16x are indeed available
+//
+#if !LL_DARWIN
+ if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
+ { //remove FSAA settings above "4x"
+ LLComboBox* combo = getChild<LLComboBox>("fsaa");
+ combo->remove("8x");
+ combo->remove("16x");
+ }
+#endif
+
+ resetDirtyChilds();
+ setPresetText();
+
+ LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
+ presetsMgr->setPresetListChangeCallback(boost::bind(&LLPanelPreferenceGraphics::onPresetsListChange, this));
+ presetsMgr->createMissingDefault(); // a no-op after the first time, but that's ok
+
return LLPanelPreference::postBuild();
}
+
void LLPanelPreferenceGraphics::draw()
{
+ setPresetText();
LLPanelPreference::draw();
-
- LLButton* button_apply = findChild<LLButton>("Apply");
-
- if (button_apply && button_apply->getVisible())
+}
+
+void LLPanelPreferenceGraphics::onPresetsListChange()
+{
+ resetDirtyChilds();
+ setPresetText();
+
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if (instance && !gSavedSettings.getString("PresetGraphicActive").empty())
{
- bool enable = hasDirtyChilds();
+ instance->saveSettings(); //make cancel work correctly after changing the preset
+ }
+}
+
+void LLPanelPreferenceGraphics::setPresetText()
+{
+ LLTextBox* preset_text = getChild<LLTextBox>("preset_text");
- button_apply->setEnabled(enable);
+ std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
+
+ if (!preset_graphic_active.empty() && preset_graphic_active != preset_text->getText())
+ {
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if (instance)
+ {
+ instance->saveGraphicsPreset(preset_graphic_active);
+ }
+ }
+
+ if (hasDirtyChilds() && !preset_graphic_active.empty())
+ {
+ gSavedSettings.setString("PresetGraphicActive", "");
+ preset_graphic_active.clear();
+ // This doesn't seem to cause an infinite recursion. This trigger is needed to cause the pulldown
+ // panel to update.
+ LLPresetsManager::getInstance()->triggerChangeSignal();
+ }
+
+ if (!preset_graphic_active.empty())
+ {
+ if (preset_graphic_active == PRESETS_DEFAULT)
+ {
+ preset_graphic_active = LLTrans::getString(PRESETS_DEFAULT);
+ }
+ preset_text->setText(preset_graphic_active);
+ }
+ else
+ {
+ preset_text->setText(LLTrans::getString("none_paren_cap"));
}
+
+ preset_text->resetDirty();
}
+
bool LLPanelPreferenceGraphics::hasDirtyChilds()
{
+ LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
std::list<LLView*> view_stack;
view_stack.push_back(this);
+ if (advanced)
+ {
+ view_stack.push_back(advanced);
+ }
while(!view_stack.empty())
{
// Process view on top of the stack
@@ -2156,7 +2579,17 @@ bool LLPanelPreferenceGraphics::hasDirtyChilds()
if (ctrl)
{
if (ctrl->isDirty())
- return true;
+ {
+ LLControlVariable* control = ctrl->getControlVariable();
+ if (control)
+ {
+ std::string control_name = control->getName();
+ if (!control_name.empty())
+ {
+ return true;
+ }
+ }
+ }
}
// Push children onto the end of the work stack
for (child_list_t::const_iterator iter = curview->getChildList()->begin();
@@ -2164,14 +2597,20 @@ bool LLPanelPreferenceGraphics::hasDirtyChilds()
{
view_stack.push_back(*iter);
}
- }
+ }
+
return false;
}
void LLPanelPreferenceGraphics::resetDirtyChilds()
{
+ LLFloater* advanced = LLFloaterReg::findTypedInstance<LLFloater>("prefs_graphics_advanced");
std::list<LLView*> view_stack;
view_stack.push_back(this);
+ if (advanced)
+ {
+ view_stack.push_back(advanced);
+ }
while(!view_stack.empty())
{
// Process view on top of the stack
@@ -2191,14 +2630,9 @@ void LLPanelPreferenceGraphics::resetDirtyChilds()
}
}
}
-void LLPanelPreferenceGraphics::apply()
-{
- resetDirtyChilds();
- LLPanelPreference::apply();
-}
+
void LLPanelPreferenceGraphics::cancel()
{
- resetDirtyChilds();
LLPanelPreference::cancel();
}
void LLPanelPreferenceGraphics::saveSettings()
@@ -2209,7 +2643,18 @@ void LLPanelPreferenceGraphics::saveSettings()
void LLPanelPreferenceGraphics::setHardwareDefaults()
{
resetDirtyChilds();
- LLPanelPreference::setHardwareDefaults();
+}
+
+LLFloaterPreferenceGraphicsAdvanced::LLFloaterPreferenceGraphicsAdvanced(const LLSD& key)
+ : LLFloater(key)
+{
+ mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::onVertexShaderEnable, this));
+ mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxNonImpostors", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::updateMaxNonImpostors,this));
+ mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxComplexity", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::updateMaxComplexity,this));
+}
+
+LLFloaterPreferenceGraphicsAdvanced::~LLFloaterPreferenceGraphicsAdvanced()
+{
}
LLFloaterPreferenceProxy::LLFloaterPreferenceProxy(const LLSD& key)
@@ -2221,6 +2666,20 @@ LLFloaterPreferenceProxy::LLFloaterPreferenceProxy(const LLSD& key)
mCommitCallbackRegistrar.add("Proxy.Change", boost::bind(&LLFloaterPreferenceProxy::onChangeSocksSettings, this));
}
+void LLFloaterPreferenceGraphicsAdvanced::onOpen(const LLSD& key)
+{
+ refresh();
+}
+
+void LLFloaterPreferenceGraphicsAdvanced::onClickCloseBtn(bool app_quitting)
+{
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if (instance)
+ {
+ instance->cancel();
+ }
+}
+
LLFloaterPreferenceProxy::~LLFloaterPreferenceProxy()
{
}
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
old mode 100755
new mode 100644
index 04e5e377313a5ef1ecd682490a531fc75cdf95a8..fa0c09e97a7c901723c132d47bb3205b9ae52a8b
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -58,7 +58,6 @@ typedef enum
} EGraphicsSettings;
-
// Floater to control preferences (display, audio, bandwidth, general.
class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver, public LLConversationLogObserver
{
@@ -93,11 +92,11 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void saveAvatarProperties( void );
void selectPrivacyPanel();
void selectChatPanel();
+ void getControlNames(std::vector<std::string>& names);
protected:
- void onBtnOK();
- void onBtnCancel();
- void onBtnApply();
+ void onBtnOK(const LLSD& userdata);
+ void onBtnCancel(const LLSD& userdata);
void onClickClearCache(); // Clear viewer texture cache, vfs, and VO cache on next startup
void onClickBrowserClearCache(); // Clear web history and caches as well as viewer caches above
@@ -111,11 +110,13 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
// if the custom settings box is clicked
void onChangeCustom();
void updateMeterText(LLUICtrl* ctrl);
- void onOpenHardwareSettings();
// callback for defaults
void setHardwareDefaults();
+ void setRecommended();
// callback for when client turns on shaders
void onVertexShaderEnable();
+ // callback for when client turns on impostors
+ void onAvatarImpostorsEnable();
// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
void onClickActionChange();
@@ -123,13 +124,11 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void updateClickActionSettings();
// updates click/double-click action controls depending on values from settings.xml
void updateClickActionControls();
-
+
+public:
// This function squirrels away the current values of the controls so that
// cancel() can restore them.
void saveSettings();
-
-
-public:
void setCacheLocation(const LLStringExplicit& location);
@@ -150,13 +149,11 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void enableHistory();
void setPersonalInfo(const std::string& visibility, bool im_via_email);
void refreshEnabledState();
- void disableUnavailableSettings();
void onCommitWindowedMode();
void refresh(); // Refresh enable/disable
// if the quality radio buttons are changed
void onChangeQuality(const LLSD& data);
- void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
void refreshUI();
void onCommitParcelMediaAutoPlayEnable();
@@ -170,18 +167,21 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void onClickPermsDefault();
void onClickAutoReplace();
void onClickSpellChecker();
+ void onClickAdvanced();
void applyUIColor(LLUICtrl* ctrl, const LLSD& param);
void getUIColor(LLUICtrl* ctrl, const LLSD& param);
void onLogChatHistorySaved();
void buildPopupLists();
static void refreshSkin(void* data);
void selectPanel(const LLSD& name);
+ void saveGraphicsPreset(std::string& preset);
private:
void onDeleteTranscripts();
void onDeleteTranscriptsResponse(const LLSD& notification, const LLSD& response);
void updateDeleteTranscriptsButton();
+ void updateMaxComplexity();
static std::string sSkin;
notifications_map mNotificationOptions;
@@ -196,6 +196,8 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
std::string mDirectoryVisibility;
LLAvatarData mAvatarProperties;
+ std::string mSavedGraphicsPreset;
+ LOG_CLASS(LLFloaterPreference);
};
class LLPanelPreference : public LLPanel
@@ -209,7 +211,7 @@ class LLPanelPreference : public LLPanel
virtual void apply();
virtual void cancel();
void setControlFalse(const LLSD& user_data);
- virtual void setHardwareDefaults(){};
+ virtual void setHardwareDefaults();
// Disables "Allow Media to auto play" check box only when both
// "Streaming Music" and "Media" are unchecked. Otherwise enables it.
@@ -218,7 +220,11 @@ class LLPanelPreference : public LLPanel
// This function squirrels away the current values of the controls so that
// cancel() can restore them.
virtual void saveSettings();
-
+
+ void deletePreset(const LLSD& user_data);
+ void savePreset(const LLSD& user_data);
+ void loadPreset(const LLSD& user_data);
+
class Updater;
protected:
@@ -235,6 +241,7 @@ class LLPanelPreference : public LLPanel
string_color_map_t mSavedColors;
Updater* mBandWidthUpdater;
+ LOG_CLASS(LLPanelPreference);
};
class LLPanelPreferenceGraphics : public LLPanelPreference
@@ -242,14 +249,56 @@ class LLPanelPreferenceGraphics : public LLPanelPreference
public:
BOOL postBuild();
void draw();
- void apply();
void cancel();
void saveSettings();
+ void resetDirtyChilds();
void setHardwareDefaults();
+ void setPresetText();
+
+ static const std::string getPresetsPath();
+
protected:
bool hasDirtyChilds();
- void resetDirtyChilds();
-
+
+private:
+
+ void onPresetsListChange();
+ LOG_CLASS(LLPanelPreferenceGraphics);
+};
+
+class LLFloaterPreferenceGraphicsAdvanced : public LLFloater
+{
+ public:
+ LLFloaterPreferenceGraphicsAdvanced(const LLSD& key);
+ ~LLFloaterPreferenceGraphicsAdvanced();
+ void onOpen(const LLSD& key);
+ void onClickCloseBtn(bool app_quitting);
+ void disableUnavailableSettings();
+ void refreshEnabledGraphics();
+ void refreshEnabledState();
+ void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+ void updateMaxNonImpostors();
+ void setMaxNonImpostorsText(U32 value, LLTextBox* text_box);
+ void updateMaxComplexity();
+ void setMaxComplexityText(U32 value, LLTextBox* text_box);
+ static void setIndirectControls();
+ static void setIndirectMaxNonImpostors();
+ static void setIndirectMaxArc();
+ void refresh();
+ // callback for when client turns on shaders
+ void onVertexShaderEnable();
+ LOG_CLASS(LLFloaterPreferenceGraphicsAdvanced);
+};
+
+class LLAvatarComplexityControls
+{
+ public:
+ static void updateMax(LLSliderCtrl* slider, LLTextBox* value_label);
+ static void setText(U32 value, LLTextBox* text_box);
+ static void setIndirectControls();
+ static void setIndirectMaxNonImpostors();
+ static void setIndirectMaxArc();
+ LOG_CLASS(LLAvatarComplexityControls);
};
class LLFloaterPreferenceProxy : public LLFloater
@@ -278,7 +327,7 @@ class LLFloaterPreferenceProxy : public LLFloater
bool mSocksSettingsDirty;
typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
control_values_map_t mSavedValues;
-
+ LOG_CLASS(LLFloaterPreferenceProxy);
};
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterproperties.h b/indra/newview/llfloaterproperties.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterregiondebugconsole.h b/indra/newview/llfloaterregiondebugconsole.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bdef718d0e94dc4689634cfbe23f0fbf9048905e
--- /dev/null
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -0,0 +1,108 @@
+/**
+ * @file llfloatersaveprefpreset.cpp
+ * @brief Floater to save a graphics / camera preset
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatersaveprefpreset.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llfloaterpreference.h"
+#include "llfloaterreg.h"
+#include "llnotificationsutil.h"
+#include "llpresetsmanager.h"
+
+LLFloaterSavePrefPreset::LLFloaterSavePrefPreset(const LLSD &key)
+: LLFloater(key)
+{
+}
+
+// virtual
+BOOL LLFloaterSavePrefPreset::postBuild()
+{ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+ if (preferences)
+ {
+ preferences->addDependentFloater(this);
+ }
+ getChild<LLComboBox>("preset_combo")->setTextEntryCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
+ getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
+ getChild<LLButton>("save")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnSave, this));
+ getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnCancel, this));
+
+ LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetsListChange, this));
+
+ mSaveButton = getChild<LLButton>("save");
+ mPresetCombo = getChild<LLComboBox>("preset_combo");
+
+ return TRUE;
+}
+
+void LLFloaterSavePrefPreset::onPresetNameEdited()
+{
+ // Disable saving a preset having empty name.
+ std::string name = mPresetCombo->getSimple();
+
+ mSaveButton->setEnabled(!name.empty());
+}
+
+void LLFloaterSavePrefPreset::onOpen(const LLSD& key)
+{
+ mSubdirectory = key.asString();
+
+ std::string floater_title = getString(std::string("title_") + mSubdirectory);
+
+ setTitle(floater_title);
+
+ EDefaultOptions option = DEFAULT_TOP;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
+
+ onPresetNameEdited();
+}
+
+void LLFloaterSavePrefPreset::onBtnSave()
+{
+ std::string name = mPresetCombo->getSimple();
+
+ if (!LLPresetsManager::getInstance()->savePreset(mSubdirectory, name))
+ {
+ LLSD args;
+ args["NAME"] = name;
+ LLNotificationsUtil::add("PresetNotSaved", args);
+ }
+
+ closeFloater();
+}
+
+void LLFloaterSavePrefPreset::onPresetsListChange()
+{
+ EDefaultOptions option = DEFAULT_TOP;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
+}
+
+void LLFloaterSavePrefPreset::onBtnCancel()
+{
+ closeFloater();
+}
diff --git a/indra/lscript/lscript_http.h b/indra/newview/llfloatersaveprefpreset.h
old mode 100755
new mode 100644
similarity index 54%
rename from indra/lscript/lscript_http.h
rename to indra/newview/llfloatersaveprefpreset.h
index c6f2325995a0e9017f5af116f3db20292a238047..09a87b8c6296b7cb39fdec8b4953736eb19e03db
--- a/indra/lscript/lscript_http.h
+++ b/indra/newview/llfloatersaveprefpreset.h
@@ -1,10 +1,11 @@
/**
- * @file lscript_http.h
- * @brief LSL HTTP keys
+ * @file llfloatersaveprefpreset.h
+ * @brief Floater to save a graphics / camera preset
+
*
- * $LicenseInfo:firstyear=2006&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2014, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,22 +25,33 @@
* $/LicenseInfo$
*/
-// Keys used in LSL HTTP function <key,value> pair lists.
+#ifndef LL_LLFLOATERSAVEPREFPRESET_H
+#define LL_LLFLOATERSAVEPREFPRESET_H
-#ifndef LSCRIPT_HTTP_H
-#define LSCRIPT_HTTP_H
+#include "llfloater.h"
-enum LLScriptHTTPRequestParameterKey
-{
- HTTP_METHOD,
- HTTP_MIMETYPE,
- HTTP_BODY_MAXLENGTH,
- HTTP_VERIFY_CERT
-};
+class LLComboBox;
-enum LLScriptHTTPResponseMetadataKey
+class LLFloaterSavePrefPreset : public LLFloater
{
- HTTP_BODY_TRUNCATED
+
+public:
+ LLFloaterSavePrefPreset(const LLSD &key);
+
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
+
+ void onBtnSave();
+ void onBtnCancel();
+
+private:
+ LLComboBox* mPresetCombo;
+ LLButton* mSaveButton;
+
+ void onPresetsListChange();
+ void onPresetNameEdited();
+
+ std::string mSubdirectory;
};
-#endif
+#endif // LL_LLFLOATERSAVEPREFPRESET_H
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterscriptdebug.h b/indra/newview/llfloaterscriptdebug.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersellland.h b/indra/newview/llfloatersellland.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersidepanelcontainer.h b/indra/newview/llfloatersidepanelcontainer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersounddevices.cpp b/indra/newview/llfloatersounddevices.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatersounddevices.h b/indra/newview/llfloatersounddevices.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterspellchecksettings.cpp b/indra/newview/llfloaterspellchecksettings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterspellchecksettings.h b/indra/newview/llfloaterspellchecksettings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertelehub.h b/indra/newview/llfloatertelehub.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertestinspectors.cpp b/indra/newview/llfloatertestinspectors.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertestinspectors.h b/indra/newview/llfloatertestinspectors.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertestlistview.cpp b/indra/newview/llfloatertestlistview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertestlistview.h b/indra/newview/llfloatertestlistview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertexturefetchdebugger.cpp b/indra/newview/llfloatertexturefetchdebugger.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertexturefetchdebugger.h b/indra/newview/llfloatertexturefetchdebugger.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertoybox.h b/indra/newview/llfloatertoybox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateruipreview.h b/indra/newview/llfloateruipreview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterurlentry.h b/indra/newview/llfloaterurlentry.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatervoicevolume.cpp b/indra/newview/llfloatervoicevolume.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloatervoicevolume.h b/indra/newview/llfloatervoicevolume.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwebprofile.cpp b/indra/newview/llfloaterwebprofile.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwebprofile.h b/indra/newview/llfloaterwebprofile.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwhitelistentry.cpp b/indra/newview/llfloaterwhitelistentry.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwhitelistentry.h b/indra/newview/llfloaterwhitelistentry.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwindowsize.cpp b/indra/newview/llfloaterwindowsize.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterwindowsize.h b/indra/newview/llfloaterwindowsize.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfollowcam.cpp b/indra/newview/llfollowcam.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfollowcam.h b/indra/newview/llfollowcam.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llgesturelistener.cpp b/indra/newview/llgesturelistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgesturelistener.h b/indra/newview/llgesturelistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgiveinventory.h b/indra/newview/llgiveinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgroupactions.h b/indra/newview/llgroupactions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llgroupiconctrl.cpp b/indra/newview/llgroupiconctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgroupiconctrl.h b/indra/newview/llgroupiconctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhints.h b/indra/newview/llhints.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhttpretrypolicy.cpp b/indra/newview/llhttpretrypolicy.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhttpretrypolicy.h b/indra/newview/llhttpretrypolicy.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffect.cpp b/indra/newview/llhudeffect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffect.h b/indra/newview/llhudeffect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectbeam.cpp b/indra/newview/llhudeffectbeam.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectbeam.h b/indra/newview/llhudeffectbeam.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectblob.cpp b/indra/newview/llhudeffectblob.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectblob.h b/indra/newview/llhudeffectblob.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectlookat.h b/indra/newview/llhudeffectlookat.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectpointat.cpp b/indra/newview/llhudeffectpointat.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffectpointat.h b/indra/newview/llhudeffectpointat.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffecttrail.cpp b/indra/newview/llhudeffecttrail.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudeffecttrail.h b/indra/newview/llhudeffecttrail.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudicon.cpp b/indra/newview/llhudicon.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudmanager.h b/indra/newview/llhudmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudnametag.cpp b/indra/newview/llhudnametag.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudnametag.h b/indra/newview/llhudnametag.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudrender.h b/indra/newview/llhudrender.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llhudview.h b/indra/newview/llhudview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspect.h b/indra/newview/llinspect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectavatar.h b/indra/newview/llinspectavatar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectgroup.cpp b/indra/newview/llinspectgroup.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectgroup.h b/indra/newview/llinspectgroup.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectobject.h b/indra/newview/llinspectobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspectremoteobject.h b/indra/newview/llinspectremoteobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinspecttoast.h b/indra/newview/llinspecttoast.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryactions.h b/indra/newview/llinventoryactions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryclipboard.cpp b/indra/newview/llinventoryclipboard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryclipboard.h b/indra/newview/llinventoryclipboard.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorylistitem.h b/indra/newview/llinventorylistitem.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllightconstants.h b/indra/newview/lllightconstants.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllistbrowser.cpp b/indra/newview/lllistbrowser.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllistbrowser.h b/indra/newview/lllistbrowser.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllistcontextmenu.cpp b/indra/newview/lllistcontextmenu.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllistcontextmenu.h b/indra/newview/lllistcontextmenu.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllistview.cpp b/indra/newview/lllistview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllistview.h b/indra/newview/lllistview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llloginhandler.h b/indra/newview/llloginhandler.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lllookshistorypanel.h b/indra/newview/lllookshistorypanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmachineid.h b/indra/newview/llmachineid.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmainlooprepeater.cpp b/indra/newview/llmainlooprepeater.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmainlooprepeater.h b/indra/newview/llmainlooprepeater.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmanip.h b/indra/newview/llmanip.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmaniprotate.h b/indra/newview/llmaniprotate.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmaniptranslate.h b/indra/newview/llmaniptranslate.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmarketplacenotifications.cpp b/indra/newview/llmarketplacenotifications.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmarketplacenotifications.h b/indra/newview/llmarketplacenotifications.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.h b/indra/newview/llmenuoptionpathfindingrebakenavmesh.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
old mode 100755
new mode 100644
index e42367ad9e7e9f223180b2502d9345f394bed38e..0aaed3e286768ac9495ddc496a0d5517bc1985cc
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3122,7 +3122,10 @@ void LLMeshLODHandler::processData(LLCore::BufferArray * /* body */, S32 /* body
LLMeshSkinInfoHandler::~LLMeshSkinInfoHandler()
{
- llassert(mProcessed);
+ if (!mProcessed)
+ {
+ LL_WARNS(LOG_MESH) << "deleting unprocessed request handler (may be ok on exit)" << LL_ENDL;
+ }
}
void LLMeshSkinInfoHandler::processFailure(LLCore::HttpStatus status)
@@ -3166,7 +3169,10 @@ void LLMeshSkinInfoHandler::processData(LLCore::BufferArray * /* body */, S32 /*
LLMeshDecompositionHandler::~LLMeshDecompositionHandler()
{
- llassert(mProcessed);
+ if (!mProcessed)
+ {
+ LL_WARNS(LOG_MESH) << "deleting unprocessed request handler (may be ok on exit)" << LL_ENDL;
+ }
}
void LLMeshDecompositionHandler::processFailure(LLCore::HttpStatus status)
@@ -3209,7 +3215,10 @@ void LLMeshDecompositionHandler::processData(LLCore::BufferArray * /* body */, S
LLMeshPhysicsShapeHandler::~LLMeshPhysicsShapeHandler()
{
- llassert(mProcessed);
+ if (!mProcessed)
+ {
+ LL_WARNS(LOG_MESH) << "deleting unprocessed request handler (may be ok on exit)" << LL_ENDL;
+ }
}
void LLMeshPhysicsShapeHandler::processFailure(LLCore::HttpStatus status)
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmimetypes.h b/indra/newview/llmimetypes.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmorphview.h b/indra/newview/llmorphview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
old mode 100755
new mode 100644
index 3f4f2446e8e791e1fb2a61caaec03130e8214ff3..01cf68bcdabd07194c68e9ae5309562221e0994e
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -218,6 +218,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
if ((mute.mType == LLMute::AGENT)
&& isLinden(mute.mName) && (flags & LLMute::flagTextChat || flags == 0))
{
+ LL_WARNS() << "Trying to mute a Linden; ignored" << LL_ENDL;
LLNotifications::instance().add("MuteLinden", LLSD(), LLSD());
return FALSE;
}
@@ -226,6 +227,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
if (mute.mType == LLMute::AGENT
&& mute.mID == gAgent.getID())
{
+ LL_WARNS() << "Trying to self; ignored" << LL_ENDL;
return FALSE;
}
@@ -256,6 +258,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
}
else
{
+ LL_INFOS() << "duplicate mute ignored" << LL_ENDL;
// was duplicate
return FALSE;
}
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnameeditor.h b/indra/newview/llnameeditor.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
old mode 100755
new mode 100644
index d7e7f13e87ca5c4febf0d5324cb197209a629dde..5fc73c67d1bfbbf4c17c1f0464bdfbe096274a51
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -96,13 +96,13 @@ LLNetMap::LLNetMap (const Params & p)
mToolTipMsg(),
mPopupMenu(NULL)
{
+ mScale = gSavedSettings.getF32("MiniMapScale");
+ mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
- setScale(gSavedSettings.getF32("MiniMapScale"));
}
LLNetMap::~LLNetMap()
{
- gSavedSettings.setF32("MiniMapScale", mScale);
}
BOOL LLNetMap::postBuild()
@@ -137,6 +137,8 @@ void LLNetMap::setScale( F32 scale )
mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
+ gSavedSettings.setF32("MiniMapScale", mScale);
+
mUpdateNow = true;
}
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationhinthandler.cpp b/indra/newview/llnotificationhinthandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationmanager.h b/indra/newview/llnotificationmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationstorage.cpp b/indra/newview/llnotificationstorage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationstorage.h b/indra/newview/llnotificationstorage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
old mode 100755
new mode 100644
index 4ca961c1f908a6414822831e7d4be083ab253ebe..596327e8f1a40e033c2ce2b11159703a006abe89
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -113,11 +113,23 @@ bool LLTipHandler::processNotification(const LLNotificationPtr& notification)
LLToast::Params p;
p.notif_id = notification->getID();
p.notification = notification;
- p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
p.panel = notify_box;
p.is_tip = true;
p.can_be_stored = false;
-
+
+ LLDate cur_time = LLDate::now();
+ LLDate exp_time = notification->getExpiration();
+ if (exp_time > cur_time)
+ {
+ // we have non-default expiration time - keep visible until expires
+ p.lifetime_secs = exp_time.secondsSinceEpoch() - cur_time.secondsSinceEpoch();
+ }
+ else
+ {
+ // use default time
+ p.lifetime_secs = gSavedSettings.getS32("NotificationTipToastLifeTime");
+ }
+
LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
if(channel)
channel->addToast(p);
diff --git a/indra/newview/lloutfitobserver.cpp b/indra/newview/lloutfitobserver.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lloutfitobserver.h b/indra/newview/lloutfitobserver.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelappearancetab.cpp b/indra/newview/llpanelappearancetab.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelappearancetab.h b/indra/newview/llpanelappearancetab.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelavatartag.cpp b/indra/newview/llpanelavatartag.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelavatartag.h b/indra/newview/llpanelavatartag.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgenerictip.cpp b/indra/newview/llpanelgenerictip.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgenerictip.h b/indra/newview/llpanelgenerictip.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroupinvite.h b/indra/newview/llpanelgroupinvite.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgrouplandmoney.h b/indra/newview/llpanelgrouplandmoney.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelhome.cpp b/indra/newview/llpanelhome.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelhome.h b/indra/newview/llpanelhome.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandaudio.h b/indra/newview/llpanellandaudio.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandmarkinfo.h b/indra/newview/llpanellandmarkinfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellandmedia.h b/indra/newview/llpanellandmedia.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelloginlistener.cpp b/indra/newview/llpanelloginlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelloginlistener.h b/indra/newview/llpanelloginlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelme.h b/indra/newview/llpanelme.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmediasettingspermissions.cpp b/indra/newview/llpanelmediasettingspermissions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmediasettingspermissions.h b/indra/newview/llpanelmediasettingspermissions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelmediasettingssecurity.h b/indra/newview/llpanelmediasettingssecurity.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
old mode 100755
new mode 100644
index 1cdd1b664e1ef4b3d71b4dacd63d2c40e9b2641e..737ae2e32d3a6d99a80274761295023a6b5596d9
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -65,6 +65,9 @@ extern LLControlGroup gSavedSettings;
static const LLUUID PARCEL_MEDIA_LIST_ITEM_UUID = LLUUID("CAB5920F-E484-4233-8621-384CF373A321");
static const LLUUID PARCEL_AUDIO_LIST_ITEM_UUID = LLUUID("DF4B020D-8A24-4B95-AB5D-CA970D694822");
+const F32 AUTO_CLOSE_FADE_TIME_START= 2.0f;
+const F32 AUTO_CLOSE_FADE_TIME_END = 3.0f;
+
//
// LLPanelNearByMedia
//
@@ -227,9 +230,6 @@ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
}
-const F32 AUTO_CLOSE_FADE_TIME_START= 4.0f;
-const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f;
-
/*virtual*/
void LLPanelNearByMedia::draw()
{
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelonlinestatus.cpp b/indra/newview/llpanelonlinestatus.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelonlinestatus.h b/indra/newview/llpanelonlinestatus.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpeoplemenus.h b/indra/newview/llpanelpeoplemenus.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpermissions.h b/indra/newview/llpanelpermissions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplaceprofile.h b/indra/newview/llpanelplaceprofile.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9b4dc5474a08e644ed0121935862e91ebb848958
--- /dev/null
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -0,0 +1,231 @@
+/**
+ * @file llpanelpresetspulldown.cpp
+ * @brief A panel showing a quick way to pick presets
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelpresetspulldown.h"
+
+#include "llviewercontrol.h"
+#include "llstatusbar.h"
+
+#include "llbutton.h"
+#include "lltabcontainer.h"
+#include "llfloaterreg.h"
+#include "llfloaterpreference.h"
+#include "llpresetsmanager.h"
+#include "llsliderctrl.h"
+#include "llscrolllistctrl.h"
+#include "lltrans.h"
+
+/* static */ const F32 LLPanelPresetsPulldown::sAutoCloseFadeStartTimeSec = 2.0f;
+/* static */ const F32 LLPanelPresetsPulldown::sAutoCloseTotalTimeSec = 3.0f;
+
+///----------------------------------------------------------------------------
+/// Class LLPanelPresetsPulldown
+///----------------------------------------------------------------------------
+
+// Default constructor
+LLPanelPresetsPulldown::LLPanelPresetsPulldown()
+{
+ mHoverTimer.stop();
+
+ mCommitCallbackRegistrar.add("Presets.GoGraphicsPrefs", boost::bind(&LLPanelPresetsPulldown::onGraphicsButtonClick, this, _2));
+ mCommitCallbackRegistrar.add("Presets.RowClick", boost::bind(&LLPanelPresetsPulldown::onRowClick, this, _2));
+
+ buildFromFile( "panel_presets_pulldown.xml");
+}
+
+BOOL LLPanelPresetsPulldown::postBuild()
+{
+ LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
+ presetsMgr->setPresetListChangeCallback(boost::bind(&LLPanelPresetsPulldown::populatePanel, this));
+ // Make sure there is a default preference file
+ presetsMgr->createMissingDefault();
+
+ populatePanel();
+
+ return LLPanel::postBuild();
+}
+
+void LLPanelPresetsPulldown::populatePanel()
+{
+ std::string presets_dir = LLPresetsManager::getInstance()->getPresetsDir(PRESETS_GRAPHIC);
+ LLPresetsManager::getInstance()->loadPresetNamesFromDir(presets_dir, mPresetNames, DEFAULT_TOP);
+
+ LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
+
+ if (scroll && mPresetNames.begin() != mPresetNames.end())
+ {
+ scroll->clearRows();
+
+ std::string active_preset = gSavedSettings.getString("PresetGraphicActive");
+ if (active_preset == PRESETS_DEFAULT)
+ {
+ active_preset = LLTrans::getString(PRESETS_DEFAULT);
+ }
+
+ for (std::list<std::string>::const_iterator it = mPresetNames.begin(); it != mPresetNames.end(); ++it)
+ {
+ const std::string& name = *it;
+ LL_DEBUGS() << "adding '" << name << "'" << LL_ENDL;
+
+ LLSD row;
+ row["columns"][0]["column"] = "preset_name";
+ row["columns"][0]["value"] = name;
+
+ bool is_selected_preset = false;
+ if (name == active_preset)
+ {
+ row["columns"][1]["column"] = "icon";
+ row["columns"][1]["type"] = "icon";
+ row["columns"][1]["value"] = "Check_Mark";
+
+ is_selected_preset = true;
+ }
+
+ LLScrollListItem* new_item = scroll->addElement(row);
+ new_item->setSelected(is_selected_preset);
+ }
+ }
+}
+
+/*virtual*/
+void LLPanelPresetsPulldown::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+ mHoverTimer.stop();
+ LLPanel::onMouseEnter(x,y,mask);
+}
+
+/*virtual*/
+void LLPanelPresetsPulldown::onTopLost()
+{
+ setVisible(FALSE);
+}
+
+/*virtual*/
+BOOL LLPanelPresetsPulldown::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+ LLPanel::handleMouseDown(x,y,mask);
+ return TRUE;
+}
+
+/*virtual*/
+BOOL LLPanelPresetsPulldown::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+ LLPanel::handleRightMouseDown(x, y, mask);
+ return TRUE;
+}
+
+/*virtual*/
+BOOL LLPanelPresetsPulldown::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+ LLPanel::handleDoubleClick(x, y, mask);
+ return TRUE;
+}
+
+/*virtual*/
+void LLPanelPresetsPulldown::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+ mHoverTimer.start();
+ LLPanel::onMouseLeave(x,y,mask);
+}
+
+/*virtual*/
+void LLPanelPresetsPulldown::onVisibilityChange ( BOOL new_visibility )
+{
+ if (new_visibility)
+ {
+ mHoverTimer.start(); // timer will be stopped when mouse hovers over panel
+ }
+ else
+ {
+ mHoverTimer.stop();
+
+ }
+}
+
+void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
+{
+ LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
+
+ if (scroll)
+ {
+ LLScrollListItem* item = scroll->getFirstSelected();
+ if (item)
+ {
+ std::string name = item->getColumn(1)->getValue().asString();
+
+ LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
+ LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);
+
+ setVisible(FALSE);
+ }
+ else
+ {
+ LL_DEBUGS() << "none selected" << LL_ENDL;
+ }
+ }
+ else
+ {
+ LL_DEBUGS() << "no scroll" << LL_ENDL;
+ }
+}
+
+void LLPanelPresetsPulldown::onGraphicsButtonClick(const LLSD& user_data)
+{
+ // close the minicontrol, we're bringing up the big one
+ setVisible(FALSE);
+
+ // bring up the prefs floater
+ LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences");
+ if (prefsfloater)
+ {
+ // grab the 'graphics' panel from the preferences floater and
+ // bring it the front!
+ LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
+ LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("display");
+ if (tabcontainer && graphicspanel)
+ {
+ tabcontainer->selectTabPanel(graphicspanel);
+ }
+ }
+}
+
+//virtual
+void LLPanelPresetsPulldown::draw()
+{
+ F32 alpha = mHoverTimer.getStarted()
+ ? clamp_rescale(mHoverTimer.getElapsedTimeF32(), sAutoCloseFadeStartTimeSec, sAutoCloseTotalTimeSec, 1.f, 0.f)
+ : 1.0f;
+ LLViewDrawContext context(alpha);
+
+ LLPanel::draw();
+
+ if (alpha == 0.f)
+ {
+ setVisible(FALSE);
+ }
+}
diff --git a/indra/newview/llpanelpresetspulldown.h b/indra/newview/llpanelpresetspulldown.h
new file mode 100644
index 0000000000000000000000000000000000000000..322bf5a58f5414bf54624677d3d6d7aae825daa3
--- /dev/null
+++ b/indra/newview/llpanelpresetspulldown.h
@@ -0,0 +1,62 @@
+/**
+ * @file llpanelpresetspulldown.h
+ * @brief A panel showing a quick way to pick presets
+ *
+ * $LicenseInfo:firstyear=2014&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2014, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPANELPRESETSPULLDOWN_H
+#define LL_LLPANELPRESETSPULLDOWN_H
+
+#include "linden_common.h"
+
+#include "llpanel.h"
+
+class LLFrameTimer;
+
+class LLPanelPresetsPulldown : public LLPanel
+{
+ public:
+ LLPanelPresetsPulldown();
+ /*virtual*/ void draw();
+ /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
+ /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+ /*virtual*/ void onTopLost();
+ /*virtual*/ void onVisibilityChange ( BOOL new_visibility );
+ /*virtual*/ BOOL postBuild();
+ void populatePanel();
+
+ private:
+ void onGraphicsButtonClick(const LLSD& user_data);
+ void onRowClick(const LLSD& user_data);
+
+ std::list<std::string> mPresetNames;
+ LLFrameTimer mHoverTimer;
+ static const F32 sAutoCloseFadeStartTimeSec;
+ static const F32 sAutoCloseTotalTimeSec;
+ LOG_CLASS(LLPanelPresetsPulldown);
+};
+
+#endif // LL_LLPANELPRESETSPULLDOWN_H
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
old mode 100755
new mode 100644
index f91c4110c0a7c9e1228f1801baa2a729f7376942..e795e7eedb0b8bd1312dc46c2f612aad222362e3
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -168,7 +168,7 @@ class LLAgentHandler : public LLCommandHandler
{
if (params.size() > 2)
{
- const std::string object_name = params[2].asString();
+ const std::string object_name = LLURI::unescape(params[2].asString());
LLMute mute(avatar_id, object_name, LLMute::OBJECT);
LLMuteList::getInstance()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID);
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelsnapshot.h b/indra/newview/llpanelsnapshot.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelsnapshotinventory.cpp b/indra/newview/llpanelsnapshotinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelsnapshotlocal.cpp b/indra/newview/llpanelsnapshotlocal.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelsnapshotprofile.cpp b/indra/newview/llpanelsnapshotprofile.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneltiptoast.cpp b/indra/newview/llpaneltiptoast.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneltiptoast.h b/indra/newview/llpaneltiptoast.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneltopinfobar.cpp b/indra/newview/llpaneltopinfobar.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
old mode 100755
new mode 100644
index cb00f742ccfc607e8c2b9ccef0e7ade92ba90646..6595da235ca1813ef4e7adcceb588e96c85ff90a
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -40,8 +40,8 @@
#include "llfloaterpreference.h"
#include "llsliderctrl.h"
-/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 4.0f;
-/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 5.0f;
+/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 2.0f;
+/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 3.0f;
///----------------------------------------------------------------------------
/// Class LLPanelVolumePulldown
diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpanelwearing.h b/indra/newview/llpanelwearing.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llparcelselection.h b/indra/newview/llparcelselection.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpatchvertexarray.cpp b/indra/newview/llpatchvertexarray.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpatchvertexarray.h b/indra/newview/llpatchvertexarray.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingcharacter.h b/indra/newview/llpathfindingcharacter.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingcharacterlist.h b/indra/newview/llpathfindingcharacterlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindinglinkset.cpp b/indra/newview/llpathfindinglinkset.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindinglinkset.h b/indra/newview/llpathfindinglinkset.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindinglinksetlist.cpp b/indra/newview/llpathfindinglinksetlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindinglinksetlist.h b/indra/newview/llpathfindinglinksetlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingnavmeshstatus.cpp b/indra/newview/llpathfindingnavmeshstatus.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingnavmeshzone.cpp b/indra/newview/llpathfindingnavmeshzone.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingobjectlist.cpp b/indra/newview/llpathfindingobjectlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpersistentnotificationstorage.cpp b/indra/newview/llpersistentnotificationstorage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpersistentnotificationstorage.h b/indra/newview/llpersistentnotificationstorage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llphysicsmotion.h b/indra/newview/llphysicsmotion.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llphysicsshapebuilderutil.cpp b/indra/newview/llphysicsshapebuilderutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llphysicsshapebuilderutil.h b/indra/newview/llphysicsshapebuilderutil.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llplacesfolderview.cpp b/indra/newview/llplacesfolderview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llplacesfolderview.h b/indra/newview/llplacesfolderview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llplacesinventorybridge.h b/indra/newview/llplacesinventorybridge.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpopupview.h b/indra/newview/llpopupview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpostcard.cpp b/indra/newview/llpostcard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpostcard.h b/indra/newview/llpostcard.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d95546f11d211a3826cad348239710191f7c390c
--- /dev/null
+++ b/indra/newview/llpresetsmanager.cpp
@@ -0,0 +1,320 @@
+/**
+ * @file llpresetsmanager.cpp
+ * @brief Implementation for the LLPresetsManager class.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include <boost/assign/list_of.hpp>
+
+#include "llpresetsmanager.h"
+
+#include "lldiriterator.h"
+#include "llfloater.h"
+#include "llsdserialize.h"
+#include "lltrans.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "llfloaterpreference.h"
+#include "llfloaterreg.h"
+
+LLPresetsManager::LLPresetsManager()
+{
+}
+
+LLPresetsManager::~LLPresetsManager()
+{
+}
+
+void LLPresetsManager::triggerChangeSignal()
+{
+ mPresetListChangeSignal();
+}
+
+void LLPresetsManager::createMissingDefault()
+{
+ std::string default_file = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR, PRESETS_GRAPHIC, PRESETS_DEFAULT + ".xml");
+ if (!gDirUtilp->fileExists(default_file))
+ {
+ LL_INFOS() << "No default preset found -- creating one at " << default_file << LL_ENDL;
+
+ // Write current graphic settings as the default
+ savePreset(PRESETS_GRAPHIC, PRESETS_DEFAULT);
+ }
+ else
+ {
+ LL_DEBUGS() << "default preset exists; no-op" << LL_ENDL;
+ }
+}
+
+std::string LLPresetsManager::getPresetsDir(const std::string& subdirectory)
+{
+ std::string presets_path = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR);
+ std::string full_path;
+
+ if (!gDirUtilp->fileExists(presets_path))
+ {
+ LLFile::mkdir(presets_path);
+ }
+
+ full_path = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PRESETS_DIR, subdirectory);
+ if (!gDirUtilp->fileExists(full_path))
+ {
+ LLFile::mkdir(full_path);
+ }
+
+ return full_path;
+}
+
+void LLPresetsManager::loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets, EDefaultOptions default_option)
+{
+ LL_INFOS("AppInit") << "Loading list of preset names from " << dir << LL_ENDL;
+
+ mPresetNames.clear();
+
+ LLDirIterator dir_iter(dir, "*.xml");
+ bool found = true;
+ while (found)
+ {
+ std::string file;
+ found = dir_iter.next(file);
+
+ if (found)
+ {
+ std::string path = gDirUtilp->add(dir, file);
+ std::string name = gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true);
+
+ LL_DEBUGS() << " Found preset '" << name << "'" << LL_ENDL;
+
+ if (PRESETS_DEFAULT != name)
+ {
+ mPresetNames.push_back(name);
+ }
+ else
+ {
+ switch (default_option)
+ {
+ case DEFAULT_SHOW:
+ mPresetNames.push_back(LLTrans::getString(PRESETS_DEFAULT));
+ break;
+
+ case DEFAULT_TOP:
+ mPresetNames.push_front(LLTrans::getString(PRESETS_DEFAULT));
+ break;
+
+ case DEFAULT_HIDE:
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ presets = mPresetNames;
+}
+
+bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string name)
+{
+ if (LLTrans::getString(PRESETS_DEFAULT) == name)
+ {
+ name = PRESETS_DEFAULT;
+ }
+
+ bool saved = false;
+ std::vector<std::string> name_list;
+
+ if(PRESETS_GRAPHIC == subdirectory)
+ {
+ gSavedSettings.setString("PresetGraphicActive", name);
+
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if (instance)
+ {
+ instance->getControlNames(name_list);
+ LL_DEBUGS() << "saving preset '" << name << "'; " << name_list.size() << " names" << LL_ENDL;
+ name_list.push_back("PresetGraphicActive");
+ }
+ else
+ {
+ LL_WARNS() << "preferences floater instance not found" << LL_ENDL;
+ }
+ }
+ else if(PRESETS_CAMERA == subdirectory)
+ {
+ name_list = boost::assign::list_of
+ ("Placeholder");
+ }
+ else
+ {
+ LL_ERRS() << "Invalid presets directory '" << subdirectory << "'" << LL_ENDL;
+ }
+
+ if (name_list.size() > 1) // if the active preset name is the only thing in the list, don't save the list
+ {
+ // make an empty llsd
+ LLSD paramsData(LLSD::emptyMap());
+
+ for (std::vector<std::string>::iterator it = name_list.begin(); it != name_list.end(); ++it)
+ {
+ std::string ctrl_name = *it;
+ LLControlVariable* ctrl = gSavedSettings.getControl(ctrl_name).get();
+ std::string comment = ctrl->getComment();
+ std::string type = LLControlGroup::typeEnumToString(ctrl->type());
+ LLSD value = ctrl->getValue();
+
+ paramsData[ctrl_name]["Comment"] = comment;
+ paramsData[ctrl_name]["Persist"] = 1;
+ paramsData[ctrl_name]["Type"] = type;
+ paramsData[ctrl_name]["Value"] = value;
+ }
+
+ std::string pathName(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
+
+ // write to file
+ llofstream presetsXML(pathName.c_str());
+ if (presetsXML.is_open())
+ {
+
+ LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
+ formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
+ presetsXML.close();
+ saved = true;
+
+ LL_DEBUGS() << "saved preset '" << name << "'; " << paramsData.size() << " parameters" << LL_ENDL;
+
+ gSavedSettings.setString("PresetGraphicActive", name);
+
+ // signal interested parties
+ triggerChangeSignal();
+ }
+ else
+ {
+ LL_WARNS("Presets") << "Cannot open for output preset file " << pathName << LL_ENDL;
+ }
+ }
+ else
+ {
+ LL_INFOS() << "No settings found; preferences floater has not yet been created" << LL_ENDL;
+ }
+
+ return saved;
+}
+
+void LLPresetsManager::setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo, EDefaultOptions default_option)
+{
+ combo->clearRows();
+
+ std::string presets_dir = getPresetsDir(subdirectory);
+
+ if (!presets_dir.empty())
+ {
+ std::list<std::string> preset_names;
+ loadPresetNamesFromDir(presets_dir, preset_names, default_option);
+
+ std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
+
+ if (preset_names.begin() != preset_names.end())
+ {
+ for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it)
+ {
+ const std::string& name = *it;
+ combo->add(name, LLSD().with(0, name));
+ }
+ }
+ else
+ {
+ combo->setLabel(LLTrans::getString("preset_combo_label"));
+ }
+ }
+}
+
+void LLPresetsManager::loadPreset(const std::string& subdirectory, std::string name)
+{
+ if (LLTrans::getString(PRESETS_DEFAULT) == name)
+ {
+ name = PRESETS_DEFAULT;
+ }
+
+ std::string full_path(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
+
+ LL_DEBUGS() << "attempting to load preset '"<<name<<"' from '"<<full_path<<"'" << LL_ENDL;
+
+ if(gSavedSettings.loadFromFile(full_path, false, true) > 0)
+ {
+ if(PRESETS_GRAPHIC == subdirectory)
+ {
+ gSavedSettings.setString("PresetGraphicActive", name);
+ }
+
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if (instance)
+ {
+ instance->refreshEnabledGraphics();
+ }
+ triggerChangeSignal();
+ }
+ else
+ {
+ LL_WARNS() << "failed to load preset '"<<name<<"' from '"<<full_path<<"'" << LL_ENDL;
+ }
+}
+
+bool LLPresetsManager::deletePreset(const std::string& subdirectory, std::string name)
+{
+ if (LLTrans::getString(PRESETS_DEFAULT) == name)
+ {
+ name = PRESETS_DEFAULT;
+ }
+
+ bool sts = true;
+
+ if (PRESETS_DEFAULT == name)
+ {
+ // This code should never execute
+ LL_WARNS("Presets") << "You are not allowed to delete the default preset." << LL_ENDL;
+ sts = false;
+ }
+
+ if (gDirUtilp->deleteFilesInDir(getPresetsDir(subdirectory), LLURI::escape(name) + ".xml") < 1)
+ {
+ LL_WARNS("Presets") << "Error removing preset " << name << " from disk" << LL_ENDL;
+ sts = false;
+ }
+
+ // If you delete the preset that is currently marked as loaded then also indicate that no preset is loaded.
+ if (gSavedSettings.getString("PresetGraphicActive") == name)
+ {
+ gSavedSettings.setString("PresetGraphicActive", "");
+ }
+
+ // signal interested parties
+ triggerChangeSignal();
+
+ return sts;
+}
+
+boost::signals2::connection LLPresetsManager::setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb)
+{
+ return mPresetListChangeSignal.connect(cb);
+}
diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h
new file mode 100644
index 0000000000000000000000000000000000000000..ac4f0c010ce31cfc0862682a33549836288e66a8
--- /dev/null
+++ b/indra/newview/llpresetsmanager.h
@@ -0,0 +1,79 @@
+/**
+ * @file llpresetsmanager.h
+ * @brief Implementation for the LLPresetsManager class.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_PRESETSMANAGER_H
+#define LL_PRESETSMANAGER_H
+
+#include "llcombobox.h"
+
+#include <list>
+#include <map>
+
+static const std::string PRESETS_DEFAULT = "Default";
+static const std::string PRESETS_DIR = "presets";
+static const std::string PRESETS_GRAPHIC = "graphic";
+static const std::string PRESETS_CAMERA = "camera";
+
+enum EDefaultOptions
+{
+ DEFAULT_SHOW,
+ DEFAULT_TOP,
+ DEFAULT_HIDE // Do not display "Default" in a list
+};
+
+class LLPresetsManager : public LLSingleton<LLPresetsManager>
+{
+public:
+
+ typedef std::list<std::string> preset_name_list_t;
+ typedef boost::signals2::signal<void()> preset_list_signal_t;
+
+ void createMissingDefault();
+ void triggerChangeSignal();
+ static std::string getPresetsDir(const std::string& subdirectory);
+ void setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo, EDefaultOptions default_option);
+ void loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets, EDefaultOptions default_option);
+ bool savePreset(const std::string& subdirectory, std::string name);
+ void loadPreset(const std::string& subdirectory, std::string name);
+ bool deletePreset(const std::string& subdirectory, std::string name);
+
+ // Emitted when a preset gets loaded, deleted, or saved.
+ boost::signals2::connection setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb);
+
+ // Emitted when a preset gets loaded or saved.
+
+ preset_name_list_t mPresetNames;
+
+ LLPresetsManager();
+ ~LLPresetsManager();
+
+ preset_list_signal_t mPresetListChangeSignal;
+
+ private:
+ LOG_CLASS(LLPresetsManager);
+};
+
+#endif // LL_PRESETSMANAGER_H
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewanim.h b/indra/newview/llpreviewanim.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
old mode 100755
new mode 100644
index 98e0272300b65401e6e7033a1f1aeba047b43e5c..5b1b3565978b09ba7ad0b3ae0fadb8de209f6204
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -52,7 +52,6 @@
#include "llscrolllistcell.h"
#include "llsdserialize.h"
#include "llslider.h"
-#include "lscript_rt_interface.h"
#include "lltooldraganddrop.h"
#include "llvfile.h"
@@ -1688,194 +1687,9 @@ void LLPreviewLSL::saveIfNeeded(bool sync /*= true*/)
LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo);
}
- else if (gAssetStorage)
- {
- // save off asset into file
- LLTransactionID tid;
- tid.generate();
- LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
- std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, asset_id.asString());
- std::string filename = filepath + ".lsl";
-
- mScriptEd->writeToFile(filename);
-
- uploadAssetLegacy(filename, mItemUUID, tid);
- }
}
}
-void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
- const LLUUID& item_id,
- const LLTransactionID& tid)
-{
- LLLineEditor* descEditor = getChild<LLLineEditor>("desc");
- LLScriptSaveInfo* info = new LLScriptSaveInfo(item_id,
- descEditor->getText(),
- tid);
- gAssetStorage->storeAssetData(filename, tid,
- LLAssetType::AT_LSL_TEXT,
- &LLPreviewLSL::onSaveComplete,
- info);
-
- LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
- std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
- std::string dst_filename = llformat("%s.lso", filepath.c_str());
- std::string err_filename = llformat("%s.out", filepath.c_str());
-
- const BOOL compile_to_mono = FALSE;
- if(!lscript_compile(filename.c_str(),
- dst_filename.c_str(),
- err_filename.c_str(),
- compile_to_mono,
- asset_id.asString().c_str(),
- gAgent.isGodlike()))
- {
- LL_INFOS() << "Compile failed!" << LL_ENDL;
- //char command[256];
- //sprintf(command, "type %s\n", err_filename.c_str());
- //system(command);
-
- // load the error file into the error scrolllist
- LLFILE* fp = LLFile::fopen(err_filename, "r");
- if(fp)
- {
- char buffer[MAX_STRING]; /*Flawfinder: ignore*/
- std::string line;
- while(!feof(fp))
- {
- if (fgets(buffer, MAX_STRING, fp) == NULL)
- {
- buffer[0] = '\0';
- }
- if(feof(fp))
- {
- break;
- }
- else
- {
- line.assign(buffer);
- LLStringUtil::stripNonprintable(line);
-
- LLSD row;
- row["columns"][0]["value"] = line;
- row["columns"][0]["font"] = "OCRA";
- mScriptEd->mErrorList->addElement(row);
- }
- }
- fclose(fp);
- mScriptEd->selectFirstError();
- }
- }
- else
- {
- LL_INFOS() << "Compile worked!" << LL_ENDL;
- if(gAssetStorage)
- {
- getWindow()->incBusyCount();
- mPendingUploads++;
- LLUUID* this_uuid = new LLUUID(mItemUUID);
- gAssetStorage->storeAssetData(dst_filename,
- tid,
- LLAssetType::AT_LSL_BYTECODE,
- &LLPreviewLSL::onSaveBytecodeComplete,
- (void**)this_uuid);
- }
- }
-
- // get rid of any temp files left lying around
- LLFile::remove(filename);
- LLFile::remove(err_filename);
- LLFile::remove(dst_filename);
-}
-
-
-// static
-void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
-{
- LLScriptSaveInfo* info = reinterpret_cast<LLScriptSaveInfo*>(user_data);
- if(0 == status)
- {
- if (info)
- {
- const LLViewerInventoryItem* item;
- item = (const LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
- if(item)
- {
- LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
- new_item->setAssetUUID(asset_uuid);
- new_item->setTransactionID(info->mTransactionID);
- new_item->updateServer(FALSE);
- gInventory.updateItem(new_item);
- gInventory.notifyObservers();
- }
- else
- {
- LL_WARNS() << "Inventory item for script " << info->mItemUUID
- << " is no longer in agent inventory." << LL_ENDL;
- }
-
- // Find our window and close it if requested.
- LLPreviewLSL* self = LLFloaterReg::findTypedInstance<LLPreviewLSL>("preview_script", info->mItemUUID);
- if (self)
- {
- getWindow()->decBusyCount();
- self->mPendingUploads--;
- if (self->mPendingUploads <= 0
- && self->mCloseAfterSave)
- {
- self->closeFloater();
- }
- }
- }
- }
- else
- {
- LL_WARNS() << "Problem saving script: " << status << LL_ENDL;
- LLSD args;
- args["REASON"] = std::string(LLAssetStorage::getErrorString(status));
- LLNotificationsUtil::add("SaveScriptFailReason", args);
- }
- delete info;
-}
-
-// static
-void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
-{
- LLUUID* instance_uuid = (LLUUID*)user_data;
- LLPreviewLSL* self = NULL;
- if(instance_uuid)
- {
- self = LLFloaterReg::findTypedInstance<LLPreviewLSL>("preview_script", *instance_uuid);
- }
- if (0 == status)
- {
- if (self)
- {
- LLSD row;
- row["columns"][0]["value"] = "Compile successful!";
- row["columns"][0]["font"] = "SANSSERIF_SMALL";
- self->mScriptEd->mErrorList->addElement(row);
-
- // Find our window and close it if requested.
- self->getWindow()->decBusyCount();
- self->mPendingUploads--;
- if (self->mPendingUploads <= 0
- && self->mCloseAfterSave)
- {
- self->closeFloater();
- }
- }
- }
- else
- {
- LL_WARNS() << "Problem saving LSL Bytecode (Preview)" << LL_ENDL;
- LLSD args;
- args["REASON"] = std::string(LLAssetStorage::getErrorString(status));
- LLNotificationsUtil::add("SaveBytecodeFailReason", args);
- }
- delete instance_uuid;
-}
-
// static
void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
@@ -2258,23 +2072,6 @@ void LLLiveLSLEditor::draw()
{
runningCheckbox->setLabel(getString("script_running"));
runningCheckbox->setEnabled(!mIsSaving);
-
- if(object->permAnyOwner())
- {
- runningCheckbox->setLabel(getString("script_running"));
- runningCheckbox->setEnabled(!mIsSaving);
- }
- else
- {
- runningCheckbox->setLabel(getString("public_objects_can_not_run"));
- runningCheckbox->setEnabled(FALSE);
- // *FIX: Set it to false so that the ui is correct for
- // a box that is released to public. It could be
- // incorrect after a release/claim cycle, but will be
- // correct after clicking on it.
- runningCheckbox->set(FALSE);
- mMonoCheckbox->set(FALSE);
- }
}
else
{
@@ -2286,9 +2083,7 @@ void LLLiveLSLEditor::draw()
// incorrect after a release/claim cycle, but will be
// correct after clicking on it.
runningCheckbox->set(FALSE);
- mMonoCheckbox->setEnabled(FALSE);
- // object may have fallen out of range.
- mHaveRunningInfo = FALSE;
+ mMonoCheckbox->set(FALSE);
}
}
else if(!object)
@@ -2297,6 +2092,7 @@ void LLLiveLSLEditor::draw()
// Really ought to put in main window.
setTitle(LLTrans::getString("ObjectOutOfRange"));
runningCheckbox->setEnabled(FALSE);
+ mMonoCheckbox->setEnabled(FALSE);
// object may have fallen out of range.
mHaveRunningInfo = FALSE;
}
@@ -2421,206 +2217,6 @@ void LLLiveLSLEditor::saveIfNeeded(bool sync /*= true*/)
LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo);
}
- else if (gAssetStorage)
- {
- // set up the save on the local machine.
- LLTransactionID tid;
- tid.generate();
- LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
- std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, asset_id.asString());
- std::string filename = llformat("%s.lsl", filepath.c_str());
-
- mItem->setAssetUUID(asset_id);
- mItem->setTransactionID(tid);
-
- mScriptEd->writeToFile(filename);
-
- mIsSaving = TRUE;
- uploadAssetLegacy(filename, object, tid, isRunning);
- }
-
-}
-
-void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
- LLViewerObject* object,
- const LLTransactionID& tid,
- BOOL is_running)
-{
- LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectUUID,
- mItem,
- is_running);
- gAssetStorage->storeAssetData(filename, tid,
- LLAssetType::AT_LSL_TEXT,
- &onSaveTextComplete,
- (void*)data,
- FALSE);
-
- LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
- std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
- std::string dst_filename = llformat("%s.lso", filepath.c_str());
- std::string err_filename = llformat("%s.out", filepath.c_str());
-
- LLFILE *fp;
- const BOOL compile_to_mono = FALSE;
- if(!lscript_compile(filename.c_str(),
- dst_filename.c_str(),
- err_filename.c_str(),
- compile_to_mono,
- asset_id.asString().c_str(),
- gAgent.isGodlike()))
- {
- // load the error file into the error scrolllist
- LL_INFOS() << "Compile failed!" << LL_ENDL;
- if(NULL != (fp = LLFile::fopen(err_filename, "r")))
- {
- char buffer[MAX_STRING]; /*Flawfinder: ignore*/
- std::string line;
- while(!feof(fp))
- {
-
- if (fgets(buffer, MAX_STRING, fp) == NULL)
- {
- buffer[0] = '\0';
- }
- if(feof(fp))
- {
- break;
- }
- else
- {
- line.assign(buffer);
- LLStringUtil::stripNonprintable(line);
-
- LLSD row;
- row["columns"][0]["value"] = line;
- row["columns"][0]["font"] = "OCRA";
- mScriptEd->mErrorList->addElement(row);
- }
- }
- fclose(fp);
- mScriptEd->selectFirstError();
- // don't set the asset id, because we want to save the
- // script, even though the compile failed.
- //mItem->setAssetUUID(LLUUID::null);
- object->saveScript(mItem, FALSE, false);
- dialog_refresh_all();
- }
- }
- else
- {
- LL_INFOS() << "Compile worked!" << LL_ENDL;
- mScriptEd->mErrorList->setCommentText(LLTrans::getString("CompileSuccessfulSaving"));
- if(gAssetStorage)
- {
- LL_INFOS() << "LLLiveLSLEditor::saveAsset "
- << mItem->getAssetUUID() << LL_ENDL;
- getWindow()->incBusyCount();
- mPendingUploads++;
- LLLiveLSLSaveData* data = NULL;
- data = new LLLiveLSLSaveData(mObjectUUID,
- mItem,
- is_running);
- gAssetStorage->storeAssetData(dst_filename,
- tid,
- LLAssetType::AT_LSL_BYTECODE,
- &LLLiveLSLEditor::onSaveBytecodeComplete,
- (void*)data);
- dialog_refresh_all();
- }
- }
-
- // get rid of any temp files left lying around
- LLFile::remove(filename);
- LLFile::remove(err_filename);
- LLFile::remove(dst_filename);
-
- // If we successfully saved it, then we should be able to check/uncheck the running box!
- LLCheckBoxCtrl* runningCheckbox = getChild<LLCheckBoxCtrl>( "running");
- runningCheckbox->setLabel(getString("script_running"));
- runningCheckbox->setEnabled(TRUE);
-}
-
-void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
-{
- LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
-
- if (status)
- {
- LL_WARNS() << "Unable to save text for a script." << LL_ENDL;
- LLSD args;
- args["REASON"] = std::string(LLAssetStorage::getErrorString(status));
- LLNotificationsUtil::add("CompileQueueSaveText", args);
- }
- else
- {
- LLSD floater_key;
- floater_key["taskid"] = data->mSaveObjectID;
- floater_key["itemid"] = data->mItem->getUUID();
- LLLiveLSLEditor* self = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key);
- if (self)
- {
- self->getWindow()->decBusyCount();
- self->mPendingUploads--;
- if (self->mPendingUploads <= 0
- && self->mCloseAfterSave)
- {
- self->closeFloater();
- }
- }
- }
- delete data;
- data = NULL;
-}
-
-
-void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
-{
- LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
- if(!data)
- return;
- if(0 ==status)
- {
- LL_INFOS() << "LSL Bytecode saved" << LL_ENDL;
- LLSD floater_key;
- floater_key["taskid"] = data->mSaveObjectID;
- floater_key["itemid"] = data->mItem->getUUID();
- LLLiveLSLEditor* self = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key);
- if (self)
- {
- // Tell the user that the compile worked.
- self->mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
- // close the window if this completes both uploads
- self->getWindow()->decBusyCount();
- self->mPendingUploads--;
- if (self->mPendingUploads <= 0
- && self->mCloseAfterSave)
- {
- self->closeFloater();
- }
- }
- LLViewerObject* object = gObjectList.findObject(data->mSaveObjectID);
- if(object)
- {
- object->saveScript(data->mItem, data->mActive, false);
- dialog_refresh_all();
- //LLToolDragAndDrop::dropScript(object, ids->first,
- // LLAssetType::AT_LSL_TEXT, FALSE);
- }
- }
- else
- {
- LL_INFOS() << "Problem saving LSL Bytecode (Live Editor)" << LL_ENDL;
- LL_WARNS() << "Unable to save a compiled script." << LL_ENDL;
-
- LLSD args;
- args["REASON"] = std::string(LLAssetStorage::getErrorString(status));
- LLNotificationsUtil::add("CompileQueueSaveBytecode", args);
- }
-
- std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_uuid.asString());
- std::string dst_filename = llformat("%s.lso", filepath.c_str());
- LLFile::remove(dst_filename);
- delete data;
}
BOOL LLLiveLSLEditor::canClose()
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
old mode 100755
new mode 100644
index fc2a56c0a4f5c4aae50f6df19d6a992a4d929eff..a8c6a6eeebd9ba5f2ca929830e275b1eb1584d1f
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -204,10 +204,6 @@ class LLPreviewLSL : public LLScriptEdContainer
virtual void loadAsset();
/*virtual*/ void saveIfNeeded(bool sync = true);
- void uploadAssetLegacy(const std::string& filename,
- const LLUUID& item_id,
- const LLTransactionID& tid);
-
static void onSearchReplace(void* userdata);
static void onLoad(void* userdata);
static void onSave(void* userdata, BOOL close_after_save);
@@ -215,9 +211,7 @@ class LLPreviewLSL : public LLScriptEdContainer
static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
- static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
- static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
-
+
protected:
static void* createScriptEdPanel(void* userdata);
@@ -268,10 +262,6 @@ class LLLiveLSLEditor : public LLScriptEdContainer
virtual void loadAsset();
void loadAsset(BOOL is_new);
/*virtual*/ void saveIfNeeded(bool sync = true);
- void uploadAssetLegacy(const std::string& filename,
- LLViewerObject* object,
- const LLTransactionID& tid,
- BOOL is_running);
BOOL monoChecked() const;
@@ -282,8 +272,6 @@ class LLLiveLSLEditor : public LLScriptEdContainer
static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
- static void onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
- static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
static void onReset(void* userdata);
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewsound.h b/indra/newview/llpreviewsound.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llproductinforequest.cpp b/indra/newview/llproductinforequest.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llproductinforequest.h b/indra/newview/llproductinforequest.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llrecentpeople.cpp b/indra/newview/llrecentpeople.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llregioninfomodel.cpp b/indra/newview/llregioninfomodel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llregioninfomodel.h b/indra/newview/llregioninfomodel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llregionposition.cpp b/indra/newview/llregionposition.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llregionposition.h b/indra/newview/llregionposition.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llremoteparcelrequest.h b/indra/newview/llremoteparcelrequest.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llresourcedata.h b/indra/newview/llresourcedata.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llrootview.h b/indra/newview/llrootview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsavedsettingsglue.cpp b/indra/newview/llsavedsettingsglue.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsavedsettingsglue.h b/indra/newview/llsavedsettingsglue.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsaveoutfitcombobtn.cpp b/indra/newview/llsaveoutfitcombobtn.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsaveoutfitcombobtn.h b/indra/newview/llsaveoutfitcombobtn.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsceneview.cpp b/indra/newview/llsceneview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsceneview.h b/indra/newview/llsceneview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llscriptruntimeperms.h b/indra/newview/llscriptruntimeperms.h
new file mode 100644
index 0000000000000000000000000000000000000000..51f57afdc91a2f94a0df3dea63d09f6a51ccb3e6
--- /dev/null
+++ b/indra/newview/llscriptruntimeperms.h
@@ -0,0 +1,64 @@
+/**
+ * @file llscriptruntimeperms.h
+ * @brief Script runtime permission definitions
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2015, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSCRIPTRUNTIME_PERMS_H
+#define LL_LLSCRIPTRUNTIME_PERMS_H
+
+#include <boost/array.hpp>
+
+typedef struct _script_perm {
+ std::string question;
+ U32 permbit;
+ bool caution;
+ _script_perm(const std::string& q, const U32 b, const bool c) :
+ question(q), permbit(b), caution(c) {}
+} script_perm_t;
+
+const U32 NUM_SCRIPT_PERMISSIONS = 16;
+const S32 SCRIPT_PERMISSION_DEBIT = 0;
+const S32 SCRIPT_PERMISSION_TRIGGER_ANIMATION = 3;
+const S32 SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS = 14;
+
+static const boost::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSIONS = {{
+ _script_perm("ScriptTakeMoney", (0x1 << 1), true),
+ _script_perm("ActOnControlInputs", (0x1 << 2), false),
+ _script_perm("RemapControlInputs", (0x1 << 3), false),
+ _script_perm("AnimateYourAvatar", (0x1 << 4), false),
+ _script_perm("AttachToYourAvatar", (0x1 << 5), false),
+ _script_perm("ReleaseOwnership", (0x1 << 6), false),
+ _script_perm("LinkAndDelink", (0x1 << 7), false),
+ _script_perm("AddAndRemoveJoints", (0x1 << 8), false),
+ _script_perm("ChangePermissions", (0x1 << 9), false),
+ _script_perm("TrackYourCamera", (0x1 << 10), false),
+ _script_perm("ControlYourCamera", (0x1 << 11), false),
+ _script_perm("TeleportYourAgent", (0x1 << 12), false),
+ _script_perm("JoinAnExperience", (0x1 << 13), false),
+ _script_perm("SilentlyManageEstateAccess", (0x1 << 14), false),
+ _script_perm("OverrideYourAnimations", (0x1 << 15), false),
+ _script_perm("ScriptReturnObjects", (0x1 << 16), false)
+}};
+
+#endif // LL_LLSCRIPTRUNTIME_PERMS_H
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llscrollingpanelparambase.cpp b/indra/newview/llscrollingpanelparambase.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llscrollingpanelparambase.h b/indra/newview/llscrollingpanelparambase.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsearchcombobox.h b/indra/newview/llsearchcombobox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsearchhistory.cpp b/indra/newview/llsearchhistory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsearchhistory.h b/indra/newview/llsearchhistory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsecapi.cpp b/indra/newview/llsecapi.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsechandler_basic.h b/indra/newview/llsechandler_basic.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llshareavatarhandler.cpp b/indra/newview/llshareavatarhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepanelinventorysubpanel.cpp b/indra/newview/llsidepanelinventorysubpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepanelinventorysubpanel.h b/indra/newview/llsidepanelinventorysubpanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidetraypanelcontainer.cpp b/indra/newview/llsidetraypanelcontainer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsidetraypanelcontainer.h b/indra/newview/llsidetraypanelcontainer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsky.h b/indra/newview/llsky.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
old mode 100755
new mode 100644
index 22944493c90d002b551b8efcf27d99dcb7e10670..b0eb4137a735634a160a7af5fb9cf1bbf9cf01bc
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -862,10 +862,7 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
{
if (bridge->mAvatar.notNull())
{
- bridge->mAvatar->mAttachmentGeometryBytes -= mGeometryBytes;
- bridge->mAvatar->mAttachmentGeometryBytes = llmax(bridge->mAvatar->mAttachmentGeometryBytes, 0);
- bridge->mAvatar->mAttachmentSurfaceArea -= mSurfaceArea;
- bridge->mAvatar->mAttachmentSurfaceArea = llmax(bridge->mAvatar->mAttachmentSurfaceArea, 0.f);
+ bridge->mAvatar->subtractAttachmentArea(mSurfaceArea );
}
}
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llspeakingindicatormanager.h b/indra/newview/llspeakingindicatormanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsplitbutton.cpp b/indra/newview/llsplitbutton.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsplitbutton.h b/indra/newview/llsplitbutton.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsprite.h b/indra/newview/llsprite.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsrv.cpp b/indra/newview/llsrv.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsrv.h b/indra/newview/llsrv.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llstartuplistener.cpp b/indra/newview/llstartuplistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llstartuplistener.h b/indra/newview/llstartuplistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
old mode 100755
new mode 100644
index c839ed48b593cf29d81b9a3096c2985be55e1dcc..041eae4b3c9cd36af417dd1fe2a02581f667c9a2
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -38,6 +38,7 @@
#include "llfloaterbuycurrency.h"
#include "llbuycurrencyhtml.h"
#include "llpanelnearbymedia.h"
+#include "llpanelpresetspulldown.h"
#include "llpanelvolumepulldown.h"
#include "llfloaterregioninfo.h"
#include "llfloaterscriptdebug.h"
@@ -170,6 +171,9 @@ BOOL LLStatusBar::postBuild()
mBtnStats = getChildView("stat_btn");
+ mIconPresets = getChild<LLIconCtrl>( "presets_icon" );
+ mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this));
+
mBtnVolume = getChild<LLButton>( "volume_btn" );
mBtnVolume->setClickedCallback( onClickVolume, this );
mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
@@ -223,6 +227,11 @@ BOOL LLStatusBar::postBuild()
mSGPacketLoss = LLUICtrlFactory::create<LLStatGraph>(pgp);
addChild(mSGPacketLoss);
+ mPanelPresetsPulldown = new LLPanelPresetsPulldown();
+ addChild(mPanelPresetsPulldown);
+ mPanelPresetsPulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
+ mPanelPresetsPulldown->setVisible(FALSE);
+
mPanelVolumePulldown = new LLPanelVolumePulldown();
addChild(mPanelVolumePulldown);
mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
@@ -316,6 +325,7 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
mSGBandwidth->setVisible(visible);
mSGPacketLoss->setVisible(visible);
setBackgroundVisible(visible);
+ mIconPresets->setVisible(visible);
}
void LLStatusBar::debitBalance(S32 debit)
@@ -460,8 +470,32 @@ void LLStatusBar::onClickBuyCurrency()
LLFirstUse::receiveLindens(false);
}
+void LLStatusBar::onMouseEnterPresets()
+{
+ LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder");
+ LLIconCtrl* icon = getChild<LLIconCtrl>( "presets_icon" );
+ LLRect icon_rect = icon->getRect();
+ LLRect pulldown_rect = mPanelPresetsPulldown->getRect();
+ pulldown_rect.setLeftTopAndSize(icon_rect.mLeft -
+ (pulldown_rect.getWidth() - icon_rect.getWidth()),
+ icon_rect.mBottom,
+ pulldown_rect.getWidth(),
+ pulldown_rect.getHeight());
+
+ pulldown_rect.translate(popup_holder->getRect().getWidth() - pulldown_rect.mRight, 0);
+ mPanelPresetsPulldown->setShape(pulldown_rect);
+
+ // show the master presets pull-down
+ LLUI::clearPopups();
+ LLUI::addPopup(mPanelPresetsPulldown);
+ mPanelNearByMedia->setVisible(FALSE);
+ mPanelVolumePulldown->setVisible(FALSE);
+ mPanelPresetsPulldown->setVisible(TRUE);
+}
+
void LLStatusBar::onMouseEnterVolume()
{
+ LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder");
LLButton* volbtn = getChild<LLButton>( "volume_btn" );
LLRect vol_btn_rect = volbtn->getRect();
LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
@@ -471,12 +505,14 @@ void LLStatusBar::onMouseEnterVolume()
volume_pulldown_rect.getWidth(),
volume_pulldown_rect.getHeight());
+ volume_pulldown_rect.translate(popup_holder->getRect().getWidth() - volume_pulldown_rect.mRight, 0);
mPanelVolumePulldown->setShape(volume_pulldown_rect);
// show the master volume pull-down
LLUI::clearPopups();
LLUI::addPopup(mPanelVolumePulldown);
+ mPanelPresetsPulldown->setVisible(FALSE);
mPanelNearByMedia->setVisible(FALSE);
mPanelVolumePulldown->setVisible(TRUE);
}
@@ -500,6 +536,7 @@ void LLStatusBar::onMouseEnterNearbyMedia()
LLUI::clearPopups();
LLUI::addPopup(mPanelNearByMedia);
+ mPanelPresetsPulldown->setVisible(FALSE);
mPanelVolumePulldown->setVisible(FALSE);
mPanelNearByMedia->setVisible(TRUE);
}
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
old mode 100755
new mode 100644
index 9d28e6c2bc581273fc5fb95fde6a3785e756ef0b..277f039f204cde31066f9aee967d26255d6d8c71
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -41,8 +41,10 @@ class LLUICtrl;
class LLUUID;
class LLFrameTimer;
class LLStatGraph;
+class LLPanelPresetsPulldown;
class LLPanelVolumePulldown;
class LLPanelNearByMedia;
+class LLIconCtrl;
class LLStatusBar
: public LLPanel
@@ -89,6 +91,7 @@ class LLStatusBar
void onClickBuyCurrency();
void onVolumeChanged(const LLSD& newvalue);
+ void onMouseEnterPresets();
void onMouseEnterVolume();
void onMouseEnterNearbyMedia();
void onClickScreen(S32 x, S32 y);
@@ -103,6 +106,7 @@ class LLStatusBar
LLStatGraph *mSGPacketLoss;
LLView *mBtnStats;
+ LLIconCtrl *mIconPresets;
LLButton *mBtnVolume;
LLTextBox *mBoxBalance;
LLButton *mMediaToggle;
@@ -115,6 +119,7 @@ class LLStatusBar
S32 mSquareMetersCommitted;
LLFrameTimer* mBalanceTimer;
LLFrameTimer* mHealthTimer;
+ LLPanelPresetsPulldown* mPanelPresetsPulldown;
LLPanelVolumePulldown* mPanelVolumePulldown;
LLPanelNearByMedia* mPanelNearByMedia;
};
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llstylemap.h b/indra/newview/llstylemap.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsurfacepatch.h b/indra/newview/llsurfacepatch.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsyswellitem.h b/indra/newview/llsyswellitem.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltable.h b/indra/newview/lltable.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llteleporthistorystorage.h b/indra/newview/llteleporthistorystorage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureatlas.cpp b/indra/newview/lltextureatlas.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureatlas.h b/indra/newview/lltextureatlas.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureatlasmanager.cpp b/indra/newview/lltextureatlasmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureatlasmanager.h b/indra/newview/lltextureatlasmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
old mode 100755
new mode 100644
index a0e112c5e89332607f7ecefd022ab9c88874041a..07b3dc1aa48634a3c4bfba468ac20491ca329510
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -669,6 +669,7 @@ class LLTextureFetchWorker : public LLWorkerClass, public LLCore::HttpHandler
* is required to distribute data and perform global actions.
* In pseudo-UML, it looks like:
*
+ * @verbatim
* Main Thread1
* . .
* . .
@@ -711,7 +712,6 @@ class LLTextureFetchWorker : public LLWorkerClass, public LLCore::HttpHandler
* . .
* . .
*
- *
* Key:
*
* SRE - Set Region Enqueued. Enqueue a 'Set Region' command in
@@ -736,6 +736,7 @@ class LLTextureFetchWorker : public LLWorkerClass, public LLCore::HttpHandler
* global pointers used to find the 'current stats'.
* RSC - Read Stats Collector. Extract collector data cloning it
* (i.e. deep copy) when necessary.
+ * @endverbatim
*
*/
class LLTextureFetch::TFRequest // : public LLQueuedThread::QueuedRequest
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureinfo.cpp b/indra/newview/lltextureinfo.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureinfo.h b/indra/newview/lltextureinfo.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureinfodetails.cpp b/indra/newview/lltextureinfodetails.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureinfodetails.h b/indra/newview/lltextureinfodetails.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturestats.cpp b/indra/newview/lltexturestats.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturestats.h b/indra/newview/lltexturestats.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastalertpanel.h b/indra/newview/lltoastalertpanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastgroupnotifypanel.h b/indra/newview/lltoastgroupnotifypanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastimpanel.h b/indra/newview/lltoastimpanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastpanel.h b/indra/newview/lltoastpanel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastscriptquestion.cpp b/indra/newview/lltoastscriptquestion.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastscriptquestion.h b/indra/newview/lltoastscriptquestion.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoastscripttextbox.h b/indra/newview/lltoastscripttextbox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolgrab.h b/indra/newview/lltoolgrab.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolgun.h b/indra/newview/lltoolgun.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolindividual.h b/indra/newview/lltoolindividual.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolmorph.h b/indra/newview/lltoolmorph.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolplacer.h b/indra/newview/lltoolplacer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolselect.h b/indra/newview/lltoolselect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolselectrect.cpp b/indra/newview/lltoolselectrect.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolselectrect.h b/indra/newview/lltoolselectrect.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltoolview.h b/indra/newview/lltoolview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltransientdockablefloater.cpp b/indra/newview/lltransientdockablefloater.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltransientdockablefloater.h b/indra/newview/lltransientdockablefloater.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltransientfloatermgr.h b/indra/newview/lltransientfloatermgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltranslate.h b/indra/newview/lltranslate.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lluiconstants.h b/indra/newview/lluiconstants.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lluilistener.h b/indra/newview/lluilistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lluploaddialog.h b/indra/newview/lluploaddialog.h
old mode 100755
new mode 100644
diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llurl.cpp b/indra/newview/llurl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llurl.h b/indra/newview/llurl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llurldispatcherlistener.cpp b/indra/newview/llurldispatcherlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llurldispatcherlistener.h b/indra/newview/llurldispatcherlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llurlhistory.h b/indra/newview/llurlhistory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llurllineeditorctrl.h b/indra/newview/llurllineeditorctrl.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llurlwhitelist.cpp b/indra/newview/llurlwhitelist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llurlwhitelist.h b/indra/newview/llurlwhitelist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvectorperfoptions.cpp b/indra/newview/llvectorperfoptions.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvectorperfoptions.h b/indra/newview/llvectorperfoptions.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp
old mode 100755
new mode 100644
index e53de8be32146929d02b0d58ad83529284016703..a0ca91672aa357f9743dba9cc0f58a4d58f06a11
--- a/indra/newview/llversioninfo.cpp
+++ b/indra/newview/llversioninfo.cpp
@@ -172,3 +172,8 @@ LLVersionInfo::ViewerMaturity LLVersionInfo::getViewerMaturity()
}
+const std::string &LLVersionInfo::getBuildConfig()
+{
+ static const std::string build_configuration(LLBUILD_CONFIG); // set in indra/cmake/BuildVersion.cmake
+ return build_configuration;
+}
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h
old mode 100755
new mode 100644
index 4e75535ec5470cec1b1cb710fe62b06d2f336f18..ec599c0cdaade535a1279e0dac89cd524f5d7ae9
--- a/indra/newview/llversioninfo.h
+++ b/indra/newview/llversioninfo.h
@@ -66,6 +66,9 @@ class LLVersionInfo
/// return the channel name, e.g. "Second Life"
static const std::string &getChannel();
+ /// return the CMake build type
+ static const std::string &getBuildConfig();
+
/// reset the channel name used by the viewer.
static void resetChannel(const std::string& channel);
diff --git a/indra/newview/llviewchildren.cpp b/indra/newview/llviewchildren.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewchildren.h b/indra/newview/llviewchildren.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerassetstats.h b/indra/newview/llviewerassetstats.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerassettype.cpp b/indra/newview/llviewerassettype.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerassettype.h b/indra/newview/llviewerassettype.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerattachmenu.h b/indra/newview/llviewerattachmenu.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvieweraudio.h b/indra/newview/llvieweraudio.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerchat.h b/indra/newview/llviewerchat.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
old mode 100755
new mode 100644
index 502051845446f5e6786ac18ecd30b5740bb8e87e..16f40fb747393d55ff6f6c0f177040f065062470
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -167,11 +167,6 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
return true;
}
-bool handleRenderAvatarComplexityLimitChanged(const LLSD& newvalue)
-{
- return true;
-}
-
bool handleRenderTransparentWaterChanged(const LLSD& newvalue)
{
LLWorld::getInstance()->updateWaterObjects();
@@ -224,12 +219,6 @@ static bool handleAvatarPhysicsLODChanged(const LLSD& newvalue)
return true;
}
-static bool handleAvatarMaxVisibleChanged(const LLSD& newvalue)
-{
- LLVOAvatar::sMaxVisible = (U32) newvalue.asInteger();
- return true;
-}
-
static bool handleTerrainLODChanged(const LLSD& newvalue)
{
LLVOSurfacePatch::sLODFactor = (F32)newvalue.asReal();
@@ -423,12 +412,6 @@ static bool handleRenderBumpChanged(const LLSD& newval)
return true;
}
-static bool handleRenderUseImpostorsChanged(const LLSD& newvalue)
-{
- LLVOAvatar::sUseImpostors = newvalue.asBoolean();
- return true;
-}
-
static bool handleRenderDebugGLChanged(const LLSD& newvalue)
{
gDebugGL = newvalue.asBoolean() || gDebugSession;
@@ -635,8 +618,6 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
- gSavedSettings.getControl("RenderAvatarMaxVisible")->getSignal()->connect(boost::bind(&handleAvatarMaxVisibleChanged, _2));
- gSavedSettings.getControl("RenderAvatarComplexityLimit")->getSignal()->connect(boost::bind(&handleRenderAvatarComplexityLimitChanged, _2));
gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _2));
gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _2));
gSavedSettings.getControl("RenderAvatarPhysicsLODFactor")->getSignal()->connect(boost::bind(&handleAvatarPhysicsLODChanged, _2));
@@ -654,7 +635,6 @@ void settings_setup_listeners()
gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleRenderBumpChanged, _2));
gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
gSavedSettings.getControl("RenderDeferredNoise")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
- gSavedSettings.getControl("RenderUseImpostors")->getSignal()->connect(boost::bind(&handleRenderUseImpostorsChanged, _2));
gSavedSettings.getControl("RenderDebugGL")->getSignal()->connect(boost::bind(&handleRenderDebugGLChanged, _2));
gSavedSettings.getControl("RenderDebugPipeline")->getSignal()->connect(boost::bind(&handleRenderDebugPipelineChanged, _2));
gSavedSettings.getControl("RenderResolutionDivisor")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _2));
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewercontrollistener.cpp b/indra/newview/llviewercontrollistener.cpp
old mode 100755
new mode 100644
index 361b96221ca893904744aebfe4dd7f2ab5a6df04..d2484b2b233a8b766c360cdfec90d84734c5aaf0
--- a/indra/newview/llviewercontrollistener.cpp
+++ b/indra/newview/llviewercontrollistener.cpp
@@ -121,7 +121,7 @@ struct Info
if (control)
{
response["name"] = control->getName();
- response["type"] = group->typeEnumToString(control->type());
+ response["type"] = LLControlGroup::typeEnumToString(control->type());
response["value"] = control->get();
response["comment"] = control->getComment();
}
@@ -167,7 +167,7 @@ void LLViewerControlListener::toggle(LLSD const & request)
info.response.error(STRINGIZE("toggle of non-boolean '" << info.groupname
<< "' control '" << info.key
<< "', type is "
- << info.group->typeEnumToString(info.control->type())));
+ << LLControlGroup::typeEnumToString(info.control->type())));
}
}
@@ -199,7 +199,7 @@ struct CollectVars: public LLControlGroup::ApplyFunctor
{
vars.append(LLSDMap
("name", name)
- ("type", mGroup->typeEnumToString(control->type()))
+ ("type", LLControlGroup::typeEnumToString(control->type()))
("value", control->get())
("comment", control->getComment()));
}
diff --git a/indra/newview/llviewercontrollistener.h b/indra/newview/llviewercontrollistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerdisplay.h b/indra/newview/llviewerdisplay.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
old mode 100755
new mode 100644
index c0e5e632e6ddbf5bad5076c5c435e59f59dc0d3b..91e4980e45b87202141b56895c62e3adb157ebd0
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -55,6 +55,7 @@
#include "llfloaterconversationlog.h"
#include "llfloaterconversationpreview.h"
#include "llfloaterdeleteenvpreset.h"
+#include "llfloaterdeleteprefpreset.h"
#include "llfloaterdestinations.h"
#include "llfloatereditdaycycle.h"
#include "llfloatereditsky.h"
@@ -70,7 +71,6 @@
#include "llfloatergesture.h"
#include "llfloatergodtools.h"
#include "llfloatergroups.h"
-#include "llfloaterhardwaresettings.h"
#include "llfloaterhelpbrowser.h"
#include "llfloaterhoverheight.h"
#include "llfloaterhud.h"
@@ -82,6 +82,7 @@
#include "llfloaterlagmeter.h"
#include "llfloaterland.h"
#include "llfloaterlandholdings.h"
+#include "llfloaterloadprefpreset.h"
#include "llfloatermap.h"
#include "llfloatermarketplacelistings.h"
#include "llfloatermediasettings.h"
@@ -104,6 +105,7 @@
#include "llfloaterregioninfo.h"
#include "llfloaterregionrestarting.h"
#include "llfloaterreporter.h"
+#include "llfloatersaveprefpreset.h"
#include "llfloatersceneloadstats.h"
#include "llfloaterscriptdebug.h"
#include "llfloaterscriptedprefs.h"
@@ -209,6 +211,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
+ LLFloaterReg::add("delete_pref_preset", "floater_delete_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeletePrefPreset>);
LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>);
LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
@@ -249,6 +252,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
LLFloaterReg::add("land_holdings", "floater_land_holdings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLandHoldings>);
+ LLFloaterReg::add("load_pref_preset", "floater_load_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLoadPrefPreset>);
LLFloaterReg::add("mem_leaking", "floater_mem_leaking.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMemLeak>);
@@ -281,8 +285,8 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("perms_default", "floater_perms_default.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPermsDefault>);
LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
+ LLFloaterReg::add("prefs_graphics_advanced", "floater_preferences_graphics_advanced.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceGraphicsAdvanced>);
LLFloaterReg::add("prefs_proxy", "floater_preferences_proxy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreferenceProxy>);
- LLFloaterReg::add("prefs_hardware_settings", "floater_hardware_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHardwareSettings>);
LLFloaterReg::add("prefs_spellchecker_import", "floater_spellcheck_import.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerImport>);
LLFloaterReg::add("prefs_translation", "floater_translation_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTranslationSettings>);
LLFloaterReg::add("prefs_spellchecker", "floater_spellcheck.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSpellCheckerSettings>);
@@ -299,6 +303,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>);
LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>);
+ LLFloaterReg::add("save_pref_preset", "floater_save_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSavePrefPreset>);
LLFloaterReg::add("script_colors", "floater_script_ed_prefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptEdPrefs>);
LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>);
diff --git a/indra/newview/llviewerfloaterreg.h b/indra/newview/llviewerfloaterreg.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerfoldertype.h b/indra/newview/llviewerfoldertype.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewergenericmessage.h b/indra/newview/llviewergenericmessage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewergesture.h b/indra/newview/llviewergesture.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerhelp.h b/indra/newview/llviewerhelp.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerhelputil.cpp b/indra/newview/llviewerhelputil.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerhelputil.h b/indra/newview/llviewerhelputil.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerhome.cpp b/indra/newview/llviewerhome.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerhome.h b/indra/newview/llviewerhome.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjointattachment.h b/indra/newview/llviewerjointattachment.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerjoystick.h b/indra/newview/llviewerjoystick.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerkeyboard.h b/indra/newview/llviewerkeyboard.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerlayer.cpp b/indra/newview/llviewerlayer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerlayer.h b/indra/newview/llviewerlayer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
old mode 100755
new mode 100644
index a7ad7c80d9694038bf8422d84e282260ffe99096..6ed063e06637fd8c5238612c4d97742177370450
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1317,16 +1317,18 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url)
// For now, we use the URL for the OpenID POST request since it will have the same authority
// as the domain field.
// (Feels like there must be a less dirty way to construct a URL from component LLURL parts)
- url = std::string(sOpenIDURL.mURI) + "://" + std::string(sOpenIDURL.mAuthority);
+ // MAINT-6392 - Rider: Do not change, however, the original URI requested, since it is used further
+ // down.
+ std::string cefUrl(std::string(sOpenIDURL.mURI) + "://" + std::string(sOpenIDURL.mAuthority));
- media_instance->getMediaPlugin()->setCookie(url, cookie_name, cookie_value, cookie_host, cookie_path, httponly, secure);
+ media_instance->getMediaPlugin()->setCookie(cefUrl, cookie_name, cookie_value, cookie_host, cookie_path, httponly, secure);
}
}
}
- // NOTE: this is the original OpenID cookie code, so of which is no longer needed now that we
- // are using CEF - it's very intertwined with other code so, for the moment, I'm going to
- // leave it alone and make a task to come back to it once we're sure the CEF cookie code is robust.
+ // Note: Rider: MAINT-6392 - Some viewer code requires access to the my.sl.com openid cookie for such
+ // actions as posting snapshots to the feed. This is handled through HTTPCore rather than CEF and so
+ // we must learn to SHARE the cookies.
// Do a web profile get so we can store the cookie
httpHeaders->append(HTTP_OUT_HEADER_ACCEPT, "*/*");
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermedia_streamingaudio.h b/indra/newview/llviewermedia_streamingaudio.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermediaobserver.h b/indra/newview/llviewermediaobserver.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
old mode 100755
new mode 100644
index fd47ec9903e6223e5c1be948dd974675b75ec3da..99a9ed1d75a2d7fbd93be5fa0f443167d6de1246
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1008,10 +1008,6 @@ U32 info_display_from_string(std::string info_display)
{
return LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY;
}
- else if ("shame" == info_display)
- {
- return LLPipeline::RENDER_DEBUG_SHAME;
- }
else if ("texture area" == info_display)
{
return LLPipeline::RENDER_DEBUG_TEXTURE_AREA;
@@ -1040,9 +1036,9 @@ U32 info_display_from_string(std::string info_display)
{
return LLPipeline::RENDER_DEBUG_COMPOSITION;
}
- else if ("attachment bytes" == info_display)
+ else if ("avatardrawinfo" == info_display)
{
- return LLPipeline::RENDER_DEBUG_ATTACHMENT_BYTES;
+ return (LLPipeline::RENDER_DEBUG_AVATAR_DRAW_INFO);
}
else if ("glow" == info_display)
{
@@ -1078,6 +1074,7 @@ U32 info_display_from_string(std::string info_display)
}
else
{
+ LL_WARNS() << "unrecognized feature name '" << info_display << "'" << LL_ENDL;
return 0;
}
};
@@ -2896,6 +2893,8 @@ BOOL enable_object_build(void*)
bool enable_object_edit()
{
+ if (!isAgentAvatarValid()) return false;
+
// *HACK: The new "prelude" Help Islands have a build sandbox area,
// so users need the Edit and Create pie menu options when they are
// there. Eventually this needs to be replaced with code that only
@@ -3056,11 +3055,11 @@ class LLAvatarCheckImpostorMode : public view_listener_t
switch (mode)
{
case 0:
- return (avatar->getVisualMuteSettings() == LLVOAvatar::VISUAL_MUTE_NOT_SET);
+ return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_RENDER_NORMALLY);
case 1:
- return (avatar->getVisualMuteSettings() == LLVOAvatar::ALWAYS_VISUAL_MUTE);
+ return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_DO_NOT_RENDER);
case 2:
- return (avatar->getVisualMuteSettings() == LLVOAvatar::NEVER_VISUAL_MUTE);
+ return (avatar->getVisualMuteSettings() == LLVOAvatar::AV_ALWAYS_RENDER);
default:
return false;
}
@@ -3082,19 +3081,18 @@ class LLAvatarSetImpostorMode : public view_listener_t
switch (mode)
{
case 0:
- avatar->setVisualMuteSettings(LLVOAvatar::VISUAL_MUTE_NOT_SET);
+ avatar->setVisualMuteSettings(LLVOAvatar::AV_RENDER_NORMALLY);
break;
case 1:
- avatar->setVisualMuteSettings(LLVOAvatar::ALWAYS_VISUAL_MUTE);
+ avatar->setVisualMuteSettings(LLVOAvatar::AV_DO_NOT_RENDER);
break;
case 2:
- avatar->setVisualMuteSettings(LLVOAvatar::NEVER_VISUAL_MUTE);
+ avatar->setVisualMuteSettings(LLVOAvatar::AV_ALWAYS_RENDER);
break;
default:
return false;
}
- avatar->forceUpdateVisualMuteSettings();
LLVOAvatar::cullAvatarsByPixelArea();
return true;
} // handleEvent()
@@ -3114,6 +3112,8 @@ class LLObjectMute : public view_listener_t
LLVOAvatar* avatar = find_avatar_from_object(object);
if (avatar)
{
+ avatar->mNeedsImpostorUpdate = TRUE;
+
id = avatar->getID();
LLNameValue *firstname = avatar->getNVPair("FirstName");
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
old mode 100755
new mode 100644
index 66eee552bee9ba8f288d2b69eec8196f81e612d9..92df3866f72634a6bf7b78a7872f29aaf07f832e
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -33,7 +33,6 @@
#include "llaudioengine.h"
#include "llavataractions.h"
#include "llavatarnamecache.h" // IDEVO HACK
-#include "lscript_byteformat.h"
#include "lleconomy.h"
#include "lleventtimer.h"
#include "llfloaterreg.h"
@@ -78,6 +77,7 @@
#include "llpanelgrouplandmoney.h"
#include "llrecentpeople.h"
#include "llscriptfloater.h"
+#include "llscriptruntimeperms.h"
#include "llselectmgr.h"
#include "llstartup.h"
#include "llsky.h"
@@ -117,6 +117,7 @@
#include <boost/algorithm/string/split.hpp> //
#include <boost/regex.hpp>
+#include <boost/foreach.hpp>
#include "llnotificationmanager.h" //
#include "llexperiencecache.h"
@@ -159,47 +160,6 @@ const U8 AU_FLAGS_NONE = 0x00;
const U8 AU_FLAGS_HIDETITLE = 0x01;
const U8 AU_FLAGS_CLIENT_AUTOPILOT = 0x02;
-//script permissions
-const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
- {
- "ScriptTakeMoney",
- "ActOnControlInputs",
- "RemapControlInputs",
- "AnimateYourAvatar",
- "AttachToYourAvatar",
- "ReleaseOwnership",
- "LinkAndDelink",
- "AddAndRemoveJoints",
- "ChangePermissions",
- "TrackYourCamera",
- "ControlYourCamera",
- "TeleportYourAgent",
- "JoinAnExperience",
- "SilentlyManageEstateAccess",
- "OverrideYourAnimations",
- "ScriptReturnObjects"
- };
-
-const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
-{
- TRUE, // ScriptTakeMoney,
- FALSE, // ActOnControlInputs
- FALSE, // RemapControlInputs
- FALSE, // AnimateYourAvatar
- FALSE, // AttachToYourAvatar
- FALSE, // ReleaseOwnership,
- FALSE, // LinkAndDelink,
- FALSE, // AddAndRemoveJoints
- FALSE, // ChangePermissions
- FALSE, // TrackYourCamera,
- FALSE, // ControlYourCamera
- FALSE, // TeleportYourAgent
- FALSE, // JoinAnExperience
- FALSE, // SilentlyManageEstateAccess
- FALSE, // OverrideYourAnimations
- FALSE, // ScriptReturnObjects
-};
-
bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
@@ -2489,7 +2449,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
buffer = message;
- LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+ LL_DEBUGS("Messaging") << "session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
// add to IM panel, but do not bother the user
gIMMgr->addMessage(
@@ -2538,7 +2498,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
}
buffer = saved + message;
- LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+ LL_DEBUGS("Messaging") << "session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
bool mute_im = is_muted;
if(accept_im_from_only_friend && !is_friend && !is_linden)
@@ -3003,7 +2963,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
buffer = message;
- LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+ LL_DEBUGS("Messaging") << "message in dnd; session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
// add to IM panel, but do not bother the user
gIMMgr->addMessage(
@@ -3030,7 +2990,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
buffer = saved + message;
- LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+ LL_DEBUGS("Messaging") << "standard message session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
gIMMgr->addMessage(
session_id,
@@ -6377,21 +6337,22 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
BOOL caution = FALSE;
S32 count = 0;
std::string perms;
- for (S32 i = 0; i < SCRIPT_PERMISSION_EOF; i++)
+ BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
{
- if ((orig_questions & LSCRIPTRunTimePermissionBits[i]) && SCRIPT_QUESTION_IS_CAUTION[i])
+ if ((orig_questions & script_perm.permbit)
+ && script_perm.caution)
{
count++;
caution = TRUE;
// add a comma before the permission description if it is not the first permission
// added to the list or the last permission to check
- if ((count > 1) && (i < SCRIPT_PERMISSION_EOF))
+ if (count > 1)
{
perms.append(", ");
}
- perms.append(LLTrans::getString(SCRIPT_QUESTIONS[i]));
+ perms.append(LLTrans::getString(script_perm.question));
}
}
@@ -6620,27 +6581,27 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
std::string script_question;
if (questions)
{
- BOOL caution = FALSE;
+ bool caution = false;
S32 count = 0;
LLSD args;
args["OBJECTNAME"] = object_name;
args["NAME"] = LLCacheName::cleanFullName(owner_name);
S32 known_questions = 0;
- BOOL has_not_only_debit = questions ^ LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_DEBIT];
+ bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
// check the received permission flags against each permission
- for (S32 i = 0; i < SCRIPT_PERMISSION_EOF; i++)
+ BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
{
- if (questions & LSCRIPTRunTimePermissionBits[i])
+ if (questions & script_perm.permbit)
{
count++;
- known_questions |= LSCRIPTRunTimePermissionBits[i];
+ known_questions |= script_perm.permbit;
// check whether permission question should cause special caution dialog
- caution |= (SCRIPT_QUESTION_IS_CAUTION[i]);
+ caution |= (script_perm.caution);
- if (("ScriptTakeMoney" == SCRIPT_QUESTIONS[i]) && has_not_only_debit)
+ if (("ScriptTakeMoney" == script_perm.question) && has_not_only_debit)
continue;
- script_question += " " + LLTrans::getString(SCRIPT_QUESTIONS[i]) + "\n";
+ script_question += " " + LLTrans::getString(script_perm.question) + "\n";
}
}
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
old mode 100755
new mode 100644
index 230bdca4ef4d5ac7ce0c168aeb6fba5230181f6a..b4617566ac73a783b282224e93fa714afb1fe992
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -39,6 +39,7 @@
#include "llworld.h"
#include "pipeline.h"
#include "llspatialpartition.h"
+#include "llvoavatarself.h"
#include "llvovolume.h"
const F32 PART_SIM_BOX_SIDE = 16.f;
@@ -703,16 +704,24 @@ void LLViewerPartSim::updateSimulation()
if (!mViewerPartSources[i]->isDead())
{
BOOL upd = TRUE;
- if (!LLPipeline::sRenderAttachedParticles)
+ LLViewerObject* vobj = mViewerPartSources[i]->mSourceObjectp;
+
+ if (vobj && vobj->isAvatar() && ((LLVOAvatar*)vobj)->isInMuteList())
+ {
+ upd = FALSE;
+ }
+
+ if (upd && vobj && (vobj->getPCode() == LL_PCODE_VOLUME))
{
- LLViewerObject* vobj = mViewerPartSources[i]->mSourceObjectp;
- if (vobj && (vobj->getPCode() == LL_PCODE_VOLUME))
+ if(vobj->getAvatar() && vobj->getAvatar()->isTooComplex())
+ {
+ upd = FALSE;
+ }
+
+ LLVOVolume* vvo = (LLVOVolume *)vobj;
+ if (!LLPipeline::sRenderAttachedParticles && vvo && vvo->isAttachment())
{
- LLVOVolume* vvo = (LLVOVolume *)vobj;
- if (vvo && vvo->isAttachment())
- {
- upd = FALSE;
- }
+ upd = FALSE;
}
}
diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerprecompiledheaders.cpp b/indra/newview/llviewerprecompiledheaders.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
old mode 100755
new mode 100644
index b0280ef3e0b173728c167a5b8cec851918f0b494..cac2ed8585c5d291b480677578e64ad919d22465
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -577,8 +577,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
mImpl->mObjectPartition.push_back(NULL); //PARTITION_NONE
mImpl->mVOCachePartition = getVOCachePartition();
- mRenderInfoRequestTimer.resetWithExpiry(0.f); // Set timer to be expired
- setCapabilitiesReceivedCallback(boost::bind(&LLAvatarRenderInfoAccountant::expireRenderInfoReportTimer, _1));
+ setCapabilitiesReceivedCallback(boost::bind(&LLAvatarRenderInfoAccountant::scanNewRegion, _1));
}
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
old mode 100755
new mode 100644
index 8c4966369c35e78bc570dea45272f02b36074496..a7bb546d2cc079e376b75a8e70d26c0673c3ac93
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -433,7 +433,8 @@ class LLViewerRegion: public LLCapabilityProvider // implements this interface
static BOOL sVOCacheCullingEnabled; //vo cache culling enabled or not.
static S32 sLastCameraUpdated;
- LLFrameTimer & getRenderInfoRequestTimer() { return mRenderInfoRequestTimer; };
+ LLFrameTimer & getRenderInfoRequestTimer() { return mRenderInfoRequestTimer; };
+ LLFrameTimer & getRenderInfoReportTimer() { return mRenderInfoReportTimer; };
struct CompareRegionByLastUpdate
{
@@ -542,6 +543,7 @@ class LLViewerRegion: public LLCapabilityProvider // implements this interface
// the materials capability throttle
LLFrameTimer mMaterialsCapThrottleTimer;
LLFrameTimer mRenderInfoRequestTimer;
+ LLFrameTimer mRenderInfoReportTimer;
};
inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerstatsrecorder.h b/indra/newview/llviewerstatsrecorder.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
old mode 100755
new mode 100644
index c5e07f009f0808c98c29efb0e52f8d1c7e5ee90b..db4b555eca950969240ba29f045462d2ce263af4
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1118,6 +1118,7 @@ void LLViewerFetchedTexture::init(bool firstinit)
mLastCallBackActiveTime = 0.f;
mForceCallbackFetch = FALSE;
mInDebug = FALSE;
+ mUnremovable = FALSE;
mFTType = FTT_UNKNOWN;
}
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
old mode 100755
new mode 100644
index a3f8db69076378d669f3c2c6b3a71072ecfc9b7e..8017d8260418e27b9a366af9c848535739d40771
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -346,7 +346,10 @@ class LLViewerFetchedTexture : public LLViewerTexture
bool updateFetch();
bool setDebugFetching(S32 debug_level);
- bool isInDebug() {return mInDebug;}
+ bool isInDebug() const { return mInDebug; }
+
+ void setUnremovable(BOOL value) { mUnremovable = value; }
+ bool isUnremovable() const { return mUnremovable; }
void clearFetchedResults(); //clear all fetched results, for debug use.
@@ -435,6 +438,7 @@ class LLViewerFetchedTexture : public LLViewerTexture
private:
BOOL mFullyLoaded;
BOOL mInDebug;
+ BOOL mUnremovable;
BOOL mInFastCacheList;
BOOL mForceCallbackFetch;
diff --git a/indra/newview/llviewertextureanim.cpp b/indra/newview/llviewertextureanim.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertextureanim.h b/indra/newview/llviewertextureanim.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
old mode 100755
new mode 100644
index 5cfd04b4c191cbfbee9185772057b8582c564676..08f6143861675cf6437d36e2c3d063fa8b36a5ba
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -178,6 +178,12 @@ void LLViewerTextureList::doPreloadImages()
mImagePreloads.insert(image);
}
+ LLPointer<LLImageRaw> img_blak_square_tex(new LLImageRaw(2, 2, 3));
+ memset(img_blak_square_tex->getData(), 0, img_blak_square_tex->getDataSize());
+ LLPointer<LLViewerFetchedTexture> img_blak_square(new LLViewerFetchedTexture(img_blak_square_tex, FTT_DEFAULT, FALSE));
+ gBlackSquareID = img_blak_square->getID();
+ img_blak_square->setUnremovable(TRUE);
+ addImage(img_blak_square, TEX_LIST_STANDARD);
}
static std::string get_texture_list_name()
@@ -860,7 +866,7 @@ void LLViewerTextureList::updateImagesDecodePriorities()
LLPointer<LLViewerFetchedTexture> imagep = iter->second;
++iter; // safe to increment now
- if(imagep->isInDebug())
+ if(imagep->isInDebug() || imagep->isUnremovable())
{
update_counter--;
continue; //is in debug, ignore.
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerthrottle.h b/indra/newview/llviewerthrottle.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerwearable.h b/indra/newview/llviewerwearable.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
old mode 100755
new mode 100644
index 50329d85768044396b915f4c2ada9256c41db115..c17c50fd88114e9f8031434476f2f98adb0dda42
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -677,14 +677,13 @@ class LLDebugText
{
LLVOAvatar* avatar = av_iter->second;
- avatar->calculateUpdateRenderCost(); // Make sure the numbers are up-to-date
+ avatar->calculateUpdateRenderComplexity(); // Make sure the numbers are up-to-date
trunc_name = utf8str_truncate(avatar->getFullname(), 16);
- addText(xpos, ypos, llformat("%s : rez %d, weight %d, bytes %d area %.2f",
+ addText(xpos, ypos, llformat("%s : %s, complexity %d, area %.2f",
trunc_name.c_str(),
- avatar->getRezzedStatus(),
+ LLVOAvatar::rezStatusToString(avatar->getRezzedStatus()).c_str(),
avatar->getVisualComplexity(),
- avatar->getAttachmentGeometryBytes(),
avatar->getAttachmentSurfaceArea()));
ypos += y_inc;
av_iter++;
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerwindowlistener.cpp b/indra/newview/llviewerwindowlistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerwindowlistener.h b/indra/newview/llviewerwindowlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvlmanager.h b/indra/newview/llvlmanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
old mode 100755
new mode 100644
index ddf60b946439cce4001e4ef115e0291321b878f0..b9dd43f0617aa7b0345362b8d25e5fc2684b0d95
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1,4 +1,4 @@
-/**
+/**
* @File llvoavatar.cpp
* @brief Implementation of LLVOAvatar class which is a derivation of LLViewerObject
*
@@ -43,6 +43,7 @@
#include "llanimationstates.h"
#include "llavatarnamecache.h"
#include "llavatarpropertiesprocessor.h"
+#include "llavatarrendernotifier.h"
#include "llexperiencecache.h"
#include "llphysicsmotion.h"
#include "llviewercontrol.h"
@@ -115,8 +116,6 @@ extern U32 JOINT_COUNT_REQUIRED_FOR_FULLRIG;
const F32 MAX_HOVER_Z = 2.0;
const F32 MIN_HOVER_Z = -2.0;
-// #define OUTPUT_BREAST_DATA
-
using namespace LLAvatarAppearanceDefines;
//-----------------------------------------------------------------------------
@@ -186,6 +185,8 @@ const F32 NAMETAG_UPDATE_THRESHOLD = 0.3f;
const F32 NAMETAG_VERTICAL_SCREEN_OFFSET = 25.f;
const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.17f;
+const U32 LLVOAvatar::VISUAL_COMPLEXITY_UNKNOWN = 0;
+
enum ERenderName
{
RENDER_NAME_NEVER,
@@ -622,7 +623,7 @@ class LLPelvisFixMotion :
//-----------------------------------------------------------------------------
LLAvatarAppearanceDictionary *LLVOAvatar::sAvatarDictionary = NULL;
S32 LLVOAvatar::sFreezeCounter = 0;
-U32 LLVOAvatar::sMaxVisible = 12;
+U32 LLVOAvatar::sMaxNonImpostors = 12; // overridden based on graphics setting
F32 LLVOAvatar::sRenderDistance = 256.f;
S32 LLVOAvatar::sNumVisibleAvatars = 0;
S32 LLVOAvatar::sNumLODChangesThisFrame = 0;
@@ -649,7 +650,7 @@ BOOL LLVOAvatar::sShowFootPlane = FALSE;
BOOL LLVOAvatar::sVisibleInFirstPerson = FALSE;
F32 LLVOAvatar::sLODFactor = 1.f;
F32 LLVOAvatar::sPhysicsLODFactor = 1.f;
-BOOL LLVOAvatar::sUseImpostors = FALSE;
+bool LLVOAvatar::sUseImpostors = false; // overwridden by RenderAvatarMaxNonImpostors
BOOL LLVOAvatar::sJointDebug = FALSE;
F32 LLVOAvatar::sUnbakedTime = 0.f;
F32 LLVOAvatar::sUnbakedUpdateTime = 0.f;
@@ -670,9 +671,8 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
LLAvatarAppearance(&gAgentWearables),
LLViewerObject(id, pcode, regionp),
mSpecialRenderMode(0),
- mAttachmentGeometryBytes(-1),
- mAttachmentSurfaceArea(-1.f),
- mReportedVisualComplexity(-1),
+ mAttachmentSurfaceArea(0.f),
+ mReportedVisualComplexity(VISUAL_COMPLEXITY_UNKNOWN),
mTurning(FALSE),
mLastSkeletonSerialNum( 0 ),
mIsSitting(FALSE),
@@ -702,12 +702,14 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mNeedsSkin(FALSE),
mLastSkinTime(0.f),
mUpdatePeriod(1),
+ mVisualComplexityStale(true),
+ mVisuallyMuteSetting(AV_RENDER_NORMALLY),
+ mMutedAVColor(LLColor4::white /* used for "uninitialize" */),
mFirstFullyVisible(TRUE),
mFullyLoaded(FALSE),
mPreviousFullyLoaded(FALSE),
mFullyLoadedInitialized(FALSE),
- mVisualComplexity(0),
- mVisualComplexityStale(TRUE),
+ mVisualComplexity(VISUAL_COMPLEXITY_UNKNOWN),
mLoadedCallbacksPaused(FALSE),
mRenderUnloadedAvatar(LLCachedControl<bool>(gSavedSettings, "RenderUnloadedAvatar", false)),
mLastRezzedStatus(-1),
@@ -718,6 +720,8 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mCachedMuteListUpdateTime(0),
mCachedInMuteList(false)
{
+ LL_DEBUGS("AvatarRender") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
+
//VTResume(); // VTune
setHoverOffset(LLVector3(0.0, 0.0, 0.0));
@@ -726,7 +730,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mVoiceVisualizer = ( LLVoiceVisualizer *)LLHUDManager::getInstance()->createViewerEffect( LLHUDObject::LL_HUD_EFFECT_VOICE_VISUALIZER, needsSendToSim );
LL_DEBUGS("Avatar","Message") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
-
mPelvisp = NULL;
mDirtyMesh = 2; // Dirty geometry, need to regenerate.
@@ -775,17 +778,10 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mDebugExistenceTimer.reset();
mLastAppearanceMessageTimer.reset();
- if(LLSceneMonitor::getInstance()->isEnabled())
+ if(LLSceneMonitor::getInstance()->isEnabled())
{
- LLSceneMonitor::getInstance()->freezeAvatar((LLCharacter*)this);
+ LLSceneMonitor::getInstance()->freezeAvatar((LLCharacter*)this);
}
-
- mCachedVisualMute = !isSelf();
- mCachedVisualMuteUpdateTime = LLFrameTimer::getTotalSeconds() + 5.0;
- mVisuallyMuteSetting = VISUAL_MUTE_NOT_SET;
-
- F32 color_value = (F32) (getID().mData[0]);
- mMutedAVColor = calcMutedAVColor(color_value, 0, 256);
}
std::string LLVOAvatar::avString() const
@@ -993,8 +989,8 @@ std::string LLVOAvatar::rezStatusToString(S32 rez_status)
{
if (rez_status==0) return "cloud";
if (rez_status==1) return "gray";
- if (rez_status==2) return "textured";
- if (rez_status==3) return "textured_and_downloaded";
+ if (rez_status==2) return "downloading";
+ if (rez_status==3) return "full";
return "unknown";
}
@@ -1106,6 +1102,7 @@ void LLVOAvatar::resetImpostors()
{
LLVOAvatar* avatar = (LLVOAvatar*) *iter;
avatar->mImpostor.release();
+ avatar->mNeedsImpostorUpdate = TRUE;
}
}
@@ -2156,7 +2153,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
}
idleUpdateNameTag( mLastRootPos );
- idleUpdateRenderCost();
+ idleUpdateRenderComplexity();
}
void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled)
@@ -2496,19 +2493,22 @@ void LLVOAvatar::idleUpdateLoadingEffect()
// update visibility when avatar is partially loaded
if (updateIsFullyLoaded()) // changed?
{
- if (isFullyLoaded() && mFirstFullyVisible && isSelf())
- {
- LL_INFOS("Avatar") << avString() << "self isFullyLoaded, mFirstFullyVisible" << LL_ENDL;
- mFirstFullyVisible = FALSE;
- LLAppearanceMgr::instance().onFirstFullyVisible();
- }
- if (isFullyLoaded() && mFirstFullyVisible && !isSelf())
- {
- LL_INFOS("Avatar") << avString() << "other isFullyLoaded, mFirstFullyVisible" << LL_ENDL;
- mFirstFullyVisible = FALSE;
- }
if (isFullyLoaded())
{
+ if (mFirstFullyVisible)
+ {
+ mFirstFullyVisible = FALSE;
+ if (isSelf())
+ {
+ LL_INFOS("Avatar") << avString() << "self isFullyLoaded, mFirstFullyVisible" << LL_ENDL;
+ LLAppearanceMgr::instance().onFirstFullyVisible();
+ }
+ else
+ {
+ LL_INFOS("Avatar") << avString() << "other isFullyLoaded, mFirstFullyVisible" << LL_ENDL;
+ }
+ }
+
deleteParticleSource();
updateLOD();
}
@@ -2733,7 +2733,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
}
else
{
- is_muted = LLMuteList::getInstance()->isMuted(getID());
+ is_muted = isInMuteList();
}
bool is_friend = LLAvatarTracker::instance().isBuddy(getID());
bool is_cloud = getIsCloud();
@@ -3091,86 +3091,32 @@ bool LLVOAvatar::isVisuallyMuted()
{
bool muted = false;
+ // Priority order (highest priority first)
+ // * own avatar is never visually muted
+ // * if on the "always draw normally" list, draw them normally
+ // * if on the "always visually mute" list, mute them
+ // * check against the render cost and attachment limits
if (!isSelf())
{
- static LLCachedControl<U32> render_auto_mute_functions(gSavedSettings, "RenderAutoMuteFunctions", 0);
- if (render_auto_mute_functions) // Hacky debug switch for developing feature
+ if (mVisuallyMuteSetting == AV_ALWAYS_RENDER)
{
- // Priority order (highest priority first)
- // * own avatar is never visually muted
- // * if on the "always draw normally" list, draw them normally
- // * if on the "always visually mute" list, mute them
- // * draw them normally if they meet the following criteria:
- // - within the closest N avatars OR on friends list OR in an IM chat
- // - AND aren't over the thresholds
- // * otherwise visually mute all other avatars
-
- static LLCachedControl<U32> max_attachment_bytes(gSavedSettings, "RenderAutoMuteByteLimit", 0);
- static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 0.0);
- static LLCachedControl<U32> max_render_cost(gSavedSettings, "RenderAutoMuteRenderWeightLimit", 0);
-
- if (mVisuallyMuteSetting == ALWAYS_VISUAL_MUTE)
- { // Always want to see this AV as an impostor
- muted = true;
- }
- else if (mVisuallyMuteSetting == NEVER_VISUAL_MUTE)
- { // Never show as impostor
- muted = false;
- }
- else
- {
- F64 now = LLFrameTimer::getTotalSeconds();
-
- if (now < mCachedVisualMuteUpdateTime)
- { // Use cached mute value
- muted = mCachedVisualMute;
- }
- else
- { // Determine if visually muted or not
-
- U32 max_cost = (U32) (max_render_cost*(LLVOAvatar::sLODFactor+0.5));
-
- muted = (mAttachmentGeometryBytes > max_attachment_bytes && max_attachment_bytes > 0) ||
- (mAttachmentSurfaceArea > max_attachment_area && max_attachment_area > 0.f) ||
- (mVisualComplexity > max_cost && max_render_cost > 0);
-
- // Could be part of the grand || collection above, but yanked out to make the logic visible
- if (!muted)
- {
- if (sMaxVisible > 0)
- { // They are above the visibilty rank - mute them
- muted = (mVisibilityRank > sMaxVisible);
- }
-
- // Always draw friends or those in IMs. Needs UI?
- if ((render_auto_mute_functions & 0x02) &&
- (muted || sMaxVisible == 0)) // Don't mute friends or IMs
- {
- muted = !(LLAvatarTracker::instance().isBuddy(getID()));
- if (muted)
- { // Not a friend, so they are muted ... are they in an IM?
- LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,getID());
- muted = !gIMMgr->hasSession(session_id);
- }
- }
- }
-
- // Save visual mute state and set interval for updating
- const F64 SECONDS_BETWEEN_RENDER_AUTO_MUTE_UPDATES = 1.5;
- mCachedVisualMuteUpdateTime = now + SECONDS_BETWEEN_RENDER_AUTO_MUTE_UPDATES;
- mCachedVisualMute = muted;
- }
- }
+ muted = false;
+ }
+ else if (mVisuallyMuteSetting == AV_DO_NOT_RENDER)
+ { // Always want to see this AV as an impostor
+ muted = true;
+ }
+ else if (isInMuteList())
+ {
+ muted = true;
+ }
+ else
+ {
+ muted = isTooComplex();
}
}
- return muted || isInMuteList();
-}
-
-void LLVOAvatar::forceUpdateVisualMuteSettings()
-{
- // Set the cache time so it's updated ASAP
- mCachedVisualMuteUpdateTime = LLFrameTimer::getTotalSeconds() - 1.0;
+ return muted;
}
bool LLVOAvatar::isInMuteList()
@@ -3335,18 +3281,18 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
{ // visually muted avatars update at 16 hz
mUpdatePeriod = 16;
}
- else if (mVisibilityRank <= LLVOAvatar::sMaxVisible ||
- mDrawable->mDistanceWRTCamera < 1.f + mag)
- { //first 25% of max visible avatars are not impostored
- //also, don't impostor avatars whose bounding box may be penetrating the
- //impostor camera near clip plane
+ else if ( ! shouldImpostor()
+ || mDrawable->mDistanceWRTCamera < 1.f + mag)
+ { // first 25% of max visible avatars are not impostored
+ // also, don't impostor avatars whose bounding box may be penetrating the
+ // impostor camera near clip plane
mUpdatePeriod = 1;
}
- else if (mVisibilityRank > LLVOAvatar::sMaxVisible * 4)
+ else if ( shouldImpostor(4) )
{ //background avatars are REALLY slow updating impostors
mUpdatePeriod = 16;
}
- else if (mVisibilityRank > LLVOAvatar::sMaxVisible * 3)
+ else if ( shouldImpostor(3) )
{ //back 25% of max visible avatars are slow updating impostors
mUpdatePeriod = 8;
}
@@ -3930,6 +3876,10 @@ void LLVOAvatar::updateVisibility()
}
}
+ if ( visible != mVisible )
+ {
+ LL_DEBUGS("AvatarRender") << "visible was " << mVisible << " now " << visible << LL_ENDL;
+ }
mVisible = visible;
}
@@ -4119,11 +4069,9 @@ U32 LLVOAvatar::renderSkinned()
BOOL first_pass = TRUE;
if (!LLDrawPoolAvatar::sSkipOpaque)
{
- bool visually_muted = isVisuallyMuted();
-
if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender)
{
- if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy || visually_muted)
+ if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy)
{
LLViewerJoint* head_mesh = getViewerJoint(MESH_ID_HEAD);
if (head_mesh)
@@ -4133,7 +4081,7 @@ U32 LLVOAvatar::renderSkinned()
first_pass = FALSE;
}
}
- if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy || visually_muted)
+ if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy)
{
LLViewerJoint* upper_mesh = getViewerJoint(MESH_ID_UPPER_BODY);
if (upper_mesh)
@@ -4143,7 +4091,7 @@ U32 LLVOAvatar::renderSkinned()
first_pass = FALSE;
}
- if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy || visually_muted)
+ if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy)
{
LLViewerJoint* lower_mesh = getViewerJoint(MESH_ID_LOWER_BODY);
if (lower_mesh)
@@ -4202,8 +4150,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
}
// Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair)
// TODO: 1.25 will be able to switch this logic back to calling isTextureVisible();
- if ( ( getImage(TEX_HAIR_BAKED, 0) &&
- getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE ) || LLDrawPoolAlpha::sShowDebugAlpha)
+ if ( (getImage(TEX_HAIR_BAKED, 0) && getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE)
+ || LLDrawPoolAlpha::sShowDebugAlpha)
{
LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR);
if (hair_mesh)
@@ -5840,7 +5788,7 @@ const LLViewerJointAttachment *LLVOAvatar::attachObject(LLViewerObject *viewer_o
return 0;
}
- mVisualComplexityStale = TRUE;
+ updateVisualComplexity();
if (viewer_object->isSelected())
{
@@ -5996,7 +5944,7 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
if (attachment->isObjectAttached(viewer_object))
{
- mVisualComplexityStale = TRUE;
+ updateVisualComplexity();
cleanupAttachedMesh( viewer_object );
attachment->removeObject(viewer_object);
@@ -6298,32 +6246,20 @@ BOOL LLVOAvatar::isVisible() const
}
// Determine if we have enough avatar data to render
-BOOL LLVOAvatar::getIsCloud() const
+bool LLVOAvatar::getIsCloud() const
{
- // Do we have a shape?
- if ((const_cast<LLVOAvatar*>(this))->visualParamWeightsAreDefault())
- {
- return TRUE;
- }
-
- if (!isTextureDefined(TEX_LOWER_BAKED) ||
- !isTextureDefined(TEX_UPPER_BAKED) ||
- !isTextureDefined(TEX_HEAD_BAKED))
- {
- return TRUE;
- }
-
- if (isTooComplex())
- {
- return TRUE;
- }
- return FALSE;
+ return ( ((const_cast<LLVOAvatar*>(this))->visualParamWeightsAreDefault())// Do we have a shape?
+ || ( !isTextureDefined(TEX_LOWER_BAKED)
+ || !isTextureDefined(TEX_UPPER_BAKED)
+ || !isTextureDefined(TEX_HEAD_BAKED)
+ )
+ );
}
void LLVOAvatar::updateRezzedStatusTimers()
{
// State machine for rezzed status. Statuses are -1 on startup, 0
- // = cloud, 1 = gray, 2 = textured, 3 = textured_and_downloaded.
+ // = cloud, 1 = gray, 2 = downloading, 3 = full.
// Purpose is to collect time data for each it takes avatar to reach
// various loading landmarks: gray, textured (partial), textured fully.
@@ -6363,6 +6299,8 @@ void LLVOAvatar::updateRezzedStatusTimers()
selfStopPhase("update_appearance_from_cof");
selfStopPhase("wear_inventory_category", false);
selfStopPhase("process_initial_wearables_update", false);
+
+ updateVisualComplexity();
}
}
mLastRezzedStatus = rez_status;
@@ -6495,7 +6433,7 @@ void LLVOAvatar::logMetricsTimerRecord(const std::string& phase_name, F32 elapse
// returns true if the value has changed.
BOOL LLVOAvatar::updateIsFullyLoaded()
{
- const BOOL loading = getIsCloud();
+ const bool loading = getIsCloud();
updateRezzedStatusTimers();
updateRuthTimer(loading);
return processFullyLoadedChange(loading);
@@ -6556,6 +6494,12 @@ BOOL LLVOAvatar::processFullyLoadedChange(bool loading)
mPreviousFullyLoaded = mFullyLoaded;
mFullyLoadedInitialized = TRUE;
mFullyLoadedFrameCounter++;
+
+ if (changed && isSelf())
+ {
+ // to know about outfit switching
+ LLAvatarRenderNotifier::getInstance()->updateNotificationState();
+ }
return changed;
}
@@ -6567,15 +6511,28 @@ BOOL LLVOAvatar::isFullyLoaded() const
bool LLVOAvatar::isTooComplex() const
{
- if (gSavedSettings.getS32("RenderAvatarComplexityLimit") > 0 && mVisualComplexity >= gSavedSettings.getS32("RenderAvatarComplexityLimit"))
+ bool too_complex;
+ if (isSelf() || mVisuallyMuteSetting == AV_ALWAYS_RENDER)
+ {
+ too_complex = false;
+ }
+ else
{
- return true;
+ // Determine if visually muted or not
+ static LLCachedControl<U32> max_render_cost(gSavedSettings, "RenderAvatarMaxComplexity", 0U);
+ static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1000.0f);
+ // If the user has chosen unlimited max complexity, we also disregard max attachment area
+ // so that unlimited will completely disable the overly complex impostor rendering
+ // yes, this leaves them vulnerable to griefing objects... their choice
+ too_complex = ( max_render_cost > 0
+ && ( mVisualComplexity > max_render_cost
+ || (max_attachment_area > 0.0f && mAttachmentSurfaceArea > max_attachment_area)
+ ));
}
- return false;
+ return too_complex;
}
-
//-----------------------------------------------------------------------------
// findMotion()
//-----------------------------------------------------------------------------
@@ -7450,7 +7407,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
// appearance messages.
mLastUpdateReceivedCOFVersion = this_update_cof_version;
- applyParsedTEMessage(contents.mTEContents);
+ if (applyParsedTEMessage(contents.mTEContents) > 0 && isChanged(TEXTURE))
+ {
+ updateVisualComplexity();
+ }
// prevent the overwriting of valid baked textures with invalid baked textures
for (U8 baked_index = 0; baked_index < mBakedTextureDatas.size(); baked_index++)
@@ -7568,7 +7528,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
// Got an update for some other avatar
// Ignore updates for self, because we have a more authoritative value in the preferences.
setHoverOffset(contents.mHoverOffset);
- LL_INFOS("Avatar") << avString() << "setting hover from message" << contents.mHoverOffset[2] << LL_ENDL;
+ LL_INFOS("Avatar") << avString() << "setting hover to " << contents.mHoverOffset[2] << LL_ENDL;
}
if (!contents.mHoverOffsetWasSet && !isSelf())
@@ -8152,7 +8112,7 @@ void LLVOAvatar::updateFreezeCounter(S32 counter)
BOOL LLVOAvatar::updateLOD()
{
- if (isImpostor())
+ if (isImpostor() && 0 != mDrawable->getNumFaces() && mDrawable->getFace(0)->hasGeometry())
{
return TRUE;
}
@@ -8189,28 +8149,36 @@ U32 LLVOAvatar::getPartitionType() const
}
//static
-void LLVOAvatar::updateImpostors()
+void LLVOAvatar::updateImpostors()
{
- LLCharacter::sAllowInstancesChange = FALSE ;
+ LLCharacter::sAllowInstancesChange = FALSE;
for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
- iter != LLCharacter::sInstances.end(); ++iter)
+ iter != LLCharacter::sInstances.end(); ++iter)
{
LLVOAvatar* avatar = (LLVOAvatar*) *iter;
- if (!avatar->isDead() && avatar->needsImpostorUpdate() && avatar->isVisible() && avatar->isImpostor())
+ if (!avatar->isDead() && avatar->isVisible()
+ && (
+ (avatar->isImpostor() || LLVOAvatar::AV_DO_NOT_RENDER == avatar->getVisualMuteSettings()) && avatar->needsImpostorUpdate())
+ )
{
+ avatar->calcMutedAVColor();
gPipeline.generateImpostor(avatar);
}
}
- LLCharacter::sAllowInstancesChange = TRUE ;
+ LLCharacter::sAllowInstancesChange = TRUE;
}
BOOL LLVOAvatar::isImpostor()
{
- return (sUseImpostors && (isVisuallyMuted() || (mUpdatePeriod >= IMPOSTOR_PERIOD))) || isInMuteList() ? TRUE : FALSE;
+ return sUseImpostors && (isVisuallyMuted() || (mUpdatePeriod >= IMPOSTOR_PERIOD)) ? TRUE : FALSE;
}
+BOOL LLVOAvatar::shouldImpostor(const U32 rank_factor) const
+{
+ return (!isSelf() && sUseImpostors && mVisibilityRank > (sMaxNonImpostors * rank_factor));
+}
BOOL LLVOAvatar::needsImpostorUpdate() const
{
@@ -8251,68 +8219,170 @@ void LLVOAvatar::getImpostorValues(LLVector4a* extents, LLVector3& angle, F32& d
angle.mV[2] = da;
}
+// static
+const U32 LLVOAvatar::IMPOSTORS_OFF = 66; /* Must equal the maximum allowed the RenderAvatarMaxNonImpostors
+ * slider in panel_preferences_graphics1.xml */
-void LLVOAvatar::idleUpdateRenderCost()
+// static
+void LLVOAvatar::updateImpostorRendering(U32 newMaxNonImpostorsValue)
{
- static LLCachedControl<U32> max_render_cost(gSavedSettings, "RenderAutoMuteRenderWeightLimit", 0);
- static const U32 ARC_LIMIT = 20000;
-
- if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_ATTACHMENT_BYTES))
- { //set debug text to attachment geometry bytes here so render cost will override
- setDebugText(llformat("%.1f KB, %.2f m^2", mAttachmentGeometryBytes/1024.f, mAttachmentSurfaceArea));
+ U32 oldmax = sMaxNonImpostors;
+ bool oldflg = sUseImpostors;
+
+ if (IMPOSTORS_OFF <= newMaxNonImpostorsValue)
+ {
+ sMaxNonImpostors = 0;
}
-
- if (!gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SHAME) && max_render_cost == 0)
+ else
{
- return;
+ sMaxNonImpostors = newMaxNonImpostorsValue;
}
+ // the sUseImpostors flag depends on whether or not sMaxNonImpostors is set to the no-limit value (0)
+ sUseImpostors = (0 != sMaxNonImpostors);
+ if ( oldflg != sUseImpostors )
+ {
+ LL_DEBUGS("AvatarRender")
+ << "was " << (oldflg ? "use" : "don't use" ) << " impostors (max " << oldmax << "); "
+ << "now " << (sUseImpostors ? "use" : "don't use" ) << " impostors (max " << sMaxNonImpostors << "); "
+ << LL_ENDL;
+ }
+}
- calculateUpdateRenderCost(); // Update mVisualComplexity if needed
-
- if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SHAME))
+
+void LLVOAvatar::idleUpdateRenderComplexity()
+{
+ // Render Complexity
+ calculateUpdateRenderComplexity(); // Update mVisualComplexity if needed
+
+ if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_AVATAR_DRAW_INFO))
{
- std::string viz_string = LLVOAvatar::rezStatusToString(getRezzedStatus());
- setDebugText(llformat("%s %d", viz_string.c_str(), mVisualComplexity));
- F32 green = 1.f-llclamp(((F32) mVisualComplexity-(F32)ARC_LIMIT)/(F32)ARC_LIMIT, 0.f, 1.f);
- F32 red = llmin((F32) mVisualComplexity/(F32)ARC_LIMIT, 1.f);
- mText->setColor(LLColor4(red,green,0,1));
+ std::string info_line;
+ F32 red_level;
+ F32 green_level;
+ LLColor4 info_color;
+ LLFontGL::StyleFlags info_style;
+
+ if ( !mText )
+ {
+ initHudText();
+ mText->setFadeDistance(20.0, 5.0); // limit clutter in large crowds
+ }
+ else
+ {
+ mText->clearString(); // clear debug text
+ }
+
+ /*
+ * NOTE: the logic for whether or not each of the values below
+ * controls muting MUST match that in the isVisuallyMuted and isTooComplex methods.
+ */
+
+ static LLCachedControl<U32> max_render_cost(gSavedSettings, "RenderAvatarMaxComplexity", 0);
+ info_line = llformat("%d Complexity", mVisualComplexity);
+
+ if (max_render_cost != 0) // zero means don't care, so don't bother coloring based on this
+ {
+ green_level = 1.f-llclamp(((F32) mVisualComplexity-(F32)max_render_cost)/(F32)max_render_cost, 0.f, 1.f);
+ red_level = llmin((F32) mVisualComplexity/(F32)max_render_cost, 1.f);
+ info_color.set(red_level, green_level, 0.0, 1.0);
+ info_style = ( mVisualComplexity > max_render_cost
+ ? LLFontGL::BOLD : LLFontGL::NORMAL );
+ }
+ else
+ {
+ info_color.set(LLColor4::grey);
+ info_style = LLFontGL::NORMAL;
+ }
+ mText->addLine(info_line, info_color, info_style);
+
+ // Visual rank
+ info_line = llformat("%d rank", mVisibilityRank);
+ // Use grey for imposters, white for normal rendering or no impostors
+ info_color.set(isImpostor() ? LLColor4::grey : LLColor4::white);
+ info_style = LLFontGL::NORMAL;
+ mText->addLine(info_line, info_color, info_style);
+
+ // Attachment Surface Area
+ static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1000.0f);
+ info_line = llformat("%.0f m^2", mAttachmentSurfaceArea);
+
+ if (max_render_cost != 0 && max_attachment_area != 0) // zero means don't care, so don't bother coloring based on this
+ {
+ green_level = 1.f-llclamp((mAttachmentSurfaceArea-max_attachment_area)/max_attachment_area, 0.f, 1.f);
+ red_level = llmin(mAttachmentSurfaceArea/max_attachment_area, 1.f);
+ info_color.set(red_level, green_level, 0.0, 1.0);
+ info_style = ( mAttachmentSurfaceArea > max_attachment_area
+ ? LLFontGL::BOLD : LLFontGL::NORMAL );
+
+ }
+ else
+ {
+ info_color.set(LLColor4::grey);
+ info_style = LLFontGL::NORMAL;
+ }
+ mText->addLine(info_line, info_color, info_style);
+
+ updateText(); // corrects position
}
}
+void LLVOAvatar::addAttachmentArea(F32 delta_area)
+{
+ mAttachmentSurfaceArea += delta_area;
+}
+
+void LLVOAvatar::subtractAttachmentArea(F32 delta_area)
+{
+ mAttachmentSurfaceArea = delta_area > mAttachmentSurfaceArea ? 0.0 : mAttachmentSurfaceArea - delta_area;
+}
+
+void LLVOAvatar::updateVisualComplexity()
+{
+ LL_DEBUGS("AvatarRender") << "avatar " << getID() << " appearance changed" << LL_ENDL;
+ // Set the cache time to in the past so it's updated ASAP
+ mVisualComplexityStale = true;
+}
// Calculations for mVisualComplexity value
-void LLVOAvatar::calculateUpdateRenderCost()
+void LLVOAvatar::calculateUpdateRenderComplexity()
{
- static const U32 ARC_BODY_PART_COST = 200;
+ /*****************************************************************
+ * This calculation should not be modified by third party viewers,
+ * since it is used to limit rendering and should be uniform for
+ * everyone. If you have suggested improvements, submit them to
+ * the official viewer for consideration.
+ *****************************************************************/
+ static const U32 COMPLEXITY_BODY_PART_COST = 200;
// Diagnostic list of all textures on our avatar
static std::set<LLUUID> all_textures;
if (mVisualComplexityStale)
{
- mVisualComplexityStale = FALSE;
- U32 cost = 0;
+ U32 cost = VISUAL_COMPLEXITY_UNKNOWN;
LLVOVolume::texture_cost_t textures;
for (U8 baked_index = 0; baked_index < BAKED_NUM_INDICES; baked_index++)
{
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = LLAvatarAppearanceDictionary::getInstance()->getBakedTexture((EBakedTextureIndex)baked_index);
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict
+ = LLAvatarAppearanceDictionary::getInstance()->getBakedTexture((EBakedTextureIndex)baked_index);
ETextureIndex tex_index = baked_dict->mTextureIndex;
if ((tex_index != TEX_SKIRT_BAKED) || (isWearingWearableType(LLWearableType::WT_SKIRT)))
{
if (isTextureVisible(tex_index))
{
- cost +=ARC_BODY_PART_COST;
+ cost +=COMPLEXITY_BODY_PART_COST;
}
}
}
+ LL_DEBUGS("ARCdetail") << "Avatar body parts complexity: " << cost << LL_ENDL;
- for (attachment_map_t::const_iterator iter = mAttachmentPoints.begin();
- iter != mAttachmentPoints.end();
- ++iter)
+ for (attachment_map_t::const_iterator attachment_point = mAttachmentPoints.begin();
+ attachment_point != mAttachmentPoints.end();
+ ++attachment_point)
{
- LLViewerJointAttachment* attachment = iter->second;
+ LLViewerJointAttachment* attachment = attachment_point->second;
for (LLViewerJointAttachment::attachedobjs_vec_t::iterator attachment_iter = attachment->mAttachedObjects.begin();
attachment_iter != attachment->mAttachedObjects.end();
++attachment_iter)
@@ -8327,7 +8397,12 @@ void LLVOAvatar::calculateUpdateRenderCost()
const LLVOVolume* volume = drawable->getVOVolume();
if (volume)
{
- cost += volume->getRenderCost(textures);
+ U32 attachment_total_cost = 0;
+ U32 attachment_volume_cost = 0;
+ U32 attachment_texture_cost = 0;
+ U32 attachment_children_cost = 0;
+
+ attachment_volume_cost += volume->getRenderCost(textures);
const_child_list_t children = volume->getChildren();
for (const_child_list_t::const_iterator child_iter = children.begin();
@@ -8338,15 +8413,27 @@ void LLVOAvatar::calculateUpdateRenderCost()
LLVOVolume *child = dynamic_cast<LLVOVolume*>( child_obj );
if (child)
{
- cost += child->getRenderCost(textures);
+ attachment_children_cost += child->getRenderCost(textures);
}
}
- for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
+ for (LLVOVolume::texture_cost_t::iterator volume_texture = textures.begin();
+ volume_texture != textures.end();
+ ++volume_texture)
{
// add the cost of each individual texture in the linkset
- cost += iter->second;
+ attachment_texture_cost += volume_texture->second;
}
+
+ attachment_total_cost = attachment_volume_cost + attachment_texture_cost + attachment_children_cost;
+ LL_DEBUGS("ARCdetail") << "Attachment costs " << attached_object->getAttachmentItemID()
+ << " total: " << attachment_total_cost
+ << ", volume: " << attachment_volume_cost
+ << ", textures: " << attachment_texture_cost
+ << ", " << volume->numChildren()
+ << " children: " << attachment_children_cost
+ << LL_ENDL;
+ cost += attachment_total_cost;
}
}
}
@@ -8392,38 +8479,85 @@ void LLVOAvatar::calculateUpdateRenderCost()
}
}
+ if ( cost != mVisualComplexity )
+ {
+ LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
+ << " complexity updated was " << mVisualComplexity << " now " << cost
+ << " reported " << mReportedVisualComplexity
+ << LL_ENDL;
+ }
+ else
+ {
+ LL_DEBUGS("AvatarRender") << "Avatar "<< getID()
+ << " complexity updated no change " << mVisualComplexity
+ << " reported " << mReportedVisualComplexity
+ << LL_ENDL;
+ }
mVisualComplexity = cost;
+ mVisualComplexityStale = false;
+
+ static LLCachedControl<U32> show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 20);
+
+ if (isSelf() && show_my_complexity_changes)
+ {
+ LLAvatarRenderNotifier::getInstance()->updateNotificationAgent(mVisualComplexity);
+ }
}
}
+void LLVOAvatar::setVisualMuteSettings(VisualMuteSettings set)
+{
+ mVisuallyMuteSetting = set;
+ mNeedsImpostorUpdate = TRUE;
+}
-// static
-LLColor4 LLVOAvatar::calcMutedAVColor(F32 value, S32 range_low, S32 range_high)
+
+void LLVOAvatar::calcMutedAVColor()
{
- F32 clamped_value = llmin(value, (F32) range_high);
- clamped_value = llmax(value, (F32) range_low);
- F32 spectrum = (clamped_value / range_high); // spectrum is between 0 and 1.f
+ LLColor4 new_color(mMutedAVColor);
+ std::string change_msg;
+ LLUUID av_id(getID());
- // Array of colors. These are arranged so only one RGB color changes between each step,
- // and it loops back to red so there is an even distribution. It is not a heat map
- const S32 NUM_SPECTRUM_COLORS = 7;
- static LLColor4 * spectrum_color[NUM_SPECTRUM_COLORS] = { &LLColor4::red, &LLColor4::magenta, &LLColor4::blue, &LLColor4::cyan, &LLColor4::green, &LLColor4::yellow, &LLColor4::red };
+ if (getVisualMuteSettings() == AV_DO_NOT_RENDER)
+ {
+ // explicitly not-rendered avatars are light grey
+ new_color = LLColor4::grey3;
+ change_msg = " not rendered: color is grey3";
+ }
+ else if (LLMuteList::getInstance()->isMuted(av_id)) // the user blocked them
+ {
+ // blocked avatars are dark grey
+ new_color = LLColor4::grey4;
+ change_msg = " blocked: color is grey4";
+ }
+ else if ( mMutedAVColor == LLColor4::white || mMutedAVColor == LLColor4::grey3 || mMutedAVColor == LLColor4::grey4 )
+ {
+ // select a color based on the first byte of the agents uuid so any muted agent is always the same color
+ F32 color_value = (F32) (av_id.mData[0]);
+ F32 spectrum = (color_value / 256.0); // spectrum is between 0 and 1.f
+
+ // Array of colors. These are arranged so only one RGB color changes between each step,
+ // and it loops back to red so there is an even distribution. It is not a heat map
+ const S32 NUM_SPECTRUM_COLORS = 7;
+ static LLColor4 * spectrum_color[NUM_SPECTRUM_COLORS] = { &LLColor4::red, &LLColor4::magenta, &LLColor4::blue, &LLColor4::cyan, &LLColor4::green, &LLColor4::yellow, &LLColor4::red };
- spectrum = spectrum * (NUM_SPECTRUM_COLORS - 1); // Scale to range of number of colors
- S32 spectrum_index_1 = floor(spectrum); // Desired color will be after this index
- S32 spectrum_index_2 = spectrum_index_1 + 1; // and before this index (inclusive)
- F32 fractBetween = spectrum - (F32)(spectrum_index_1); // distance between the two indexes (0-1)
+ spectrum = spectrum * (NUM_SPECTRUM_COLORS - 1); // Scale to range of number of colors
+ S32 spectrum_index_1 = floor(spectrum); // Desired color will be after this index
+ S32 spectrum_index_2 = spectrum_index_1 + 1; // and before this index (inclusive)
+ F32 fractBetween = spectrum - (F32)(spectrum_index_1); // distance between the two indexes (0-1)
- LLColor4 new_color = lerp(*spectrum_color[spectrum_index_1], *spectrum_color[spectrum_index_2], fractBetween);
- new_color.normalize();
- new_color *= 0.7f; // Tone it down a bit
+ new_color = lerp(*spectrum_color[spectrum_index_1], *spectrum_color[spectrum_index_2], fractBetween);
+ new_color.normalize();
+ new_color *= 0.28f; // Tone it down
- //LL_INFOS() << "From value " << std::setprecision(3) << value << " returning color " << new_color
- // << " using indexes " << spectrum_index_1 << ", " << spectrum_index_2
- // << " and fractBetween " << fractBetween
- // << LL_ENDL;
+ change_msg = " over limit color ";
+ }
- return new_color;
+ if (mMutedAVColor != new_color)
+ {
+ LL_DEBUGS("AvatarRender") << "avatar "<< av_id << change_msg << std::setprecision(3) << new_color << LL_ENDL;
+ mMutedAVColor = new_color;
+ }
}
// static
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
old mode 100755
new mode 100644
index 09d86620348d7d4eed72048842c386321ff22a4c..418cca519d68697664ce31830df290a91e2bceb4
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -253,20 +253,22 @@ class LLVOAvatar :
// force all name tags to rebuild, useful when display names turned on/off
static void invalidateNameTags();
void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font);
- void idleUpdateRenderCost();
- void calculateUpdateRenderCost();
- void updateVisualComplexity() { mVisualComplexityStale = TRUE; }
+ void idleUpdateRenderComplexity();
+ void calculateUpdateRenderComplexity();
+ static const U32 VISUAL_COMPLEXITY_UNKNOWN;
+ void updateVisualComplexity();
- S32 getVisualComplexity() { return mVisualComplexity; }; // Numbers calculated here by rendering AV
- S32 getAttachmentGeometryBytes() { return mAttachmentGeometryBytes; }; // number of bytes in attached geometry
+ U32 getVisualComplexity() { return mVisualComplexity; }; // Numbers calculated here by rendering AV
F32 getAttachmentSurfaceArea() { return mAttachmentSurfaceArea; }; // estimated surface area of attachments
+ void addAttachmentArea(F32 delta_area);
+ void subtractAttachmentArea(F32 delta_area);
- S32 getReportedVisualComplexity() { return mReportedVisualComplexity; }; // Numbers as reported by the SL server
- void setReportedVisualComplexity(S32 value) { mReportedVisualComplexity = value; };
+ U32 getReportedVisualComplexity() { return mReportedVisualComplexity; }; // Numbers as reported by the SL server
+ void setReportedVisualComplexity(U32 value) { mReportedVisualComplexity = value; };
S32 getUpdatePeriod() { return mUpdatePeriod; };
const LLColor4 & getMutedAVColor() { return mMutedAVColor; };
-
+ static void updateImpostorRendering(U32 newMaxNonImpostorsValue);
void idleUpdateBelowWater();
@@ -276,10 +278,12 @@ class LLVOAvatar :
public:
static S32 sRenderName;
static BOOL sRenderGroupTitles;
- static U32 sMaxVisible; //(affected by control "RenderAvatarMaxVisible")
+ static const U32 IMPOSTORS_OFF; /* Must equal the maximum allowed the RenderAvatarMaxNonImpostors
+ * slider in panel_preferences_graphics1.xml */
+ static U32 sMaxNonImpostors; //(affected by control "RenderAvatarMaxNonImpostors")
static F32 sRenderDistance; //distance at which avatars will render.
static BOOL sShowAnimationDebug; // show animation debug info
- static BOOL sUseImpostors; //use impostors for far away avatars
+ static bool sUseImpostors; //use impostors for far away avatars
static BOOL sShowFootPlane; // show foot collision plane reported by server
static BOOL sShowCollisionVolumes; // show skeletal collision volumes
static BOOL sVisibleInFirstPerson;
@@ -303,9 +307,9 @@ class LLVOAvatar :
//--------------------------------------------------------------------
public:
BOOL isFullyLoaded() const;
- bool isTooComplex() const;
+ bool isTooComplex() const;
bool visualParamWeightsAreDefault();
- virtual BOOL getIsCloud() const;
+ virtual bool getIsCloud() const;
BOOL isFullyTextured() const;
BOOL hasGray() const;
S32 getRezzedStatus() const; // 0 = cloud, 1 = gray, 2 = textured, 3 = textured and fully downloaded.
@@ -321,7 +325,7 @@ class LLVOAvatar :
static void logPendingPhasesAllAvatars();
void logMetricsTimerRecord(const std::string& phase_name, F32 elapsed, bool completed);
- static LLColor4 calcMutedAVColor(F32 value, S32 range_low, S32 range_high);
+ void calcMutedAVColor();
protected:
LLViewerStats::PhaseMap& getPhases() { return mPhases; }
@@ -336,8 +340,6 @@ class LLVOAvatar :
BOOL mPreviousFullyLoaded;
BOOL mFullyLoadedInitialized;
S32 mFullyLoadedFrameCounter;
- S32 mVisualComplexity;
- BOOL mVisualComplexityStale;
LLColor4 mMutedAVColor;
LLFrameTimer mFullyLoadedTimer;
LLFrameTimer mRuthTimer;
@@ -386,16 +388,15 @@ class LLVOAvatar :
U32 renderImpostor(LLColor4U color = LLColor4U(255,255,255,255), S32 diffuse_channel = 0);
bool isVisuallyMuted();
bool isInMuteList();
- void setCachedVisualMute(bool muted) { mCachedVisualMute = muted; };
void forceUpdateVisualMuteSettings();
enum VisualMuteSettings
{
- VISUAL_MUTE_NOT_SET = 0,
- ALWAYS_VISUAL_MUTE = 1,
- NEVER_VISUAL_MUTE = 2
+ AV_RENDER_NORMALLY = 0,
+ AV_DO_NOT_RENDER = 1,
+ AV_ALWAYS_RENDER = 2
};
- void setVisualMuteSettings(VisualMuteSettings set) { mVisuallyMuteSetting = set; };
+ void setVisualMuteSettings(VisualMuteSettings set);
VisualMuteSettings getVisualMuteSettings() { return mVisuallyMuteSetting; };
U32 renderRigid();
@@ -408,12 +409,9 @@ class LLVOAvatar :
static void destroyGL();
static void restoreGL();
S32 mSpecialRenderMode; // special lighting
- S32 mAttachmentGeometryBytes; //number of bytes in attached geometry
+
+ private:
F32 mAttachmentSurfaceArea; //estimated surface area of attachments
-
- S32 mReportedVisualComplexity; // Numbers as reported by the SL server
-
-private:
bool shouldAlphaMask();
BOOL mNeedsSkin; // avatar has been animated and verts have not been updated
@@ -422,8 +420,10 @@ class LLVOAvatar :
S32 mUpdatePeriod;
S32 mNumInitFaces; //number of faces generated when creating the avatar drawable, does not inculde splitted faces due to long vertex buffer.
- bool mCachedVisualMute; // cached return value for isVisuallyMuted()
- F64 mCachedVisualMuteUpdateTime; // Time to update mCachedVisualMute
+ // the isTooComplex method uses these mutable values to avoid recalculating too frequently
+ mutable U32 mVisualComplexity;
+ mutable bool mVisualComplexityStale;
+ U32 mReportedVisualComplexity; // from other viewers through the simulator
bool mCachedInMuteList;
F64 mCachedMuteListUpdateTime;
@@ -469,6 +469,7 @@ class LLVOAvatar :
//--------------------------------------------------------------------
public:
BOOL isImpostor();
+ BOOL shouldImpostor(const U32 rank_factor = 1) const;
BOOL needsImpostorUpdate() const;
const LLVector3& getImpostorOffset() const;
const LLVector2& getImpostorDim() const;
@@ -703,7 +704,6 @@ class LLVOAvatar :
public:
BOOL isVisible() const;
void setVisibilityRank(U32 rank);
- U32 getVisibilityRank() const { return mVisibilityRank; } // unused
static S32 sNumVisibleAvatars; // Number of instances of this class
/** Appearance
** **
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
old mode 100755
new mode 100644
index e7dee1438743a006cc9ec5568bdb745fbcc23251..5f48898cb165319a53b9594cfe3d247a8b501b9a
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -422,7 +422,7 @@ BOOL LLVOAvatarSelf::buildMenus()
++iter)
{
LLViewerJointAttachment* attachment = iter->second;
- if (attachment->getGroup() == i)
+ if (attachment && attachment->getGroup() == i)
{
LLMenuItemCallGL::Params item_params;
@@ -461,7 +461,7 @@ BOOL LLVOAvatarSelf::buildMenus()
++iter)
{
LLViewerJointAttachment* attachment = iter->second;
- if (attachment->getGroup() == i)
+ if (attachment && attachment->getGroup() == i)
{
LLMenuItemCallGL::Params item_params;
std::string sub_piemenu_name = attachment->getName();
@@ -494,7 +494,7 @@ BOOL LLVOAvatarSelf::buildMenus()
++iter)
{
LLViewerJointAttachment* attachment = iter->second;
- if (attachment->getGroup() == 8)
+ if (attachment && attachment->getGroup() == 8)
{
LLMenuItemCallGL::Params item_params;
std::string sub_piemenu_name = attachment->getName();
@@ -596,7 +596,7 @@ BOOL LLVOAvatarSelf::buildMenus()
++iter)
{
LLViewerJointAttachment* attachment = iter->second;
- if(attachment->getGroup() == group)
+ if(attachment && attachment->getGroup() == group)
{
// use multimap to provide a partial order off of the pie slice key
S32 pie_index = attachment->getPieSlice();
@@ -1872,7 +1872,7 @@ void LLVOAvatarSelf::dumpTotalLocalTextureByteCount()
LL_INFOS() << "Total Avatar LocTex GL:" << (gl_bytes/1024) << "KB" << LL_ENDL;
}
-BOOL LLVOAvatarSelf::getIsCloud() const
+bool LLVOAvatarSelf::getIsCloud() const
{
// Let people know why they're clouded without spamming them into oblivion.
bool do_warn = false;
@@ -1900,7 +1900,7 @@ BOOL LLVOAvatarSelf::getIsCloud() const
<< (skin_count ? "" : "SKIN ")
<< LL_ENDL;
}
- return TRUE;
+ return true;
}
if (!isTextureDefined(TEX_HAIR, 0))
@@ -1909,7 +1909,7 @@ BOOL LLVOAvatarSelf::getIsCloud() const
{
LL_INFOS() << "Self is clouded because of no hair texture" << LL_ENDL;
}
- return TRUE;
+ return true;
}
if (!mPreviousFullyLoaded)
@@ -1921,7 +1921,7 @@ BOOL LLVOAvatarSelf::getIsCloud() const
{
LL_INFOS() << "Self is clouded because lower textures not baked" << LL_ENDL;
}
- return TRUE;
+ return true;
}
if (!isLocalTextureDataAvailable(getLayerSet(BAKED_UPPER)) &&
@@ -1931,7 +1931,7 @@ BOOL LLVOAvatarSelf::getIsCloud() const
{
LL_INFOS() << "Self is clouded because upper textures not baked" << LL_ENDL;
}
- return TRUE;
+ return true;
}
for (U32 i = 0; i < mBakedTextureDatas.size(); i++)
@@ -1952,13 +1952,13 @@ BOOL LLVOAvatarSelf::getIsCloud() const
LL_INFOS() << "Self is clouded because texture at index " << i
<< " (texture index is " << texture_data.mTextureIndex << ") is not loaded" << LL_ENDL;
}
- return TRUE;
+ return true;
}
}
LL_DEBUGS() << "Avatar de-clouded" << LL_ENDL;
}
- return FALSE;
+ return false;
}
/*static*/
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
old mode 100755
new mode 100644
index cdd82a8a4462179090c962002e31f556ab8ba559..a9c4ab26a9ac0762f1131ebefd092f2ba3dd1e9d
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -135,7 +135,7 @@ class LLVOAvatarSelf :
// Loading state
//--------------------------------------------------------------------
public:
- /*virtual*/ BOOL getIsCloud() const;
+ /*virtual*/ bool getIsCloud() const;
//--------------------------------------------------------------------
// Region state
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoground.cpp b/indra/newview/llvoground.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoground.h b/indra/newview/llvoground.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicevisualizer.h b/indra/newview/llvoicevisualizer.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoinventorylistener.cpp b/indra/newview/llvoinventorylistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoinventorylistener.h b/indra/newview/llvoinventorylistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvosurfacepatch.h b/indra/newview/llvosurfacepatch.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvotree.h b/indra/newview/llvotree.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
old mode 100755
new mode 100644
index 476c0eef15c269ea3990f660838ee40eea7dff1a..8f0b233f01544b91e90845204f38c1fbef2a1736
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3357,6 +3357,13 @@ const LLMatrix4 LLVOVolume::getRenderMatrix() const
// children, and cost should only be increased for unique textures -Nyx
U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
{
+ /*****************************************************************
+ * This calculation should not be modified by third party viewers,
+ * since it is used to limit rendering and should be uniform for
+ * everyone. If you have suggested improvements, submit them to
+ * the official viewer for consideration.
+ *****************************************************************/
+
// Get access to params we'll need at various points.
// Skip if this is object doesn't have a volume (e.g. is an avatar).
BOOL has_volume = (getVolume() != NULL);
@@ -3430,7 +3437,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
{
// base cost is dependent on mesh complexity
// note that 3 is the highest LOD as of the time of this coding.
- S32 size = gMeshRepo.getMeshSize(volume_params.getSculptID(),3);
+ S32 size = gMeshRepo.getMeshSize(volume_params.getSculptID(), getLOD());
if ( size > 0)
{
if (gMeshRepo.getSkinInfo(volume_params.getSculptID(), this))
@@ -4722,10 +4729,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
if (pAvatarVO)
{
- pAvatarVO->mAttachmentGeometryBytes -= group->mGeometryBytes;
- pAvatarVO->mAttachmentGeometryBytes = llmax(pAvatarVO->mAttachmentGeometryBytes, 0);
- pAvatarVO->mAttachmentSurfaceArea -= group->mSurfaceArea;
- pAvatarVO->mAttachmentSurfaceArea = llmax(pAvatarVO->mAttachmentSurfaceArea, 0.f);
+ pAvatarVO->subtractAttachmentArea( group->mSurfaceArea );
}
group->mGeometryBytes = 0;
@@ -5279,24 +5283,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
if (pAvatarVO)
{
- if (pAvatarVO->mAttachmentGeometryBytes < 0)
- { // First time through value is -1
- pAvatarVO->mAttachmentGeometryBytes = group->mGeometryBytes;
- }
- else
- {
- pAvatarVO->mAttachmentGeometryBytes += group->mGeometryBytes;
- }
- if (pAvatarVO->mAttachmentSurfaceArea < 0.f)
- { // First time through value is -1
- pAvatarVO->mAttachmentSurfaceArea = group->mSurfaceArea;
- }
- else
- {
- pAvatarVO->mAttachmentSurfaceArea += group->mSurfaceArea;
+ pAvatarVO->addAttachmentArea( group->mSurfaceArea );
}
}
-}
static LLTrace::BlockTimerStatHandle FTM_REBUILD_MESH_FLUSH("Flush Mesh");
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvowlsky.h b/indra/newview/llvowlsky.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
old mode 100755
new mode 100644
index 374792193cade71fd9dceb05b61d5327a09694b8..28ae569ba2ac46714449159cdd5a2cb2a74fafaa
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -89,7 +89,7 @@ void LLWaterParamManager::loadAllPresets()
void LLWaterParamManager::loadPresetsFromDir(const std::string& dir)
{
- LL_INFOS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL;
+ LL_DEBUGS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL;
LLDirIterator dir_iter(dir, "*.xml");
while (1)
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwaterparamset.h b/indra/newview/llwaterparamset.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwearablelist.h b/indra/newview/llwearablelist.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwebprofile.h b/indra/newview/llwebprofile.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwind.cpp b/indra/newview/llwind.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwind.h b/indra/newview/llwind.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwindebug.cpp b/indra/newview/llwindebug.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp
old mode 100755
new mode 100644
index 734018cfc29831effafa77167ae19ebe054999d7..5367262bb6cfe3094187fffa8868c5393b1d8e52
--- a/indra/newview/llwindowlistener.cpp
+++ b/indra/newview/llwindowlistener.cpp
@@ -55,7 +55,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter&
"Given [\"keysym\"], [\"keycode\"] or [\"char\"], inject the specified ";
std::string keyExplain =
"(integer keycode values, or keysym string from any addKeyName() call in\n"
- "http://hg.secondlife.com/viewer-development/src/tip/indra/llwindow/llkeyboard.cpp )\n";
+ "http://bitbucket.org/lindenlab/viewer-release/src/tip/indra/llwindow/llkeyboard.cpp )\n";
std::string mask =
"Specify optional [\"mask\"] as an array containing any of \"CTL\", \"ALT\",\n"
"\"SHIFT\" or \"MAC_CONTROL\"; the corresponding modifier bits will be combined\n"
@@ -70,7 +70,7 @@ LLWindowListener::LLWindowListener(LLViewerWindow *window, const KeyboardGetter&
"(button values \"LEFT\", \"MIDDLE\", \"RIGHT\")\n";
std::string paramsExplain =
"[\"path\"] is as for LLUI::resolvePath(), described in\n"
- "http://hg.secondlife.com/viewer-development/src/tip/indra/llui/llui.h\n"
+ "http://bitbucket.org/lindenlab/viewer-release/src/tip/indra/llui/llui.h\n"
"If you omit [\"path\"], you must specify both [\"x\"] and [\"y\"].\n"
"If you specify [\"path\"] without both [\"x\"] and [\"y\"], will synthesize (x, y)\n"
"in the center of the LLView selected by [\"path\"].\n"
diff --git a/indra/newview/llwindowlistener.h b/indra/newview/llwindowlistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlanimator.cpp b/indra/newview/llwlanimator.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlanimator.h b/indra/newview/llwlanimator.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp
old mode 100755
new mode 100644
index 88079c5d263f5253ba07ca3838f805a670d7a25e..106f17f61b8eea9cff13ae7245546677f8487d58
--- a/indra/newview/llwldaycycle.cpp
+++ b/indra/newview/llwldaycycle.cpp
@@ -107,7 +107,7 @@ void LLWLDayCycle::loadDayCycleFromFile(const std::string & fileName)
// static
LLSD LLWLDayCycle::loadDayCycleFromPath(const std::string& file_path)
{
- LL_INFOS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL;
+ LL_DEBUGS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL;
llifstream day_cycle_xml(file_path.c_str());
if (day_cycle_xml.is_open())
diff --git a/indra/newview/llwldaycycle.h b/indra/newview/llwldaycycle.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmapmessage.h b/indra/newview/llworldmapmessage.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmapview.h b/indra/newview/llworldmapview.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmipmap.cpp b/indra/newview/llworldmipmap.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llworldmipmap.h b/indra/newview/llworldmipmap.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llxmlrpclistener.h b/indra/newview/llxmlrpclistener.h
old mode 100755
new mode 100644
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llxmlrpctransaction.h b/indra/newview/llxmlrpctransaction.h
old mode 100755
new mode 100644
diff --git a/indra/newview/macmain.h b/indra/newview/macmain.h
old mode 100755
new mode 100644
diff --git a/indra/newview/macutil_Prefix.h b/indra/newview/macutil_Prefix.h
old mode 100755
new mode 100644
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h
old mode 100755
new mode 100644
diff --git a/indra/newview/nl.lproj/language.txt b/indra/newview/nl.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/noise.cpp b/indra/newview/noise.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/noise.h b/indra/newview/noise.h
old mode 100755
new mode 100644
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
old mode 100755
new mode 100644
index 6c418966fd3638e68a5606eec9ded4933accdc3e..c6bbfb1c8ffd975cd57f9642b4319dec6a68927c
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -568,7 +568,7 @@ void LLPipeline::init()
connectRefreshCachedSettingsSafe("RenderAutoMaskAlphaDeferred");
connectRefreshCachedSettingsSafe("RenderAutoMaskAlphaNonDeferred");
connectRefreshCachedSettingsSafe("RenderUseFarClip");
- connectRefreshCachedSettingsSafe("RenderAvatarMaxVisible");
+ connectRefreshCachedSettingsSafe("RenderAvatarMaxNonImpostors");
connectRefreshCachedSettingsSafe("RenderDelayVBUpdate");
connectRefreshCachedSettingsSafe("UseOcclusion");
connectRefreshCachedSettingsSafe("VertexShaderEnable");
@@ -1080,7 +1080,8 @@ void LLPipeline::refreshCachedSettings()
LLPipeline::sAutoMaskAlphaDeferred = gSavedSettings.getBOOL("RenderAutoMaskAlphaDeferred");
LLPipeline::sAutoMaskAlphaNonDeferred = gSavedSettings.getBOOL("RenderAutoMaskAlphaNonDeferred");
LLPipeline::sUseFarClip = gSavedSettings.getBOOL("RenderUseFarClip");
- LLVOAvatar::sMaxVisible = (U32)gSavedSettings.getS32("RenderAvatarMaxVisible");
+ LLVOAvatar::sMaxNonImpostors = gSavedSettings.getU32("RenderAvatarMaxNonImpostors");
+ LLVOAvatar::updateImpostorRendering(LLVOAvatar::sMaxNonImpostors);
LLPipeline::sDelayVBUpdate = gSavedSettings.getBOOL("RenderDelayVBUpdate");
LLPipeline::sUseOcclusion =
@@ -3112,7 +3113,9 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera)
if (vobj) // this test may not be needed, see above
{
LLVOAvatar* av = vobj->asAvatar();
- if (av && av->isImpostor())
+ if (av && (av->isImpostor()
+ || av->isInMuteList()
+ || (LLVOAvatar::AV_DO_NOT_RENDER == av->getVisualMuteSettings() && !av->needsImpostorUpdate()) ))
{
return;
}
@@ -6111,7 +6114,9 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
const Light* light = &(*iter);
LLDrawable* drawable = light->drawable;
const LLViewerObject *vobj = light->drawable->getVObj();
- if(vobj && vobj->getAvatar() && vobj->getAvatar()->isInMuteList())
+ if(vobj && vobj->getAvatar()
+ && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList())
+ )
{
drawable->clearState(LLDrawable::NEARBY_LIGHT);
continue;
@@ -11315,16 +11320,25 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
if (!avatar || !avatar->mDrawable)
{
+ LL_WARNS_ONCE("AvatarRenderPipeline") << "Avatar is " << (avatar ? "not drawable" : "null") << LL_ENDL;
return;
}
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " is drawable" << LL_ENDL;
assertInitialized();
bool visually_muted = avatar->isVisuallyMuted();
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID()
+ << " is " << ( visually_muted ? "" : "not ") << "visually muted"
+ << LL_ENDL;
+ bool too_complex = avatar->isTooComplex();
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID()
+ << " is " << ( too_complex ? "" : "not ") << "too complex"
+ << LL_ENDL;
pushRenderTypeMask();
- if (visually_muted)
+ if (visually_muted || too_complex)
{
andRenderTypeMask(LLPipeline::RENDER_TYPE_AVATAR, END_RENDER_TYPES);
}
@@ -11369,7 +11383,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
{
LL_RECORD_BLOCK_TIME(FTM_IMPOSTOR_MARK_VISIBLE);
markVisible(avatar->mDrawable, *viewer_camera);
- LLVOAvatar::sUseImpostors = FALSE;
+ LLVOAvatar::sUseImpostors = false; // @TODO ???
LLVOAvatar::attachment_map_t::iterator iter;
for (iter = avatar->mAttachmentPoints.begin();
@@ -11482,7 +11496,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
F32 old_alpha = LLDrawPoolAvatar::sMinimumAlpha;
- if (visually_muted)
+ if (visually_muted || too_complex)
{ //disable alpha masking for muted avatars (get whole skin silhouette)
LLDrawPoolAvatar::sMinimumAlpha = 0.f;
}
@@ -11544,7 +11558,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
LLGLDisable blend(GL_BLEND);
- if (visually_muted)
+ if (visually_muted || too_complex)
{
gGL.setColorMask(true, true);
}
@@ -11573,13 +11587,16 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
}
- if (LLMuteList::getInstance()->isMuted(avatar->getID()))
- { //grey muted avatar
- gGL.diffuseColor4ub(64,64,64,255);
+ if (visually_muted)
+ { // Visually muted avatar
+ LLColor4 muted_color(avatar->getMutedAVColor());
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " MUTED set solid color " << muted_color << LL_ENDL;
+ gGL.diffuseColor4fv( muted_color.mV );
}
else
- { // Visually muted avatar
- gGL.diffuseColor4fv( avatar->getMutedAVColor().mV );
+ { //grey muted avatar
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " MUTED set grey" << LL_ENDL;
+ gGL.diffuseColor4fv(LLColor4::pink.mV );
}
{
@@ -11606,7 +11623,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
avatar->setImpostorDim(tdim);
- LLVOAvatar::sUseImpostors = TRUE;
+ LLVOAvatar::sUseImpostors = true; // @TODO ???
sUseOcclusion = occlusion;
sReflectionRender = FALSE;
sImpostorRender = FALSE;
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
old mode 100755
new mode 100644
index 97e11a151f2c91dace88b0f1b169d62db769d9ae..bba36351d9f374e9d18fd4f82a0fcd2f78493ac5
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -519,7 +519,7 @@ class LLPipeline
RENDER_DEBUG_BATCH_SIZE = 0x00004000,
RENDER_DEBUG_ALPHA_BINS = 0x00008000,
RENDER_DEBUG_RAYCAST = 0x00010000,
- RENDER_DEBUG_SHAME = 0x00020000,
+ RENDER_DEBUG_AVATAR_DRAW_INFO = 0x00020000,
RENDER_DEBUG_SHADOW_FRUSTA = 0x00040000,
RENDER_DEBUG_SCULPTED = 0x00080000,
RENDER_DEBUG_AVATAR_VOLUME = 0x00100000,
diff --git a/indra/newview/pl.lproj/language.txt b/indra/newview/pl.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/pt.lproj/language.txt b/indra/newview/pt.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/arrow.BMP b/indra/newview/res-sdl/arrow.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/arrowcop.BMP b/indra/newview/res-sdl/arrowcop.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/arrowcopmulti.BMP b/indra/newview/res-sdl/arrowcopmulti.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/arrowdrag.BMP b/indra/newview/res-sdl/arrowdrag.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/circleandline.BMP b/indra/newview/res-sdl/circleandline.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/cross.BMP b/indra/newview/res-sdl/cross.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/hand.BMP b/indra/newview/res-sdl/hand.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/ibeam.BMP b/indra/newview/res-sdl/ibeam.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llarrow.BMP b/indra/newview/res-sdl/llarrow.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llarrowdrag.BMP b/indra/newview/res-sdl/llarrowdrag.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llarrowdragmulti.BMP b/indra/newview/res-sdl/llarrowdragmulti.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llarrowlocked.BMP b/indra/newview/res-sdl/llarrowlocked.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llgrablocked.BMP b/indra/newview/res-sdl/llgrablocked.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llno.BMP b/indra/newview/res-sdl/llno.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/llnolocked.BMP b/indra/newview/res-sdl/llnolocked.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolcamera.BMP b/indra/newview/res-sdl/lltoolcamera.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolcreate.BMP b/indra/newview/res-sdl/lltoolcreate.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolfocus.BMP b/indra/newview/res-sdl/lltoolfocus.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolgrab.BMP b/indra/newview/res-sdl/lltoolgrab.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolland.BMP b/indra/newview/res-sdl/lltoolland.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpan.BMP b/indra/newview/res-sdl/lltoolpan.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpathfinding.BMP b/indra/newview/res-sdl/lltoolpathfinding.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpathfindingpathend.BMP b/indra/newview/res-sdl/lltoolpathfindingpathend.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpathfindingpathendadd.BMP b/indra/newview/res-sdl/lltoolpathfindingpathendadd.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpathfindingpathstart.BMP b/indra/newview/res-sdl/lltoolpathfindingpathstart.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpathfindingpathstartadd.BMP b/indra/newview/res-sdl/lltoolpathfindingpathstartadd.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolpipette.BMP b/indra/newview/res-sdl/lltoolpipette.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolrotate.BMP b/indra/newview/res-sdl/lltoolrotate.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolscale.BMP b/indra/newview/res-sdl/lltoolscale.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltooltranslate.BMP b/indra/newview/res-sdl/lltooltranslate.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolzoomin.BMP b/indra/newview/res-sdl/lltoolzoomin.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/lltoolzoomout.BMP b/indra/newview/res-sdl/lltoolzoomout.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/sizenesw.BMP b/indra/newview/res-sdl/sizenesw.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/sizens.BMP b/indra/newview/res-sdl/sizens.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/sizenwse.BMP b/indra/newview/res-sdl/sizenwse.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/sizewe.BMP b/indra/newview/res-sdl/sizewe.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolbuy.BMP b/indra/newview/res-sdl/toolbuy.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolmediaopen.BMP b/indra/newview/res-sdl/toolmediaopen.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolopen.BMP b/indra/newview/res-sdl/toolopen.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolpause.BMP b/indra/newview/res-sdl/toolpause.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolpickobject.BMP b/indra/newview/res-sdl/toolpickobject.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolpickobject2.BMP b/indra/newview/res-sdl/toolpickobject2.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolpickobject3.BMP b/indra/newview/res-sdl/toolpickobject3.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolplay.BMP b/indra/newview/res-sdl/toolplay.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/toolsit.BMP b/indra/newview/res-sdl/toolsit.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/wait.BMP b/indra/newview/res-sdl/wait.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res-sdl/working.BMP b/indra/newview/res-sdl/working.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res/arrow.cur b/indra/newview/res/arrow.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/arrowcop.cur b/indra/newview/res/arrowcop.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/arrowcopmulti.cur b/indra/newview/res/arrowcopmulti.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/arrowdrag.cur b/indra/newview/res/arrowdrag.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/bitmap2.bmp b/indra/newview/res/bitmap2.bmp
old mode 100755
new mode 100644
diff --git a/indra/newview/res/circleandline.cur b/indra/newview/res/circleandline.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/icon1.ico b/indra/newview/res/icon1.ico
old mode 100755
new mode 100644
diff --git a/indra/newview/res/install_icon.BMP b/indra/newview/res/install_icon.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llarrow.cur b/indra/newview/res/llarrow.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llarrowdrag.cur b/indra/newview/res/llarrowdrag.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llarrowdragmulti.cur b/indra/newview/res/llarrowdragmulti.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llarrowlocked.cur b/indra/newview/res/llarrowlocked.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llgrablocked.cur b/indra/newview/res/llgrablocked.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llno.cur b/indra/newview/res/llno.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/llnolocked.cur b/indra/newview/res/llnolocked.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolcamera.cur b/indra/newview/res/lltoolcamera.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolcreate.cur b/indra/newview/res/lltoolcreate.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolfocus.cur b/indra/newview/res/lltoolfocus.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolgrab.cur b/indra/newview/res/lltoolgrab.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolland.cur b/indra/newview/res/lltoolland.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpan.cur b/indra/newview/res/lltoolpan.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpathfinding.cur b/indra/newview/res/lltoolpathfinding.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpathfindingpathend.cur b/indra/newview/res/lltoolpathfindingpathend.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpathfindingpathendadd.cur b/indra/newview/res/lltoolpathfindingpathendadd.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpathfindingpathstart.cur b/indra/newview/res/lltoolpathfindingpathstart.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpathfindingpathstartadd.cur b/indra/newview/res/lltoolpathfindingpathstartadd.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolpipette.cur b/indra/newview/res/lltoolpipette.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolrotate.cur b/indra/newview/res/lltoolrotate.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolscale.cur b/indra/newview/res/lltoolscale.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltooltranslate.cur b/indra/newview/res/lltooltranslate.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolzoomin.cur b/indra/newview/res/lltoolzoomin.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/lltoolzoomout.cur b/indra/newview/res/lltoolzoomout.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/loginbackground.bmp b/indra/newview/res/loginbackground.bmp
old mode 100755
new mode 100644
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolmediaopen.cur b/indra/newview/res/toolmediaopen.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolpause.cur b/indra/newview/res/toolpause.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolpickobject.cur b/indra/newview/res/toolpickobject.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolpickobject2.cur b/indra/newview/res/toolpickobject2.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolpickobject3.cur b/indra/newview/res/toolpickobject3.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolpipette.cur b/indra/newview/res/toolpipette.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolplay.cur b/indra/newview/res/toolplay.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur
old mode 100755
new mode 100644
diff --git a/indra/newview/res/uninstall_icon.BMP b/indra/newview/res/uninstall_icon.BMP
old mode 100755
new mode 100644
diff --git a/indra/newview/ru.lproj/language.txt b/indra/newview/ru.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/secondlife_firstlook.icns b/indra/newview/secondlife_firstlook.icns
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/btn_purplepill_bg.png b/indra/newview/skins/default/html/btn_purplepill_bg.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/da/loading/loading.html b/indra/newview/skins/default/html/da/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/de/loading-error/index.html b/indra/newview/skins/default/html/de/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/de/loading/loading.html b/indra/newview/skins/default/html/de/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/en-us/help-offline/index.html b/indra/newview/skins/default/html/en-us/help-offline/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/en-us/loading-error/index.html b/indra/newview/skins/default/html/en-us/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/es/loading-error/index.html b/indra/newview/skins/default/html/es/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/es/loading/loading.html b/indra/newview/skins/default/html/es/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/fr/loading-error/index.html b/indra/newview/skins/default/html/fr/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/fr/loading/loading.html b/indra/newview/skins/default/html/fr/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/hu/loading/loading.html b/indra/newview/skins/default/html/hu/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/it/loading/loading.html b/indra/newview/skins/default/html/it/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/ja/loading-error/index.html b/indra/newview/skins/default/html/ja/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/ko/loading-error/index.html b/indra/newview/skins/default/html/ko/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/nl/loading/loading.html b/indra/newview/skins/default/html/nl/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/pl/loading/loading.html b/indra/newview/skins/default/html/pl/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/pt/loading-error/index.html b/indra/newview/skins/default/html/pt/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/pt/loading/loading.html b/indra/newview/skins/default/html/pt/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/ru/loading/loading.html b/indra/newview/skins/default/html/ru/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/tr/loading/loading.html b/indra/newview/skins/default/html/tr/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/uk/loading/loading.html b/indra/newview/skins/default/html/uk/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/unabletoconnect.png b/indra/newview/skins/default/html/unabletoconnect.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/zh/loading-error/index.html b/indra/newview/skins/default/html/zh/loading-error/index.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/html/zh/loading/loading.html b/indra/newview/skins/default/html/zh/loading/loading.html
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/Blank.png b/indra/newview/skins/default/textures/Blank.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/Rounded_Rect.png b/indra/newview/skins/default/textures/Rounded_Rect.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/alpha_gradient.tga b/indra/newview/skins/default/textures/alpha_gradient.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/arrow_down.tga b/indra/newview/skins/default/textures/arrow_down.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/arrow_up.tga b/indra/newview/skins/default/textures/arrow_up.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/badge_note.j2c b/indra/newview/skins/default/textures/badge_note.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/badge_ok.j2c b/indra/newview/skins/default/textures/badge_ok.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/badge_warn.j2c b/indra/newview/skins/default/textures/badge_warn.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/DownArrow.png b/indra/newview/skins/default/textures/bottomtray/DownArrow.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png b/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Cone.png b/indra/newview/skins/default/textures/build/Object_Cone.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Cube.png b/indra/newview/skins/default/textures/build/Object_Cube.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Cylinder.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Grass.png b/indra/newview/skins/default/textures/build/Object_Grass.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Prism.png b/indra/newview/skins/default/textures/build/Object_Prism.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid.png b/indra/newview/skins/default/textures/build/Object_Pyramid.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Ring.png b/indra/newview/skins/default/textures/build/Object_Ring.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Sphere.png b/indra/newview/skins/default/textures/build/Object_Sphere.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Torus.png b/indra/newview/skins/default/textures/build/Object_Torus.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Tree.png b/indra/newview/skins/default/textures/build/Object_Tree.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Tube.png b/indra/newview/skins/default/textures/build/Object_Tube.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Tool_Create.png b/indra/newview/skins/default/textures/build/Tool_Create.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Tool_Dozer.png b/indra/newview/skins/default/textures/build/Tool_Dozer.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Tool_Face.png b/indra/newview/skins/default/textures/build/Tool_Face.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Tool_Grab.png b/indra/newview/skins/default/textures/build/Tool_Grab.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/build/Tool_Zoom.png b/indra/newview/skins/default/textures/build/Tool_Zoom.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/button_anim_pause.tga b/indra/newview/skins/default/textures/button_anim_pause.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/button_anim_pause_selected.tga b/indra/newview/skins/default/textures/button_anim_pause_selected.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/button_anim_play.tga b/indra/newview/skins/default/textures/button_anim_play.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/button_anim_play_selected.tga b/indra/newview/skins/default/textures/button_anim_play_selected.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/checker.png b/indra/newview/skins/default/textures/checker.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/cloud-particle.j2c b/indra/newview/skins/default/textures/cloud-particle.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/color_swatch_alpha.tga b/indra/newview/skins/default/textures/color_swatch_alpha.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/crosshairs.tga b/indra/newview/skins/default/textures/crosshairs.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/default_land_picture.j2c b/indra/newview/skins/default/textures/default_land_picture.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/default_profile_picture.j2c b/indra/newview/skins/default/textures/default_profile_picture.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/direction_arrow.tga b/indra/newview/skins/default/textures/direction_arrow.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/down_arrow.png b/indra/newview/skins/default/textures/down_arrow.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/eye_button_active.tga b/indra/newview/skins/default/textures/eye_button_active.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/eye_button_inactive.tga b/indra/newview/skins/default/textures/eye_button_inactive.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/folder_arrow.tga b/indra/newview/skins/default/textures/folder_arrow.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/foot_shadow.j2c b/indra/newview/skins/default/textures/foot_shadow.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icn_media_movie.tga b/indra/newview/skins/default/textures/icn_media_movie.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icn_media_web.tga b/indra/newview/skins/default/textures/icn_media_web.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icon_avatar_offline.tga b/indra/newview/skins/default/textures/icon_avatar_offline.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icon_avatar_online.tga b/indra/newview/skins/default/textures/icon_avatar_online.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icon_diurnal.tga b/indra/newview/skins/default/textures/icon_diurnal.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icon_for_sale_adult.tga b/indra/newview/skins/default/textures/icon_for_sale_adult.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Disabled.png b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Off.png b/indra/newview/skins/default/textures/icons/AddItem_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Press.png b/indra/newview/skins/default/textures/icons/AddItem_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Off.png b/indra/newview/skins/default/textures/icons/AudioMute_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Over.png b/indra/newview/skins/default/textures/icons/AudioMute_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Audio_Off.png b/indra/newview/skins/default/textures/icons/Audio_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Audio_Press.png b/indra/newview/skins/default/textures/icons/Audio_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Off.png b/indra/newview/skins/default/textures/icons/BackArrow_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Conv_log_inbox.png b/indra/newview/skins/default/textures/icons/Conv_log_inbox.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Copy.png b/indra/newview/skins/default/textures/icons/Copy.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/DownArrow_Off.png b/indra/newview/skins/default/textures/icons/DownArrow_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Edit_Wrench.png b/indra/newview/skins/default/textures/icons/Edit_Wrench.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Female.png b/indra/newview/skins/default/textures/icons/Female.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/ForSale_Badge.png b/indra/newview/skins/default/textures/icons/ForSale_Badge.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group.png b/indra/newview/skins/default/textures/icons/Generic_Group.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Generic_Object_Small.png b/indra/newview/skins/default/textures/icons/Generic_Object_Small.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Generic_Person.png b/indra/newview/skins/default/textures/icons/Generic_Person.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Info.png b/indra/newview/skins/default/textures/icons/Info.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Info_Small.png b/indra/newview/skins/default/textures/icons/Info_Small.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Animation.png b/indra/newview/skins/default/textures/icons/Inv_Animation.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_BodyShape.png b/indra/newview/skins/default/textures/icons/Inv_BodyShape.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_CallingCard.png b/indra/newview/skins/default/textures/icons/Inv_CallingCard.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Clothing.png b/indra/newview/skins/default/textures/icons/Inv_Clothing.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Eye.png b/indra/newview/skins/default/textures/icons/Inv_Eye.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gesture.png b/indra/newview/skins/default/textures/icons/Inv_Gesture.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gloves.png b/indra/newview/skins/default/textures/icons/Inv_Gloves.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Hair.png b/indra/newview/skins/default/textures/icons/Inv_Hair.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Invalid.png b/indra/newview/skins/default/textures/icons/Inv_Invalid.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Jacket.png b/indra/newview/skins/default/textures/icons/Inv_Jacket.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Landmark.png b/indra/newview/skins/default/textures/icons/Inv_Landmark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Link.png b/indra/newview/skins/default/textures/icons/Inv_Link.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkItem.png b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_LostClosed.png b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_LostOpen.png b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Mesh.png b/indra/newview/skins/default/textures/icons/Inv_Mesh.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Notecard.png b/indra/newview/skins/default/textures/icons/Inv_Notecard.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Object.png b/indra/newview/skins/default/textures/icons/Inv_Object.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Pants.png b/indra/newview/skins/default/textures/icons/Inv_Pants.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Physics.png b/indra/newview/skins/default/textures/icons/Inv_Physics.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Script.png b/indra/newview/skins/default/textures/icons/Inv_Script.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Shirt.png b/indra/newview/skins/default/textures/icons/Inv_Shirt.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Shoe.png b/indra/newview/skins/default/textures/icons/Inv_Shoe.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Skin.png b/indra/newview/skins/default/textures/icons/Inv_Skin.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Skirt.png b/indra/newview/skins/default/textures/icons/Inv_Skirt.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Snapshot.png b/indra/newview/skins/default/textures/icons/Inv_Snapshot.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Socks.png b/indra/newview/skins/default/textures/icons/Inv_Socks.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Sound.png b/indra/newview/skins/default/textures/icons/Inv_Sound.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Texture.png b/indra/newview/skins/default/textures/icons/Inv_Texture.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Underpants.png b/indra/newview/skins/default/textures/icons/Inv_Underpants.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Inv_Undershirt.png b/indra/newview/skins/default/textures/icons/Inv_Undershirt.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/List_View_Disabled.png b/indra/newview/skins/default/textures/icons/List_View_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/List_View_On.png b/indra/newview/skins/default/textures/icons/List_View_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Lock.png b/indra/newview/skins/default/textures/icons/Lock.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Locked_Icon.png b/indra/newview/skins/default/textures/icons/Locked_Icon.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Male.png b/indra/newview/skins/default/textures/icons/Male.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Microphone_On.png b/indra/newview/skins/default/textures/icons/Microphone_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Off.png b/indra/newview/skins/default/textures/icons/MinusItem_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Press.png b/indra/newview/skins/default/textures/icons/MinusItem_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Pause_Off.png b/indra/newview/skins/default/textures/icons/Pause_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Pause_Over.png b/indra/newview/skins/default/textures/icons/Pause_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Pause_Press.png b/indra/newview/skins/default/textures/icons/Pause_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Person_Check.png b/indra/newview/skins/default/textures/icons/Person_Check.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Person_Star.png b/indra/newview/skins/default/textures/icons/Person_Star.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Play_Off.png b/indra/newview/skins/default/textures/icons/Play_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Play_Over.png b/indra/newview/skins/default/textures/icons/Play_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Play_Press.png b/indra/newview/skins/default/textures/icons/Play_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a6628816b34fca5623902249385a0b7e836fd68
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon.png differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_1.png b/indra/newview/skins/default/textures/icons/Progress_1.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_10.png b/indra/newview/skins/default/textures/icons/Progress_10.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_11.png b/indra/newview/skins/default/textures/icons/Progress_11.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_12.png b/indra/newview/skins/default/textures/icons/Progress_12.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_2.png b/indra/newview/skins/default/textures/icons/Progress_2.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_3.png b/indra/newview/skins/default/textures/icons/Progress_3.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_4.png b/indra/newview/skins/default/textures/icons/Progress_4.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_5.png b/indra/newview/skins/default/textures/icons/Progress_5.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_6.png b/indra/newview/skins/default/textures/icons/Progress_6.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_7.png b/indra/newview/skins/default/textures/icons/Progress_7.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_8.png b/indra/newview/skins/default/textures/icons/Progress_8.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Progress_9.png b/indra/newview/skins/default/textures/icons/Progress_9.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Refresh_Off.png b/indra/newview/skins/default/textures/icons/Refresh_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Search_Icon.png b/indra/newview/skins/default/textures/icons/Search_Icon.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Shirt_Large.png b/indra/newview/skins/default/textures/icons/Shirt_Large.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/SkipBackward_Off.png b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/SkipForward_Off.png b/indra/newview/skins/default/textures/icons/SkipForward_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/StopReload_Off.png b/indra/newview/skins/default/textures/icons/StopReload_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/StopReload_Over.png b/indra/newview/skins/default/textures/icons/StopReload_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Stop_Off.png b/indra/newview/skins/default/textures/icons/Stop_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Off.png b/indra/newview/skins/default/textures/icons/TrashItem_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Press.png b/indra/newview/skins/default/textures/icons/TrashItem_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/UnZoom_Off.png b/indra/newview/skins/default/textures/icons/UnZoom_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/UpArrow_Off.png b/indra/newview/skins/default/textures/icons/UpArrow_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_On.png b/indra/newview/skins/default/textures/icons/VoicePTT_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Web_Profile_Off.png b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/Zoom_Off.png b/indra/newview/skins/default/textures/icons/Zoom_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png
old mode 100755
new mode 100644
index 4d927cb29e75645f6eec5199802835e2b4205757..fefd202decac36fe1e3a6a438383b166ea09fb1c
Binary files a/indra/newview/skins/default/textures/icons/check_mark.png and b/indra/newview/skins/default/textures/icons/check_mark.png differ
diff --git a/indra/newview/skins/default/textures/icons/collapse_to_one_line.png b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/expand_one_liner.png b/indra/newview/skins/default/textures/icons/expand_one_liner.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/icons/unknown_icon.png b/indra/newview/skins/default/textures/icons/unknown_icon.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/jump_left_in.tga b/indra/newview/skins/default/textures/jump_left_in.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/jump_left_out.tga b/indra/newview/skins/default/textures/jump_left_out.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/jump_right_in.tga b/indra/newview/skins/default/textures/jump_right_in.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/jump_right_out.tga b/indra/newview/skins/default/textures/jump_right_out.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/lag_status_critical.tga b/indra/newview/skins/default/textures/lag_status_critical.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/lag_status_good.tga b/indra/newview/skins/default/textures/lag_status_good.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/lag_status_warning.tga b/indra/newview/skins/default/textures/lag_status_warning.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/legend.tga b/indra/newview/skins/default/textures/legend.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/locked_image.j2c b/indra/newview/skins/default/textures/locked_image.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_32.tga b/indra/newview/skins/default/textures/map_avatar_32.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_above_32.tga b/indra/newview/skins/default/textures/map_avatar_above_32.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_below_32.tga b/indra/newview/skins/default/textures/map_avatar_below_32.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_unknown_32.tga b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_avatar_you_32.tga b/indra/newview/skins/default/textures/map_avatar_you_32.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/map_track_16.tga b/indra/newview/skins/default/textures/map_track_16.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/menu_separator.png b/indra/newview/skins/default/textures/menu_separator.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/missing_asset.tga b/indra/newview/skins/default/textures/missing_asset.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/model_wizard/progress_light.png b/indra/newview/skins/default/textures/model_wizard/progress_light.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Flag.png b/indra/newview/skins/default/textures/navbar/Flag.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Help_Press.png b/indra/newview/skins/default/textures/navbar/Help_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Home_Off.png b/indra/newview/skins/default/textures/navbar/Home_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Lock.png b/indra/newview/skins/default/textures/navbar/Lock.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/Search.png b/indra/newview/skins/default/textures/navbar/Search.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/navbar/separator.png b/indra/newview/skins/default/textures/navbar/separator.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/notify_caution_icon.tga b/indra/newview/skins/default/textures/notify_caution_icon.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/pixiesmall.j2c b/indra/newview/skins/default/textures/pixiesmall.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/rounded_square.j2c b/indra/newview/skins/default/textures/rounded_square.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/script_error.j2c b/indra/newview/skins/default/textures/script_error.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/silhouette.j2c b/indra/newview/skins/default/textures/silhouette.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/slim_icon_16_viewer.tga b/indra/newview/skins/default/textures/slim_icon_16_viewer.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/snapshot_download.png b/indra/newview/skins/default/textures/snapshot_download.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/snapshot_email.png b/indra/newview/skins/default/textures/snapshot_email.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/spacer24.tga b/indra/newview/skins/default/textures/spacer24.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/tabarea.tga b/indra/newview/skins/default/textures/tabarea.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/tearoff_pressed.tga b/indra/newview/skins/default/textures/tearoff_pressed.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/tearoffbox.tga b/indra/newview/skins/default/textures/tearoffbox.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
old mode 100755
new mode 100644
index e453d9488331ea92b948f5ad54a6e169b0aed216..72037a84b3ff53dd8df1355e47b46fa657a04f18
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -205,6 +205,8 @@ with the same filename but different name
<texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
+ <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
+
<texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
<texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
<texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/appearance.png b/indra/newview/skins/default/textures/toolbar_icons/appearance.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/avatars.png b/indra/newview/skins/default/textures/toolbar_icons/avatars.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/build.png b/indra/newview/skins/default/textures/toolbar_icons/build.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/chat.png b/indra/newview/skins/default/textures/toolbar_icons/chat.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/destinations.png b/indra/newview/skins/default/textures/toolbar_icons/destinations.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/gestures.png b/indra/newview/skins/default/textures/toolbar_icons/gestures.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/howto.png b/indra/newview/skins/default/textures/toolbar_icons/howto.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/inventory.png b/indra/newview/skins/default/textures/toolbar_icons/inventory.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/land.png b/indra/newview/skins/default/textures/toolbar_icons/land.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/map.png b/indra/newview/skins/default/textures/toolbar_icons/map.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/marketplace.png b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/move.png b/indra/newview/skins/default/textures/toolbar_icons/move.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/outbox.png b/indra/newview/skins/default/textures/toolbar_icons/outbox.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/people.png b/indra/newview/skins/default/textures/toolbar_icons/people.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/picks.png b/indra/newview/skins/default/textures/toolbar_icons/picks.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/places.png b/indra/newview/skins/default/textures/toolbar_icons/places.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/preferences.png b/indra/newview/skins/default/textures/toolbar_icons/preferences.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/profile.png b/indra/newview/skins/default/textures/toolbar_icons/profile.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/search.png b/indra/newview/skins/default/textures/toolbar_icons/search.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/snapshot.png b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/speak.png b/indra/newview/skins/default/textures/toolbar_icons/speak.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/toolbar_icons/view.png b/indra/newview/skins/default/textures/toolbar_icons/view.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/transparent.j2c b/indra/newview/skins/default/textures/transparent.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/up_arrow.png b/indra/newview/skins/default/textures/up_arrow.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/uv_test1.j2c b/indra/newview/skins/default/textures/uv_test1.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/uv_test2.tga b/indra/newview/skins/default/textures/uv_test2.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/voice_meter_dot.j2c b/indra/newview/skins/default/textures/voice_meter_dot.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/voice_meter_rings.j2c b/indra/newview/skins/default/textures/voice_meter_rings.j2c
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/white.tga b/indra/newview/skins/default/textures/white.tga
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Down.png b/indra/newview/skins/default/textures/widgets/Arrow_Down.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Right.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Up.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_On.png b/indra/newview/skins/default/textures/widgets/ComboButton_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/DropTarget.png b/indra/newview/skins/default/textures/widgets/DropTarget.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png b/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Background.png b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Border.png b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ProgressTrack.png b/indra/newview/skins/default/textures/widgets/ProgressTrack.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Active.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/Tooltip.png b/indra/newview/skins/default/textures/widgets/Tooltip.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/bevel_background.png b/indra/newview/skins/default/textures/widgets/bevel_background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Dragbar.png b/indra/newview/skins/default/textures/windows/Dragbar.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Left.png b/indra/newview/skins/default/textures/windows/Flyout_Left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Right.png b/indra/newview/skins/default/textures/windows/Flyout_Right.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Inspector_Background.png b/indra/newview/skins/default/textures/windows/Inspector_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Inspector_Hover.png b/indra/newview/skins/default/textures/windows/Inspector_Hover.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Resize_Corner.png b/indra/newview/skins/default/textures/windows/Resize_Corner.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Toast_Background.png b/indra/newview/skins/default/textures/windows/Toast_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Toast_Over.png b/indra/newview/skins/default/textures/windows/Toast_Over.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Volume_Background.png b/indra/newview/skins/default/textures/windows/Volume_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Wearables_Divider.png b/indra/newview/skins/default/textures/windows/Wearables_Divider.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_down.png b/indra/newview/skins/default/textures/windows/hint_arrow_down.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_right.png b/indra/newview/skins/default/textures/windows/hint_arrow_right.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_up.png b/indra/newview/skins/default/textures/windows/hint_arrow_up.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/hint_background.png b/indra/newview/skins/default/textures/windows/hint_background.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/startup_logo.png b/indra/newview/skins/default/textures/windows/startup_logo.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/windows/yellow_gradient.png b/indra/newview/skins/default/textures/windows/yellow_gradient.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/textures/world/NoEntryPassLines.png b/indra/newview/skins/default/textures/world/NoEntryPassLines.png
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
old mode 100755
new mode 100644
index 9206690c8f27a5b44a4effe44932dd4a11b4f28f..8c0b5748ded5095d01c264e12ca32b72a882ce7b
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="OM [CAPITALIZED_APP_NAME]">
<floater.string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</floater.string>
- <floater.string name="AboutCompiler">
- Bygget med [COMPILER] version [COMPILER_VERSION]
- </floater.string>
<floater.string name="AboutPosition">
Du er ved [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] i regionen [REGION] lokaliseret ved <nolink>[HOSTNAME]</nolink> ([HOSTIP])
[SERVER_VERSION]
@@ -25,10 +22,9 @@ Grafik kort: [GRAPHICS_CARD]
<floater.string name="AboutLibs">
OpenGL Version: [OPENGL_VERSION]
-libcurl Version: [LIBCURL_VERSION]
J2C Decoder Version: [J2C_VERSION]
Audio Driver Version: [AUDIO_DRIVER_VERSION]
-Qt Webkit Version: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF Version: [LLCEFLIB_VERSION]
Voice Server Version: [VOICE_VERSION]
</floater.string>
<floater.string name="none">
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_activeim.xml b/indra/newview/skins/default/xui/da/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_display_name.xml b/indra/newview/skins/default/xui/da/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_gesture.xml b/indra/newview/skins/default/xui/da/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_hud.xml b/indra/newview/skins/default/xui/da/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_im_session.xml b/indra/newview/skins/default/xui/da/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_import_collada.xml b/indra/newview/skins/default/xui/da/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_media_settings.xml b/indra/newview/skins/default/xui/da/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_region_info.xml b/indra/newview/skins/default/xui/da/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_search.xml b/indra/newview/skins/default/xui/da/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_url_entry.xml b/indra/newview/skins/default/xui/da/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_web_content.xml b/indra/newview/skins/default/xui/da/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/inspect_group.xml b/indra/newview/skins/default/xui/da/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/inspect_remote_object.xml b/indra/newview/skins/default/xui/da/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_other.xml b/indra/newview/skins/default/xui/da/menu_attachment_other.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_other.xml b/indra/newview/skins/default/xui/da/menu_avatar_other.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_cof_gear.xml b/indra/newview/skins/default/xui/da/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_edit.xml b/indra/newview/skins/default/xui/da/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_favorites.xml b/indra/newview/skins/default/xui/da/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_group_plus.xml b/indra/newview/skins/default/xui/da/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_land.xml b/indra/newview/skins/default/xui/da/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_landmark.xml b/indra/newview/skins/default/xui/da/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_navbar.xml b/indra/newview/skins/default/xui/da/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_object_icon.xml b/indra/newview/skins/default/xui/da/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_picks_plus.xml b/indra/newview/skins/default/xui/da/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_place.xml b/indra/newview/skins/default/xui/da/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_save_outfit.xml b/indra/newview/skins/default/xui/da/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_text_editor.xml b/indra/newview/skins/default/xui/da/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_agent.xml b/indra/newview/skins/default/xui/da/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_group.xml b/indra/newview/skins/default/xui/da/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_http.xml b/indra/newview/skins/default/xui/da/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_inventory.xml b/indra/newview/skins/default/xui/da/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_map.xml b/indra/newview/skins/default/xui/da/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_objectim.xml b/indra/newview/skins/default/xui/da/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_parcel.xml b/indra/newview/skins/default/xui/da/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_slapp.xml b/indra/newview/skins/default/xui/da/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_slurl.xml b/indra/newview/skins/default/xui/da/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_url_teleport.xml b/indra/newview/skins/default/xui/da/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/mime_types.xml b/indra/newview/skins/default/xui/da/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/mime_types_linux.xml b/indra/newview/skins/default/xui/da/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/mime_types_mac.xml b/indra/newview/skins/default/xui/da/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
old mode 100755
new mode 100644
index 3e0f0133ddd8172485b139a356964f0dcc6518ed..513394fa9bf2d83424fb35d3835ed3369427ee5e
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -85,12 +85,6 @@ Check at Internet forbindelsen fungerer korrekt.
Gem ændringer til nuværende tøj/krops del?
<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem ikke" yestext="Gem"/>
</notification>
- <notification name="CompileQueueSaveText">
- Der var problemer med upload af teksten til et script af følgende årsager: [REASON]. Prøv igen senere.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Der var problemer med at uploade den kompileret script af følgende årsager: [REASON]. Prøv igen senere.
- </notification>
<notification name="WriteAnimationFail">
Der var et problem med skrivning af animations data. Prøv igen senere.
</notification>
diff --git a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_active_object_row.xml b/indra/newview/skins/default/xui/da/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_hair.xml b/indra/newview/skins/default/xui/da/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pants.xml b/indra/newview/skins/default/xui/da/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_physics.xml b/indra/newview/skins/default/xui/da/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skin.xml b/indra/newview/skins/default/xui/da/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_socks.xml b/indra/newview/skins/default/xui/da/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_inventory_item.xml b/indra/newview/skins/default/xui/da/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_list.xml b/indra/newview/skins/default/xui/da/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_picks.xml b/indra/newview/skins/default/xui/da/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_move.xml b/indra/newview/skins/default/xui/da/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_region_debug.xml b/indra/newview/skins/default/xui/da/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_script_ed.xml b/indra/newview/skins/default/xui/da/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_sound_devices.xml b/indra/newview/skins/default/xui/da/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/role_actions.xml b/indra/newview/skins/default/xui/da/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
old mode 100755
new mode 100644
index ee631476cb3085ed7fdc5668943bec9c73428276..42e23b208995dafc49e70ae1a2802b164bda65bc
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Info" name="support_panel">
<button label="In Zwischenablage kopieren" name="copy_btn"/>
+ <button label="Nach Updates suchen" name="update_btn"/>
</panel>
<panel label="Danksagung" name="credits_panel">
<text name="linden_intro">Second Life wird präsentiert von den Lindens
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
old mode 100755
new mode 100644
index 60f25704dda22bd015de7051afa27ca13b244795..07f297cf0ad4f90e8ca21fd78014c5bec3e87fcc
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -10,13 +10,13 @@
"Parcel_R_Dark"
</floater.string>
<floater.string name="Minutes">
- [MINUTES] Minuten
+ [MINUTES] Min.
</floater.string>
<floater.string name="Minute">
- Minute
+ Min.
</floater.string>
<floater.string name="Seconds">
- [SECONDS] Sekunden
+ [SECONDS] Sek.
</floater.string>
<floater.string name="Remaining">
Restzeit
@@ -449,7 +449,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<spinner label="Online-Zeit:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Immer erlauben" name="AllowedText">
- Zulässige Einwohner
+ Zulässige Einwohner ([COUNT])
</text>
<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_allowed"/>
@@ -457,7 +457,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
</panel>
<panel name="Banned_layout_panel">
<text label="Verbannen" name="BanCheck">
- Verbannte Einwohner
+ Verbannte Einwohner ([COUNT])
</text>
<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/de/floater_activeim.xml b/indra/newview/skins/default/xui/de/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
old mode 100755
new mode 100644
index 0c774990efe5f375d2a2e8d5ce31b1b5990b55e2..fc37818dfb88cc0c355bda12de1766e0a5afbb53
--- a/indra/newview/skins/default/xui/de/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Hinzufügen..." name="autoreplace_add_entry"/>
<button label="Entfernen" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Schlüsselwort:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Ersetzung:
+ </text>
<button label="Eintrag speichern" name="autoreplace_save_entry" tool_tip="Diesen Eintrag speichern."/>
<button label="Änderungen speichern" name="autoreplace_save_changes" tool_tip="Alle Änderungen speichern."/>
<button label="Abbrechen" name="autoreplace_cancel" tool_tip="Alle Änderungen löschen."/>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar.xml b/indra/newview/skins/default/xui/de/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml
old mode 100755
new mode 100644
index 5d02511ab1f5c61ea8efcb17b8c32587a8eede5f..9e519ca121334127f2d67f4c53e5c5757a5eee37
--- a/indra/newview/skins/default/xui/de/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/de/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] hat Sie mit einem physischen Objekt getroffen
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_choose_group.xml b/indra/newview/skins/default/xui/de/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_critical.xml b/indra/newview/skins/default/xui/de/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..172a08e0caa6b98f70dbc430bfd4ec8c0f3e6f40
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="BEVORZ. VOREINST. LöSCHEN">
+ <string name="title_graphic">
+ Grafikvoreinstellung löschen
+ </string>
+ <string name="title_camera">
+ Kameravoreinstellung löschen
+ </string>
+ <text name="Preset">
+ Voreinstellung auswählen
+ </text>
+ <button label="Löschen" name="delete"/>
+ <button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_destinations.xml b/indra/newview/skins/default/xui/de/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_display_name.xml b/indra/newview/skins/default/xui/de/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_experience_search.xml b/indra/newview/skins/default/xui/de/floater_experience_search.xml
index 0fda5086ffb322b65171b5847d857f29e809e382..4e2cc1ecbdccf2802bab752e036f6b0992c43dee 100644
--- a/indra/newview/skins/default/xui/de/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_experience_search.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="experiencepicker" title="ERLEBNIS AUSWÄHLEN"/>
+<floater name="experiencepicker" title="ERLEBNIS AUSWäHLEN"/>
diff --git a/indra/newview/skins/default/xui/de/floater_experienceprofile.xml b/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
index a553a5b6f04a805b70b19fb4e4ec709124552645..33c9f6dbe5043b4b81347ac4f39b87ee9722a872 100644
--- a/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
@@ -66,7 +66,7 @@
<icons_combo_box label="Moderat" name="edit_ContentRatingText" tool_tip="Bei Erhöhung der Inhaltseinstufung eines Erlebnisses wird die Berechtigung für alle Einwohner zurückgesetzt, die das Erlebnis zugelassen haben.">
<icons_combo_box.item label="Adult" name="Adult" value="42"/>
<icons_combo_box.item label="Moderat" name="Mature" value="21"/>
- <icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+ <icons_combo_box.item label="Generell" name="PG" value="13"/>
</icons_combo_box>
<text name="edit_Location">
Standort:
diff --git a/indra/newview/skins/default/xui/de/floater_fast_timers.xml b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
old mode 100755
new mode 100644
index e61e5426887b51438910f197ab4324374f71aae9..4b5383c64d4a32592f783fdb4a64c5a9134227e2
--- a/indra/newview/skins/default/xui/de/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Rennen
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x Durchschnitt" name="2x Average"/>
+ <item label="Höchstwert" name="Max"/>
+ <item label="Jüngster Höchstwert" name="Recent Max"/>
+ <item label="100 ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Zeit" name="Time"/>
+ <item label="Anzahl von Aufrufen" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Pause" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_font_test.xml b/indra/newview/skins/default/xui/de/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_how_to.xml b/indra/newview/skins/default/xui/de/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_import_collada.xml b/indra/newview/skins/default/xui/de/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 0820e75029ac1ee4ed51493ba615d47bdfd8296b..23c71573337e5522d7eb8f4edf89c7a0a10fb52f
--- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Älter als" name="older"/>
</radio_group>
<spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago"/>
+ <text name="label_hours">
+ Stunden
+ </text>
<spinner label="Tage zuvor" name="spin_days_ago"/>
+ <text name="label_days">
+ Tage
+ </text>
<button label="Schließen" label_selected="Schließen" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23102d19ea8d0dadd4fae2125c6fda0fa1ba5fbf
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="BEVORZ. VOREINST. LADEN">
+ <string name="title_graphic">
+ Grafikvoreinstellung laden
+ </string>
+ <string name="title_camera">
+ Kameravoreinstellung laden
+ </string>
+ <text name="Preset">
+ Voreinstellung auswählen
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index a412b530a40f4175a5e2ec1c7e8e263ed35551c5..4070dee84c3796edf11305a87d5490d4193ae7cf
--- a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
Initialisieren...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Laden...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Artikel hierher ziehen, um Ordner zu erstellen
+ </text>
+ </panel>
<button label="In Marktplatz übertragen" name="outbox_import_btn" tool_tip="In meinen Marktplatz-Laden verschieben"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
old mode 100755
new mode 100644
index 4285462bc898c8b9459e66698a326785c87ba0d7..f06e856966e353d76645013ab8ce3d7c5bd255f6
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
Detailstufenmaterial ist keine Teilmenge des Referenzmodells.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Einige physische Hüllen überschreiten die Vertexbeschränkungen.
+ </string>
<string name="layer_all">
Alle
</string>
@@ -93,52 +96,52 @@
<text initial_value="Scheitelpunkte" name="vertices" value="Scheitelpunkte"/>
<text initial_value="Hoch" name="high_label" value="Hoch"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Aus Datei laden"/>
- <item name="Generate" value="Generieren"/>
+ <item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+ <item label="Generieren" name="Generate" value="Generieren"/>
</combo_box>
<button label="Durchsuchen..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="Dreiecklimit"/>
- <item name="Error Threshold" value="Fehlerschwelle"/>
+ <item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+ <item label="Fehlerschwelle" name="Error Threshold" value="Fehlerschwelle"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Mittel" name="medium_label" value="Mittel"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Aus Datei laden"/>
- <item name="Generate" value="Generieren"/>
- <item name="Use LoD above" value="Detailstufe oben verwenden"/>
+ <item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+ <item label="Generieren" name="Generate" value="Generieren"/>
+ <item label="Detailstufe oben verwenden" name="Use LoD above" value="Detailstufe oben verwenden"/>
</combo_box>
<button label="Durchsuchen..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="Dreiecklimit"/>
- <item name="Error Threshold" value="Fehlerschwelle"/>
+ <item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+ <item label="Fehlerschwelle" name="Error Threshold" value="Fehlerschwelle"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Niedrig" name="low_label" value="Niedrig"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Aus Datei laden"/>
- <item name="Generate" value="Generieren"/>
- <item name="Use LoD above" value="Detailstufe oben verwenden"/>
+ <item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+ <item label="Generieren" name="Generate" value="Generieren"/>
+ <item label="Detailstufe oben verwenden" name="Use LoD above" value="Detailstufe oben verwenden"/>
</combo_box>
<button label="Durchsuchen..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="Dreiecklimit"/>
- <item name="Error Threshold" value="Fehlerschwelle"/>
+ <item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+ <item label="Fehlerschwelle" name="Error Threshold" value="Fehlerschwelle"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="Niedrigste" name="lowest_label" value="Niedrigste"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Aus Datei laden"/>
- <item name="Generate" value="Generieren"/>
- <item name="Use LoD above" value="Detailstufe oben verwenden"/>
+ <item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+ <item label="Generieren" name="Generate" value="Generieren"/>
+ <item label="Detailstufe oben verwenden" name="Use LoD above" value="Detailstufe oben verwenden"/>
</combo_box>
<button label="Durchsuchen..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="Dreiecklimit"/>
- <item name="Error Threshold" value="Fehlerschwelle"/>
+ <item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+ <item label="Fehlerschwelle" name="Error Threshold" value="Fehlerschwelle"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_my_appearance.xml b/indra/newview/skins/default/xui/de/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_my_inventory.xml b/indra/newview/skins/default/xui/de/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_notification.xml b/indra/newview/skins/default/xui/de/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/indra/newview/skins/default/xui/de/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/de/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e98ca482e2738d37fd8b9c1bd06fefc5ce833b2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="BENACHRICHTIGUNGEN">
+ <floater.string name="system_tab_title">
+ System ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Transaktionen ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Einladungen ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Gruppe ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ BENACHRICHTIGUNGEN
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="System (0)" name="system_notification_list_tab"/>
+ <panel label="Transaktionen (0)" name="transaction_notifications_tab"/>
+ <panel label="Einladungen (0)" name="group_invite_notifications_tab"/>
+ <panel label="Gruppe (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Alle schließen" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="Lückenbedienfeld" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Alle löschen" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_object_weights.xml b/indra/newview/skins/default/xui/de/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index 7096dbc156e1c9df8985455f4e0ed9a044f68bc9..b50a7bb6ec43082ac7b516a290db393e465f0706
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[Gruppe]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Name" name="name"/>
<scroll_list.columns label="Beschreibung" name="description"/>
@@ -42,7 +42,7 @@
<button label="Alle auswählen" name="select_all_objects"/>
<button label="Keine auswählen" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
Aktionen für ausgewählte Figuren:
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index ebf8f01632ff177b9f1838369b825381a8606b84..27c6b739677b83b19cb29251954d899552748a82
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Fehler bei der Pfaderstellung aufgetreten.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Viewer-Status
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Simulator-Status
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Anzeigen" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 0d3ba59efb4dbf8ddbb8f607e7c278c6c0db6d43..f80bc1da8dca8d2bd1b887d528eef4190b4e8457
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
Linkset-Nutzung auswählen...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Filtern nach:
+ </text>
+ <text name="linksets_name_label">
+ Name
+ </text>
+ <text name="linksets_desc_label">
+ Beschreibung
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Nach Linkset-Nutzung filtern..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Begehbar" name="filter_by_linkset_use_walkable"/>
@@ -103,7 +112,7 @@
<button label="Anwenden" name="apply_filters"/>
<button label="Entfernen" name="clear_filters"/>
<scroll_list name="objects_scroll_list">
- <scroll_list.columns label="Name (Hauptprim)" name="name"/>
+ <scroll_list.columns label="Name(Hauptprim)" name="name"/>
<scroll_list.columns label="Beschreibung (Hauptprim)" name="description"/>
<scroll_list.columns label="Eigentümer" name="owner"/>
<scroll_list.columns label="Geskriptet" name="scripted"/>
@@ -120,9 +129,12 @@
</text>
<button label="Liste aktualisieren" name="refresh_objects_list"/>
<button label="Alle auswählen" name="select_all_objects"/>
- <button label="Keine auswählen" name="select_none_objects"/>
+ <button label="Nichts auswählen" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Aktionen für ausgewählte Linksets (wenn ein Linkset aus der Welt entfernt wird, gehen seine Attribute u. U. verloren):
+ </text>
<check_box label="Beacon anzeigen" name="show_beacon"/>
<button label="Nehmen" name="take_objects"/>
<button label="Kopie nehmen" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="Zurückgeben" name="return_objects"/>
<button label="Löschen" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Bearbeiten Sie die Attribute ausgewählter Linksets und klicken Sie auf die Schaltfläche, um die änderungen zu übernehmen
+ </text>
<text name="walkability_coefficients_label">
Begehbarkeit:
</text>
@@ -150,7 +165,7 @@
D
</text>
<line_editor name="edit_d_value" tool_tip="Begehbarkeit für Figuren vom Typ D. Ein Beispiel für diesen Typ wäre „Anderer“."/>
- <button label="Änderungen übernehmen" name="apply_edit_values"/>
+ <button label="änderungen übernehmen" name="apply_edit_values"/>
<text name="suggested_use_a_label">
(Humanoid)
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_people.xml b/indra/newview/skins/default/xui/de/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_perms_default.xml b/indra/newview/skins/default/xui/de/floater_perms_default.xml
index 6d6c89172d0ee4aff84bc3f88415fdb84773e41a..6274739f702c8b538a43ca236cdfaa829eaa8276 100644
--- a/indra/newview/skins/default/xui/de/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/de/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="STANDARD-ERSTELLUNGSBERECHTIGUNGEN">
- <panel label="Standardberechtigungen" name="default permissions"/>
+ <panel label="Standardberechtigungen" name="default permissions">
+ <text name="label_1">
+ Nächster Eigentümer:
+ </text>
+ <text name="label_2">
+ Kopie
+ </text>
+ <text name="label_3">
+ ändern
+ </text>
+ <text name="label_4">
+ übertragen
+ </text>
+ <text name="label_5">
+ Mit Gruppe teilen
+ </text>
+ <text name="label_6">
+ Kopieren allen erlauben
+ </text>
+ <text name="label_7" tool_tip="Standardberechtigungen für die Erstellung von Objekten festlegen">
+ Objekte
+ </text>
+ <text name="label_8" tool_tip="Standardberechtigungen für hochgeladene Artikel festlegen">
+ Uploads
+ </text>
+ <text name="label_9" tool_tip="Standardberechtigungen für die Erstellung von Skripts festlegen">
+ Skripts
+ </text>
+ <text name="label_10" tool_tip="Standardberechtigungen für die Erstellung von Notizkarten festlegen">
+ Notizkarten
+ </text>
+ <text name="label_11" tool_tip="Standardberechtigungen für die Erstellung von Gesten festlegen">
+ Gesten
+ </text>
+ <text name="label_12" tool_tip="Standardberechtigungen für die Erstellung von Kleidungsstücken und Körperteilen festlegen">
+ Tragbare Objekte
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="Abbrechen" label_selected="Abbrechen" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_places.xml b/indra/newview/skins/default/xui/de/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2c141f616ff139f2ac250016e3eb5830ea82add1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="ERWEITERTE GRAFIKEINSTELLUNGEN">
+ <text name="GeneralText">
+ Allgemein
+ </text>
+ <slider label="Sichtweite:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
+ <slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Niedrig
+ </text>
+ <text name="AvatarText">
+ Avatar
+ </text>
+ <slider label="Maximale Komplexität:" name="IndirectMaxComplexity" tool_tip="Bestimmt, an welchem Punkt ein visuell komplexer Avatar als „Gummibärchen“ dargestellt wird"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="Max. Anzahl an voll dargestellten Avataren:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="Details:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ Niedrig
+ </text>
+ <slider label="Physik:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ Niedrig
+ </text>
+ <text name="ShadersText">
+ Hardware
+ </text>
+ <slider label="Texturen-Cache (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/>
+ <slider label="Nebeldistanzverhältnis:" name="fog"/>
+ <slider label="Gamma:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 = Standardhelligkeit, niedriger = heller)
+ </text>
+ <check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani"/>
+ <check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern. Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
+ <check_box initial_value="true" label="Texturkomprimierung aktivieren (Neustart erforderlich)" name="texture compression" tool_tip="Komprimiert Texturen im Videospeicher, damit höher auflösende Texturen geladen werden können (leichte Beeinträchtigung der Farbqualität)."/>
+ <text name="antialiasing label">
+ Antialiasing:
+ </text>
+ <combo_box label="Antialiasing" name="fsaa">
+ <combo_box.item label="Deaktiviert" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (Neustart erforderlich)
+ </text>
+ <slider label="Gitterdetails Terrain:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ Niedrig
+ </text>
+ <slider label="Bäume:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ Niedrig
+ </text>
+ <slider label="Objekte:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ Niedrig
+ </text>
+ <slider label="Flexiprimitiva:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ Niedrig
+ </text>
+ <check_box initial_value="true" label="Transparentes Wasser" name="TransparentWater"/>
+ <check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/>
+ <check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
+ <check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
+ <slider label="Terraindetails:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ Niedrig
+ </text>
+ <check_box initial_value="true" label="Hardware-Hautberechnung für Avatar" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Wasserreflexionen:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="Minimal" name="0"/>
+ <combo_box.item label="Terrain und Bäume" name="1"/>
+ <combo_box.item label="Alle statischen Objekte" name="2"/>
+ <combo_box.item label="Alle Avatare und Objekte" name="3"/>
+ <combo_box.item label="Alles" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
+ <slider label="Himmel:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ Niedrig
+ </text>
+ <check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
+ <check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ Schatten:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Keine" name="0"/>
+ <combo_box.item label="Sonne/Mond" name="1"/>
+ <combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
+ </combo_box>
+ <button label="Auf empfohlene Einstellungen zurücksetzen" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/indra/newview/skins/default/xui/de/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9614e361543ac00b4b1d176d1f6d418f8523a6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="BEVORZ. VOREINST. SPEICHERN">
+ <string name="title_graphic">
+ Grafikvoreinstellung speichern
+ </string>
+ <string name="title_camera">
+ Kameravoreinstellung speichern
+ </string>
+ <text name="Preset">
+ Geben Sie einen Namen für die Voreinstellung ein oder wählen Sie eine vorhandene Voreinstellung aus.
+ </text>
+ <button label="Speichern" name="save"/>
+ <button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug.xml b/indra/newview/skins/default/xui/de/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_script_limits.xml b/indra/newview/skins/default/xui/de/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_sound_preview.xml b/indra/newview/skins/default/xui/de/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck.xml b/indra/newview/skins/default/xui/de/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index 374c0fc0d2dda52de11609f3153fb01acef895a9..fc5de44aeb5c778bf70a4f9b47916869f75ad412
--- a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Wörterbuch importieren">
+ <text name="import_dict">
+ Wörterbuch:
+ </text>
<button label="Durchsuchen" label_selected="Durchsuchen" name="dictionary_path_browse"/>
+ <text name="import_name">
+ Name:
+ </text>
+ <text name="import_lang">
+ Sprache:
+ </text>
<button label="Importieren" name="ok_btn"/>
<button label="Abbrechen" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml
old mode 100755
new mode 100644
index ba329371f8e0884b7343ef5829d31d8c76788fc0..0193cf619d3dc2ec3410ef6199020931e413c6f5
--- a/indra/newview/skins/default/xui/de/floater_tos.xml
+++ b/indra/newview/skins/default/xui/de/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Lesen Sie die folgenden Servicebedingungen und Datenbestimmungen sorgfältig durch. Sie müssen den Servicebedingungen zustimmen, um sich bei [SECOND_LIFE] anmelden zu können.
</text>
+ <text name="external_tos_required">
+ Sie müssen sich auf my.secondlife.com anmelden und die Servicebedingungen akzeptieren, bevor Sie fortfahren können. Vielen Dank!
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_toybox.xml b/indra/newview/skins/default/xui/de/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_translation_settings.xml b/indra/newview/skins/default/xui/de/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/inspect_remote_object.xml b/indra/newview/skins/default/xui/de/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/language_settings.xml b/indra/newview/skins/default/xui/de/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
old mode 100755
new mode 100644
index 4c125c8b5d8d2d4c1f67b3c87f134961b4daaca1..ddb1e7b0b1c112f29c3b5e044e732883d428cdf7
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Hineinzoomen" name="Zoom In"/>
<menu_item_call label="Bezahlen" name="Pay..."/>
<menu_item_call label="Objektprofil" name="Object Inspect"/>
+ <menu_item_check label="Normal darstellen" name="RenderNormally"/>
+ <menu_item_check label="Nicht darstellen" name="DoNotRender"/>
+ <menu_item_check label="Komplett darstellen" name="AlwaysRenderFully"/>
<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
old mode 100755
new mode 100644
index 65dc054ed506483c7e91af04ac15fb7bad8eaf0c..7242ba1495bcd64b4c0c699c9bb31f4a8e54d331
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="XML ausgeben" name="Dump XML"/>
<menu_item_call label="Hineinzoomen" name="Zoom In"/>
<menu_item_call label="Bezahlen" name="Pay..."/>
+ <menu_item_check label="Normal darstellen" name="RenderNormally"/>
+ <menu_item_check label="Nicht darstellen" name="DoNotRender"/>
+ <menu_item_check label="Komplett darstellen" name="AlwaysRenderFully"/>
<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_edit.xml b/indra/newview/skins/default/xui/de/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_favorites.xml b/indra/newview/skins/default/xui/de/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_group_plus.xml b/indra/newview/skins/default/xui/de/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_landmark.xml b/indra/newview/skins/default/xui/de/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
old mode 100755
new mode 100644
index 329ea20179c2f7b19b9282c775c3d2d9947cf775..2dc4c1d687a85226a1df624571ff2411c4f314c9
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
<menu_item_call label="Fehler melden" name="Report Bug"/>
<menu_item_call label="INFO ÃœBER [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Nach Updates suchen" name="Check for Updates"/>
</menu>
<menu_item_check label="Debug-Menü anzeigen" name="Show Debug Menu"/>
<menu label="Debug" name="Debug">
diff --git a/indra/newview/skins/default/xui/de/menu_marketplace_view.xml b/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
index 41516a1e7c3f28ed06bf1f13b823962b1becced1..5475834b3bbb1cd058ffa67ed684e4b31f757b17 100644
--- a/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+ <menu_item_check label="Nach jüngsten sortieren" name="sort_by_recent"/>
<menu_item_check label="Nach verfügbarer Menge sortieren (niedrig bis hoch)" name="sort_by_stock_amount"/>
<menu_item_check label="Nur Auflistungsordner anzeigen" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_picks.xml b/indra/newview/skins/default/xui/de/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_picks_plus.xml b/indra/newview/skins/default/xui/de/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_place.xml b/indra/newview/skins/default/xui/de/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_save_outfit.xml b/indra/newview/skins/default/xui/de/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_slurl.xml b/indra/newview/skins/default/xui/de/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_toolbars.xml b/indra/newview/skins/default/xui/de/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_email.xml b/indra/newview/skins/default/xui/de/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3d8e61bc80e42dd08d7357ad5504a13abc233aaa
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="E-Mail in externem Client verfassen" name="email_open_external"/>
+ <menu_item_call label="E-Mail in Zwischenablage kopieren" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_group.xml b/indra/newview/skins/default/xui/de/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_http.xml b/indra/newview/skins/default/xui/de/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_inventory.xml b/indra/newview/skins/default/xui/de/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_map.xml b/indra/newview/skins/default/xui/de/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_parcel.xml b/indra/newview/skins/default/xui/de/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_slapp.xml b/indra/newview/skins/default/xui/de/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_slurl.xml b/indra/newview/skins/default/xui/de/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_url_teleport.xml b/indra/newview/skins/default/xui/de/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
old mode 100755
new mode 100644
index 956530c990f3a79e669dee6c8b264c22d0627b66..d83a6071f6e1a8b75810a16fdbc4597208b91515
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -180,6 +180,7 @@
<menu_item_call label="Fehler melden" name="Report Bug"/>
<menu_item_call label="Rempler, Stöße & Schläge" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="INFO ÃœBER [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Nach Updates suchen" name="Check for Updates"/>
</menu>
<menu label="Erweitert" name="Advanced">
<menu_item_call label="Textur neu laden" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
<menu_item_call label="Statistiken zum Laden von Szenen" name="Scene Load Statistics"/>
- <menu_item_check label="Zuggewicht für Avatare anzeigen" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Informationen zur Avatarkomplexität anzeigen" name="Avatar Draw Info"/>
</menu>
<menu label="Hervorhebung und Sichtbarkeit" name="Highlighting and Visibility">
<menu_item_check label="Pulsierender Strahl" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
<menu_item_check label="Gelenke" name="Joints"/>
<menu_item_check label="Raycast" name="Raycast"/>
<menu_item_check label="Windvektoren" name="Wind Vectors"/>
- <menu_item_check label="Komplexität beim Rendern" name="rendercomplexity"/>
- <menu_item_check label="Byte in Anhängen" name="attachment bytes"/>
<menu_item_check label="Formen" name="Sculpt"/>
<menu label="Texturdichte" name="Texture Density">
<menu_item_check label="Keine" name="None"/>
@@ -417,13 +416,11 @@
<menu_item_check label="Fehler für sichtbare Agenten beseitigen" name="Debug Character Vis"/>
<menu_item_check label="Gelenkpunkte anzeigen" name="Show Collision Skeleton"/>
<menu_item_check label="Agent-Ziel anzeigen" name="Display Agent Target"/>
- -->
<menu_item_call label="Anhänge ausgeben" name="Dump Attachments"/>
<menu_item_call label="Fehler in Avatar-Texturen beseitigen" name="Debug Avatar Textures"/>
<menu_item_call label="Lokale Texturen ausgeben" name="Dump Local Textures"/>
</menu>
<menu_item_check label="HTTP-Texturen" name="HTTP Textures"/>
- <menu_item_check label="HTTP-Inventar" name="HTTP Inventory"/>
<menu_item_call label="Bilder komprimieren" name="Compress Images"/>
<menu_item_call label="Visual Leak Detector aktivieren" name="Enable Visual Leak Detector"/>
<menu_item_check label="Ausgabe Fehlerbeseitigung ausgeben" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/mime_types_linux.xml b/indra/newview/skins/default/xui/de/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/mime_types_mac.xml b/indra/newview/skins/default/xui/de/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
old mode 100755
new mode 100644
index 670d081faf65d1f8b34ab7cdf8c0eee829bde004..6fcd025a945897fae572e1e213db24e38411b4b9
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -164,6 +164,10 @@ Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschl
„[ERROR_CODE]“
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ Um Ihre Auflistung zu erstellen, haben wir die Hierarchie des Auflistungsinhalts korrigiert.
+ <usetemplate ignoretext="Warnung anzeigen, wenn beim Erstellen einer Auflistung die Hierarchie des Inhalts korrigiert wird" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Diese Aktion ändert den aktiven Inhalt dieser Auflistung. Möchten Sie fortfahren?
<usetemplate ignoretext="Vor Ändern einer aktiven Auflistung im Marktplatz bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
@@ -211,11 +215,9 @@ Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschl
Wir haben Ihre Auflistung entfernt, da der Bestandsordner leer ist. Um diese Auflistung wieder zu listen, müssen Sie weitere Einheiten zum Bestandsordner hinzufügen.
<usetemplate ignoretext="Benachrichtigen, wenn Auflistung aufgrund eines leeren Bestandsordners nicht aufgelistet wird" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- Der Text für ein Skript konnte aus folgendem Grund nicht hochgeladen werden: [REASON]. Bitte versuchen Sie es erneut.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Eine kompiliertes Skript konnte aus folgendem Grund nicht hochgeladen werden: [REASON]. Bitte versuchen Sie es erneut.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ Wir haben Ihre Auflistung entfernt, da der Versionsordner leer ist. Um diese Auflistung erneut zu listen, müssen Sie Artikel zum Versionsordner hinzufügen.
+ <usetemplate ignoretext="Benachrichtigen, wenn Auflistung aufgrund eines leeren Versionsordners nicht aufgelistet wird" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
Fehler beim Schreiben von Animationsdaten. Bitte versuchen Sie es erneut.
@@ -326,6 +328,14 @@ Wenn diese Rolle nicht mehr diese Fähigkeiten haben soll, deaktivieren Sie sie
Sie sind dabei, [COUNT] Mitglieder aus der Gruppe hinauszuwerfen.
<usetemplate ignoretext="Hinauswerfen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ Sie sind dabei, [AVATAR_NAME] aus der Gruppe zu verbannen.
+ <usetemplate ignoretext="Verbannen eines Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verbannen"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ Sie sind dabei, [COUNT] Mitglieder aus der Gruppe zu verbannen.
+ <usetemplate ignoretext="Verbannen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verbannen"/>
+ </notification>
<notification name="AttachmentDrop">
Sie möchten Ihren Anhang wirklich fallen lassen?
Möchten Sie fortfahren?
@@ -411,7 +421,7 @@ Objekte: [N]
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- Möchten Sie alle aufgeführten Objekte ihren Eigentümern zurückgeben?
+ Möchten Sie alle aufgeführten Objekte ihren Eigentümern zurückgeben? Dadurch werden ALLE Skriptobjekte in der Region zurückgegeben.
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -594,16 +604,10 @@ Möchten Sie die letzte gespeicherte Version vom Server laden?
(**Warnung** Dieser Vorgang kann nicht rückgängig gemacht werden.)
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- Ein Skript konnte aus folgendem Grund nicht gespeichert werden: [REASON]. Speichern Sie das Skript bitte später.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
Skript konnte nicht gespeichert werden, weil das zugehörige Objekt nicht gefunden wurde.
Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
</notification>
- <notification name="SaveBytecodeFailReason">
- Ein kompiliertes Skript konnte aus folgendem Grund nicht gespeichert werden: [REASON]. Speichern Sie das Skript bitte später.
- </notification>
<notification name="StartRegionEmpty">
Ihre Startregion ist nicht definiert.
Geben Sie den Namen der Region im Feld „Startposition“ ein oder wählen Sie „Mein letzter Standort“ oder „Mein Zuhause“ als Startposition aus.
@@ -616,6 +620,10 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
<notification name="CannotDownloadFile">
Dateidownload nicht möglich
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ Sie haben einen Datei-Download angefordert, der in [SECOND_LIFE] nicht unterstützt wird.
+ <usetemplate ignoretext="Warnung anzeigen, wenn ein Datei-Download nicht unterstützt wird" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
Datei [[FILE]] kann nicht geschrieben werden
</notification>
@@ -1122,7 +1130,8 @@ Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen
</notification>
<notification name="YouHaveBeenLoggedOut">
Es tut uns leid! Sie wurden von [SECOND_LIFE] abgemeldet.
- [MESSAGE]
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Beenden" yestext="IM & Chat anzeigen"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1371,6 +1380,13 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
<ignore name="ignore" text="Das Herunterladen der Kleidung dauert lange"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visuelle Komplexität] ist [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visuelle Komplexität] ist [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
Installation von [APP_NAME] vollständig abgeschlossen.
@@ -1648,6 +1664,25 @@ Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ Ein Update ist verfügbar.
+Es wird im Hintergrund heruntergeladen. Wenn der Download fertig ist, werden Sie aufgefordert, den Viewer neu zu starten, damit die Installation abgeschlossen werden kann.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ Ein Update wurde heruntergeladen. Es wird beim Neustart installiert.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ Beim Suchen nach einem Update ist ein Fehler aufgetreten.
+Versuchen Sie es später erneut.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ Ihr Viewer ist auf dem neuesten Stand.
+Wenn Sie die neuesten Features und Fixes ausprobieren möchten, gehen Sie zur Seite „Alternate Viewers“. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
Bei Übertragung dieses Objekts erhält die Gruppe:
* An das Objekt bezahlte L$
@@ -1752,6 +1787,14 @@ Diese Gruppe verlassen?
Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine Gruppe bevor Sie einer neuen beitreten oder eine neue Gruppe bilden.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ Die Gruppenbegrenzung für Basiskonten ist [MAX_BASIC]; für
+[https://secondlife.com/premium/ Premium-]Konten ist sie [MAX_PREMIUM].
+Wenn Sie ein Downgrade Ihres Kontos durchgeführt haben, müssen Sie das Gruppenlimit unter [MAX_BASIC] bringen, bevor sich weitere Personen registrieren können.
+
+[https://secondlife.com/my/account/membership.php Noch heute upgraden!]
+ <usetemplate name="okbutton" yestext="Schließen"/>
+ </notification>
<notification name="KickUser">
Beim Hinauswerfen dieses Benutzers welche Meldung anzeigen?
<form name="form">
@@ -2264,6 +2307,10 @@ Inventarobjekt(e) verschieben?
Bestätigen Sie, dass Sie L$ [AMOUNT] an [TARGET] zahlen möchten.
<usetemplate ignoretext="Vor den Bezahlen bestätigen (Summen über L$ 200)" name="okcancelignore" notext="Abbrechen" yestext="Bezahlen"/>
</notification>
+ <notification name="PayObjectFailed">
+ Zahlung fehlgeschlagen: Objekt nicht gefunden.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Sie haben keine Berechtigung zum Kopieren von Elementen in diesem Objekt.
</notification>
@@ -2295,10 +2342,9 @@ Diese Aktion kann nicht rückgängig gemacht werden.
[QUESTION]
<usetemplate ignoretext="Vor dem Löschen von Objekten bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] und [http://secondlife.com/corporate/cs.php Community-Standards] melden.
-
-Alle gemeldeten Verstöße werden bearbeitet.
+ <notification name="ConfirmUnlink">
+ Dies ist eine große Auswahl mit Linksets. Wenn Sie die Verknüpfung auflösen, kann sie möglicherweise nicht erneut hergestellt werden. Als Vorsichtsmaßnahme empfiehlt es sich, Kopien von Linksets in Ihr Inventar aufzunehmen.
+ <usetemplate ignoretext="Auflösen der Verknüpfung eines Linksets bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verknüpfung auflösen"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Wählen Sie eine Missbrauchskategorie aus.
@@ -2988,13 +3034,13 @@ Ist das OK?
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="NotInGroupExperienceProfileMessage">
- Eine Änderung der Erlebnisgruppe wurde ignoriert, weil der Eigentümer nicht Mitglied der ausgewählten Gruppe ist.
+ Eine änderung der Erlebnisgruppe wurde ignoriert, weil der Eigentümer nicht Mitglied der ausgewählten Gruppe ist.
</notification>
<notification name="UneditableExperienceProfileMessage">
Das nicht bearbeitbare Feld „[field]“ wurde beim Aktualisieren des Erlebnisprofils ignoriert.
</notification>
<notification name="RestrictedToOwnerExperienceProfileMessage">
- Änderungen des Felds „[field]“ ignoriert; Feld kann nur vom Eigentümer des Erlebnisses eingestellt werden.
+ änderungen des Felds „[field]“ ignoriert; Feld kann nur vom Eigentümer des Erlebnisses eingestellt werden.
</notification>
<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
Sie können die Inhaltseinstufung eines Erlebnisses nicht auf eine höhere Stufe setzen als die des Eigentümers.
@@ -3226,6 +3272,12 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
<notification name="AttachmentSaved">
Der Anhang wurde gespeichert.
</notification>
+ <notification name="PresetNotSaved">
+ Fehler beim Speichern der Voreinstellung [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Fehler beim Löschen der Voreinstellung [NAME].
+ </notification>
<notification name="UnableToFindHelpTopic">
Hilfethema für dieses Element wurde nicht gefunden.
</notification>
@@ -3258,9 +3310,8 @@ Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten.
</notification>
<notification name="MeshUploadError">
- [LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER]
-
-Details finden Sie in der Protokolldatei.
+ [LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER]
+[DETAILS]Details finden Sie in SecondLife.log.
</notification>
<notification name="MeshUploadPermError">
Fehler beim Anfordern der Berechtigungen zum Hochladen des Netzes
diff --git a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_active_object_row.xml b/indra/newview/skins/default/xui/de/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_hair.xml b/indra/newview/skins/default/xui/de/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pants.xml b/indra/newview/skins/default/xui/de/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_physics.xml b/indra/newview/skins/default/xui/de/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_socks.xml b/indra/newview/skins/default/xui/de/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
index b87c81448549fb9761bca4514855a1f2844e94cf..d4e095edfe27590259b1389a6b0dfc4a9a750e5a 100644
--- a/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="experince_list_editor">
<panel.string name="loading">
- wird geladen...
+ Laden...
</panel.string>
<panel.string name="panel_allowed">
Zulässige Erlebnisse:
diff --git a/indra/newview/skins/default/xui/de/panel_experience_search.xml b/indra/newview/skins/default/xui/de/panel_experience_search.xml
index e556335213aea6f7998c5397a018c91f0d301905..a3751824e5b0022e936d38041cc05ef6662ac02f 100644
--- a/indra/newview/skins/default/xui/de/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/de/panel_experience_search.xml
@@ -26,7 +26,7 @@
<icons_combo_box label="Moderat" name="maturity">
<icons_combo_box.item label="Adult" name="Adult" value="42"/>
<icons_combo_box.item label="Moderat" name="Mature" value="21"/>
- <icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+ <icons_combo_box.item label="Generell" name="PG" value="13"/>
</icons_combo_box>
<scroll_list name="search_results">
<columns label="Name" name="experience_name"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_inventory_item.xml b/indra/newview/skins/default/xui/de/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
old mode 100755
new mode 100644
index 2f00782ef081358521995937a24223057b7fffdb..92bbed6b07c9c15b4c0255afc7221768c5d5bca3
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] Objekte [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ Abgerufen: [ITEM_COUNT] Artikel [FILTER]
+ </panel.string>
<text name="ItemcountText">
Objekte:
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+ <menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="Neues Objekt hinzufügen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
old mode 100755
new mode 100644
index 2d56d6b7d2ed3d8a6832c624ffa1f23b6bab891e..1eb3d4d1b924f891e708468ded1853b01c6d223d
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -18,6 +18,7 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
+ <string name="GroupCountWithInfo" value="Sie gehören [COUNT] Gruppen an und können [REMAINING] weiteren beitreten. [secondlife:/// Möchten Sie noch mehr?]"/>
<tab_container name="tabs">
<panel label="IN DER NÄHE" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_pick_info.xml b/indra/newview/skins/default/xui/de/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 8eb815fd1bd444cf5cd6100d81c4311d9fbe7c30..e9ced1a0d288df044b32d698297099a1fb669fcb
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Inventarangebot" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ Speichern:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Protokoll und Transkripte" name="log_and_transcripts" value="2"/>
+ <item label="Nur Protokoll" name="log_only" value="1"/>
+ <item label="Weder Protokoll noch Transkripte" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="Protokoll löschen..." name="clear_log"/>
<button label="Transkripte löschen..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ Standort:
+ </text>
<button label="Durchsuchen..." label_selected="Durchblättern" name="log_path_button"/>
</panel>
<button label="Ãœbersetzen..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
old mode 100755
new mode 100644
index 2587ea0ced5809f260ee4308fc0d4f2daf831a4e..201998f220c36c983a0caa7b7dff58a50d16707d
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -6,7 +6,7 @@
<combo_box name="language_combobox">
<combo_box.item label="Systemvorgabe" name="System Default Language"/>
<combo_box.item label="English (Englisch)" name="English"/>
- <combo_box.item label="Danks (Dänisch) - Beta" name="Danish"/>
+ <combo_box.item label="Dansk (Dänisch) - Beta" name="Danish"/>
<combo_box.item label="Deutsch - Beta" name="Deutsch(German)"/>
<combo_box.item label="Español (Spanisch) - Beta" name="Spanish"/>
<combo_box.item label="Français (Französisch) - Beta" name="French"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index f3746a7c8246af5863504db8af493187d60eb391..06fd22141f6168a9b39c8464e762a279b03357eb
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Grafik" name="Display panel">
+ <text name="preset_text">
+ (Keine)
+ </text>
<text name="QualitySpeed">
Qualität und Geschwindigkeit:
</text>
- <text name="FasterText">
- Schneller
- </text>
- <text name="BetterText">
- Besser
- </text>
<text name="ShadersPrefText">
Niedrig
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
Ultra
</text>
- <panel label="CustomGraphics" name="CustomGraphics Panel">
- <text name="ShadersText">
- Shader:
- </text>
- <check_box initial_value="true" label="Transparentes Wasser" name="TransparentWater"/>
- <check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/>
- <check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
- <check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
- <check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
- <check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
- <check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
- <text name="shadows_label">
- Schatten:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Keine" name="0"/>
- <combo_box.item label="Sonne/Mond" name="1"/>
- <combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Wasserreflexionen:
- </text>
- <combo_box initial_value="true" label="Wasserreflexionen" name="Reflections">
- <combo_box.item label="Minimal" name="0"/>
- <combo_box.item label="Terrain und Bäume" name="1"/>
- <combo_box.item label="Alle statischen Objekte" name="2"/>
- <combo_box.item label="Alle Avatare und Objekte" name="3"/>
- <combo_box.item label="Alles" name="4"/>
- </combo_box>
- <slider label="Avatar-Physik:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Niedrig
- </text>
- <slider label="Sichtweite:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
- <slider label="Max. Anzahl an voll dargestellten Avataren:" label_width="230" name="MaxNumberAvatarDrawn" width="315"/>
- <slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Darstellungsgrad:
- </text>
- <slider label=" Objekte:" name="ObjectMeshDetail"/>
- <slider label=" Flexiprimitiva:" name="FlexibleMeshDetail"/>
- <slider label=" Bäume:" name="TreeMeshDetail"/>
- <slider label=" Avatare:" name="AvatarMeshDetail"/>
- <slider label=" Terrain:" name="TerrainMeshDetail"/>
- <slider label=" Himmel:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Niedrig
- </text>
- <text name="ObjectMeshDetailText">
- Niedrig
- </text>
- <text name="FlexibleMeshDetailText">
- Niedrig
- </text>
- <text name="TreeMeshDetailText">
- Niedrig
- </text>
- <text name="AvatarMeshDetailText">
- Niedrig
- </text>
- <text name="TerrainMeshDetailText">
- Niedrig
- </text>
- <text name="SkyMeshDetailText">
- Niedrig
- </text>
- <text name="AvatarRenderingText">
- Avatar-Darstellung:
- </text>
- <check_box initial_value="true" label="Vereinfachte Avatardarstellung" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- Terraindetails:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="Niedrig" name="0"/>
- <radio_item label="Hoch" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Ãœbernehmen" label_selected="Ãœbernehmen" name="Apply"/>
- <button label="Zurücksetzen" name="Defaults"/>
- <button label="Erweitert" name="Advanced"/>
- <button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ Schneller
+ </text>
+ <text name="BetterText">
+ Besser
+ </text>
+ <check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
+ <button label="Einstellungen als Voreinstellung speichern..." name="PrefSaveButton"/>
+ <button label="Voreinstellung laden..." name="PrefLoadButton"/>
+ <button label="Voreinstellung löschen..." name="PrefDeleteButton"/>
+ <button label="Auf empfohlene Einstellungen zurücksetzen" name="Defaults"/>
+ <button label="Erweiterte Einstellungen..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
old mode 100755
new mode 100644
index e6c90f21d1897cb781c4a8c53844a1158b05b136..dc456e2281c88106b86cf3fee86c4900620d362e
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="Meinen Browser (Chrome, Firefox, IE) für alle Links verwenden" name="internal" tool_tip="Standard-Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen." value="0"/>
<radio_item label="Integrierten Browser nur für Linden Lab-/Second Life-Links verwenden" name="external" tool_tip="Verwenden Sie den Standard-Webbrowser Ihres Systems für Hilfe, Weblinks usw. Der integrierte Browser wird nur für Linden Lab-/Second Life-Links verwendet." value="1"/>
+ <radio_item label="Integrierten Browser für alle Links verwenden" name="external_all" tool_tip="Integrierten Browser für Hilfe, Internetlinks, usw. verwenden. Der Browser wird als eigenständiges Fenster in [APP_NAME] geöffnet." value="2"/>
</radio_group>
<check_box initial_value="true" label="Plugins aktivieren" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/>
<check_box initial_value="true" label="Javascript aktivieren" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Medienbrowser-Popups aktivieren" name="media_popup_enabled"/>
<text name="Software updates:">
Softwareupdates:
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="Automatisch installieren" name="Install_automatically"/>
- <combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/>
+ <combo_box.item label="Ich werde Updates manuell herunterladen und installieren" name="Install_manual"/>
</combo_box>
<check_box label="Bereit, Release-Kandidaten zu verwenden" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/de/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad68087ecbcafcfdb59eb99361cdfcba72136e05
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ Grafikvoreinstellungen
+ </text>
+ <button label="Grafikeinstellungen öffnen" name="open_prefs_btn" tool_tip="Grafikeinstellungen anzeigen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index c85f2762b124f1c526cabf73074bc319926c9208..a4fa9b5e6a25f4ab032f34332fd57fc9b5a69a7a
--- a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="Medien URL"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="Whitelist aktiviert"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Sicheres Browsen"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_region_experiences.xml b/indra/newview/skins/default/xui/de/panel_region_experiences.xml
index 6e193aba19f09b1fa88359bd8fbebb04ead26e39..ec1d761962c98baef2bdfc188f377dbf13e09d1d 100644
--- a/indra/newview/skins/default/xui/de/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_experiences.xml
@@ -18,7 +18,7 @@ Zulässige Erlebnisse können in diesem Grundbesitz ausgeführt werden.
Blockierte Erlebnisse können in diesem Grundbesitz nicht ausgeführt werden.
</panel.string>
<panel.string name="estate_caption">
- Änderungen wirken sich auf alle Regionen des Grundbesitzes aus.
+ änderungen wirken sich auf alle Regionen des Grundbesitzes aus.
</panel.string>
<panel.string name="allowed_parcel_text">
Nur Erlebnisse mit Landumfang können zulässig sein.
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index 2b8c4e6cd1c391eb7b9d9a8031447f87f204496c..602424821fc0881fd62e02c57fd692a75a03c182
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -7,6 +7,7 @@
<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
+ <combo_box.item label="Aktuelles Fenster (512x512)" name="CurrentWindow"/>
<combo_box.item label="Benutzerdefiniert" name="Custom"/>
</combo_box>
<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
index 18517d7a7d3aa04fa6467f237c28ab84ea832961..3314c0c7b6fd1755d1e0470c769dcb46c997d55c 100644
--- a/indra/newview/skins/default/xui/de/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Material" name="Materials"/>
<combo_box.item label="Medien" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="Textur (diffus)" name="Texture (diffuse)"/>
- <combo_box.item label="Unebenheit (normal)" name="Bumpiness (normal)"/>
- <combo_box.item label="Glanzlicht (Spiegel)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="Textur (diffus)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="Unebenheit (normal)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="Glanzlicht (Spiegel)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
<text name="label alphamode">
Alpha-Modus
diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/panel_world_map.xml b/indra/newview/skins/default/xui/de/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
old mode 100755
new mode 100644
index 35f5624c134355a61d084d0f980fff7bab1a32bd..810022525a76875980a919f0556f829c6e138806
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -38,12 +38,9 @@
Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber.
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">
- Kompiliert mit [COMPILER], Version [COMPILER_VERSION]
- </string>
<string name="AboutPosition">
Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURL: <nolink>[SLURL]</nolink>
@@ -64,10 +61,9 @@ Grafikkarte: [GRAPHICS_CARD]
<string name="AboutLibs">
OpenGL-Version: [OPENGL_VERSION]
-libcurl-Version: [LIBCURL_VERSION]
J2C-Decoderversion: [J2C_VERSION]
Audiotreiberversion: [AUDIO_DRIVER_VERSION]
-Qt-Webkit-Version: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF-Version: [LLCEFLIB_VERSION]
Voice-Server-Version: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -178,6 +174,12 @@ Voice-Server-Version: [VOICE_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Second Life Main Grid (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Second Life Beta Test Grid (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -453,6 +455,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Sie können keinen Ordner tragen, der mehr als [AMOUNT] Elemente enthält. Sie können diesen Höchstwert unter „Erweitert“ > „Debug-Einstellungen anzeigen“ > „WearFolderLimit“ ändern.
</string>
<string name="TooltipPrice" value="[AMOUNT] L$"/>
+ <string name="TooltipSLIcon">
+ Führt zu einer Seite in der offiziellen Domäne SecondLife.com oder LindenLab.com.
+ </string>
<string name="TooltipOutboxDragToWorld">
Sie können keine Objekte aus dem Marktplatz-Auflistungsordner rezzen
</string>
@@ -472,7 +477,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Anzahl von Bestandsobjekten überschreitet [AMOUNT].
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Sie können Objekte oder Ordner nur in der Registerkarte „Alle“ ablegen. Wählen Sie diese Registerkarte aus und verschieben Sie Ihre Objekte bzw. Ordner noch einmal.
+ Sie können Objekte oder Ordner nur in der Registerkarte „ALLE“ oder „NICHT VERKNüPFT“ ablegen. Klicken Sie auf eine dieser Registerkarten und versuchen Sie dann erneut, Ihre Objekte bzw. Ordner zu verschieben.
</string>
<string name="TooltipOutboxNoTransfer">
Mindestens eines dieser Objekte kann nicht verkauft oder übertragen werden
@@ -556,6 +561,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Anklicken, um Befehl secondlife:// auszuführen
</string>
<string name="CurrentURL" value=" CurrentURL: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Klicken, um eine E-Mail zu verfassen
+ </string>
<string name="SLurlLabelTeleport">
Teleportieren nach
</string>
@@ -1081,7 +1089,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="AgentNameSubst">
(Sie)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Beim Verwalten von Grundbesitzzugangslisten Warnhinweise unterdrücken
</string>
@@ -1860,6 +1868,21 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="TodayOld">
Seit heute Mitglied
</string>
+ <string name="av_render_everyone_now">
+ Jetzt kann jeder Sie sehen.
+ </string>
+ <string name="av_render_not_everyone">
+ Sie sind u. U. nicht für alle Leute in Ihrer Nähe sichtbar.
+ </string>
+ <string name="av_render_over_half">
+ Sie sind u. U. für mehr als die Hälfte der Leute in Ihrer Nähe nicht sichtbar.
+ </string>
+ <string name="av_render_most_of">
+ Sie sind u. U. für die meisten Leuten in Ihrer Nähe nicht sichtbar.
+ </string>
+ <string name="av_render_anyone">
+ Sie sind u. U. für niemanden in Ihrer Nähe sichtbar.
+ </string>
<string name="AgeYearsA">
[COUNT] Jahr
</string>
@@ -1977,6 +2000,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="CompileQueueUnknownFailure">
Unbekannter Fehler beim Herunterladen
</string>
+ <string name="CompileNoExperiencePerm">
+ Skript „[SCRIPT]“ mit Erlebnis „[EXPERIENCE]“ wird übersprungen.
+ </string>
<string name="CompileQueueTitle">
Rekompilierung
</string>
@@ -2022,9 +2048,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="GroupsNone">
keine
</string>
- <string name="CompileNoExperiencePerm">
- Skript „[SCRIPT]“ mit Erlebnis „[EXPERIENCE]“ wird übersprungen.
- </string>
<string name="Group" value=" (Gruppe)"/>
<string name="Unknown">
(unbekannt)
@@ -5380,18 +5403,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="UserDictionary">
[Benutzer]
</string>
- <string name="logging_calls_disabled_log_empty">
- Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“.
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“.
- </string>
- <string name="logging_calls_enabled_log_empty">
- Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
- </string>
- <string name="loading_chat_logs">
- Laden...
- </string>
<string name="experience_tools_experience">
Erlebnis
</string>
@@ -5408,7 +5419,7 @@ Setzen Sie den Editorpfad in Anführungszeichen
Gridumfang
</string>
<string name="Allowed_Experiences_Tab">
- ZULÄSSIG
+ ZULäSSIG
</string>
<string name="Blocked_Experiences_Tab">
BLOCKIERT
@@ -5473,4 +5484,37 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="ExperiencePermissionShort12">
Berechtigung
</string>
+ <string name="logging_calls_disabled_log_empty">
+ Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
+ </string>
+ <string name="loading_chat_logs">
+ Laden...
+ </string>
+ <string name="preset_combo_label">
+ -Leere Liste-
+ </string>
+ <string name="Default">
+ Standard
+ </string>
+ <string name="none_paren_cap">
+ (Keine)
+ </string>
+ <string name="no_limit">
+ Keine Begrenzung
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ Die Physikform enthält Dreiecke, die zu klein sind. Versuchen Sie, das Physikmodell zu vereinfachen.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ Die Physikform enthält ungültige Bestätigungsdaten. Versuchen Sie, das Physikmodell zu korrigieren.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ Die Physikform hat keine korrekte Version. Legen Sie die korrekte Version für das Physikmodell fest.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/de/xui_version.xml b/indra/newview/skins/default/xui/de/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_associate_listing.xml b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
old mode 100755
new mode 100644
index 0bfefc8abe36e9a9723b940c90cb3a6b6e6cb8cd..9cfb562001ac9baf8083044196d6f128b327f9aa
--- a/indra/newview/skins/default/xui/en/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
@@ -184,6 +184,7 @@
mouse_opaque="false"
name="divisor3"/>
<text
+ name="autoreplace_keyword_txt"
type="string"
follows="left|top"
height="16"
@@ -204,6 +205,7 @@
width="150"
/>
<text
+ name="autoreplace_replacement_txt"
type="string"
follows="left|top"
height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0688fdb42c2f8d23079d3704c8aa9d7a80f50728
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic="floater_delete_preset"
+ layout="topleft"
+ name="Delete Pref Preset"
+ save_rect="true"
+ title="DELETE PREF PRESET"
+ width="300">
+
+ <string name="title_graphic">Delete Graphic Preset</string>
+ <string name="title_camera">Delete Camera Preset</string>
+
+ <text
+ follows="top|left|right"
+ height="10"
+ layout="topleft"
+ left="20"
+ name="Preset"
+ top="30"
+ width="200">
+ Select a preset
+ </text>
+ <combo_box
+ follows="top|left"
+ layout="topleft"
+ left="20"
+ name="preset_combo"
+ top_delta="20"
+ width="200"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="Delete"
+ layout="topleft"
+ top_delta="40"
+ left="20"
+ name="delete"
+ width="70"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ left_pad="20"
+ name="cancel"
+ width="70"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
old mode 100755
new mode 100644
index 671f116df3647e162443008c3d977cee9b01bc45..fa7147d9cae52884a43cba37550959d98ccee93d
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -22,10 +22,10 @@
top="5"
width="150"
height="20">
- <item label="2x Average"/>
- <item label="Max"/>
- <item label="Recent Max"/>
- <item label="100ms"/>
+ <item name="2x Average" label="2x Average"/>
+ <item name="Max" label="Max"/>
+ <item name="Recent Max" label="Recent Max"/>
+ <item name="100ms" label="100ms"/>
</combo_box>
<combo_box name="metric_combo"
follows="left|top"
@@ -33,9 +33,9 @@
top="5"
width="150"
height="20">
- <item label="Time"/>
- <item label="Number of Calls"/>
- <item label="Hz"/>
+ <item name="Time" label="Time"/>
+ <item name="Number of Calls" label="Number of Calls"/>
+ <item name="Hz" label="Hz"/>
</combo_box>
<button follows="top|right"
name="pause_btn"
diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
deleted file mode 100755
index dcd6d985817c6db32a27a78023d1011bd971accb..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="224"
- layout="topleft"
- name="Hardware Settings Floater"
- help_topic="hardware_settings_floater"
- title="HARDWARE SETTINGS"
- width="615">
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left="10"
- name="Filtering:"
- top="20"
- width="188">
- Filtering:
- </text>
- <check_box
- control_name="RenderAnisotropic"
- height="16"
- label="Anisotropic Filtering (slower when enabled)"
- layout="topleft"
- left_pad="10"
- name="ani"
- top_delta="0"
- width="256" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left="10"
- name="antialiasing label"
- top_pad="7"
- width="188">
- Antialiasing:
- </text>
- <combo_box
- control_name="RenderFSAASamples"
- height="22"
- initial_value="false"
- label="Antialiasing"
- layout="topleft"
- left_pad="10"
- name="fsaa"
- top_delta="0"
- width="130">
- <combo_box.item
- label="Disabled"
- name="FSAADisabled"
- value="0" />
- <combo_box.item
- label="2x"
- name="2x"
- value="2" />
- <combo_box.item
- label="4x"
- name="4x"
- value="4" />
- <combo_box.item
- label="8x"
- name="8x"
- value="8" />
- <combo_box.item
- label="16x"
- name="16x"
- value="16" />
- </combo_box>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_pad="10"
- name="antialiasing restart"
- top_delta="0"
- width="230">
- (requires viewer restart)
- </text>
- <spinner
- control_name="RenderGamma"
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.01"
- initial_value="1"
- label="Gamma:"
- label_width="198"
- layout="topleft"
- left="10"
- max_val="2"
- name="gamma"
- top_pad="11"
- width="262" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_pad="10"
- name="(brightness, lower is brighter)"
- top_delta="2"
- width="385">
- (0 = default brightness, lower = brighter)
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="Enable VBO:"
- top_pad="10"
- width="188">
- Enable VBO:
- </text>
- <check_box
- control_name="RenderVBOEnable"
- height="16"
- initial_value="true"
- label="Enable OpenGL Vertex Buffer Objects"
- layout="topleft"
- left_pad="10"
- name="vbo"
- tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
- width="315" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="tc label"
- top_pad="10"
- width="188">
- Enable S3TC:
- </text>
- <check_box
- control_name="RenderCompressTextures"
- height="16"
- initial_value="true"
- label="Enable Texture Compression (requires restart)"
- layout="topleft"
- left_pad="10"
- name="texture compression"
- tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
- width="315" />
- <slider
- control_name="TextureMemory"
- decimal_digits="0"
- follows="left|top"
- height="20"
- increment="16"
- initial_value="32"
- label="Texture Memory (MB):"
- label_width="195"
- layout="topleft"
- left="10"
- max_val="4096"
- name="GraphicsCardTextureMemory"
- tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
- top_pad="10"
- width="360" />
- <spinner
- control_name="RenderFogRatio"
- decimal_digits="1"
- follows="left|top"
- height="22"
- initial_value="4"
- label="Fog Distance Ratio:"
- label_width="198"
- layout="topleft"
- left_delta="0"
- max_val="10"
- min_val="0.5"
- name="fog"
- top_pad="7"
- width="262" />
- <button
- follows="right|bottom"
- height="22"
- label="OK"
- label_selected="OK"
- layout="topleft"
- right="-105"
- name="OK"
- top="192"
- width="90" />
- <button
- follows="right|bottom"
- height="22"
- label="Cancel"
- label_selected="Cancel"
- layout="topleft"
- left_pad="5"
- name="Cancel"
- right="-10"
- width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 17bc818cc1bc1f6ea17520be0a0734cc75030a9a..519d3e043c59db827072c55be7c1a29f68cf03bf
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -301,6 +301,7 @@
top_pad="4"
width="64" />
<text
+ name="label_hours"
type="string"
length="1"
follows="left|top"
@@ -323,6 +324,7 @@
left="8"
width="64" />
<text
+ name="label_days"
type="string"
length="1"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5f2eb770e25a4670f3e59b16fad27e11c47093d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic="floater_load_preset"
+ layout="topleft"
+ name="Load Pref Preset"
+ save_rect="true"
+ title="LOAD PREF PRESET"
+ width="300">
+
+ <string name="title_graphic">Load Graphic Preset</string>
+ <string name="title_camera">Load Camera Preset</string>
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left="20"
+ name="Preset"
+ top="30"
+ width="200">
+ Select a preset
+ </text>
+ <combo_box
+ follows="top|left"
+ layout="topleft"
+ left="20"
+ name="preset_combo"
+ top_delta="20"
+ width="200"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="OK"
+ layout="topleft"
+ top_delta="40"
+ left="20"
+ name="ok"
+ width="70"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ left_pad="20"
+ name="cancel"
+ width="70"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index b98f280b562735228408e092aa809394db6b4f01..7802f65902e5f4452ec1a37112ad5ef0a66ce712
--- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
@@ -19,6 +19,7 @@
<string name="OutboxImporting">Sending folders...</string>
<string name="OutboxInitializing">Initializing...</string>
<panel
+ name="panel_1"
follows="all"
layout="topleft"
left="0"
@@ -27,6 +28,7 @@
height="440"
width="333">
<panel
+ name="panel_2"
follows="all"
left="10"
bottom="370"
@@ -70,6 +72,7 @@
</panel>
</panel>
<panel
+ name="panel_3"
follows="bottom|left|right"
left="10"
bottom="435"
@@ -89,6 +92,7 @@
bevel_style="in"
visible="true">
<text
+ name="text_1"
type="string"
follows="all"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
old mode 100755
new mode 100644
index 7183b2f1f9d5d0f6081390fca477258f1cf59fcf..d2c8dddfe10d8f5348b74c1c811178bbcc97e2be
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -185,9 +185,11 @@
width="135">
<item
name="Load from file"
+ label="Load from file"
value="Load from file" />
<item
name="Generate"
+ label="Generate"
value="Generate" />
</combo_box>
<line_editor
@@ -220,9 +222,11 @@
width="130">
<item
name="Triangle Limit"
+ label="Triangle Limit"
value="Triangle Limit" />
<item
name="Error Threshold"
+ label="Error Threshold"
value="Error Threshold" />
</combo_box>
<spinner
@@ -310,12 +314,15 @@
width="135">
<item
name="Load from file"
+ label="Load from file"
value="Load from file" />
<item
name="Generate"
+ label="Generate"
value="Generate" />
<item
name="Use LoD above"
+ label="Use LoD above"
value="Use LoD above" />
</combo_box>
<line_editor
@@ -349,9 +356,11 @@
width="130">
<item
name="Triangle Limit"
+ label="Triangle Limit"
value="Triangle Limit" />
<item
name="Error Threshold"
+ label="Error Threshold"
value="Error Threshold" />
</combo_box>
<spinner
@@ -438,12 +447,15 @@
width="135">
<item
name="Load from file"
+ label="Load from file"
value="Load from file" />
<item
name="Generate"
+ label="Generate"
value="Generate" />
<item
name="Use LoD above"
+ label="Use LoD above"
value="Use LoD above" />
</combo_box>
<line_editor
@@ -477,9 +489,11 @@
width="130">
<item
name="Triangle Limit"
+ label="Triangle Limit"
value="Triangle Limit" />
<item
name="Error Threshold"
+ label="Error Threshold"
value="Error Threshold" />
</combo_box>
<spinner
@@ -566,12 +580,15 @@
width="135">
<item
name="Load from file"
+ label="Load from file"
value="Load from file" />
<item
name="Generate"
+ label="Generate"
value="Generate" />
<item
name="Use LoD above"
+ label="Use LoD above"
value="Use LoD above" />
</combo_box>
<line_editor
@@ -605,9 +622,11 @@
width="130">
<item
name="Triangle Limit"
+ label="Triangle Limit"
value="Triangle Limit" />
<item
name="Error Threshold"
+ label="Error Threshold"
value="Error Threshold" />
</combo_box>
<spinner
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index 46ee113b69361378b867bee7df04da8545de7f4c..7242c734cf8f788da092e689d99f86ecb81334be
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -27,6 +27,7 @@
<floater.string name="character_owner_unknown">[Unknown]</floater.string>
<floater.string name="character_owner_group">[group]</floater.string>
<panel
+ name="pathfinding_chars_main"
border="false"
bevel_style="none"
follows="left|top|right|bottom"
@@ -118,6 +119,7 @@
left="18"
width="600"/>
<panel
+ name="pathfinding_chars_actions"
border="false"
bevel_style="none"
follows="left|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index 26293130699004f3c76a0a46e4148139331ba87e..eb37cf214c7738ada3ba92c9a027768d35e897f0
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -37,6 +37,7 @@
<floater.string name="pathing_path_invalid">A path between the chosen points cannot be found.</floater.string>
<floater.string name="pathing_error">An error occurred during path generation.</floater.string>
<panel
+ name="pathfinding_console_main"
border="false"
bevel_style="none"
follows="left|top"
@@ -46,6 +47,7 @@
height="61"
width="214">
<text
+ name="viewer_status_label"
height="13"
word_wrap="true"
use_ellipses="false"
@@ -74,6 +76,7 @@
</text>
</panel>
<panel
+ name="pathfinding_console_simulator"
border="false"
bevel_style="none"
follows="left|top"
@@ -82,6 +85,7 @@
height="66"
width="214">
<text
+ name="simulator_status_label"
height="13"
word_wrap="true"
use_ellipses="false"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 4a457fb92988b3c8531bc2e7fdf915f3ffd9430b..52d03cc432b6c3115ee15626c2e14e13ee926a8c
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -46,6 +46,7 @@
<floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
<floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
<panel
+ name="pathfinding_linksets_main"
border="false"
bevel_style="none"
follows="left|top|right|bottom"
@@ -53,6 +54,7 @@
height="226"
width="1059">
<text
+ name="linksets_filter_label"
height="13"
word_wrap="false"
use_ellipses="false"
@@ -67,6 +69,7 @@
Filter by:
</text>
<text
+ name="linksets_name_label"
height="13"
word_wrap="false"
use_ellipses="false"
@@ -91,6 +94,7 @@
name="filter_by_name"
width="161" />
<text
+ name="linksets_desc_label"
height="13"
word_wrap="false"
use_ellipses="false"
@@ -279,6 +283,7 @@
left="18"
width="1039"/>
<panel
+ name="pathfinding_linksets_actions"
border="false"
bevel_style="none"
follows="left|right|bottom"
@@ -287,6 +292,7 @@
height="67"
width="1010">
<text
+ name="linksets_actions_label"
height="13"
word_wrap="false"
use_ellipses="false"
@@ -366,6 +372,7 @@
left="18"
width="1039"/>
<panel
+ name="pathfinding_linksets_attributes"
border="false"
bevel_style="none"
follows="left|right|bottom"
@@ -374,6 +381,7 @@
height="75"
width="1010">
<text
+ name="linksets_attributes_label"
height="13"
word_wrap="false"
use_ellipses="false"
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index ceb260fffb37e10b5ba012f1e34c542c5e7ca392..1c3af49bfe0c5ef42a4c90923698b6965198194d 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -24,6 +24,7 @@
left="0"
width="430" />
<text
+ name="label_1"
type="string"
length="1"
follows="left|top"
@@ -36,6 +37,7 @@
Next owner:
</text>
<text
+ name="label_2"
type="string"
length="1"
follows="left|top"
@@ -48,6 +50,7 @@
Copy
</text>
<text
+ name="label_3"
type="string"
length="1"
follows="left|top"
@@ -60,6 +63,7 @@
Modify
</text>
<text
+ name="label_4"
type="string"
length="1"
follows="left|top"
@@ -72,6 +76,7 @@
Transfer
</text>
<text
+ name="label_5"
type="string"
length="1"
follows="left|top"
@@ -85,6 +90,7 @@
Share with group
</text>
<text
+ name="label_6"
type="string"
length="1"
follows="left|top"
@@ -98,6 +104,7 @@
Allow anyone to copy
</text>
<text
+ name="label_7"
type="string"
length="1"
follows="left|top"
@@ -162,6 +169,7 @@
top_delta="0"
width="100" />
<text
+ name="label_8"
type="string"
length="1"
follows="left|top"
@@ -225,6 +233,7 @@
top_delta="0"
width="100" />
<text
+ name="label_9"
type="string"
length="1"
follows="left|top"
@@ -288,6 +297,7 @@
top_delta="0"
width="100" />
<text
+ name="label_10"
type="string"
length="1"
follows="left|top"
@@ -351,6 +361,7 @@
top_delta="0"
width="100" />
<text
+ name="label_11"
type="string"
length="1"
follows="left|top"
@@ -414,6 +425,7 @@
top_delta="0"
width="100" />
<text
+ name="label_12"
type="string"
length="1"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
old mode 100755
new mode 100644
index bd6faf4ed8fb01650f528413e2c2fb9d303eca51..638a4e2da88ceca6d7278498fce3392d5a23561a
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,7 +11,7 @@
single_instance="true"
title="PREFERENCES"
width="658">
- <button
+ <button
follows="right|bottom"
height="23"
label="OK"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2bd3aa8bcc165d7bd7c0583b924e6d958acad2e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,935 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="400"
+ layout="topleft"
+ name="prefs_graphics_advanced"
+ help_topic="Preferences_Graphics_Advanced"
+ single_instance="true"
+ save_rect="true"
+ title="ADVANCED GRAPHICS PREFERENCES"
+ width="800">
+
+<!-- This block shows Advanced Settings -->
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="GeneralText"
+ top="5"
+ left="10"
+ width="128">
+ General
+ </text>
+
+ <slider
+ control_name="RenderFarClip"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="8"
+ initial_value="160"
+ label="Draw distance:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ min_val="64"
+ max_val="512"
+ name="DrawDistance"
+ top_delta="16"
+ width="330" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="DrawDistanceMeterText2"
+ top_delta="0"
+ left_delta="330"
+ width="20">
+ m
+ </text>
+ <slider
+ control_name="RenderMaxPartCount"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="256"
+ initial_value="4096"
+ label="Max. particle count:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ max_val="8192"
+ name="MaxParticleCount"
+ top_delta="16"
+ width="336" />
+
+ <slider
+ control_name="RenderGlowResolutionPow"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="8"
+ label="Post process quality:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ min_val="8"
+ max_val="9"
+ name="RenderPostProcess"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="PostProcessText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="PostProcessText"
+ top_delta="0"
+ left_delta="304"
+ width="65">
+ Low
+ </text>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="AvatarText"
+ top_delta="20"
+ left="10"
+ width="128">
+ Avatar
+ </text>
+
+ <slider
+ control_name="IndirectMaxComplexity"
+ tool_tip="Controls at what point a visually complex avatar is drawn as a jelly doll"
+ follows="left|top"
+ height="16"
+ initial_value="101"
+ increment="1"
+ label="Maximum complexity:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ min_val="1"
+ max_val="101"
+ name="IndirectMaxComplexity"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateIndirectMaxComplexity"
+ parameter="IndirectMaxComlexityText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ top_delta="0"
+ left_delta="304"
+ text_readonly_color="LabelDisabledColor"
+ name="IndirectMaxComplexityText"
+ width="65">
+ 0
+ </text>
+
+ <slider
+ control_name="IndirectMaxNonImpostors"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="12"
+ label="Max. # of non-impostors:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ min_val="1"
+ max_val="66"
+ name="IndirectMaxNonImpostors"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateIndirectMaxNonImpostors"
+ parameter="IndirectNonImpostorsText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ top_delta="0"
+ left_delta="304"
+ text_readonly_color="LabelDisabledColor"
+ name="IndirectMaxNonImpostorsText"
+ width="65">
+ 0
+ </text>
+
+ <slider
+ control_name="RenderAvatarLODFactor"
+ follows="left|top"
+ height="16"
+ increment="0.125"
+ initial_value="160"
+ label="Detail:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ name="AvatarMeshDetail"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="AvatarMeshDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="AvatarMeshDetailText"
+ top_delta="0"
+ left_delta="304"
+ width="65">
+ Low
+ </text>
+
+ <slider
+ control_name="RenderAvatarPhysicsLODFactor"
+ follows="left|top"
+ height="16"
+ initial_value="100"
+ increment=".05"
+ label="Physics:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ name="AvatarPhysicsDetail"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="AvatarPhysicsDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ top_delta="0"
+ left_delta="304"
+ name="AvatarPhysicsDetailText"
+ width="65">
+ Low
+ </text>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="ShadersText"
+ top_delta="20"
+ left="10"
+ width="128">
+ Hardware
+ </text>
+
+ <slider
+ control_name="TextureMemory"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="16"
+ initial_value="32"
+ label="Texture Memory (MB):"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ max_val="4096"
+ name="GraphicsCardTextureMemory"
+ tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
+ top_delta="16"
+ width="335" />
+
+ <slider
+ control_name="RenderFogRatio"
+ follows="left|top"
+ height="16"
+ initial_value="4"
+ decimal_digits="1"
+ label="Fog Distance Ratio:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ name="fog"
+ min_val="0.5"
+ max_val="10"
+ increment="0.1"
+ top_delta="16"
+ width="332" />
+
+ <slider
+ control_name="RenderGamma"
+ follows="left|top"
+ height="16"
+ initial_value="1"
+ decimal_digits="2"
+ label="Gamma:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ name="gamma"
+ min_val="0"
+ max_val="2"
+ increment="0.01"
+ top_delta="16"
+ width="332" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="30"
+ name="(brightness, lower is brighter)"
+ top_delta="16"
+ width="260">
+ (0 = default brightness, lower = brighter)
+ </text>
+
+ <check_box
+ control_name="RenderAnisotropic"
+ height="16"
+ label="Anisotropic Filtering (slower when enabled)"
+ layout="topleft"
+ left="30"
+ name="ani"
+ top_delta="16"
+ width="256" />
+
+ <check_box
+ control_name="RenderVBOEnable"
+ height="16"
+ initial_value="true"
+ label="Enable OpenGL Vertex Buffer Objects"
+ layout="topleft"
+ left="30"
+ top_delta="16"
+ name="vbo"
+ tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+ width="315" />
+
+ <check_box
+ control_name="RenderCompressTextures"
+ height="16"
+ initial_value="true"
+ label="Enable Texture Compression (requires restart)"
+ layout="topleft"
+ left="30"
+ top_delta="16"
+ name="texture compression"
+ tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+ width="315" />
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="30"
+ name="antialiasing label"
+ top_delta="20"
+ width="100">
+ Antialiasing:
+ </text>
+ <combo_box
+ control_name="RenderFSAASamples"
+ height="20"
+ initial_value="false"
+ label="Antialiasing"
+ layout="topleft"
+ left_pad="40"
+ name="fsaa"
+ top_delta="0"
+ width="90">
+ <combo_box.item
+ label="Disabled"
+ name="FSAADisabled"
+ value="0" />
+ <combo_box.item
+ label="2x"
+ name="2x"
+ value="2" />
+ <combo_box.item
+ label="4x"
+ name="4x"
+ value="4" />
+ <combo_box.item
+ label="8x"
+ name="8x"
+ value="8" />
+ <combo_box.item
+ label="16x"
+ name="16x"
+ value="16" />
+ </combo_box>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left_pad="10"
+ name="antialiasing restart"
+ top_delta="0"
+ width="130">
+ (requires restart)
+ </text>
+ <view_border
+ bevel_style="in"
+ height="322"
+ layout="topleft"
+ left="385"
+ name="vert_border"
+ top="16"
+ width="0"/>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="AvatarText"
+ top_delta="20"
+ left="400"
+ top="21"
+ width="128">
+ Mesh
+ </text>
+
+ <slider
+ control_name="RenderTerrainLODFactor"
+ follows="left|top"
+ height="16"
+ increment="0.125"
+ initial_value="160"
+ label="Terrain Mesh Detail:"
+ label_width="185"
+ layout="topleft"
+ left="420"
+ min_val="1"
+ max_val="2"
+ name="TerrainMeshDetail"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="TerrainMeshDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="TerrainMeshDetailText"
+ text_readonly_color="LabelDisabledColor"
+ top_delta="0"
+ left_delta="304"
+ width="65">
+ Low
+ </text>
+
+ <slider
+ control_name="RenderTreeLODFactor"
+ follows="left|top"
+ height="16"
+ increment="0.125"
+ initial_value="160"
+ label="Trees:"
+ label_width="185"
+ layout="topleft"
+ left="420"
+ name="TreeMeshDetail"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="TreeMeshDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="TreeMeshDetailText"
+ top_delta="0"
+ left_delta="304"
+ width="65">
+ Low
+ </text>
+
+ <slider
+ control_name="RenderVolumeLODFactor"
+ follows="left|top"
+ height="16"
+ increment="0.125"
+ initial_value="160"
+ label="Objects:"
+ label_width="185"
+ layout="topleft"
+ left="420"
+ max_val="2"
+ name="ObjectMeshDetail"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="ObjectMeshDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="ObjectMeshDetailText"
+ top_delta="0"
+ left_delta="304"
+ width="65">
+ Low
+ </text>
+
+ <slider
+ control_name="RenderFlexTimeFactor"
+ follows="left|top"
+ height="16"
+ initial_value="160"
+ label="Flexiprims:"
+ label_width="185"
+ layout="topleft"
+ left="420"
+ name="FlexibleMeshDetail"
+ show_text="false"
+ top_delta="16"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="FlexibleMeshDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="FlexibleMeshDetailText"
+ top_delta="0"
+ left_delta="304"
+ width="65">
+ Low
+ </text>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="ShadersText"
+ top_delta="20"
+ left="400"
+ width="128">
+ Shaders
+ </text>
+
+ <check_box
+ control_name="RenderTransparentWater"
+ height="16"
+ initial_value="true"
+ label="Transparent Water"
+ layout="topleft"
+ left="420"
+ name="TransparentWater"
+ top_delta="16"
+ width="300" />
+
+ <check_box
+ control_name="RenderObjectBump"
+ height="16"
+ initial_value="true"
+ label="Bump mapping and shiny"
+ layout="topleft"
+ left="420"
+ name="BumpShiny"
+ top_delta="16"
+ width="300">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <check_box
+ control_name="RenderLocalLights"
+ height="16"
+ initial_value="true"
+ label="Local Lights"
+ layout="topleft"
+ left="420"
+ name="LocalLights"
+ top_delta="16"
+ width="300" />
+
+ <check_box
+ control_name="VertexShaderEnable"
+ height="16"
+ initial_value="true"
+ label="Basic shaders"
+ layout="topleft"
+ left="420"
+ name="BasicShaders"
+ tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
+ top_delta="16"
+ width="300">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <slider
+ control_name="RenderTerrainDetail"
+ follows="left|top"
+ height="16"
+ label="Terrain Detail:"
+ label_width="165"
+ layout="topleft"
+ left="440"
+ show_text="false"
+ initial_value="0"
+ increment="1"
+ min_val="0"
+ max_val="1"
+ name="TerrainDetail"
+ top_delta="16"
+ width="280" >
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="TerrainDetail" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ top_delta="0"
+ left_delta="284"
+ name="TerrainDetailText"
+ text_readonly_color="LabelDisabledColor"
+ width="65">
+ Low
+ </text>
+
+ <check_box
+ control_name="RenderAvatarVP"
+ height="16"
+ initial_value="true"
+ label="Avatar Hardware skinning"
+ layout="topleft"
+ left="440"
+ name="AvatarVertexProgram"
+ top_delta="16"
+ width="280">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <check_box
+ control_name="RenderAvatarCloth"
+ height="16"
+ initial_value="true"
+ label="Avatar cloth"
+ layout="topleft"
+ left="440"
+ name="AvatarCloth"
+ top_delta="16"
+ width="280" />
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="ReflectionsText"
+ text_readonly_color="LabelDisabledColor"
+ top_delta="16"
+ left="440"
+ width="128">
+ Water Reflections:
+ </text>
+ <combo_box
+ control_name="RenderReflectionDetail"
+ height="18"
+ layout="topleft"
+ left_delta="170"
+ top_delta="0"
+ name="Reflections"
+ width="150">
+ <combo_box.item
+ label="Minimal"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Terrain and trees"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="All static objects"
+ name="2"
+ value="2"/>
+ <combo_box.item
+ label="All avatars and objects"
+ name="3"
+ value="3"/>
+ <combo_box.item
+ label="Everything"
+ name="4"
+ value="4"/>
+ </combo_box>
+
+ <check_box
+ control_name="WindLightUseAtmosShaders"
+ height="16"
+ initial_value="true"
+ label="Atmospheric shaders"
+ layout="topleft"
+ left="440"
+ name="WindLightUseAtmosShaders"
+ top_delta="16"
+ width="280">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <slider
+ control_name="WLSkyDetail"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="8"
+ initial_value="160"
+ label="Sky:"
+ label_width="145"
+ layout="topleft"
+ left="460"
+ min_val="16"
+ max_val="128"
+ name="SkyMeshDetail"
+ show_text="false"
+ top_delta="16"
+ width="260">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="SkyMeshDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left_delta="264"
+ name="SkyMeshDetailText"
+ text_readonly_color="LabelDisabledColor"
+ top_delta="0"
+ width="65">
+ Low
+ </text>
+
+ <check_box
+ control_name="RenderDeferred"
+ height="16"
+ initial_value="true"
+ label="Advanced Lighting Model"
+ layout="topleft"
+ left="460"
+ name="UseLightShaders"
+ top_delta="16"
+ width="260">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <check_box
+ control_name="RenderDeferredSSAO"
+ height="16"
+ initial_value="true"
+ label="Ambient Occlusion"
+ layout="topleft"
+ left="480"
+ name="UseSSAO"
+ top_delta="16"
+ width="240">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <check_box
+ control_name="RenderDepthOfField"
+ height="16"
+ initial_value="true"
+ label="Depth of Field"
+ layout="topleft"
+ left="480"
+ name="UseDoF"
+ top_delta="16"
+ width="240">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="480"
+ name="RenderShadowDetailText"
+ text_readonly_color="LabelDisabledColor"
+ top_delta="16"
+ width="128">
+ Shadows:
+ </text>
+ <combo_box
+ control_name="RenderShadowDetail"
+ height="18"
+ layout="topleft"
+ left_delta="130"
+ top_delta="0"
+ name="ShadowDetail"
+ width="150">
+ <combo_box.item
+ label="None"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Sun/Moon"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="Sun/Moon + Projectors"
+ name="2"
+ value="2"/>
+ </combo_box>
+
+<!-- End of Advanced Settings block -->
+ <view_border
+ bevel_style="in"
+ height="0"
+ layout="topleft"
+ left="13"
+ name="horiz_border"
+ top_pad="5"
+ top_delta="5"
+ width="774"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="Reset to recommended settings"
+ layout="topleft"
+ left="20"
+ name="Defaults"
+ top_delta="10"
+ width="210">
+ <button.commit_callback
+ function="Pref.HardwareDefaults" />
+ </button>
+
+ <button
+ follows="right|bottom"
+ height="23"
+ label="OK"
+ label_selected="OK"
+ layout="topleft"
+ right="-115"
+ name="OK"
+ top_delta="0"
+ width="80">
+ <button.commit_callback
+ function="Pref.OK"
+ parameter="closeadvanced" />
+ </button>
+
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Cancel"
+ label_selected="Cancel"
+ layout="topleft"
+ left_pad="5"
+ right="-20"
+ name="Cancel"
+ top_delta="0"
+ width="80" >
+ <button.commit_callback
+ function="Pref.Cancel"
+ parameter="closeadvanced" />
+ </button>
+
+<!-- These two check boxes are dummies and will never be displayed. They are here so the control variables
+are saved in a preset file. -->
+ <check_box
+ control_name="RenderAvatarMaxComplexity"
+ visible="false"
+ height="0"
+ label="RenderAvatarMaxComplexity"
+ layout="topleft"
+ left="0"
+ name="RenderAvatarMaxNonImpostors"
+ top_delta="0"
+ width="0">
+ </check_box>
+
+ <check_box
+ control_name="RenderAvatarMaxNonImpostors"
+ visible="false"
+ height="0"
+ label="RenderAvatarMaxNonImpostors"
+ layout="topleft"
+ left="0"
+ name="RenderAvatarMaxNonImpostors"
+ top_delta="0"
+ width="0">
+ </check_box>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7dee28eff3a1d5111c3e685e1730ee1435f906ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="145"
+ help_topic="floater_save_preset"
+ layout="topleft"
+ name="Save Pref Preset"
+ save_rect="true"
+ title="SAVE PREF PRESET"
+ width="300">
+
+ <string name="title_graphic">Save Graphic Preset</string>
+ <string name="title_camera">Save Camera Preset</string>
+
+ <text
+ follows="top|left|right"
+ height="32"
+ layout="topleft"
+ word_wrap="true"
+ left="20"
+ name="Preset"
+ top="30"
+ width="200">
+ Type a name for the preset or choose an existing preset.
+ </text>
+ <combo_box
+ follows="top|left"
+ layout="topleft"
+ left="20"
+ name="preset_combo"
+ top_delta="35"
+ allow_text_entry="true"
+ width="200"/>
+ <button
+ follows="top|left"
+ height="23"
+ label="Save"
+ layout="topleft"
+ top_delta="40"
+ left="20"
+ name="save"
+ width="70"/>
+ <button
+ follows="bottom|right"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ left_pad="20"
+ name="cancel"
+ width="70"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index b54090015d62f85874caef7e283dbbe6f86456a7..94393a6c77d1bce70d4f06a1a03cc0286d302a3b
--- a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
@@ -11,6 +11,7 @@
name="spellcheck_import"
title="Import Dictionary">
<text
+ name="import_dict"
follows="top|left"
height="16"
layout="topleft"
@@ -41,6 +42,7 @@
top_delta="0"
width="75" />
<text
+ name="import_name"
follows="top|left"
height="16"
layout="topleft"
@@ -61,6 +63,7 @@
top_delta="-5"
width="200" />
<text
+ name="import_lang"
follows="top|left"
height="16"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
old mode 100755
new mode 100644
index ba91b0b5d9489a7aa9fcb1e55bdcd87b58cf57f8..9e520b2d31b22c39e03acd5bf4986f2fc6a06047
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -116,8 +116,8 @@
<menu_item_separator />
<menu_item_check
- name="Normal"
- label="Normal Rendering">
+ name="RenderNormally"
+ label="Render Normally">
<menu_item_check.on_check
function="Avatar.CheckImpostorMode"
parameter="0" />
@@ -126,8 +126,8 @@
parameter="0" />
</menu_item_check>
<menu_item_check
- name="Always use impostor"
- label="Always use impostor">
+ name="DoNotRender"
+ label="Do Not Render">
<menu_item_check.on_check
function="Avatar.CheckImpostorMode"
parameter="1" />
@@ -136,8 +136,8 @@
parameter="1" />
</menu_item_check>
<menu_item_check
- name="Never use impostor"
- label="Never use impostor">
+ name="AlwaysRenderFully"
+ label="Render Fully">
<menu_item_check.on_check
function="Avatar.CheckImpostorMode"
parameter="2" />
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
old mode 100755
new mode 100644
index cfbbe41f95473e7d709c5dad7f57e0c869d1ef2e..fadacbf3cb79122f42ec226343fab8bd2b8d7f68
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -106,8 +106,8 @@
<menu_item_separator />
<menu_item_check
- name="Normal"
- label="Normal Rendering">
+ name="RenderNormally"
+ label="Render Normally">
<menu_item_check.on_check
function="Avatar.CheckImpostorMode"
parameter="0" />
@@ -116,8 +116,8 @@
parameter="0" />
</menu_item_check>
<menu_item_check
- name="Always use impostor"
- label="Always use impostor">
+ name="DoNotRender"
+ label="Do Not Render">
<menu_item_check.on_check
function="Avatar.CheckImpostorMode"
parameter="1" />
@@ -126,8 +126,8 @@
parameter="1" />
</menu_item_check>
<menu_item_check
- name="Never use impostor"
- label="Never use impostor">
+ name="AlwaysRenderFully"
+ label="Render Fully">
<menu_item_check.on_check
function="Avatar.CheckImpostorMode"
parameter="2" />
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
old mode 100755
new mode 100644
index a58fd54d4a61c0679ea0ef95459a17ebe88e0ba8..0a492fb37b25538eb33bb3a88e58d38230dd8b97
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1553,14 +1553,14 @@
parameter="scene_load_stats" />
</menu_item_call>
<menu_item_check
- label="Show Draw Weight for Avatars"
- name="Avatar Rendering Cost">
+ label="Show avatar complexity information"
+ name="Avatar Draw Info">
<menu_item_check.on_check
function="Advanced.CheckInfoDisplay"
- parameter="shame" />
+ parameter="avatardrawinfo" />
<menu_item_check.on_click
function="Advanced.ToggleInfoDisplay"
- parameter="shame" />
+ parameter="avatardrawinfo" />
</menu_item_check>
</menu>
<menu
@@ -2690,26 +2690,6 @@
<menu_item_check.on_click
function="Advanced.ToggleInfoDisplay"
parameter="wind vectors" />
- </menu_item_check>
- <menu_item_check
- label="Render Complexity"
- name="rendercomplexity">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="rendercomplexity" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="rendercomplexity" />
- </menu_item_check>
- <menu_item_check
- label="Attachment Bytes"
- name="attachment bytes">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="attachment bytes" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="attachment bytes" />
</menu_item_check>
<menu_item_check
label="Sculpt"
@@ -3557,7 +3537,7 @@
function="Advanced.ToggleInfoDisplay"
parameter="agent target" />
</menu_item_check>
-<!-- Appears not to exist anymore
+ <!-- Appears not to exist anymore
<menu_item_check
label="Debug Rotation"
name="Debug Rotation">
@@ -3568,7 +3548,6 @@
function="ToggleControl"
parameter="DebugAvatarRotation" />
</menu_item_check> -->
--->
<menu_item_call
label="Dump Attachments"
name="Dump Attachments">
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
old mode 100755
new mode 100644
index f8e346afb94d2ff977dc474198581c9ab4e3a13f..492d96365358902da40464e8613e75b43d654134
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -552,22 +552,6 @@ This listing could not be updated.
yestext="OK"/>
</notification>
- <notification
- icon="alertmodal.tga"
- name="CompileQueueSaveText"
- type="alertmodal">
-There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later.
- <tag>fail</tag>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="CompileQueueSaveBytecode"
- type="alertmodal">
-There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later.
- <tag>fail</tag>
- </notification>
-
<notification
icon="alertmodal.tga"
name="WriteAnimationFail"
@@ -1550,14 +1534,6 @@ Would you like to load the server's last saved version?
yestext="OK"/>
</notification>
- <notification
- icon="alertmodal.tga"
- name="SaveScriptFailReason"
- type="alertmodal">
-There was a problem saving a script due to the following reason: [REASON]. Please try re-saving the script later.
-<tag>fail</tag>
- </notification>
-
<notification
icon="alertmodal.tga"
name="SaveScriptFailObjectNotFound"
@@ -1567,14 +1543,6 @@ The object may be out of range or may have been deleted.
<tag>fail</tag>
</notification>
- <notification
- icon="alertmodal.tga"
- name="SaveBytecodeFailReason"
- type="alertmodal">
-There was a problem saving a compiled script due to the following reason: [REASON]. Please try re-saving the script later.
-<tag>fail</tag>
- </notification>
-
<notification
icon="alertmodal.tga"
name="StartRegionEmpty"
@@ -2771,8 +2739,9 @@ This is usually a temporary failure. Please customize and save the wearable agai
icon="alertmodal.tga"
name="YouHaveBeenLoggedOut"
type="alertmodal">
-Darn. You have been logged out of [SECOND_LIFE]
- [MESSAGE]
+Darn. You have been logged out of [SECOND_LIFE].
+
+[MESSAGE]
<usetemplate
name="okcancelbuttons"
notext="Quit"
@@ -3340,6 +3309,32 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
</form>
</notification>
+ <notification
+ icon = "notifytip.tga"
+ name = "AgentComplexityWithVisibility"
+ type = "notifytip"
+ log_to_chat = "false">
+ <unique combine = "cancel_old">
+ <context>AgentComplexityNotice</context>
+ </unique>
+Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ <usetemplate
+ ignoretext="Warn me if my avatar complexity may be too high"
+ name="notifyignore"/>
+ </notification>
+
+ <notification
+ icon = "notifytip.tga"
+ name = "AgentComplexity"
+ type = "notifytip"
+ log_to_chat = "false">
+ <unique combine = "cancel_old">
+ <context>AgentComplexityNotice</context>
+ </unique>
+Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
+ </notification>
+
<notification
icon="alertmodal.tga"
name="FirstRun"
@@ -4164,28 +4159,6 @@ Leave Group?
yestext="OK"/>
</notification>
- <notification
- icon="aler.tga"
- name="GroupDepartError"
- type="alert">
-Unable to leave group: [reason].
- <tag>reason</tag>
- <usetemplate
- name="okbutton"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alert.tga"
- name="GroupDepart"
- type="alert">
-You have left the group [group_name].
- <tag>group_name</tag>
- <usetemplate
- name="okbutton"
- yestext="OK"/>
- </notification>
-
<notification
icon="alert.tga"
name="ConfirmKick"
@@ -8299,6 +8272,10 @@ Appearance has been saved to XML to [PATH]
<notification icon="notifytip.tga"
name="AppearanceToXMLFailed" type="notifytip">
Failed to save appearance to XML.
+ icon="notifytip.tga"
+ name="PresetNotDeleted"
+ type="notifytip">
+Error deleting preset [NAME].
</notification>
<notification
diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 8e867259c56b43e42a0e59f6338ba7e8cde435e4..8d55e311f6cb44a2071961aae3eb77fc0dc639be
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -453,6 +453,7 @@
width="505">
<text
+ name="logging_label"
layout="topleft"
left="0"
text_color="White"
@@ -468,16 +469,19 @@
height="23"
layout="topleft"
left_pad="5"
- name="chat_font_size"
+ name="conversation_log_combo"
top="0"
width="165">
<item
+ name="log_and_transcripts"
label="Log and transcripts"
value="2"/>
<item
+ name="log_only"
label="Log only"
value="1"/>
<item
+ name="no_log_or_transcript"
label="No log or transcripts"
value="0"/>
</combo_box>
@@ -509,6 +513,7 @@
</button>
<text
+ name="log_location_label"
layout="topleft"
left="0"
text_color="White"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
old mode 100755
new mode 100644
index f6665a1d5d84512a619af905a02b38997b815fd1..9da044ab64d2e6dbd12e0331c782b762a668dafa
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -39,7 +39,12 @@
enabled="true"
label="English"
name="English"
- value="en" />
+ value="en" />
+ <combo_box.item
+ enabled="true"
+ label="Dansk (Danish) - Beta"
+ name="Danish"
+ value="da" />
<combo_box.item
enabled="true"
label="Deutsch (German) - Beta"
@@ -59,7 +64,12 @@
enabled="true"
label="Italiano (Italian) - Beta"
name="Italian"
- value="it" />
+ value="it" />
+ <combo_box.item
+ enabled="true"
+ label="Polski (Polish) - Beta"
+ name="Polish"
+ value="pl" />
<combo_box.item
enabled="true"
label="Português (Portuguese) - Beta"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index e1b8662ece6d8ce954f1de88938a9ef8cdb57e79..a9b8e197bc4c6780f0541ad404b3ee611c6abf06
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,906 +9,361 @@
name="Display panel"
top="1"
width="517">
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left="30"
- name="QualitySpeed"
- top="10"
- width="400">
- Quality and speed:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- halign="right"
- height="12"
- layout="topleft"
- left="35"
- name="FasterText"
- top_pad="4"
- width="80">
- Faster
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="360"
- name="BetterText"
- top_delta="0"
- width="100">
- Better
- </text>
- <icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left="128"
- name="LowGraphicsDivet"
- top_delta="-2"
- width="2" />
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left="5"
+ top="5"
+ width="100">
+ Preset in use:
+ </text>
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left_delta="110"
+ name="preset_text"
+ top="5"
+ width="120">
+ (None)
+ </text>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left="10"
+ name="QualitySpeed"
+ top_delta="35"
+ width="400">
+ Quality & speed:
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ halign="center"
+ height="12"
+ layout="topleft"
+ left="118"
+ name="ShadersPrefText"
+ top_delta="0"
+ width="80">
+ Low
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ halign="center"
+ height="12"
+ layout="topleft"
+ left_delta="87"
+ name="ShadersPrefText2"
+ top_delta="0"
+ width="80">
+ Mid
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ halign="center"
+ height="12"
+ layout="topleft"
+ left_delta="87"
+ name="ShadersPrefText3"
+ top_delta="0"
+ width="80">
+ High
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ halign="center"
+ height="12"
+ layout="topleft"
+ left_delta="85"
+ name="ShadersPrefText4"
+ top_delta="0"
+ width="80">
+ Ultra
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ halign="right"
+ height="12"
+ layout="topleft"
+ left="65"
+ name="FasterText"
+ top_pad="4"
+ width="80">
+ Faster
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left_delta="360"
+ name="BetterText"
+ top_delta="0"
+ width="100">
+ Better
+ </text>
+ <icon
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left="158"
+ name="LowGraphicsDivet"
+ top_delta="-2"
+ width="2" />
+ <icon
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="LowMidGraphicsDivet"
+ width="2" />
+ <icon
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="MidGraphicsDivet"
+ top_delta="0"
+ width="2" />
+ <icon
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="MidHighGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left_pad="41"
- name="LowMidGraphicsDivet"
- width="2" />
- <icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left_pad="41"
- name="MidGraphicsDivet"
- top_delta="0"
- width="2" />
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="HighGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left_pad="41"
- name="MidHighGraphicsDivet"
- top_delta="0"
- width="2" />
- <icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left_pad="41"
- name="HighGraphicsDivet"
- top_delta="0"
- width="2" />
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="HighUltraGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left_pad="41"
- name="HighUltraGraphicsDivet"
- top_delta="0"
- width="2" />
- <icon
- color="DkGray"
- height="14"
- image_name="Rounded_Square"
- layout="topleft"
- left_pad="41"
- name="UltraGraphicsDivet"
- top_delta="0"
- width="2" />
- <slider
- control_name="RenderQualityPerformance"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="0"
- layout="topleft"
- left="120"
- max_val="6"
- name="QualityPerformanceSelection"
- show_text="false"
- top_delta="-2"
- width="275">
- <slider.commit_callback
- function="Pref.QualityPerformance"/>
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- halign="center"
- height="12"
- layout="topleft"
- left="88"
- name="ShadersPrefText"
- top_delta="20"
- width="80">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- halign="center"
- height="12"
- layout="topleft"
- left_delta="87"
- name="ShadersPrefText2"
- top_delta="0"
- width="80">
- Mid
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- halign="center"
- height="12"
- layout="topleft"
- left_delta="87"
- name="ShadersPrefText3"
- top_delta="0"
- width="80">
- High
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- halign="center"
- height="12"
- layout="topleft"
- left_delta="85"
- name="ShadersPrefText4"
- top_delta="0"
- width="80">
- Ultra
- </text>
+ color="DkGray"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="UltraGraphicsDivet"
+ top_delta="0"
+ width="2" />
<slider
- control_name="RenderAvatarLODFactor"
- invisiblity_control="ShowAdvancedGraphicsSettings"
- follows="left|top"
- height="16"
- increment="0.125"
- initial_value="160"
- label="Avatar detail:"
- label_width="90"
- layout="topleft"
- left="30"
- name="AvatarMeshDetail2"
- show_text="false"
- top="72"
- width="300">
+ control_name="RenderQualityPerformance"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="0"
+ layout="topleft"
+ left="150"
+ max_val="6"
+ name="QualityPerformanceSelection"
+ show_text="false"
+ top_delta="-2"
+ width="275">
<slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="AvatarMeshDetailText2" />
+ function="Pref.QualityPerformance"/>
</slider>
+
+<!-- This block shows Basic Settings -->
+
+ <slider
+ control_name="RenderFarClip"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="8"
+ initial_value="160"
+ label="Draw distance:"
+ label_width="90"
+ layout="topleft"
+ left="30"
+ min_val="64"
+ max_val="512"
+ name="DrawDistance"
+ top_delta="40"
+ width="330" />
<text
- type="string"
- invisiblity_control="ShowAdvancedGraphicsSettings"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- name="AvatarMeshDetailText2"
- top_delta="0"
- left_delta="304"
- width="128">
- Low
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left_delta="330"
+ name="DrawDistanceMeterText2"
+ top_delta="0"
+ width="128">
+ m
</text>
+
<slider
- control_name="RenderFarClip"
- invisiblity_control="ShowAdvancedGraphicsSettings"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="8"
- initial_value="160"
- label="Draw distance:"
- label_width="90"
- layout="topleft"
- left="30"
- max_val="512"
- min_val="64"
- name="DrawDistance"
- top="110"
- width="330" />
+ control_name="IndirectMaxComplexity"
+ tool_tip="Controls at what point a visually complex avatar is drawn as a jelly doll"
+ follows="left|top"
+ height="16"
+ initial_value="101"
+ increment="1"
+ label="Avatar Maximum Complexity:"
+ label_width="165"
+ layout="topleft"
+ left="30"
+ min_val="1"
+ max_val="101"
+ name="IndirectMaxComplexity"
+ show_text="false"
+ top_delta="24"
+ width="300">
+ <slider.commit_callback
+ function="Pref.UpdateIndirectMaxComplexity"
+ parameter="IndirectMaxComlexityText" />
+ </slider>
<text
- type="string"
- invisiblity_control="ShowAdvancedGraphicsSettings"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="330"
- name="DrawDistanceMeterText2"
- top_delta="0"
- width="128">
- m
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ top_delta="0"
+ left_delta="304"
+ text_readonly_color="LabelDisabledColor"
+ name="IndirectMaxComplexityText"
+ width="65">
+ 0
</text>
+
+ <check_box
+ control_name="WindLightUseAtmosShaders"
+ height="16"
+ initial_value="true"
+ label="Atmospheric shaders"
+ layout="topleft"
+ left="30"
+ name="WindLightUseAtmosShaders"
+ top_delta="24"
+ width="280">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+
<check_box
- control_name="RenderDeferred"
- invisiblity_control="ShowAdvancedGraphicsSettings"
- height="16"
- initial_value="true"
- label="Advanced Lighting Model"
- layout="topleft"
- left="30"
- name="UseLightShaders2"
- top="148"
- width="256">
+ control_name="RenderDeferred"
+ height="16"
+ initial_value="true"
+ label="Advanced Lighting Model"
+ layout="topleft"
+ left="30"
+ name="UseLightShaders"
+ top_delta="24"
+ width="256">
<check_box.commit_callback
function="Pref.VertexShaderEnable" />
</check_box>
- <panel
- visiblity_control="ShowAdvancedGraphicsSettings"
- border="false"
- follows="top|left"
- height="300"
- label="CustomGraphics"
- layout="topleft"
- left="5"
- name="CustomGraphics Panel"
- top="76"
- width="485">
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="5"
- name="ShadersText"
- top="3"
- width="128">
- Shaders:
- </text>
- <check_box
- control_name="RenderTransparentWater"
- height="16"
- initial_value="true"
- label="Transparent Water"
- layout="topleft"
- left_delta="0"
- name="TransparentWater"
- top_pad="7"
- width="256" />
- <check_box
- control_name="RenderObjectBump"
- height="16"
- initial_value="true"
- label="Bump mapping and shiny"
- layout="topleft"
- left_delta="0"
- name="BumpShiny"
- top_pad="1"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="RenderLocalLights"
- height="16"
- initial_value="true"
- label="Local Lights"
- layout="topleft"
- left_delta="0"
- name="LocalLights"
- top_pad="1"
- width="256" />
- <check_box
- control_name="VertexShaderEnable"
- height="16"
- initial_value="true"
- label="Basic shaders"
- layout="topleft"
- left_delta="0"
- name="BasicShaders"
- tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
- top_pad="1"
- width="315">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="WindLightUseAtmosShaders"
- height="16"
- initial_value="true"
- label="Atmospheric shaders"
- layout="topleft"
- left_delta="0"
- name="WindLightUseAtmosShaders"
- top_pad="1"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="RenderDeferred"
- height="16"
- initial_value="true"
- label="Advanced Lighting Model"
- layout="topleft"
- left_delta="0"
- name="UseLightShaders"
- top_pad="1"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="RenderDeferredSSAO"
- height="16"
- initial_value="true"
- label="Ambient Occlusion"
- layout="topleft"
- left_delta="0"
- name="UseSSAO"
- top_pad="1"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="RenderDepthOfField"
- height="16"
- initial_value="true"
- label="Depth of Field"
- layout="topleft"
- left_delta="0"
- name="UseDoF"
- top_pad="1"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <text
- type="string"
- length="1"
- top_pad="8"
- follows="top|left"
- height="23"
- width="110"
- word_wrap="true"
- layout="topleft"
- left="10"
- name="shadows_label">
- Shadows:
- </text>
- <combo_box
- control_name="RenderShadowDetail"
- height="23"
- layout="topleft"
- left="10"
- top_pad="0"
- name="ShadowDetail"
- width="150">
- <combo_box.item
- label="None"
- name="0"
- value="0"/>
- <combo_box.item
- label="Sun/Moon"
- name="1"
- value="1"/>
- <combo_box.item
- label="Sun/Moon + Projectors"
- name="2"
- value="2"/>
- </combo_box>
+<!-- End of Basic Settings block -->
- <text
- type="string"
- length="1"
- top_pad="8"
- follows="top|left"
- height="12"
- width="110"
- word_wrap="true"
- layout="topleft"
- left="05"
- name="reflection_label">
- Water Reflections:
- </text>
- <combo_box
- control_name="RenderReflectionDetail"
- height="18"
- layout="topleft"
- left_delta="10"
- top_pad ="3"
- name="Reflections"
- width="150">
- <combo_box.item
- label="Minimal"
- name="0"
- value="0"/>
- <combo_box.item
- label="Terrain and trees"
- name="1"
- value="1"/>
- <combo_box.item
- label="All static objects"
- name="2"
- value="2"/>
- <combo_box.item
- label="All avatars and objects"
- name="3"
- value="3"/>
- <combo_box.item
- label="Everything"
- name="4"
- value="4"/>
- </combo_box>
-
- <slider
- control_name="RenderAvatarPhysicsLODFactor"
- follows="left|top"
- height="16"
- initial_value="100"
- increment=".05"
- label=" Avatar Physics:"
- label_width="85"
- layout="topleft"
- left_delta="-16"
- name="AvatarPhysicsDetail"
- show_text="false"
- top_pad="12"
- width="160">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="AvatarPhysicsDetailText" />
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="165"
- name="AvatarPhysicsDetailText"
- top_pad="-16"
- width="128">
- Low
- </text>
+ <button
+ follows="top|left"
+ height="23"
+ label="Save settings as a preset..."
+ layout="topleft"
+ left="10"
+ name="PrefSaveButton"
+ top="310"
+ width="200">
+ <button.commit_callback
+ function="Pref.PrefSave"
+ parameter="graphic" />
+ </button>
- <slider
- control_name="RenderFarClip"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="8"
- initial_value="160"
- label="Draw distance:"
- label_width="185"
- layout="topleft"
- left="200"
- max_val="512"
- min_val="64"
- name="DrawDistance"
- top="3"
- width="296" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="291"
- name="DrawDistanceMeterText2"
- top_delta="0"
- width="128">
- m
- </text>
- <slider
- control_name="RenderMaxPartCount"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="256"
- initial_value="4096"
- label="Max. particle count:"
- label_width="185"
- layout="topleft"
- left="200"
- max_val="8192"
- name="MaxParticleCount"
- top_pad="7"
- width="303" />
- <slider
- control_name="RenderAvatarMaxVisible"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="12"
- label="Max. # of non-impostor avatars:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- max_val="65"
- min_val="1"
- name="MaxNumberAvatarDrawn"
- top_pad="4"
- width="290" />
- <slider
- control_name="RenderGlowResolutionPow"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="8"
- label="Post process quality:"
- label_width="185"
- layout="topleft"
- left="200"
- max_val="9"
- min_val="8"
- name="RenderPostProcess"
- show_text="false"
- top_pad="4"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="PostProcessText" />
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="MeshDetailText"
- top_pad="5"
- width="128">
- Mesh detail:
- </text>
- <slider
- control_name="RenderVolumeLODFactor"
- follows="left|top"
- height="16"
- increment="0.125"
- initial_value="160"
- label=" Objects:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- max_val="2"
- name="ObjectMeshDetail"
- show_text="false"
- top_pad="6"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="ObjectMeshDetailText" />
- </slider>
- <slider
- control_name="RenderFlexTimeFactor"
- follows="left|top"
- height="16"
- initial_value="160"
- label=" Flexiprims:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- name="FlexibleMeshDetail"
- show_text="false"
- top_pad="4"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="FlexibleMeshDetailText" />
- </slider>
- <slider
- control_name="RenderTreeLODFactor"
- follows="left|top"
- height="16"
- increment="0.125"
- initial_value="160"
+ <button
+ follows="top|left"
+ height="23"
+ label="Load preset..."
+ layout="topleft"
+ left_pad="10"
+ name="PrefLoadButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefLoad"
+ parameter="graphic"/>
+ </button>
min_val="0.125"
- label=" Trees:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- name="TreeMeshDetail"
- show_text="false"
- top_pad="4"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="TreeMeshDetailText" />
- </slider>
- <slider
- control_name="RenderAvatarLODFactor"
- follows="left|top"
- height="16"
- increment="0.125"
- initial_value="160"
- label=" Avatars:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- name="AvatarMeshDetail"
- show_text="false"
- top_pad="4"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="AvatarMeshDetailText" />
- </slider>
- <slider
- control_name="RenderTerrainLODFactor"
- follows="left|top"
- height="16"
- increment="0.125"
- initial_value="160"
- label=" Terrain:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- max_val="2"
- min_val="1"
- name="TerrainMeshDetail"
- show_text="false"
- top_pad="4"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="TerrainMeshDetailText" />
- </slider>
- <slider
- control_name="WLSkyDetail"
- enabled_control="WindLightUseAtmosShaders"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="8"
- initial_value="160"
- label=" Sky:"
- label_width="185"
- layout="topleft"
- left_delta="0"
- max_val="128"
- min_val="16"
- name="SkyMeshDetail"
- show_text="false"
- top_pad="4"
- width="264">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="SkyMeshDetailText" />
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left="469"
- name="PostProcessText"
- top="60"
- width="128">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="ObjectMeshDetailText"
- top_pad="26"
- width="128">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="FlexibleMeshDetailText"
- top_pad="8"
- width="128">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="TreeMeshDetailText"
- top_pad="8"
- width="128">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="AvatarMeshDetailText"
- top_pad="8"
- width="128">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="TerrainMeshDetailText"
- top_pad="8"
- width="128">
- Low
- </text>
- <text
- enabled_control="WindLightUseAtmosShaders"
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="SkyMeshDetailText"
- top_pad="8"
- width="128">
- Low
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="-260"
- name="AvatarRenderingText"
- top_pad="18"
- width="128">
- Avatar Rendering:
- </text>
- <check_box
- control_name="RenderUseImpostors"
- height="16"
- initial_value="true"
- label="Avatar impostors"
- layout="topleft"
- left_delta="0"
- name="AvatarImpostors"
- top_pad="7"
- width="256" />
- <check_box
- control_name="RenderAvatarVP"
- height="16"
- initial_value="true"
- label="Hardware skinning"
- layout="topleft"
- left_delta="0"
- name="AvatarVertexProgram"
- top_pad="1"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="RenderAvatarCloth"
- height="16"
- initial_value="true"
- label="Avatar cloth"
- layout="topleft"
- left_delta="0"
- name="AvatarCloth"
- top_pad="1"
- width="256" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left="407"
- left_pad="-30"
- name="TerrainDetailText"
- top="250"
- width="155">
- Terrain detail:
- </text>
- <radio_group
- control_name="RenderTerrainDetail"
- draw_border="false"
- height="38"
- layout="topleft"
- left_delta="5"
- name="TerrainDetailRadio"
- top_pad="5"
- width="70">
- <radio_item
- height="16"
- label="Low"
- layout="topleft"
- name="0"
- top="3"
- width="50" />
- <radio_item
- height="16"
- label="High"
- layout="topleft"
- name="2"
- top_delta="16"
- width="50" />
- </radio_group> -->
- </panel>
-
- <button
- follows="left|bottom"
- height="23"
- label="Apply"
- label_selected="Apply"
- layout="topleft"
- left="10"
- name="Apply"
- top="390"
- width="115">
- <button.commit_callback
- function="Pref.Apply" />
- </button>
- <button
- follows="left|bottom"
- height="23"
- label="Reset"
- layout="topleft"
- left_pad="3"
- name="Defaults"
- top="390"
- width="115">
- <button.commit_callback
- function="Pref.HardwareDefaults" />
- </button>
- <button
- control_name="ShowAdvancedGraphicsSettings"
- follows="right|bottom"
- height="23"
- is_toggle="true"
- label="Advanced"
- layout="topleft"
- left_pad="35"
- name="Advanced"
- top_delta="0"
- width="115" />
- <button
- follows="right|bottom"
- height="23"
- label="Hardware"
- label_selected="Hardware"
- layout="topleft"
- left_pad="3"
- name="GraphicsHardwareButton"
- top_delta="0"
- width="115">
- <button.commit_callback
- function="Pref.HardwareSettings" />
- </button>
+ <button
+ follows="top|left"
+ height="23"
+ label="Delete preset..."
+ layout="topleft"
+ left_pad="10"
+ name="PrefDeleteButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefDelete"
+ parameter="graphic"/>
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Reset to recommended settings"
+ layout="topleft"
+ left="10"
+ name="Defaults"
+ top_delta="65"
+ width="210">
+ <button.commit_callback
+ function="Pref.HardwareDefaults" />
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Advanced Settings..."
+ layout="topleft"
+ left_pad="10"
+ name="AdvancedSettings"
+ top_delta="0"
+ width="200">
+ <button.commit_callback
+ function="Pref.Advanced"
+ parameter="advanced" />
+ </button>
+
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
old mode 100755
new mode 100644
index 45b2b6ec27b3d9b913eeed1f62fe42eff45c425f..0b605cf6f7e33a6238b7e1422c500a337d110d95
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -173,7 +173,7 @@
label="Use built-in browser for all links"
layout="topleft"
left="0"
- name="internal"
+ name="external_all"
value="2"
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
top_delta="20"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b87dda2315e9f2819c0e2d0c4c82da0ac17392af
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="155"
+ layout="topleft"
+ name="presets_pulldown"
+ width="225">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ top="4"
+ left_delta="5"
+ font.style="BOLD"
+ name="Graphic Presets"
+ width="120">
+ Graphic Presets
+ </text>
+ <scroll_list
+ follows="left|top"
+ layout="topleft"
+ column_padding="0"
+ height="100"
+ width="215"
+ draw_heading="false"
+ draw_stripes="false"
+ bg_stripe_color="0.25 0.25 0.25 0.25"
+ top_delta="15"
+ left_delta="0"
+ name="preset_list">
+ <scroll_list.columns
+ name="icon"
+ width="16" />
+ <scroll_list.columns
+ relative_width="1"
+ name="preset_name" />
+ <scroll_list.commit_callback
+ function="Presets.RowClick" />
+ </scroll_list>
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="5"
+ name="horiz_separator"
+ top_delta="105"
+ width="215" />
+ <button
+ name="open_prefs_btn"
+ label="Open Graphics Preferences"
+ tool_tip = "Bring up graphics prefs"
+ top_delta="5"
+ left="15"
+ height="20"
+ width="200">
+ <button.commit_callback
+ function="Presets.GoGraphicsPrefs" />
+ </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 8f90521bb21c07bebd59509c6783dacdecff9be3..eb67d076016e279c0774ce3def8d3e26744d0b76
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -338,6 +338,7 @@
mouse_opaque="false"
orientation="horizontal">
<layout_panel
+ name="media_address_url_icons_wl"
layout="topleft"
width="16"
mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
old mode 100755
new mode 100644
index dbf7bc031f91de499494f9130b4a75fb0c1f57ae..998f1ce59979d460145ba9747201e77f45cdda28
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
</panel.string>
<panel
height="18"
- left="-395"
+ left="-416"
width="185"
top="1"
follows="right|top"
@@ -105,6 +105,14 @@
width="145">
24:00 AM PST
</text>
+ <icon
+ follows="right|top"
+ height="16"
+ image_name="Presets_Icon"
+ left_pad="8"
+ top="2"
+ name="presets_icon"
+ width="18" />
<button
follows="right|top"
height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
old mode 100755
new mode 100644
index ff98d2f109b38a18c99b269eda782ecd1011b418..ae63546082f9975c55c39e8ada14968f575cc96c
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -22,10 +22,11 @@
<!-- about dialog/support string-->
<string name="AboutHeader">
-[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">Built with [COMPILER] version [COMPILER_VERSION]</string>
+ <string name="BuildConfig">Build Configuration [BUILD_CONFIG]</string>
+
<string name="AboutPosition">
You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURL: <nolink>[SLURL]</nolink>
@@ -47,7 +48,6 @@ Graphics Card: [GRAPHICS_CARD]
<string name="AboutLibs">
OpenGL Version: [OPENGL_VERSION]
-libcurl Version: [LIBCURL_VERSION]
J2C Decoder Version: [J2C_VERSION]
Audio Driver Version: [AUDIO_DRIVER_VERSION]
LLCEFLib/CEF Version: [LLCEFLIB_VERSION]
@@ -55,7 +55,8 @@ Voice Server Version: [VOICE_VERSION]
</string>
<string name="AboutTraffic">Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)</string>
<string name="ErrorFetchingServerReleaseNotesURL">Error fetching server release notes URL.</string>
-
+ <string name="BuildConfiguration">Build Configuration</string>
+
<!-- progress -->
<string name="ProgressRestoring">Restoring...</string>
<string name="ProgressChangingResolution">Changing resolution...</string>
@@ -2490,6 +2491,13 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<string name="DaysOld">[AGEDAYS] old</string>
<string name="TodayOld">Joined today</string>
+ <!-- Avatar complexity rendering messages, see llavatarrendernotifier. -->
+ <string name="av_render_everyone_now">Everyone can see you now.</string>
+ <string name="av_render_not_everyone">You may not be rendered by everyone around you.</string>
+ <string name="av_render_over_half">You may not be rendered by over half of those around you.</string>
+ <string name="av_render_most_of">You may not be rendered by most of those around you.</string>
+ <string name="av_render_anyone">You may not be rendered by anyone around you.</string>
+
<!-- AgeYearsA = singular,
AgeYearsB = plural,
AgeYearsC = plural for non-English languages like Russian
@@ -4123,14 +4131,18 @@ Try enclosing path to the editor with double quotes.
Loading...
</string>
+ <!-- Presets graphic/camera -->
+ <string name="preset_combo_label">-Empty list-</string>
+ <string name="Default">Default</string>
+ <string name="none_paren_cap">(None)</string>
+ <string name="no_limit">No Limit</string>
+
<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
The physics shape contains triangles which are too small. Try simplifying the physics model.
</string>
-
<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
The physics shape contains bad confirmation data. Try to correct the physics model.
</string>
-
<string name="Mav_Details_MAV_UNKNOWN_VERSION">
The physics shape does not have correct version. Set the correct version for the physics model.
</string>
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/name_editor.xml b/indra/newview/skins/default/xui/en/widgets/name_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/name_list.xml b/indra/newview/skins/default/xui/en/widgets/name_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/slider.xml b/indra/newview/skins/default/xui/en/widgets/slider.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/view_border.xml b/indra/newview/skins/default/xui/en/widgets/view_border.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/web_browser.xml b/indra/newview/skins/default/xui/en/widgets/web_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/widgets/window_shade.xml b/indra/newview/skins/default/xui/en/widgets/window_shade.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/en/xui_version.xml b/indra/newview/skins/default/xui/en/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
old mode 100755
new mode 100644
index 9bf485ce40f8484342f1da21f5027ce6ab3de486..8f143cf072ec2527bca0f75ce899f9626d83b171
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Información" name="support_panel">
<button label="Copiar al portapapeles" name="copy_btn" width="165"/>
+ <button label="Buscar actualizaciones" name="update_btn"/>
</panel>
<panel label="Créditos" name="credits_panel">
<text name="linden_intro">Second Life ofrecido por los Lindens,
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
old mode 100755
new mode 100644
index 79493d3885c0dd79235e8b9125636e35336c73d1..39426b2aaf83431e9f11ccc732ccca2ec9723245
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -10,13 +10,13 @@
"Parcel_R_Dark"
</floater.string>
<floater.string name="Minutes">
- [MINUTES] minutos
+ [MINUTES] min.
</floater.string>
<floater.string name="Minute">
- minuto
+ min.
</floater.string>
<floater.string name="Seconds">
- [SECONDS] segundos
+ [SECONDS] seg.
</floater.string>
<floater.string name="Remaining">
restantes
@@ -356,7 +356,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
<text name="allow_label5" top="170">
Los avatares de otras parcelas pueden ver a los avatares de esta parcela y chatear con ellos
</text>
- <check_box label="Ver los avatares" name="SeeAvatarsCheck" top="170" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos."/>
+ <check_box label="Ver los avatares" name="SeeAvatarsCheck" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos." top="170"/>
<text name="landing_point">
Punto de llegada: [LANDING]
</text>
@@ -451,7 +451,7 @@ los media:
<spinner label="Horas de acceso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Always Allow" name="AllowedText">
- Residentes autorizados
+ Residentes permitidos ([COUNT])
</text>
<name_list name="AccessList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
<button label="Añadir" name="add_allowed"/>
@@ -459,7 +459,7 @@ los media:
</panel>
<panel name="Banned_layout_panel">
<text label="Ban" name="BanCheck">
- Residentes con el acceso prohibido
+ Residentes no admitidos ([COUNT])
</text>
<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
<button label="Añadir" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/es/floater_activeim.xml b/indra/newview/skins/default/xui/es/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
old mode 100755
new mode 100644
index 15abccc376cab2351da921fbc0d35d84ea4acc51..744a8b1ea39719669dffe4c3eb895b0eee10b26e
--- a/indra/newview/skins/default/xui/es/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Añadir..." name="autoreplace_add_entry"/>
<button label="Eliminar" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Palabra clave:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Reemplazo:
+ </text>
<button label="Guardar entrada" name="autoreplace_save_entry" tool_tip="Guarda esta entrada."/>
<button label="Guardar cambios" name="autoreplace_save_changes" tool_tip="Guarda todos los cambios."/>
<button label="Cancelar" name="autoreplace_cancel" tool_tip="Descarta todos los cambios."/>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar.xml b/indra/newview/skins/default/xui/es/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
old mode 100755
new mode 100644
index 6d4196ca7c46f91db1a5c6c99e352ca79c3c916f..d95bda301c311d7e4851e5a4693da2a70da01183
--- a/indra/newview/skins/default/xui/es/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] te ha golpeado con un objeto fÃsico
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..614f59f356a137c40b0743dda396a118aa9068a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="ELIMINAR VALOR PREDEFINIDO PREF">
+ <string name="title_graphic">
+ Eliminar valor predefinido gráfico
+ </string>
+ <string name="title_camera">
+ Eliminar valor predefinido de cámara
+ </string>
+ <text name="Preset">
+ Seleccionar un valor predefinido
+ </text>
+ <button label="Eliminar" name="delete"/>
+ <button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_destinations.xml b/indra/newview/skins/default/xui/es/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_experienceprofile.xml b/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
index c37208647aafc73cf0ff0ded9633e87f86ef68b0..aa81343872ac80b0bd7edab9de8a2ae7126dd316 100644
--- a/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
@@ -63,7 +63,7 @@
<text name="edit_ContentRating">
Calificación:
</text>
- <icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Al aumentar el nivel de calificación de una experiencia se restablecen los permisos de todos los residentes que han permitido la experiencia.">
+ <icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Al aumentar la calificación de contenido de una experiencia se restablecen los permisos de todos los residentes que han permitido la experiencia.">
<icons_combo_box.item label="Adulto" name="Adult" value="42"/>
<icons_combo_box.item label="Moderado" name="Mature" value="21"/>
<icons_combo_box.item label="General" name="PG" value="13"/>
@@ -75,7 +75,7 @@
<button label="Borrar lugar" name="clear_btn"/>
<check_box label="Habilitar experiencia" name="edit_enable_btn" tool_tip=""/>
<check_box label="Ocultar en la búsqueda" name="edit_private_btn"/>
- <text name="changes" value="Los cambios de una experiencia pueden tardar varios minutos en mostrarse en todas las regiones.+"/>
+ <text name="changes" value="Los cambios de una experiencia pueden tardar varios minutos en mostrarse en todas las regiones."/>
<button label="Anterior" name="cancel_btn"/>
<button label="Guardar" name="save_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
old mode 100755
new mode 100644
index eeb39583efcb84bc612d653da49fcfc3bbf60f2f..6a01ee6613286036210335c143e5e87ef1e16acc
--- a/indra/newview/skins/default/xui/es/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Correr
</string>
+ <combo_box name="time_scale_combo">
+ <item label="Valor medio × 2" name="2x Average"/>
+ <item label="Máx." name="Max"/>
+ <item label="Máx. reciente" name="Recent Max"/>
+ <item label="100Â ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Hora" name="Time"/>
+ <item label="Cantidad de visitas" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Pausa" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_how_to.xml b/indra/newview/skins/default/xui/es/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 5d16ccd2719b821301183e813edf2a9bb5bad204..0485154fecc07a96067b8f868db5dd9375da15c6
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Anteriores a" name="older"/>
</radio_group>
<spinner label="horas atrás" name="spin_hours_ago"/>
+ <text name="label_hours">
+ Horas
+ </text>
<spinner label="dÃas atrás" name="spin_days_ago"/>
+ <text name="label_days">
+ DÃas
+ </text>
<button bottom_delta="-30" label="Cerrar" label_selected="Cerrar" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/es/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..233e0ffc7e0a0def738f7d560ebf27ee29e573fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CARGAR VALOR PREDEFINIDO PREF">
+ <string name="title_graphic">
+ Cargar valor predefinido gráfico
+ </string>
+ <string name="title_camera">
+ Cargar valor predefinido de cámara
+ </string>
+ <text name="Preset">
+ Seleccionar un valor predefinido
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_media_settings.xml b/indra/newview/skins/default/xui/es/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index a7c17fc136c01cdd3790f7fee96c95dff9f62473..b74c5fca5cc420c5925b9a04ce4b9e41000ad046
--- a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
Inicializando...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Cargando...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Arrastra aquà artÃculos para crear carpetas
+ </text>
+ </panel>
<button label="Enviar al Mercado" name="outbox_import_btn" tool_tip="Poner en el escaparate de Mi Mercado"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
old mode 100755
new mode 100644
index e2313bce99b4600496f7df5c9004d143bb66f001..a5229cd48c8041b917f3c072daaf1afe01390c8e
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
Los materiales con niveles de detalle no son un subconjunto del modelo de referencia.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Algunas apariencias fÃsicas sobrepasan las limitaciones de vértices.
+ </string>
<string name="layer_all">
Todo
</string>
@@ -93,52 +96,52 @@
<text initial_value="Vértices" name="vertices" value="Vértices"/>
<text initial_value="Alto" name="high_label" value="Alto"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Cargar desde archivo"/>
- <item name="Generate" value="Generar"/>
+ <item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+ <item label="Generar" name="Generate" value="Generar"/>
</combo_box>
<button label="Buscar..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="LÃmite de triángulo"/>
- <item name="Error Threshold" value="Margen de error"/>
+ <item label="LÃmite de triángulo" name="Triangle Limit" value="LÃmite de triángulo"/>
+ <item label="Margen de error" name="Error Threshold" value="Margen de error"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Medio" name="medium_label" value="Medio"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Cargar desde archivo"/>
- <item name="Generate" value="Generar"/>
- <item name="Use LoD above" value="Usar nivel de detalle superior"/>
+ <item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+ <item label="Generar" name="Generate" value="Generar"/>
+ <item label="Usar nivel de detalle superior" name="Use LoD above" value="Usar nivel de detalle superior"/>
</combo_box>
<button label="Buscar..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="LÃmite de triángulo"/>
- <item name="Error Threshold" value="Margen de error"/>
+ <item label="LÃmite de triángulo" name="Triangle Limit" value="LÃmite de triángulo"/>
+ <item label="Margen de error" name="Error Threshold" value="Margen de error"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Bajo" name="low_label" value="Bajo"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Cargar desde archivo"/>
- <item name="Generate" value="Generar"/>
- <item name="Use LoD above" value="Usar nivel de detalle superior"/>
+ <item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+ <item label="Generar" name="Generate" value="Generar"/>
+ <item label="Usar nivel de detalle superior" name="Use LoD above" value="Usar nivel de detalle superior"/>
</combo_box>
<button label="Buscar..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="LÃmite de triángulo"/>
- <item name="Error Threshold" value="Margen de error"/>
+ <item label="LÃmite de triángulo" name="Triangle Limit" value="LÃmite de triángulo"/>
+ <item label="Margen de error" name="Error Threshold" value="Margen de error"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="MÃnimo" name="lowest_label" value="MÃnimo"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Cargar desde archivo"/>
- <item name="Generate" value="Generar"/>
- <item name="Use LoD above" value="Usar nivel de detalle superior"/>
+ <item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+ <item label="Generar" name="Generate" value="Generar"/>
+ <item label="Usar nivel de detalle superior" name="Use LoD above" value="Usar nivel de detalle superior"/>
</combo_box>
<button label="Buscar..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="LÃmite de triángulo"/>
- <item name="Error Threshold" value="Margen de error"/>
+ <item label="LÃmite de triángulo" name="Triangle Limit" value="LÃmite de triángulo"/>
+ <item label="Margen de error" name="Error Threshold" value="Margen de error"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_my_appearance.xml b/indra/newview/skins/default/xui/es/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_my_inventory.xml b/indra/newview/skins/default/xui/es/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/es/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2325448c0a758cf5d14e2f68de3cd547b2cd4f13
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="NOTIFICACIONES">
+ <floater.string name="system_tab_title">
+ Sistema ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Transacciones ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Invitaciones ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Grupo ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ NOTIFICACIONES
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="Sistema (0)" name="system_notification_list_tab"/>
+ <panel label="Transacciones (0)" name="transaction_notifications_tab"/>
+ <panel label="Invitaciones (0)" name="group_invite_notifications_tab"/>
+ <panel label="Grupo (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Cerrar todo" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="Panel de espacios" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Eliminar todo" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_object_weights.xml b/indra/newview/skins/default/xui/es/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index e3ee0563d2f1f76ac716b6f9191a71c8d9e3cf35..255668e3c641700fb6b88d6ed69da72b1f860382
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[grupo]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Nombre" name="name"/>
<scroll_list.columns label="Descripción" name="description"/>
@@ -42,7 +42,7 @@
<button label="Seleccionar todo" name="select_all_objects"/>
<button label="No seleccionar ninguno" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
Acciones en los personajes seleccionados:
</text>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index e93ecc9e10d3483cacaf1db2888999333fc19399..4489213f447b0f8b55c1489156632a17288df2e1
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Error durante la generación de la ruta.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Estado del visor
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Estado del simulador
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Vista" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index e6f864eef5409401e03d0e74fb9be7cd4547893d..58ddd6b6219a6f93574f99bdf03a4f20b1820c5d
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
Elegir la utilización del linkset...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Filtrar por:
+ </text>
+ <text name="linksets_name_label">
+ Nombre
+ </text>
+ <text name="linksets_desc_label">
+ Descripción
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Filtrar por utilización de linkset..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Objeto transitable" name="filter_by_linkset_use_walkable"/>
@@ -122,7 +131,10 @@
<button label="Seleccionar todo" name="select_all_objects"/>
<button label="No seleccionar ninguno" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Acciones aplicadas a los linksets seleccionados (si se elimina un linkset de Second Life, podrÃan perderse sus atributos):
+ </text>
<check_box label="Mostrar baliza" name="show_beacon"/>
<button label="Tomar" name="take_objects"/>
<button label="Tomar una copia" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="Devolver" name="return_objects"/>
<button label="Eliminar" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Modifica los atributos de los linksets seleccionados y pulsa el botón para aplicar los cambios
+ </text>
<text name="walkability_coefficients_label">
Transitabilidad:
</text>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_people.xml b/indra/newview/skins/default/xui/es/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_perms_default.xml b/indra/newview/skins/default/xui/es/floater_perms_default.xml
index 71c3f239ea55bc9d1529ca23dd64de3dc97c6d2d..97e5390931b6a4664ec0fc628a32186c7d257c1d 100644
--- a/indra/newview/skins/default/xui/es/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/es/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="PERMISOS DE CREACIÓN PREDETERMINADOS">
- <panel label="Permisos predeterminados" name="default permissions"/>
+ <panel label="Permisos predeterminados" name="default permissions">
+ <text name="label_1">
+ Próximo propietario:
+ </text>
+ <text name="label_2">
+ Copiar
+ </text>
+ <text name="label_3">
+ Modificarlo
+ </text>
+ <text name="label_4">
+ Transferencias
+ </text>
+ <text name="label_5">
+ Compartir con el grupo
+ </text>
+ <text name="label_6">
+ Permitir copiar a cualquiera
+ </text>
+ <text name="label_7" tool_tip="Definir los permisos predeterminados para la creación de objetos">
+ Objetos
+ </text>
+ <text name="label_8" tool_tip="Definir los permisos predeterminados para los elementos subidos">
+ Subidas
+ </text>
+ <text name="label_9" tool_tip="Definir los permisos predeterminados para la creación de scripts">
+ Scripts
+ </text>
+ <text name="label_10" tool_tip="Definir los permisos predeterminados para la creación de notas">
+ Notas
+ </text>
+ <text name="label_11" tool_tip="Definir los permisos predeterminados para la creación de gestos">
+ Gestos
+ </text>
+ <text name="label_12" tool_tip="Definir los permisos predeterminados para la creación de ropa o partes del cuerpo">
+ ArtÃculos de vestir
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_picks.xml b/indra/newview/skins/default/xui/es/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_places.xml b/indra/newview/skins/default/xui/es/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dda95ad0707a1788b8a8d9b96b46a31f29c16eb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PREFERENCIAS DE GRÃFICOS AVANZADAS">
+ <text name="GeneralText">
+ General
+ </text>
+ <slider label="Distancia de dibujo:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Cant. máx. de partÃculas:" name="MaxParticleCount"/>
+ <slider label="Calidad del procesamiento:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Bajo
+ </text>
+ <text name="AvatarText">
+ Avatar
+ </text>
+ <slider label="Complejidad máxima:" name="IndirectMaxComplexity" tool_tip="Controla en qué momento un avatar visualmente complejo se dibuja como una sombra de color sólido"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="N.º máx. de avatares no simulados:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="Detalle:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ Bajo
+ </text>
+ <slider label="FÃsica:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ Bajo
+ </text>
+ <text name="ShadersText">
+ Hardware
+ </text>
+ <slider label="Memoria para texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vÃdeo. Reducir esta cantidad puede mejorar el rendimiento, pero también hacer que las texturas se vean borrosas."/>
+ <slider label="Intensidad de la niebla:" name="fog"/>
+ <slider label="Gamma:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 = brillo por defecto, más bajo = más brillo)
+ </text>
+ <check_box label="Filtrado anisotrópico (enlentece el dibujo)" name="ani"/>
+ <check_box initial_value="true" label="Habilitar objetos de búfer de vértices OpenGL" name="vbo" tool_tip="Su activación en un hardware moderno aumenta el rendimiento. No obstante, la ejecución poco eficiente de los VBO en los equipos antiguos puede hacer que se bloquee la aplicación."/>
+ <check_box initial_value="true" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas en la memoria de vÃdeo, lo cual permite cargar texturas de una resolución más alta, pero con una cierta pérdida de calidad del color."/>
+ <text name="antialiasing label">
+ Antialiasing:
+ </text>
+ <combo_box label="Antialiasing" name="fsaa">
+ <combo_box.item label="Inhabilitado" name="FSAADisabled"/>
+ <combo_box.item label="× 2" name="2x"/>
+ <combo_box.item label="× 4" name="4x"/>
+ <combo_box.item label="× 8" name="8x"/>
+ <combo_box.item label="× 16" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (requiere reiniciar)
+ </text>
+ <slider label="Detalle de la malla del terreno:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ Bajo
+ </text>
+ <slider label="Ãrboles:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ Bajo
+ </text>
+ <slider label="Objetos:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ Bajo
+ </text>
+ <slider label="Prims flexibles:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ Bajo
+ </text>
+ <check_box initial_value="true" label="Agua transparente" name="TransparentWater"/>
+ <check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/>
+ <check_box initial_value="true" label="Puntos de luz locales" name="LocalLights"/>
+ <check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivar esta opción puede evitar que se bloqueen los controladores de algunas tarjetas gráficas"/>
+ <slider label="Nivel de detalle del terreno:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ Bajo
+ </text>
+ <check_box initial_value="true" label="Renderizado de avatares por hardware" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Ropas del avatar" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Reflejos en el agua:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="MÃnimo" name="0"/>
+ <combo_box.item label="Terreno y árboles" name="1"/>
+ <combo_box.item label="Todos los objetos estáticos" name="2"/>
+ <combo_box.item label="Todos los avatares y objetos" name="3"/>
+ <combo_box.item label="Todo" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
+ <slider label="Cielo:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ Bajo
+ </text>
+ <check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Oclusión ambiental" name="UseSSAO"/>
+ <check_box initial_value="true" label="Profundidad de campo" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ Sombras:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Ninguno" name="0"/>
+ <combo_box.item label="Sol/Luna" name="1"/>
+ <combo_box.item label="Sol/Luna + Proyectores" name="2"/>
+ </combo_box>
+ <button label="Restablecer la configuración recomendada" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_region_info.xml b/indra/newview/skins/default/xui/es/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/es/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d053b9096ec550eaba2e5bea4c16a9aa2dfc2264
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="GUARDAR VALOR PREDEFINIDO PREF">
+ <string name="title_graphic">
+ Guardar valor predefinido gráfico
+ </string>
+ <string name="title_camera">
+ Guardar valor predefinido de cámara
+ </string>
+ <text name="Preset">
+ Escribe el nombre del valor predefinido o elige un valor predefinido ya existente.
+ </text>
+ <button label="Guardar" name="save"/>
+ <button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck.xml b/indra/newview/skins/default/xui/es/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index bd86ed00da1d6680181d40ed7d252d1985bcaba3..a860aaa50cc43fc90f09efc0de0daf773fae0bc9
--- a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Importar diccionario">
+ <text name="import_dict">
+ Diccionario:
+ </text>
<button label="Examinar" label_selected="Examinar" name="dictionary_path_browse"/>
+ <text name="import_name">
+ Nombre:
+ </text>
+ <text name="import_lang">
+ Idioma:
+ </text>
<button label="Importar" name="ok_btn"/>
<button label="Cancelar" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_sys_well.xml b/indra/newview/skins/default/xui/es/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
old mode 100755
new mode 100644
index 89092201d904a018f8c1ebdae8cfe240164fb9e6..d1cd912f87ac3523242753526b28f1409cee1bf9
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Por favor, lee detenidamente las siguientes Condiciones del servicio y PolÃtica de privacidad. Debes aceptar el acuerdo para poder iniciar sesión en [SECOND_LIFE].
</text>
+ <text name="external_tos_required">
+ Para poder proseguir, debes iniciar sesión en my.secondlife.com y aceptar las Condiciones del servicio. Gracias.
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_toybox.xml b/indra/newview/skins/default/xui/es/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_translation_settings.xml b/indra/newview/skins/default/xui/es/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_web_content.xml b/indra/newview/skins/default/xui/es/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/inspect_group.xml b/indra/newview/skins/default/xui/es/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/inspect_remote_object.xml b/indra/newview/skins/default/xui/es/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/language_settings.xml b/indra/newview/skins/default/xui/es/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
old mode 100755
new mode 100644
index 7698348c0041fd245bc4cc1554f92ba3955be944..772b27c9ba53dc7c62eaa9dd7989b9c673eac30c
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
+ <menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+ <menu_item_check label="No renderizar" name="DoNotRender"/>
+ <menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
<menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
old mode 100755
new mode 100644
index 244099214a2718eb0feea49f7d830b1337a72dac..75cbf5a0223305a5bc6645fdc88d1f5bb8195734
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="Volcar XML" name="Dump XML"/>
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
+ <menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+ <menu_item_check label="No renderizar" name="DoNotRender"/>
+ <menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
<menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_edit.xml b/indra/newview/skins/default/xui/es/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_favorites.xml b/indra/newview/skins/default/xui/es/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_group_plus.xml b/indra/newview/skins/default/xui/es/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_landmark.xml b/indra/newview/skins/default/xui/es/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
old mode 100755
new mode 100644
index 336572f0cb480b034c1cdcaf4b28725c82101008..44e8f3ffeb3aa7d01f71ecaf63737eb60f7bb56d
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Informar de un fallo" name="Report Bug"/>
<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Buscar actualizaciones" name="Check for Updates"/>
</menu>
<menu_item_check label="Mostrar el menú 'Debug'" name="Show Debug Menu"/>
<menu label="Depurar" name="Debug">
diff --git a/indra/newview/skins/default/xui/es/menu_marketplace_view.xml b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
index c46a9f490e60a72462d9e83dd65b38593c970909..a16b51bcc9f8be1ceb85db6cf24ef0ae74ecca0e 100644
--- a/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+ <menu_item_check label="Ordenar por más reciente" name="sort_by_recent"/>
<menu_item_check label="Ordenar por cantidad en stock (de baja a alta)" name="sort_by_stock_amount"/>
<menu_item_check label="Mostrar solamente las carpetas de artÃculos" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_navbar.xml b/indra/newview/skins/default/xui/es/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_picks.xml b/indra/newview/skins/default/xui/es/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_picks_plus.xml b/indra/newview/skins/default/xui/es/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_place.xml b/indra/newview/skins/default/xui/es/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_save_outfit.xml b/indra/newview/skins/default/xui/es/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_toolbars.xml b/indra/newview/skins/default/xui/es/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_email.xml b/indra/newview/skins/default/xui/es/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa9c74077552b093bd0dfca7950a5f002058d825
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="Redactar el correo electrónico en un cliente externo" name="email_open_external"/>
+ <menu_item_call label="Copiar el correo electrónico al portapapeles" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_group.xml b/indra/newview/skins/default/xui/es/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_http.xml b/indra/newview/skins/default/xui/es/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_inventory.xml b/indra/newview/skins/default/xui/es/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_map.xml b/indra/newview/skins/default/xui/es/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_parcel.xml b/indra/newview/skins/default/xui/es/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_slapp.xml b/indra/newview/skins/default/xui/es/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_slurl.xml b/indra/newview/skins/default/xui/es/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_url_teleport.xml b/indra/newview/skins/default/xui/es/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
old mode 100755
new mode 100644
index f6ebb498ec956545536dba8c3f981fd799fe48cb..fd248116b8728a3ef012c001d5bb36304e6edc2b
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -179,6 +179,7 @@
<menu_item_call label="Informar de un fallo" name="Report Bug"/>
<menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Buscar actualizaciones" name="Check for Updates"/>
</menu>
<menu label="Avanzado" name="Advanced">
<menu_item_call label="Recargar las texturas" name="Rebake Texture"/>
@@ -192,7 +193,7 @@
<menu_item_call label="Medidor de lag" name="Lag Meter"/>
<menu_item_check label="EstadÃsticas" name="Statistics Bar"/>
<menu_item_call label="EstadÃsticas de carga de escenas" name="Scene Load Statistics"/>
- <menu_item_check label="Mostrar el peso del dibujo de los avatares" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Mostrar información de complejidad del avatar" name="Avatar Draw Info"/>
</menu>
<menu label="Realzado y Visibilidad" name="Highlighting and Visibility">
<menu_item_check label="Baliza con destellos" name="Cheesy Beacon"/>
@@ -297,8 +298,6 @@
<menu_item_check label="PartÃculas" name="Particles"/>
<menu_item_check label="Articulaciones" name="Joints"/>
<menu_item_check label="Vectores de viento" name="Wind Vectors"/>
- <menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/>
- <menu_item_check label="Bytes de adjunto" name="attachment bytes"/>
<menu_item_check label="Esculpir" name="Sculpt"/>
<menu label="Densidad de textura" name="Texture Density">
<menu_item_check label="Ninguna" name="None"/>
@@ -372,7 +371,6 @@
<menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/>
</menu>
<menu_item_check label="HTTP Textures" name="HTTP Textures"/>
- <menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
<menu_item_check label="Console Window on next Run" name="Console Window"/>
<menu label="Configurar el nivel de registro" name="Set Logging Level"/>
<menu_item_call label="Request Admin Status" name="Request Admin Options"/>
diff --git a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/mime_types.xml b/indra/newview/skins/default/xui/es/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
old mode 100755
new mode 100644
index 2aac4458e3bd231e9b477b0978522d3aea3653b1..b52497eb85ebe2d0e2f38f330801df9b85f16673
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -164,6 +164,10 @@ La inicialización del mercado ha fallado por un error del sistema o de la red.
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ Para crear tu lista de artÃculos, hemos corregido la jerarquÃa del contenido de la lista.
+ <usetemplate ignoretext="Recordarme que al crear una lista de artÃculos se modifica la jerarquÃa del contenido" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Esta acción cambiará el contenido activo de esta lista de artÃculos. ¿Quieres continuar?
<usetemplate ignoretext="Confirmar antes de que cambie una lista de artÃculos activa en el Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -211,11 +215,9 @@ La inicialización del mercado ha fallado por un error del sistema o de la red.
Hemos retirado tu lista de artÃculos porque el stock está vacÃo. Para volver a publicar tus artÃculos, añade más unidades a la carpeta de stock.
<usetemplate ignoretext="Mostrar alerta cuando una lista de artÃculos se retire porque la carpeta de stock está vacÃa" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Hubo un problema al subir el script compilado por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ Hemos retirado tu lista de artÃculos porque la carpeta de versión está vacÃa. Para volver a publicar tus artÃculos, añade artÃculos a la carpeta de versión.
+ <usetemplate ignoretext="Mostrar una alerta cuando una lista de artÃculos se retire porque la carpeta de versión está vacÃa" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
Hubo un problema al escribir los datos de la animación. Por favor, inténtalo más tarde.
@@ -316,6 +318,14 @@ Si no quieres que este rol siga teniendo dichas capacidades, deshabilÃtalas inm
Estás a punto de expulsar a [COUNT] miembros del grupo.
<usetemplate ignoretext="Confirmar la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ Te dispones a expulsar a [AVATAR_NAME] del grupo.
+ <usetemplate ignoretext="Confirma la expulsión de un participante del grupo" name="okcancelignore" notext="Cancelar" yestext="Prohibir el acceso"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ Te dispones a expulsar a [COUNT] miembros del grupo.
+ <usetemplate ignoretext="Confirma la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Prohibir el acceso"/>
+ </notification>
<notification name="AttachmentDrop">
Vas a soltar tu anexado.
¿Estás seguro de que quieres continuar?
@@ -400,7 +410,7 @@ Objetos: [N]
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- ¿Estás seguro de que quieres devolver al inventario de su propietario todos los objetos de la lista?
+ ¿Estás seguro de que deseas devolver todos los objetos enumerados al inventario de sus propietarios? ¡Se devolverán TODOS los objetos programados de la región!
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -582,16 +592,10 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range&
(**Cuidado** No podrás deshacer esta operación).
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- Al guardar un script, hubo un problema por: [REASON]. Por favor, vuelve a intentar guardarlo más tarde.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
No se ha podido guardar el script porque no se pudo encontrar el objeto que incluye.
El objeto debe de haber sido borrado o estar fuera de rango ('out of range')..
</notification>
- <notification name="SaveBytecodeFailReason">
- Al guardar un script compilado, hubo un problema por: [REASON]. Por favor, vuelve a intentar guardarlo más tarde..
- </notification>
<notification name="StartRegionEmpty">
No está definida tu región inicial.
Por favor, escribe el nombre de la región en el cuadro de Posición inicial o elige para esa posición Mi Base o Mi última posición.
@@ -604,6 +608,10 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range&
<notification name="CannotDownloadFile">
No se ha podido descargar el archivo.
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ Has solicitado descargar un archivo, pero [SECOND_LIFE] no lo admite.
+ <usetemplate ignoretext="Avisarme si las descargas de archivos no se admiten" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
No se ha podido escribir el archivo [[FILE]]
</notification>
@@ -1110,8 +1118,9 @@ Deberás reconfigurar el nombre y las opciones de la nueva parcela.
Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el Ãtem de aquà a unos minutos.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Vaya, se ha cerrado tu sesión en [SECOND_LIFE].
- [MESSAGE]
+ Vaya, has sido desconectado de [SECOND_LIFE].
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1361,6 +1370,13 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre
<ignore name="ignore" text="La ropa está tardando mucho en descargarse"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ Tu [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad visual] es [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ Tu [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad visual] es [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
Se ha completado la instalación de [SECOND_LIFE].
@@ -1642,6 +1658,25 @@ Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
Consulta [[INFO_URL] Información sobre esta actualización].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ Está disponible una actualización.
+Se está descargando en segundo plano y, en cuanto esté lista, te pediremos que reinicies el visor para terminar de instalarla.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ Se ha descargado una actualización. Se instalará durante el reinicio.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ Ha ocurrido un error al comprobar si hay actualizaciones.
+Repite la operación más adelante.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ El visor está actualizado.
+Si estás impaciente por probar las nuevas funciones y correcciones, lee la página sobre los visores alternativos. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
Transferir este objeto al grupo hará que:
* Reciba los L$ pagados en el objeto
@@ -1747,6 +1782,14 @@ Consulta [[INFO_URL] Información sobre esta actualización].
Has superado tu número máximo de grupos. Por favor, sal de al menos uno de ellos antes de crear uno nuevo o entrar en alguno.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ El lÃmite de grupos para las cuentas básicas es de [MAX_BASIC], y para
+las cuentas [https://secondlife.com/premium/ Premium] es de [MAX_PREMIUM].
+Si has bajado la categorÃa de tu cuenta, tendrás que estar por debajo del lÃmite de [MAX_BASIC] grupos para poder apuntarte a más grupos.
+
+[https://secondlife.com/my/account/membership.php Cámbiate hoy a Premium]
+ <usetemplate name="okbutton" yestext="Cerrar"/>
+ </notification>
<notification name="KickUser">
¿Con qué mensaje quieres expulsar a este Residente?
<form name="form">
@@ -2258,6 +2301,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
Confirma que deseas pagar L$[AMOUNT] a [TARGET].
<usetemplate ignoretext="Confirmar antes de pagar (sumas mayores de 200 L$)" name="okcancelignore" notext="Cancelar" yestext="Pagar"/>
</notification>
+ <notification name="PayObjectFailed">
+ Error en el pago: no se encuentra el objeto.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
En este objeto, no hay Ãtems que estés autorizado a copiar.
</notification>
@@ -2289,10 +2336,9 @@ Esta acción no se puede deshacer.
[QUESTION]
<usetemplate ignoretext="Confirmar antes de eliminar elementos" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones del Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad].
-
-Se investigan y resuelven todas las infracciones denunciadas.
+ <notification name="ConfirmUnlink">
+ La selección es grande y contiene linksets. Si la desenlazas, quizás no puedas volver establecer los vÃnculos. Puede ser conveniente guardar copias de los linksets como medida de precaución.
+ <usetemplate ignoretext="Confirmar que desenlazas un linkset" name="okcancelignore" notext="Cancelar" yestext="Desenlazar"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, elige una categorÃa para esta denuncia de infracción.
@@ -2991,19 +3037,19 @@ Del objeto: <nolink>[OBJECTNAME]</nolink>, propietario: [NAME_SLURL]
Cambios omitidos en el campo '[field]' que solo puede configurar el propietario de la experiencia.
</notification>
<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
- No puedes definir un nivel de calificación de una experiencia superior al establecido por el propietario.
+ No puedes definir una calificación de contenido de una experiencia con un nivel superior al del propietario.
</notification>
<notification name="RestrictedTermExperienceProfileMessage">
Las condiciones siguientes han impedido la actualización del nombre o la descripción del perfil de la experiencia: [extra_info]
</notification>
<notification name="TeleportedHomeExperienceRemoved">
- Te has teleportado desde la región [region_name] porque al quitar la experiencia secondlife:///app/experience/[public_id]/profile ya no tienes permiso para entrar en la región.
+ Has sido teleportado desde la región [region_name] porque al quitar la experiencia secondlife:///app/experience/[public_id]/profile ya no tienes permiso para entrar en la región.
<form name="form">
<ignore name="ignore" text="Expulsado de la región por quitar una experiencia"/>
</form>
</notification>
<notification name="TrustedExperienceEntry">
- La participación en la experiencia clave secondlife:///app/experience/[public_id]/profile te otorga permiso para entrar en la región [region_name]. Si quitas esta experiencia, puede que te expulsen de la región.
+ La participación en la experiencia clave secondlife:///app/experience/[public_id]/profile te otorga permiso para entrar en la región [region_name]. Si quitas esta experiencia, puede que seas expulsado de la región.
<form name="form">
<ignore name="ignore" text="Admitido en una región por una experiencia"/>
</form>
@@ -3016,13 +3062,13 @@ Del objeto: <nolink>[OBJECTNAME]</nolink>, propietario: [NAME_SLURL]
Pueden estar disponibles otras experiencias clave.
</notification>
<notification name="ExperienceEvent">
- La experiencia secondlife:///app/experience/[public_id]/profile permitió la siguiente operación con un objeto: [EventType].
+ La experiencia secondlife:///app/experience/[public_id]/profile permitió un objeto de [EventType].
Propietario: secondlife:///app/agent/[OwnerID]/inspect
Nombre del objeto: [ObjectName]
Nombre de la parcela: [ParcelName]
</notification>
<notification name="ExperienceEventAttachment">
- La experiencia secondlife:///app/experience/[public_id]/profile permitió la siguiente operación con un anexo: [EventType].
+ La experiencia secondlife:///app/experience/[public_id]/profile permitió un anexo de [EventType].
Propietario: secondlife:///app/agent/[OwnerID]/inspect
</notification>
<notification name="ScriptQuestionExperience">
@@ -3212,6 +3258,12 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
<notification name="AttachmentSaved">
Se ha guardado el adjunto.
</notification>
+ <notification name="PresetNotSaved">
+ Error al guardar el valor predefinido [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Error al eliminar el valor predefinido [NAME].
+ </notification>
<notification name="UnableToFindHelpTopic">
No se ha podido encontrar un tema de ayuda para este elemento.
</notification>
@@ -3244,9 +3296,8 @@ Se mostrará cuando haya suficiente espacio.
Selecciona los residentes con quienes deseas compartir.
</notification>
<notification name="MeshUploadError">
- [LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER]
-
-Consulta los detalles en el archivo de registro.
+ [LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER]
+[DETAILS]Consulta los detalles en SecondLife.log
</notification>
<notification name="MeshUploadPermError">
Error al solicitar los permisos para subir la malla.
diff --git a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_active_object_row.xml b/indra/newview/skins/default/xui/es/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_hair.xml b/indra/newview/skins/default/xui/es/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pants.xml b/indra/newview/skins/default/xui/es/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_physics.xml b/indra/newview/skins/default/xui/es/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_skin.xml b/indra/newview/skins/default/xui/es/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_socks.xml b/indra/newview/skins/default/xui/es/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_experience_info.xml b/indra/newview/skins/default/xui/es/panel_experience_info.xml
index 85fc94ebdc32cd12554b8b24f2e868b0e82fba2c..3e0637580d0998388dc600f9fa59d950bcc516ff 100644
--- a/indra/newview/skins/default/xui/es/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/es/panel_experience_info.xml
@@ -14,7 +14,7 @@
<text name="LocationTextText">
algún lugar
</text>
- <button label="Teleportarte" name="teleport_btn"/>
+ <button label="Teleporte" name="teleport_btn"/>
<button label="Mapa" name="map_btn"/>
</layout_panel>
<layout_panel name="marketplace panel">
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_notify.xml b/indra/newview/skins/default/xui/es/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_inventory_item.xml b/indra/newview/skins/default/xui/es/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_landmarks.xml b/indra/newview/skins/default/xui/es/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
old mode 100755
new mode 100644
index 7e318a150bc0d77f2e5aee4e5b4084125a15a3c2..894943265c1531acab323d3a0264304e2f314a4a
--- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] Ãtems [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ Obtenidos [ITEM_COUNT] Ãtems [FILTER]
+ </panel.string>
<text name="ItemcountText">
Ãtems:
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Ver más opciones"/>
+ <menu_button name="options_gear_btn" tool_tip="Ver más opciones"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="Añadir un Ãtem nuevo"/>
diff --git a/indra/newview/skins/default/xui/es/panel_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
old mode 100755
new mode 100644
index 06150f7619d98b851a0930708034d576a860f641..909743c3253b07d535b32a10814036f2982a5e56
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -18,6 +18,7 @@
<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
+ <string name="GroupCountWithInfo" value="Perteneces a [COUNT] grupos y puedes unirte a [REMAINING] más. [secondlife:/// ¿Quieres más?]"/>
<tab_container name="tabs">
<panel label="CERCANA" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_pick_info.xml b/indra/newview/skins/default/xui/es/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_message.xml b/indra/newview/skins/default/xui/es/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 2599d951d7300925b54bd64671d3f02e826052ee..efa003c17e772cb867b7864dc2b4e3f8b57596ee
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="Permitir el acceso de varios usuarios" name="allow_multiple_viewer_check"/>
<check_box label="Mostrar la selección de cuadrÃcula al iniciar sesión" name="show_grid_selection_check"/>
<check_box label="Mostrar el menú Avanzado" name="show_advanced_menu_check"/>
- <check_box label="Mostrar el menú Develop" name="show_develop_menu_check"/>
+ <check_box label="Mostrar el menú Desarrollar" name="show_develop_menu_check"/>
<button label="Permisos de creación predeterminados" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 7feff9005cadb0b7cdd409089f548d4586c8b649..778a483bcc0badd088d6bd2827fc10858b40c905
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Oferta de inventario" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ Guardar:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Registro y transcripciones" name="log_and_transcripts" value="2"/>
+ <item label="Solo registro" name="log_only" value="1"/>
+ <item label="Ni el registro ni las transcripciones" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="Borrar registro..." name="clear_log"/>
<button label="Borrar grabaciones..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ Ubicación:
+ </text>
<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
</panel>
<button label="Traducción…" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
old mode 100755
new mode 100644
index e68faf6e990e66ed733619a6bb448732924d3c5b..7d3c33a781ab6894a862b875b5ed7f1b79084aba
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -6,12 +6,12 @@
<combo_box name="language_combobox">
<combo_box.item label="Predeterminado del sistema" name="System Default Language"/>
<combo_box.item label="English (Inglés)" name="English"/>
- <combo_box.item label="Dansk (Danés) - Beta" name="Danish"/>
+ <combo_box.item label="Dansk (danés) - Beta" name="Danish"/>
<combo_box.item label="Deutsch (Alemán) - Beta" 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="Polski (Polaco) - Beta" name="Polish"/>
+ <combo_box.item label="Polski (polaco) - Beta" name="Polish"/>
<combo_box.item label="Português (portugués) - Beta" name="Portugese"/>
<combo_box.item label="РуÑÑкий (Ruso) - Beta" name="Russian"/>
<combo_box.item label="Türkçe (Turco) - Beta" name="Turkish"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index a9eab74e2b5983df5c94430368dd16c6ae23029f..f7fb8ab70d73fb62ab01a54b6b1a23ad13a5c476
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Gráficos" name="Display panel">
+ <text name="preset_text">
+ (ninguno)
+ </text>
<text name="QualitySpeed">
Calidad y velocidad:
</text>
- <text name="FasterText">
- Más rápido
- </text>
- <text name="BetterText">
- Más calidad
- </text>
<text name="ShadersPrefText">
Bajo
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
Ultra
</text>
- <panel label="CustomGraphics" name="CustomGraphics Panel">
- <text name="ShadersText">
- Shaders:
- </text>
- <check_box initial_value="true" label="Agua transparente" name="TransparentWater"/>
- <check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/>
- <check_box initial_value="true" label="Luces locales" name="LocalLights"/>
- <check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
- <check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
- <check_box initial_value="true" label="Oclusión del ambiente" name="UseSSAO"/>
- <check_box initial_value="true" label="Profundidad del campo" name="UseDoF"/>
- <text name="shadows_label">
- Sombras:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Ninguno" name="0"/>
- <combo_box.item label="Sol/luna" name="1"/>
- <combo_box.item label="Sol/luna + proyectores" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Reflejos en el agua:
- </text>
- <combo_box initial_value="true" label="Reflejos en el agua" name="Reflections">
- <combo_box.item label="MÃnimo" name="0"/>
- <combo_box.item label="Terreno y árboles" name="1"/>
- <combo_box.item label="Todos los objetos estáticos" name="2"/>
- <combo_box.item label="Todos los avatares y objetos" name="3"/>
- <combo_box.item label="Todo" name="4"/>
- </combo_box>
- <slider label="FÃsica del avatar:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Bajo
- </text>
- <slider label="Distancia de dibujo:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Núm. máx. de partÃculas:" name="MaxParticleCount"/>
- <slider label="Nº máx. de avats. no impostores:" name="MaxNumberAvatarDrawn"/>
- <slider label="Calidad de procesamiento:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Detalle de la malla:
- </text>
- <slider label=" Objetos:" name="ObjectMeshDetail"/>
- <slider label=" Prims flexibles:" name="FlexibleMeshDetail"/>
- <slider label=" Ãrboles:" name="TreeMeshDetail"/>
- <slider label=" Avatares:" name="AvatarMeshDetail"/>
- <slider label=" Terreno:" name="TerrainMeshDetail"/>
- <slider label=" Cielo:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Baja
- </text>
- <text name="ObjectMeshDetailText">
- Bajo
- </text>
- <text name="FlexibleMeshDetailText">
- Bajo
- </text>
- <text name="TreeMeshDetailText">
- Bajo
- </text>
- <text name="AvatarMeshDetailText">
- Bajo
- </text>
- <text name="TerrainMeshDetailText">
- Bajo
- </text>
- <text name="SkyMeshDetailText">
- Bajo
- </text>
- <text name="AvatarRenderingText">
- Renderización del avatar:
- </text>
- <check_box initial_value="true" label="Avatares simulados" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Renderizado por hardware" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Ropas del avatar" name="AvatarCloth"/>
- <text left="402" name="TerrainDetailText">
- Detalle del terreno:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="Bajo" name="0"/>
- <radio_item label="Alto" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Aplicar" label_selected="Aplicar" name="Apply"/>
- <button label="Por defecto" name="Defaults"/>
- <button label="Avanzado" name="Advanced"/>
- <button label="Hardware" label_selected="Hardware" left="315" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ Más rápido
+ </text>
+ <text name="BetterText">
+ Más calidad
+ </text>
+ <check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
+ <button label="Guardar configuración como valor predefinido..." name="PrefSaveButton"/>
+ <button label="Cargar predefinido..." name="PrefLoadButton"/>
+ <button label="Eliminar predefinido..." name="PrefDeleteButton"/>
+ <button label="Restablecer la configuración recomendada" name="Defaults"/>
+ <button label="Configuración avanzada..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
old mode 100755
new mode 100644
index 7ccad84b55f05ce0f37b954af841e6a4c8f10b9e..4fc973614b3b5bde4b5b1306e8af15f0f98e6e66
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="Usar mi navegador (Chrome, Firefox, IE) para todos los enlaces" name="internal" tool_tip="Usa el navegador predeterminado para obtener ayuda, visitar enlaces web, etc. No es aconsejable si estás a pantalla completa." value="0"/>
<radio_item label="Usar el navegador integrado solo para los enlaces de Second Life" name="external" tool_tip="Usa el navegador predeterminado del sistema para obtener ayuda, visitar enlaces web, etc. El navegador integrado solo se utilizará para los enlaces de LindenLab/SecondLife." value="1"/>
+ <radio_item label="Usar el navegador incorporado para todos los vÃnculos" name="external_all" tool_tip="Usa el navegador incorporado para ayuda, enlaces web, etc. Este navegador se abre en una nueva ventana dentro de [APP_NAME]." value="2"/>
</radio_group>
<check_box initial_value="true" label="Activar plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Aceptar las 'cookies'" name="cookies_enabled"/>
<check_box initial_value="true" label="Activar Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Permitir las ventanas emergentes en el navegador" name="media_popup_enabled"/>
<text name="Software updates:">
Actualizaciones de software:
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="Instalar automáticamente" name="Install_automatically"/>
- <combo_box.item label="Descargar e instalar actualizaciones manualmente" name="Install_manual"/>
+ <combo_box.item label="Descargaré e instalaré manualmente las actualizaciones" name="Install_manual"/>
</combo_box>
<check_box label="Admitir candidatos a la versión comercial a la hora de realizar actualizaciones" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/es/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35e9236be114ee9891109e26f9c591e29a4d20db
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ Valores predefinidos gráficos
+ </text>
+ <button label="Abrir las preferencias de gráficos" name="open_prefs_btn" tool_tip="Abre las preferencias de gráficos"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 90b9e475e7b4e5ec11785319274d3ac86763e928..e954e7d604b49af1f25ff57543357c9b286e9f47
--- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
@@ -45,12 +45,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="URL de los media"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="Lista Blanca activada"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Navegación segura"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_region_experiences.xml b/indra/newview/skins/default/xui/es/panel_region_experiences.xml
index 4b7f82d3fb7439577ae2583bd8d960b745c3c230..2af4981255ec1481342d255f973fe7624b0a672e 100644
--- a/indra/newview/skins/default/xui/es/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_experiences.xml
@@ -18,7 +18,7 @@ Las experiencias permitidas tienen permiso de ejecución en este estado.
Las experiencias bloqueadas no pueden ejecutarse en este estado.
</panel.string>
<panel.string name="estate_caption">
- En esta pestaña, los cambios en la configuración afectarán a todas las regiones del estado.
+ Las opciones de configuración que cambies en esta pestaña afectarán a todas las regiones del estado.
</panel.string>
<panel.string name="allowed_parcel_text">
Solo se permiten las experiencias activas en el terreno.
@@ -28,6 +28,6 @@ Las experiencias permitidas tienen permiso de ejecución en esta parcela si no l
<panel.string name="blocked_parcel_text">
Puede bloquearse cualquier experiencia de los residentes.
-Las experiencias bloqueadas no pueden ejecutarse en esta parcela.
+Puede que las experiencias bloqueadas no se ejecuten en esta parcela.
</panel.string>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index c9eea9a58e93f1aae1757f174c6ec9a57fb6c448..b5cf57ade773d2725b55a76fcc02d99cc6b65ca1
--- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
Guardar una imagen en el inventario cuesta [UPLOAD_COST] L$. Para guardar una imagen como una textura, selecciona uno de los formatos cuadrados.
</text>
<combo_box label="Resolución" name="texture_size_combo">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
+ <combo_box.item label="Ventana actual (512 × 512)" name="CurrentWindow"/>
<combo_box.item label="Pequeña (128x128)" name="Small(128x128)"/>
<combo_box.item label="Mediana (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
index b820880e60a43f5f37bb263f73ae0769357a9332..d5ff5b7f2ce2011ea77f7256463d18f6118a7625 100644
--- a/indra/newview/skins/default/xui/es/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Materiales" name="Materials"/>
<combo_box.item label="Media" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="Textura (difuminar)" name="Texture (diffuse)"/>
- <combo_box.item label="Rugosidad (normal)" name="Bumpiness (normal)"/>
- <combo_box.item label="Brillo (efecto espejo)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="Textura (difusa)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="Relieve (normal)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="Brillantez (especular)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una imagen"/>
<text name="label alphamode">
Modo alfa
diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
old mode 100755
new mode 100644
index 404aa1e60e3b3babbb65feef0a91eda6933ed9b1..ea6cea060b31996cecebb2a57dd21e4144e817f6
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -29,12 +29,9 @@
Error de inicialización de gráficos. Actualiza tu controlador de gráficos.
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">
- Compilado con [COMPILER], versión [COMPILER_VERSION]
- </string>
<string name="AboutPosition">
Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1], de [REGION], alojada en <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURL: <nolink>[SLURL]</nolink>
@@ -55,10 +52,9 @@ Tarjeta gráfica: [GRAPHICS_CARD]
<string name="AboutLibs">
Versión de OpenGL: [OPENGL_VERSION]
-Versión de libcurl: [LIBCURL_VERSION]
Versión de J2C Decoder: [J2C_VERSION]
Versión de Audio Driver: [AUDIO_DRIVER_VERSION]
-Versión de Qt Webkit: [QT_WEBKIT_VERSION]
+Versión de LLCEFLib/CEF: [LLCEFLIB_VERSION]
Versión del servidor de voz: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -169,6 +165,12 @@ Versión del servidor de voz: [VOICE_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Grid principal de Second Life (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Grid de prueba beta de Second Life (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download.
</string>
@@ -444,6 +446,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
No puedes tener una carpeta de prendas que contenga más de [AMOUNT] elementos. Puedes cambiar este lÃmite en Avanzado > Mostrar las configuraciones del depurador > WearFolderLimit.
</string>
<string name="TooltipPrice" value="[AMOUNT] L$:"/>
+ <string name="TooltipSLIcon">
+ Esto crea un vÃnculo a una página del dominio oficial SecondLife.com o LindenLab.com.
+ </string>
<string name="TooltipOutboxDragToWorld">
No se pueden mostrar artÃculos desde la carpeta ArtÃculos del mercado
</string>
@@ -463,7 +468,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
La cantidad de artÃculos en stock excede de [AMOUNT].
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Solo se pueden soltar artÃculos o carpetas en la pestaña TODOS. Selecciona esta pestaña y mueve otra vez los artÃculos o carpetas.
+ Solo se pueden soltar artÃculos o carpetas en las pestañas TODOS o SIN ASOCIAR. Selecciona una de estas pestañas y mueve otra vez los artÃculos o carpetas.
</string>
<string name="TooltipOutboxNoTransfer">
Uno o varios de estos objetos no se pueden vender o transferir
@@ -547,6 +552,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
Pulsa para ejecutar el comando secondlife://
</string>
<string name="CurrentURL" value="URL actual: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Haz clic para redactar un correo electrónico
+ </string>
<string name="SLurlLabelTeleport">
Teleportarse a
</string>
@@ -1063,7 +1071,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="AgentNameSubst">
(Tú)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Suprimir alertas al gestionar las listas de acceso a un estado
</string>
@@ -1836,6 +1844,21 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="TodayOld">
Registrado hoy
</string>
+ <string name="av_render_everyone_now">
+ Ahora todos pueden verte.
+ </string>
+ <string name="av_render_not_everyone">
+ Es posible que no todos los que están próximos puedan renderizarte.
+ </string>
+ <string name="av_render_over_half">
+ Es posible que más de la mitad de los que están próximos no puedan renderizarte.
+ </string>
+ <string name="av_render_most_of">
+ Es posible que la mayorÃa de los que están próximos no puedan renderizarte.
+ </string>
+ <string name="av_render_anyone">
+ Es posible que ninguno de los que están próximos pueda renderizarte.
+ </string>
<string name="AgeYearsA">
[COUNT] año
</string>
@@ -1953,6 +1976,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="CompileQueueUnknownFailure">
Fallo desconocido en la descarga
</string>
+ <string name="CompileNoExperiencePerm">
+ Omitiendo el script [SCRIPT] con la experiencia [EXPERIENCE].
+ </string>
<string name="CompileQueueTitle">
Recompilando
</string>
@@ -1998,9 +2024,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="GroupsNone">
ninguno
</string>
- <string name="CompileNoExperiencePerm">
- Omitiendo el script [SCRIPT] con la experiencia [EXPERIENCE].
- </string>
<string name="Group" value="(grupo)"/>
<string name="Unknown">
(Desconocido)
@@ -5290,18 +5313,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="UserDictionary">
[Usuario]
</string>
- <string name="logging_calls_disabled_log_empty">
- No se están registrando las conversaciones. Para empezar a grabar un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat.
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat.
- </string>
- <string name="logging_calls_enabled_log_empty">
- No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquà se mostrará una entrada de registro.
- </string>
- <string name="loading_chat_logs">
- Cargando...
- </string>
<string name="experience_tools_experience">
Experiencia
</string>
@@ -5360,7 +5371,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
aceptar automáticamente permisos de experiencias
</string>
<string name="ExperiencePermissionShortUnknown">
- ha realizado una operación desconocida: [Permission]
+ realizar una operación desconocida: [Permission]
</string>
<string name="ExperiencePermissionShort1">
Ponerte al mando
@@ -5378,9 +5389,42 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
Controlar la cámara
</string>
<string name="ExperiencePermissionShort11">
- Teleportarte
+ Teleporte
</string>
<string name="ExperiencePermissionShort12">
Otorgar permisos
</string>
+ <string name="logging_calls_disabled_log_empty">
+ No se están registrando las conversaciones. Para empezar a grabar un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquà se mostrará una entrada de registro.
+ </string>
+ <string name="loading_chat_logs">
+ Cargando...
+ </string>
+ <string name="preset_combo_label">
+ -Lista vacÃa-
+ </string>
+ <string name="Default">
+ Predeterminado
+ </string>
+ <string name="none_paren_cap">
+ (ninguno)
+ </string>
+ <string name="no_limit">
+ Sin lÃmite
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ La forma fÃsica contiene triángulos demasiado pequeños. Intenta simplificar el modelo fÃsico.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ La forma fÃsica contiene datos de confirmación erróneos. Intenta corregir el modelo fÃsico.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ La versión de la forma fÃsica no es correcta. Configura la versión correcta del modelo fÃsico.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
old mode 100755
new mode 100644
index 08f26e60b47fc262bc926f1c4277ab60e5b5ef46..1e2a14ab3e2030042a1c7bd66f239c23e39fb873
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Infos" name="support_panel">
<button label="Copier dans le presse-papiers" name="copy_btn"/>
+ <button label="Rechercher des mises à jour" name="update_btn"/>
</panel>
<panel label="Remerciements" name="credits_panel">
<text name="linden_intro">Second Life vous est proposé par les Linden,
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
old mode 100755
new mode 100644
index 3de282e8d51fdf475daf5add257720a95ad313d7..6aea44e650730fc49d22b9988970cb876ad0a64b
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -10,13 +10,13 @@
"Parcel_R_Dark"
</floater.string>
<floater.string name="Minutes">
- [MINUTES] minutes
+ [MINUTES] min
</floater.string>
<floater.string name="Minute">
- minute
+ lmin
</floater.string>
<floater.string name="Seconds">
- [SECONDS] secondes
+ [SECONDS]Â s
</floater.string>
<floater.string name="Remaining">
restantes
@@ -456,7 +456,7 @@ musique :
<spinner label="Durée en heures :" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Toujours autoriser" name="AllowedText">
- Résidents autorisés
+ Résidents autorisés ([COUNT])
</text>
<name_list name="AccessList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
<button label="Ajouter" name="add_allowed"/>
@@ -464,7 +464,7 @@ musique :
</panel>
<panel name="Banned_layout_panel">
<text label="Bannir" name="BanCheck">
- Résidents bannis
+ Résidents bannis ([COUNT])
</text>
<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
<button label="Ajouter" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_activeim.xml b/indra/newview/skins/default/xui/fr/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
old mode 100755
new mode 100644
index 1d19181692b72491668a2824deaacdc84902ccea..fa842ae8303036fd00fd76248271da5491c69d1e
--- a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Ajouter..." name="autoreplace_add_entry"/>
<button label="Supprimer" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Mot-clé :
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Remplacement :
+ </text>
<button label="Enregistrer" name="autoreplace_save_entry" tool_tip="Enregistrer cette entrée."/>
<button label="Enregistrer les modifications" name="autoreplace_save_changes" tool_tip="Enregistrer toutes les modifications."/>
<button label="Annuler" name="autoreplace_cancel" tool_tip="Ignorer toutes les modifications."/>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar.xml b/indra/newview/skins/default/xui/fr/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
old mode 100755
new mode 100644
index 32714ea09c4733e4461c9b8be3616926cdff73e0..e2f3178420ec4d6787903e3423c0f08c3f2a9351
--- a/indra/newview/skins/default/xui/fr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] vous a donné un coup avec un objet physique.
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d276c89302f709d86848cd11ecbce73dd79d6611
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="SUPPRIMER LE PRÉRÉGLAGE PRÉF.">
+ <string name="title_graphic">
+ Supprimer le préréglage de graphique
+ </string>
+ <string name="title_camera">
+ Supprimer le préréglage de caméra
+ </string>
+ <text name="Preset">
+ Sélectionner un préréglage
+ </text>
+ <button label="Supprimer" name="delete"/>
+ <button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_destinations.xml b/indra/newview/skins/default/xui/fr/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml b/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
index 080c6e4ddef9e4716ba9431866854d0982de8300..38d3e0fb81ba94b0435c47ad3fb9f627c12ed848 100644
--- a/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
@@ -12,7 +12,7 @@
<floater.string name="maturity_icon_adult">
"Parcel_R_Light"
</floater.string>
- <text name="edit_title" value="Profil de l'expérience"/>
+ <text name="edit_title" value="Profil de l’expérience"/>
<tab_container name="tab_container">
<panel name="panel_experience_info">
<scroll_container name="xp_scroll">
@@ -63,7 +63,7 @@
<text name="edit_ContentRating">
Catégorie :
</text>
- <icons_combo_box label="Modéré" name="edit_ContentRatingText" tool_tip="Si vous augmentez la catégorie de contenu pour une expérience, les permissions seront réinitialisées pour tous les résidents ayant autorisé l'expérience.">
+ <icons_combo_box label="Modéré" name="edit_ContentRatingText" tool_tip="Si vous augmentez la catégorie de contenu pour une expérience, les permissions seront réinitialisées pour tous les résidents ayant autorisé l’expérience.">
<icons_combo_box.item label="Adulte" name="Adult" value="42"/>
<icons_combo_box.item label="Modéré" name="Mature" value="21"/>
<icons_combo_box.item label="Général" name="PG" value="13"/>
@@ -71,11 +71,11 @@
<text name="edit_Location">
Endroit :
</text>
- <button label="Définir sur l'emplacement actuel" name="location_btn"/>
- <button label="Effacer l'emplacement" name="clear_btn"/>
- <check_box label="Activer l'expérience" name="edit_enable_btn" tool_tip=""/>
+ <button label="Définir sur l’emplacement actuel" name="location_btn"/>
+ <button label="Effacer l’emplacement" name="clear_btn"/>
+ <check_box label="Activer l’expérience" name="edit_enable_btn" tool_tip=""/>
<check_box label="Cacher dans les résultats de recherche" name="edit_private_btn"/>
- <text name="changes" value="Il peut falloir plusieurs minutes pour que l'expérience soit visible dans toutes les régions."/>
+ <text name="changes" value="Il peut falloir plusieurs minutes pour que l’expérience soit visible dans toutes les régions."/>
<button label="Retour" name="cancel_btn"/>
<button label="Enregistrer" name="save_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
old mode 100755
new mode 100644
index 0100b10557270007d8e998fa138469c48615ad64..c64b7a8c008594a98b0cafdacc0d91469640ed10
--- a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Courir
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x valeur moy." name="2x Average"/>
+ <item label="Max." name="Max"/>
+ <item label="Max. récent" name="Recent Max"/>
+ <item label="100Â ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Durée" name="Time"/>
+ <item label="Nombre d’appels" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Pauser" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_import_collada.xml b/indra/newview/skins/default/xui/fr/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index fdc4000746af25e01422f80759391887f1b8d7fd..8e4afce406aeb7723f155ccb81bf455d28e3f367
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Antérieure à " name="older"/>
</radio_group>
<spinner label="Heures" name="spin_hours_ago"/>
+ <text name="label_hours">
+ Heures
+ </text>
<spinner label="Jours" name="spin_days_ago"/>
+ <text name="label_days">
+ Jours
+ </text>
<button label="Fermer" label_selected="Fermer" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
old mode 100755
new mode 100644
index d69c311a8ea34fd19586d83828d3c145503af8ec..a0d1197ea7ea04c928274b8f4a4311999e3daf4a
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -10,16 +10,16 @@
SCRIPTÂ : [NAME]
</floater.string>
<floater.string name="experience_enabled">
- Supprimer la coche pour supprimer l'expérience actuelle
+ Supprimer la coche pour supprimer l’expérience actuelle
</floater.string>
<floater.string name="no_experiences">
- Vous n'êtes autorisé(e) pour aucune expérience.
+ Vous n’êtes autorisé(e) pour aucune expérience.
</floater.string>
<floater.string name="add_experiences">
Sélectionner pour ajouter une expérience
</floater.string>
<floater.string name="show_experience_profile">
- Cliquer pour afficher le profil de l'expérience
+ Cliquer pour afficher le profil de l’expérience
</floater.string>
<floater.string name="loading">
Chargement...
diff --git a/indra/newview/skins/default/xui/fr/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/fr/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6fcd830ae8ffb9ccdbae1c7af1392d336a7a7832
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CHARGER LE PRÉRÉGLAGE PRÉF.">
+ <string name="title_graphic">
+ Charger le préréglage de graphique
+ </string>
+ <string name="title_camera">
+ Charger le préréglage de caméra
+ </string>
+ <text name="Preset">
+ Sélectionner un préréglage
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_media_settings.xml b/indra/newview/skins/default/xui/fr/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index b491dd6aed368839398f0a6281d2c4e7e7970631..0f657e9e5b7199d4676b562d9fa81e340159dc0a
--- a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
Initialisation...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Chargement...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Faites glisser des éléments ici pour créer des dossiers
+ </text>
+ </panel>
<button label="Envoyer vers la Place du marché" name="outbox_import_btn" tool_tip="Vers ma vitrine de la Place du marché"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
old mode 100755
new mode 100644
index bd3dae65995e850ccd88ad0df2e8eee5ba3b0810..d3d941ff5c0dde797c454f58e8ff367bac9deef0
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
Les options du niveau de détail ne sont pas une sous-ensemble d'un modèle de référence.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Certaines enveloppes physiques dépassent les limites de sommets.
+ </string>
<string name="layer_all">
Tout
</string>
@@ -93,52 +96,52 @@
<text initial_value="Sommets" name="vertices" value="Sommets"/>
<text initial_value="Élevé" name="high_label" value="Élevé"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Depuis un fichier"/>
- <item name="Generate" value="Génération"/>
+ <item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+ <item label="Génération" name="Generate" value="Génération"/>
</combo_box>
<button label="Parcourir..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="Triangles max"/>
- <item name="Error Threshold" value="Seuil d'erreur"/>
+ <item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+ <item label="Seuil d’erreur" name="Error Threshold" value="Seuil d'erreur"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Moyen" name="medium_label" value="Moyen"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Depuis un fichier"/>
- <item name="Generate" value="Génération"/>
- <item name="Use LoD above" value="Niveau de détail du dessus"/>
+ <item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+ <item label="Génération" name="Generate" value="Génération"/>
+ <item label="Niveau de détail du dessus" name="Use LoD above" value="Niveau de détail du dessus"/>
</combo_box>
<button label="Parcourir..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="Triangles max"/>
- <item name="Error Threshold" value="Seuil d'erreur"/>
+ <item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+ <item label="Seuil d’erreur" name="Error Threshold" value="Seuil d'erreur"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Faible" name="low_label" value="Faible"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Depuis un fichier"/>
- <item name="Generate" value="Génération"/>
- <item name="Use LoD above" value="Niveau de détail du dessus"/>
+ <item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+ <item label="Génération" name="Generate" value="Génération"/>
+ <item label="Niveau de détail du dessus" name="Use LoD above" value="Niveau de détail du dessus"/>
</combo_box>
<button label="Parcourir..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="Triangles max"/>
- <item name="Error Threshold" value="Seuil d'erreur"/>
+ <item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+ <item label="Seuil d’erreur" name="Error Threshold" value="Seuil d'erreur"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="Le plus faible" name="lowest_label" value="Le plus faible"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Depuis un fichier"/>
- <item name="Generate" value="Génération"/>
- <item name="Use LoD above" value="Niveau de détail du dessus"/>
+ <item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+ <item label="Génération" name="Generate" value="Génération"/>
+ <item label="Niveau de détail du dessus" name="Use LoD above" value="Niveau de détail du dessus"/>
</combo_box>
<button label="Parcourir..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="Triangles max"/>
- <item name="Error Threshold" value="Seuil d'erreur"/>
+ <item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+ <item label="Seuil d’erreur" name="Error Threshold" value="Seuil d'erreur"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/fr/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac34291a570b05113880f29c902b466fd0a6b813
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="NOTIFICATIONS">
+ <floater.string name="system_tab_title">
+ Système ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Transactions ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Invitations ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Groupe ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ NOTIFICATIONS
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="Système (0)" name="system_notification_list_tab"/>
+ <panel label="Transactions (0)" name="transaction_notifications_tab"/>
+ <panel label="Invitations (0)" name="group_invite_notifications_tab"/>
+ <panel label="Groupe (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Tout réduire" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="Panneau de contrôle des interstices" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Tout supprimer" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_object_weights.xml b/indra/newview/skins/default/xui/fr/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index 7c9109c011b89865fc5af75021f3d758e041749c..65105e77c57fc741231d3918ab870e38aeaf21c7
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[Groupe]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Nom" name="name"/>
<scroll_list.columns label="Description" name="description"/>
@@ -42,7 +42,7 @@
<button label="Tout sélectionner" name="select_all_objects"/>
<button label="Ne rien sélectionner" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
Actions sur les personnages sélectionnés :
</text>
@@ -50,8 +50,8 @@
<check_box label="Afficher la capsule physique" name="show_physics_capsule"/>
<button label="Prendre" name="take_objects"/>
<button label="Prendre une copie" name="take_copy_objects"/>
- <button label="M'y téléporter" name="teleport_me_to_object" tool_tip="Activé uniquement lorsqu'un personnage est sélectionné."/>
- <button label="Renvoyer" name="return_objects"/>
+ <button label="M’y téléporter" name="teleport_me_to_object" tool_tip="Activé uniquement lorsqu’un personnage est sélectionné."/>
+ <button label="Retour" name="return_objects"/>
<button label="Supprimer" name="delete_objects"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index 02d969dc0896734ede6fabdf4e77e81cfbfd1a7d..d1ad5b3bdb0439d88dd9be1ce005aa5263476689
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Erreur lors de la génération du chemin.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Statut du client
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Statut du simulateur
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Vue" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 894ec6dd9c74df409b17466d75e45573114a6d58..148fbdb0634abd35cf7e4a3c0b7563bfb0eb249d
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
@@ -90,14 +90,23 @@
<floater.string name="linkset_choose_use">
Choisir un usage de groupe de liens...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Filtrer par :
+ </text>
+ <text name="linksets_name_label">
+ Nom
+ </text>
+ <text name="linksets_desc_label">
+ Description
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Filtrer par usage..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Marche possible" name="filter_by_linkset_use_walkable"/>
<combo_box.item label="Obstacle statique" name="filter_by_linkset_use_static_obstacle"/>
<combo_box.item label="Obstacle mobile" name="filter_by_linkset_use_dynamic_obstacle"/>
<combo_box.item label="Volume de matériau" name="filter_by_linkset_use_material_volume"/>
- <combo_box.item label="Volume d'exclusion" name="filter_by_linkset_use_exclusion_volume"/>
+ <combo_box.item label="Volume d’exclusion" name="filter_by_linkset_use_exclusion_volume"/>
<combo_box.item label="Fantôme mobile" name="filter_by_linkset_use_dynamic_phantom"/>
</combo_box>
<button label="Appliquer" name="apply_filters"/>
@@ -122,15 +131,21 @@
<button label="Tout sélectionner" name="select_all_objects"/>
<button label="Ne rien sélectionner" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Actions sur les groupes de liens sélectionnés (si un groupe de liens est supprimé du monde, ses attributs risquent d’être perdus) :
+ </text>
<check_box label="Afficher la balise" name="show_beacon"/>
<button label="Prendre" name="take_objects"/>
<button label="Prendre une copie" name="take_copy_objects"/>
- <button label="M'y téléporter" name="teleport_me_to_object"/>
- <button label="Renvoyer" name="return_objects"/>
+ <button label="M’y téléporter" name="teleport_me_to_object"/>
+ <button label="Retour" name="return_objects"/>
<button label="Supprimer" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Modifier les attributs des groupes de liens sélectionnés et appuyer sur le bouton pour appliquer les modifications
+ </text>
<text name="walkability_coefficients_label">
Marche possible :
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_perms_default.xml b/indra/newview/skins/default/xui/fr/floater_perms_default.xml
index 005daf7ec1031d8f037267d4b241004891bdef25..1cea8e55ccbce9c324b59209cdf735c0261f9b51 100644
--- a/indra/newview/skins/default/xui/fr/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="PERMISSIONS DE CRÉATION PAR DÉFAUT">
- <panel label="Permissions par défaut" name="default permissions"/>
+ <panel label="Permissions par défaut" name="default permissions">
+ <text name="label_1">
+ Prochain propr. :
+ </text>
+ <text name="label_2">
+ Copier
+ </text>
+ <text name="label_3">
+ Modifier
+ </text>
+ <text name="label_4">
+ Transférer
+ </text>
+ <text name="label_5">
+ Partager avec le groupe
+ </text>
+ <text name="label_6">
+ Autoriser tout le monde à copier
+ </text>
+ <text name="label_7" tool_tip="Définir les droits par défaut pour la création d’objets">
+ Objets
+ </text>
+ <text name="label_8" tool_tip="Définir les droits par défaut pour les articles chargés">
+ Chargements
+ </text>
+ <text name="label_9" tool_tip="Définir les droits par défaut pour la création de scripts">
+ Scripts
+ </text>
+ <text name="label_10" tool_tip="Définir les droits par défaut pour la création de notes">
+ Notes
+ </text>
+ <text name="label_11" tool_tip="Définir les droits par défaut pour la création de gestes">
+ Gestes
+ </text>
+ <text name="label_12" tool_tip="Définir les droits par défaut pour la création d’habits ou de parties de corps">
+ Articles à porter
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="Annuler" label_selected="Annuler" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_places.xml b/indra/newview/skins/default/xui/fr/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c5af022cadd0fef7b78cd5e945f72f97c06b608
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PRÉFÉRENCES GRAPHIQUES AVANCÉES">
+ <text name="GeneralText">
+ Général
+ </text>
+ <slider label="Limite d’affichage :" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Nb max. de particules :" name="MaxParticleCount"/>
+ <slider label="Qualité post-traitement :" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Faible
+ </text>
+ <text name="AvatarText">
+ Avatar
+ </text>
+ <slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly doll » (forme de couleur unie)"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="Avatars max. non éloignés en 2D :" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="Détail :" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ Faible
+ </text>
+ <slider label="Propriétés physiques :" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ Faible
+ </text>
+ <text name="ShadersText">
+ Matériel
+ </text>
+ <slider label="Mémoire textures (Mo) :" name="GraphicsCardTextureMemory" tool_tip="Quantité de mémoire à affecter aux textures. Utilise la mémoire de la carte vidéo par défaut. Si vous réduisez ce paramètre, cela peut améliorer les performances, mais les textures risquent d’être floues."/>
+ <slider label="Indice du brouillard :" name="fog"/>
+ <slider label="Gamma :" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 = défaut, valeur faible = plus lumineux)
+ </text>
+ <check_box label="Filtre anisotrope (plus lent quand activé)" name="ani"/>
+ <check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="L’activation de cette option sur le matériel récent permet un gain de performance. Cependant, les implémentations VBO pour le matériel plus ancien sont souvent médiocres et votre système risque de se planter quand cette option est activée."/>
+ <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."/>
+ <text name="antialiasing label">
+ Anti-aliasing :
+ </text>
+ <combo_box label="Anti-aliasing" name="fsaa">
+ <combo_box.item label="Désactivé" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (redémarrage requis)
+ </text>
+ <slider label="Détails des rendus des terrains :" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ Faible
+ </text>
+ <slider label="Arbres :" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ Faible
+ </text>
+ <slider label="Objets :" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ Faible
+ </text>
+ <slider label="Flexiprims :" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ Faible
+ </text>
+ <check_box initial_value="true" label="Eau transparente" name="TransparentWater"/>
+ <check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/>
+ <check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
+ <check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
+ <slider label="Rendu du terrain :" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ Faible
+ </text>
+ <check_box initial_value="true" label="Accélération du rendu des avatars" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Mouvement des habits" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Reflets dans l’eau :
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="Minimes" name="0"/>
+ <combo_box.item label="Terrain et arbres" name="1"/>
+ <combo_box.item label="Tous les objets statiques" name="2"/>
+ <combo_box.item label="Tous les objets et avatars" name="3"/>
+ <combo_box.item label="Tout" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+ <slider label="Ciel :" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ Faible
+ </text>
+ <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"/>
+ <text name="RenderShadowDetailText">
+ Ombres :
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Aucun(e)" name="0"/>
+ <combo_box.item label="Soleil/Lune" name="1"/>
+ <combo_box.item label="Soleil/Lune + Projecteurs" name="2"/>
+ </combo_box>
+ <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"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/fr/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..92e05a121f05cfb9e0c4e07da787459702dac1c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="ENREGISTRER LE PRÉRÉGLAGE PRÉF.">
+ <string name="title_graphic">
+ Enregistrer le préréglage de graphique
+ </string>
+ <string name="title_camera">
+ Enregistrer le préréglage de caméra
+ </string>
+ <text name="Preset">
+ Tapez un nom pour le préréglage ou choisissez un préréglage existant.
+ </text>
+ <button label="Enregistrer" name="save"/>
+ <button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_script_limits.xml b/indra/newview/skins/default/xui/fr/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index c8c76c672d5f52fdbc3ef3fbe9172edbdc409f02..e305519488ef2f1d620901403c532a6f9982aaf2
--- a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Importation d'un dictionnaire">
+ <text name="import_dict">
+ Dictionnaire :
+ </text>
<button label="Parcourir" label_selected="Parcourir" name="dictionary_path_browse"/>
+ <text name="import_name">
+ Nom :
+ </text>
+ <text name="import_lang">
+ Langue :
+ </text>
<button label="Importer" name="ok_btn"/>
<button label="Annuler" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
old mode 100755
new mode 100644
index 6d58cf77ca59f7fa82a1e9601107fde85695a641..c43139ce0f3bc6166ecbbfd0774c103ffb3eefdf
--- a/indra/newview/skins/default/xui/fr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Veuillez lire attentivement les Conditions d'utilisation et le Règlement sur le respect de la vie privée suivants. Vous devez les accepter pour pouvoir vous connecter à [SECOND_LIFE].
</text>
+ <text name="external_tos_required">
+ Vous devez vous rendre sur my.secondlife.com et vous connecter pour accepter les Conditions d’utilisation avant de pouvoir continuer. Merci !
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_toybox.xml b/indra/newview/skins/default/xui/fr/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/language_settings.xml b/indra/newview/skins/default/xui/fr/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
old mode 100755
new mode 100644
index 0450be28e085edec52a5460088733658283024c4..20de34250a6e56abd529c3cdbf5b13204aa3f874
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
<menu_item_call label="Payer" name="Pay..."/>
<menu_item_call label="Profil de l'objet" name="Object Inspect"/>
+ <menu_item_check label="Effectuer le rendu normalement" name="RenderNormally"/>
+ <menu_item_check label="Ne pas effectuer le rendu" name="DoNotRender"/>
+ <menu_item_check label="Effectuer le rendu total" name="AlwaysRenderFully"/>
<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
old mode 100755
new mode 100644
index 1f5c1724f8037fc832838f83c00022f1ff765844..d31f205efb2cdd3265fb3f42d9eddf3d6e4220a6
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
<menu_item_call label="Payer" name="Pay..."/>
+ <menu_item_check label="Effectuer le rendu normalement" name="RenderNormally"/>
+ <menu_item_check label="Ne pas effectuer le rendu" name="DoNotRender"/>
+ <menu_item_check label="Effectuer le rendu total" name="AlwaysRenderFully"/>
<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_edit.xml b/indra/newview/skins/default/xui/fr/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_favorites.xml b/indra/newview/skins/default/xui/fr/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_group_plus.xml b/indra/newview/skins/default/xui/fr/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
old mode 100755
new mode 100644
index 5e9969627dd3eaf2a69bc55d0c6a2bb293686b63..c425e6cee7529a37694fbae6966bf29a6608ed27
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Signaler un bug" name="Report Bug"/>
<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Rechercher des mises à jour" name="Check for Updates"/>
</menu>
<menu_item_check label="Afficher le menu de débogage" name="Show Debug Menu"/>
<menu label="Débogage" name="Debug">
diff --git a/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml b/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
index a63e2082b7c3ba8eacab426b0dc2252634e71f71..dacb40738326db6e0bc3eb83eb213bd4266585d7 100644
--- a/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Trier par nom" name="sort_by_name"/>
+ <menu_item_check label="Trier en commençant par le plus récent" name="sort_by_recent"/>
<menu_item_check label="Trier par volume de stock (de bas à élevé)" name="sort_by_stock_amount"/>
<menu_item_check label="Afficher uniquement les dossiers d'annonces" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_navbar.xml b/indra/newview/skins/default/xui/fr/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_list.xml b/indra/newview/skins/default/xui/fr/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_picks.xml b/indra/newview/skins/default/xui/fr/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_toolbars.xml b/indra/newview/skins/default/xui/fr/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_email.xml b/indra/newview/skins/default/xui/fr/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a86128bc046bb40b0a221fef5cfc092188c2651b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="Composer le message dans un client externe" name="email_open_external"/>
+ <menu_item_call label="Copier le message dans le presse-papiers" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_group.xml b/indra/newview/skins/default/xui/fr/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_http.xml b/indra/newview/skins/default/xui/fr/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_map.xml b/indra/newview/skins/default/xui/fr/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
old mode 100755
new mode 100644
index 788cdbf856e1dadfb3e14f19c7563551947699ed..9b1f195391eba2626faf195f32b94969b09dd045
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -180,6 +180,7 @@
<menu_item_call label="Signaler un bug" name="Report Bug"/>
<menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Rechercher des mises à jour" name="Check for Updates"/>
</menu>
<menu label="Avancé" name="Advanced">
<menu_item_call label="Refixer les textures" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
<menu_item_call label="Mesure du lag" name="Lag Meter"/>
<menu_item_check label="Barre de statistiques" name="Statistics Bar"/>
<menu_item_call label="Statistiques de chargement de scène" name="Scene Load Statistics"/>
- <menu_item_check label="Afficher le poids de dessin pour les avatars" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Afficher les informations de complexité de l’avatar" name="Avatar Draw Info"/>
</menu>
<menu label="Surbrillance et visibilité" name="Highlighting and Visibility">
<menu_item_check label="Balise animée" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
<menu_item_check label="Articulations" name="Joints"/>
<menu_item_check label="Rayons" name="Raycast"/>
<menu_item_check label="Vecteurs de vent" name="Wind Vectors"/>
- <menu_item_check label="Complexité du rendu" name="rendercomplexity"/>
- <menu_item_check label="Octets d'éléments attachés" name="attachment bytes"/>
<menu_item_check label="Sculpture" name="Sculpt"/>
<menu label="Densité des textures" name="Texture Density">
<menu_item_check label="Aucune" name="None"/>
@@ -423,13 +422,11 @@
<menu_item_check label="Debogage Character Vis" name="Debug Character Vis"/>
<menu_item_check label="Afficher le squelette de collision" name="Show Collision Skeleton"/>
<menu_item_check label="Afficher la cible de l'avatar" name="Display Agent Target"/>
- -->
<menu_item_call label="Dump Attachments" name="Dump Attachments"/>
<menu_item_call label="Débogage des textures des avatars" name="Debug Avatar Textures"/>
<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
</menu>
<menu_item_check label="Textures HTTP" name="HTTP Textures"/>
- <menu_item_check label="Inventaire HTTP" name="HTTP Inventory"/>
<menu_item_call label="Compresser les images" name="Compress Images"/>
<menu_item_call label="Activer Visual Leak Detector" name="Enable Visual Leak Detector"/>
<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/mime_types_linux.xml b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/mime_types_mac.xml b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
old mode 100755
new mode 100644
index 55a67e118793ecb5f34de3b29eb300c94235e1f1..080ea741c5ac0071a97f6ec845bf69530cf6b106
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -164,6 +164,10 @@ L'initialisation de la Place du marché a échoué en raison d'une err
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ Pour créer votre annonce, nous avons corrigé la hiérarchie de votre contenu d’annonces.
+ <usetemplate ignoretext="M’avertir que la création d’une annonce corrige la hiérarchie du contenu" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Cette action va modifier le contenu actif de cette annonce. Voulez-vous continuer ?
<usetemplate ignoretext="Confirmer avant que je ne modifie une annonce active sur la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
@@ -211,11 +215,9 @@ L'initialisation de la Place du marché a échoué en raison d'une err
Nous avons retiré votre annonce car le stock est vide. Vous devez ajouter plus d'unités au dossier de stock pour publier à nouveau l'annonce.
<usetemplate ignoretext="Alerter lorsqu'une annonce n'est pas publiée parce que le dossier de stock est vide" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Une erreur est survenue lors du chargement du script compilé, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ Nous avons supprimé votre annonce car le dossier de version est vide. Vous devez ajouter des articles au dossier de version si vous voulez republier votre annonce.
+ <usetemplate ignoretext="Alerte quand une annonce est supprimée car le dossier de version est vide" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
Une erreur est survenue lors de l'écriture des données d'animation. Veuillez réessayer ultérieurement.
@@ -319,6 +321,14 @@ Si vous ne voulez plus que ce rôle dispose de ces pouvoirs, désactivez-les imm
Vous allez expulser [COUNT] membres du groupe.
<usetemplate ignoretext="Confirmer l'expulsion de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ Vous allez bannir [AVATAR_NAME] du groupe.
+ <usetemplate ignoretext="Confirmer le bannissement d’un membre du groupe" name="okcancelignore" notext="Annuler" yestext="Bannir"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ Vous allez bannir [COUNT] membres du groupe.
+ <usetemplate ignoretext="Confirmer le bannissement de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Bannir"/>
+ </notification>
<notification name="AttachmentDrop">
Vous êtes sur le point d'abandonner l'élément joint.
Voulez-vous vraiment continuer ?
@@ -403,7 +413,7 @@ Objets : [N]
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- Êtes-vous certain de vouloir renvoyer tous les objets de la liste dans l'inventaire de leur propriétaire ?
+ Êtes-vous certain de vouloir renvoyer tous les objets de la liste dans l’inventaire de leur propriétaire ? Cela renverra TOUS les objets scriptés dans la région !
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -586,16 +596,10 @@ Souhaitez-vous charger la dernière version enregistrée sur le serveur ?
(**Attention** Cette opération est irréversible.)
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- Une erreur est survenue lors de l'enregistrement du script, suite au problème suivant : [REASON]. Essayez d'enregistrer votre script ultérieurement.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
Impossible d'enregistrer le script car l'objet qui le contient est introuvable.
L'objet est peut-être inaccessible ou a peut-être été supprimé.
</notification>
- <notification name="SaveBytecodeFailReason">
- Une erreur est survenue lors de l'enregistrement du script compilé, suite au problème suivant : [REASON]. Essayez d'enregistrer votre script ultérieurement.
- </notification>
<notification name="StartRegionEmpty">
Vous n'avez pas défini de région de départ.
Saisissez le nom de la région voulue dans la case Lieu de départ ou choisissez Dernier emplacement ou Domicile comme lieu de départ.
@@ -608,6 +612,10 @@ L'objet est peut-être inaccessible ou a peut-être été supprimé.
<notification name="CannotDownloadFile">
Impossible de télécharger le fichier
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ Vous avez demandé un téléchargement de fichier, qui n’est pas pris en charge dans [SECOND_LIFE].
+ <usetemplate ignoretext="M’avertir des téléchargements de fichiers non pris en charge" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
Impossible d'écrire le fichier [[FILE]]
</notification>
@@ -1109,8 +1117,9 @@ Fusionner le terrain ?
Cette erreur est généralement temporaire. Veuillez modifier et sauvegarder l'élément endossable à nouveau d'ici quelques minutes.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Zut. Vous avez été déconnecté(e) de [SECOND_LIFE]
- [MESSAGE]
+ Zut. Vous avez été déconnecté(e) de [SECOND_LIFE].
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Afficher IM et chat"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1352,6 +1361,13 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
<ignore name="ignore" text="Vos habits prennent du temps à télécharger"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité visuelle] est [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité visuelle] est [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
L'installation de [APP_NAME] est terminée.
@@ -1633,6 +1649,25 @@ Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
consultez [Informations au sujet de cette mise à jour [INFO_URL]]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ Une mise à jour est disponible.
+Elle est en cours de téléchargement en arrière-plan et nous vous inviterons à redémarrer votre client pour terminer son installation dès qu’elle est prête.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ Une mise à jour a été téléchargée. Elle sera installée au redémarrage.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ Une erreur est survenue lors de la recherche de mises à jour.
+Veuillez réessayer ultérieurement.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ Votre client est à jour.
+Si vous êtes impatients de découvrir les dernières fonctionnalités et corrections, consultez la page Autres clients. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
Si vous cédez cet objet, le groupe :
* recevra les L$ versés pour l'objet ;
@@ -1737,6 +1772,14 @@ Quitter le groupe ?
Vous avez atteint le nombre de groupes maximum. Vous devez en quitter un avant d'en rejoindre ou d'en créer un nouveau.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ Le nombre de groupes maximum est [MAX_BASIC] pour les comptes basiques et
+[MAX_PREMIUM] pour les comptes [https://secondlife.com/premium/ premium].
+Si vous avez rétrogradé votre compte, vous devez réduire votre nombre de groupes pour passer sous le nombre de groupes maximum ([MAX_BASIC]) avant de pouvoir en rejoindre d’autres.
+
+[https://secondlife.com/my/account/membership.php Mettez à niveau dès aujourd’hui !]
+ <usetemplate name="okbutton" yestext="Fermer"/>
+ </notification>
<notification name="KickUser">
Éjecter ce résident avec quel message ?
<form name="form">
@@ -2248,6 +2291,10 @@ Déplacer les objets de l'inventaire ?
Confirmez que vous voulez payer [AMOUNT]Â L$ Ã [TARGET].
<usetemplate ignoretext="Confirmez avant de payer (sommes supérieures à 200 L$)" name="okcancelignore" notext="Annuler" yestext="Payer"/>
</notification>
+ <notification name="PayObjectFailed">
+ Échec de paiement : objet introuvable.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Vous n'êtes autorisé à copier aucun élément dans cet objet.
</notification>
@@ -2279,10 +2326,9 @@ Vous ne pouvez pas l'annuler.
[QUESTION]
<usetemplate ignoretext="Confirmer avant de supprimer des articles" name="okcancelignore" notext="Annuler" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php Conditions d’utilisation] et aux [http://secondlife.com/corporate/cs.php Règles communautaires].
-
-Lorsqu'elles sont signalées, toutes les infractions font l'objet d'une enquête et sont résolues.
+ <notification name="ConfirmUnlink">
+ C’est une vaste sélection avec des groupes de liens. Si vous annulez les liens, vous risquez de ne pas pouvoir les rétablir. Vous devriez peut-être faire des copies des groupes de liens dans votre inventaire par mesure de précaution.
+ <usetemplate ignoretext="Confirmer l’annulation des liens d’un groupe de liens" name="okcancelignore" notext="Annuler" yestext="Annuler le lien"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Veuillez choisir une catégorie pour ce rapport d'infraction.
@@ -2969,67 +3015,67 @@ Acceptez-vous ?
</form>
</notification>
<notification name="ExperienceAcquireFailed">
- Impossible d'acquérir une nouvelle expérience :
+ Impossible d’acquérir une nouvelle expérience :
[ERROR_MESSAGE]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="NotInGroupExperienceProfileMessage">
- Une modification du groupe de l'expérience a été ignorée, car le propriétaire n'est pas membre du groupe sélectionné.
+ Une modification du groupe de l’expérience a été ignorée, car le propriétaire n’est pas membre du groupe sélectionné.
</notification>
<notification name="UneditableExperienceProfileMessage">
- Le champ non modifiable « [field] » a été ignoré lors de la mise à jour du profil de l'expérience.
+ Le champ non modifiable « [field] » a été ignoré lors de la mise à jour du profil de l’expérience.
</notification>
<notification name="RestrictedToOwnerExperienceProfileMessage">
- Modifications du champ « [field] » ignorées, car il ne peut être défini que par le propriétaire de l'expérience.
+ Modifications du champ « [field] » ignorées, car il ne peut être défini que par le propriétaire de l’expérience.
</notification>
<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
Vous ne pouvez pas définir une catégorie de contenu plus élevée pour une expérience que pour son propriétaire.
</notification>
<notification name="RestrictedTermExperienceProfileMessage">
- Les termes suivants ont empêché la mise à jour du nom et/ou de la description du profil de l'expérience : [extra_info]
+ Les termes suivants ont empêché la mise à jour du nom et/ou de la description du profil de l’expérience : [extra_info]
</notification>
<notification name="TeleportedHomeExperienceRemoved">
- Vous avez été téléporté(e) hors de la région [region_name], car vous avez supprimé l'expérience secondlife:///app/experience/[public_id]/profile et n'êtes plus autorisé(e) dans cette région.
+ Vous avez été téléporté(e) hors de la région [region_name], car vous avez supprimé l’expérience secondlife:///app/experience/[public_id]/profile et n’êtes plus autorisé(e) dans cette région.
<form name="form">
- <ignore name="ignore" text="Éjecté(e) de la région pour cause de suppression d'une expérience"/>
+ <ignore name="ignore" text="Éjecté(e) de la région pour cause de suppression d’une expérience"/>
</form>
</notification>
<notification name="TrustedExperienceEntry">
- Vous avez été autorisé(e) à pénétrer dans la région [region_name] en participant à l'expérience avec clé secondlife:///app/experience/[public_id]/profile. Si vous supprimez cette expérience, vous risquez d'être éjecté(e) de cette région.
+ Vous avez été autorisé(e) à pénétrer dans la région [region_name] en participant à l’expérience avec clé secondlife:///app/experience/[public_id]/profile. Si vous supprimez cette expérience, vous risquez d’être éjecté(e) de cette région.
<form name="form">
<ignore name="ignore" text="Autorisé(e) dans une région par une expérience"/>
</form>
</notification>
<notification name="TrustedExperiencesAvailable">
- Vous n'avez pas accès à cette destination. Vous pouvez être autorisé(e) à pénétrer dans la région en acceptant une expérience ci-dessous :
+ Vous n’avez pas accès à cette destination. Vous pouvez être autorisé(e) à pénétrer dans la région en acceptant une expérience ci-dessous :
[EXPERIENCE_LIST]
-Il est possible que d'autres expériences avec clé soient disponibles.
+Il est possible que d’autres expériences avec clé soient disponibles.
</notification>
<notification name="ExperienceEvent">
- Un objet a été autorisé à [EventType] par l'expérience secondlife:///app/experience/[public_id]/profile.
+ Un objet a été autorisé à [EventType] par l’expérience secondlife:///app/experience/[public_id]/profile.
Propriétaire : secondlife:///app/agent/[OwnerID]/inspect
- Nom de l'objet : [ObjectName]
+ Nom de l’objet : [ObjectName]
Nom de la parcelle : [ParcelName]
</notification>
<notification name="ExperienceEventAttachment">
- Une pièce jointe a été autorisée à [EventType] par l'expérience secondlife:///app/experience/[public_id]/profile.
+ Une pièce jointe a été autorisée à [EventType] par l’expérience secondlife:///app/experience/[public_id]/profile.
Propriétaire : secondlife:///app/agent/[OwnerID]/inspect
</notification>
<notification name="ScriptQuestionExperience">
- « <nolink>[OBJECTNAME]</nolink> », un objet appartenant à « [NAME] », demande votre participation à l'expérience [GRID_WIDE] :
+ « <nolink>[OBJECTNAME]</nolink> », un objet appartenant à « [NAME] », demande votre participation à l’expérience [GRID_WIDE] :
[EXPERIENCE]
-Une fois l'autorisation accordée, vous ne verrez plus ce message pour cette expérience, sauf si elle est révoquée dans le profil de l'expérience.
+Une fois l’autorisation accordée, vous ne verrez plus ce message pour cette expérience, sauf si elle est révoquée dans le profil de l’expérience.
-Les scripts associés à cette expérience pourront effectuer les actions suivantes dans les régions dans lesquelles l'expérience est active :
+Les scripts associés à cette expérience pourront effectuer les actions suivantes dans les régions dans lesquelles l’expérience est active :
[QUESTIONS]Acceptez-vous ?
<form name="form">
- <button name="BlockExperience" text="Bloquer l'expérience"/>
- <button name="Mute" text="Ignorer l'objet"/>
+ <button name="BlockExperience" text="Bloquer l’expérience"/>
+ <button name="Mute" text="Ignorer l’objet"/>
<button name="Yes" text="Oui"/>
<button name="No" text="Non"/>
</form>
@@ -3211,6 +3257,12 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
<notification name="AttachmentSaved">
L'élément joint a été sauvegardé.
</notification>
+ <notification name="PresetNotSaved">
+ Erreur d’enregistrement du préréglage [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Erreur de suppression du préréglage [NAME].
+ </notification>
<notification name="UnableToFindHelpTopic">
Impossible de trouver l'aide.
</notification>
@@ -3243,9 +3295,8 @@ Le bouton sera affiché quand il y aura suffisamment de place.
Sélectionnez les résidents avec lesquels partager l'élément.
</notification>
<notification name="MeshUploadError">
- Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER]
-
-Voir le fichier journal pour plus de détails.
+ Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER]
+[DETAILS]Consultez SecondLife.log pour de plus amples détails
</notification>
<notification name="MeshUploadPermError">
Erreur lors de la demande des autorisations de chargement de maillage.
diff --git a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_info.xml b/indra/newview/skins/default/xui/fr/panel_experience_info.xml
index e830ce1ba6f924814d357922fd4d7faa1dd4678f..58368c12120822a53f94f222c25281a4b05080fd 100644
--- a/indra/newview/skins/default/xui/fr/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_experience_info.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_experience_info">
- <text name="title" value="Profil de l'expérience"/>
+ <text name="title" value="Profil de l’expérience"/>
<scroll_container name="xp_scroll">
<panel name="scrolling_panel">
<layout_stack>
<layout_panel>
- <text name="experience_title" value="Kyle's Superhero RPG"/>
+ <text name="experience_title" value="Kyle’s Superhero RPG"/>
</layout_panel>
<layout_panel name="location panel">
<text name="Location">
@@ -14,7 +14,7 @@
<text name="LocationTextText">
quelque part
</text>
- <button label="Téléporter" name="teleport_btn"/>
+ <button label="Téléportation" name="teleport_btn"/>
<button label="Carte" name="map_btn"/>
</layout_panel>
<layout_panel name="marketplace panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_search.xml b/indra/newview/skins/default/xui/fr/panel_experience_search.xml
index 13495057d40c1ba163a768d641ed56d1c7bdb705..ec0cb25a50cf0dd31b121a73dd79dab9dda8642f 100644
--- a/indra/newview/skins/default/xui/fr/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/fr/panel_experience_search.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="SEARCH">
<string name="not_found">
- '[TEXT]' introuvable
+ ’[TEXT]’ introuvable
</string>
<string name="no_results">
Aucun résultat
diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notify.xml b/indra/newview/skins/default/xui/fr/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
old mode 100755
new mode 100644
index db7d254b7ace284232642702f7da94e1899e4ec8..a4d087cd20f2005d84dc68844b17c0d7d382525c
--- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] articles [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ [ITEM_COUNT] articles [FILTER] récupérés
+ </panel.string>
<text name="ItemcountText">
Articles :
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Afficher d'autres options"/>
+ <menu_button name="options_gear_btn" tool_tip="Afficher d'autres options"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="Ajouter un nouvel article"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
old mode 100755
new mode 100644
index e306a0018366c975a5d9a188c73107165ab6610e..95cd13eb94341e0eb4db52a0a416abeee5cffd06
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -18,6 +18,7 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
+ <string name="GroupCountWithInfo" value="Vous appartenez à [COUNT] groupes, et pouvez en rejoindre [REMAINING] autres. [secondlife:/// Vous en voulez plus ?]"/>
<tab_container name="tabs">
<panel label="PRÈS DE VOUS" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 67bcfb0879be1b09aa06e33e5ff9c02987e46e55..f61dc5aa35931fa0eace938046e8f37037bdd6e2
--- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="Clients multiples autorisés" name="allow_multiple_viewer_check"/>
<check_box label="Liste de sélection de grille affichée à la connexion" name="show_grid_selection_check"/>
<check_box label="Menu Avancé affiché" name="show_advanced_menu_check"/>
- <check_box label="Menu Développeurs affiché" name="show_develop_menu_check"/>
+ <check_box label="Afficher le menu Développeurs" name="show_develop_menu_check"/>
<button label="Permissions de création par défaut" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 52c6ed24b9d999c33ada7b1693e6d9d2e967bbda..c948b4f9b51f3703b5c36344318b569289d27037
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Offre d'inventaire" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ Enregistrer :
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Journal et transcriptions" name="log_and_transcripts" value="2"/>
+ <item label="Journal uniquement" name="log_only" value="1"/>
+ <item label="Pas de journal ni de transcriptions" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="Effacer le journal..." name="clear_log"/>
<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ Endroit :
+ </text>
<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
</panel>
<button label="Traduction..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 4946b098142f069306f943d244f0c8cb6261bab2..01d89f03f881b8b3ad7abe9d35fb07a37bbea497
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Graphiques" name="Display panel">
- <text name="QualitySpeed">
- Qualité et vitesse :
- </text>
- <text name="FasterText">
- Plus rapide
+ <text name="preset_text">
+ (Aucun/Aucune)
</text>
- <text name="BetterText">
- Meilleure
+ <text name="QualitySpeed">
+ Qualité et vitesse :
</text>
<text name="ShadersPrefText">
Faible
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
Ultra
</text>
- <panel label="Graphiques personnalisés" name="CustomGraphics Panel">
- <text name="ShadersText">
- Effets :
- </text>
- <check_box initial_value="true" label="Eau transparente" name="TransparentWater"/>
- <check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/>
- <check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
- <check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
- <check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
- <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"/>
- <text name="shadows_label">
- Ombres :
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Aucune" name="0"/>
- <combo_box.item label="Soleil/Lune" name="1"/>
- <combo_box.item label="Soleil/Lune + Projecteurs" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Reflets dans l'eau :
- </text>
- <combo_box initial_value="true" label="Reflets dans l'eau" name="Reflections">
- <combo_box.item label="Minimes" name="0"/>
- <combo_box.item label="Terrain et arbres" name="1"/>
- <combo_box.item label="Tous les objets statiques" name="2"/>
- <combo_box.item label="Tous les objets et avatars" name="3"/>
- <combo_box.item label="Tout" name="4"/>
- </combo_box>
- <slider label="Prop. physiques avatar :" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Faible
- </text>
- <slider label="Limite d'affichage :" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Nb max. de particules :" label_width="147" name="MaxParticleCount"/>
- <slider label="Avatars max. non éloignés en 2D :" name="MaxNumberAvatarDrawn"/>
- <slider label="Qualité post-traitement :" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Détails des rendus :
- </text>
- <slider label=" Objets :" name="ObjectMeshDetail"/>
- <slider label=" Flexiprims :" name="FlexibleMeshDetail"/>
- <slider label=" Arbres :" name="TreeMeshDetail"/>
- <slider label=" Avatars :" name="AvatarMeshDetail"/>
- <slider label=" Relief :" name="TerrainMeshDetail"/>
- <slider label=" Ciel :" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Faible
- </text>
- <text name="ObjectMeshDetailText">
- Faible
- </text>
- <text name="FlexibleMeshDetailText">
- Faible
- </text>
- <text name="TreeMeshDetailText">
- Faible
- </text>
- <text name="AvatarMeshDetailText">
- Faible
- </text>
- <text name="TerrainMeshDetailText">
- Faible
- </text>
- <text name="SkyMeshDetailText">
- Faible
- </text>
- <text name="AvatarRenderingText">
- Rendu de l'avatar :
- </text>
- <check_box initial_value="true" label="Avatars éloignés en 2D" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Accélération du rendu" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Mouvement des habits" name="AvatarCloth"/>
- <text left="380" name="TerrainDetailText">
- Rendu du terrain :
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="Faible" name="0"/>
- <radio_item label="Élevé" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Appliquer" label_selected="Appliquer" name="Apply"/>
- <button label="Réinitialiser" name="Defaults"/>
- <button label="Avancé" name="Advanced"/>
- <button label="Matériel" label_selected="Matériel" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ Plus rapide
+ </text>
+ <text name="BetterText">
+ Meilleure
+ </text>
+ <check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="Modèle d’éclairage avancé" name="UseLightShaders"/>
+ <button label="Enregistrer les paramètres comme préréglage..." name="PrefSaveButton"/>
+ <button label="Charger un préréglage..." name="PrefLoadButton"/>
+ <button label="Supprimer un préréglage..." name="PrefDeleteButton"/>
+ <button label="Réinitialiser les paramètres recommandés" name="Defaults"/>
+ <button label="Paramètres avancés" name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
old mode 100755
new mode 100644
index e2f9b9567cdd2f008124410ee0ffd056fda5e3ff..bd21f9782d60c2a0cbd1b6ab390ad80a0437de8d
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="Utiliser mon navigateur (Chrome, Firefox, IE) pour tous les liens" name="internal" tool_tip="Utiliser le navigateur web système par défaut pour l'aide, les liens, etc. Non recommandé en mode plein écran." value="0"/>
<radio_item label="Utiliser le navigateur intégré pour les liens Second Life uniquement" name="external" tool_tip="Utilisez le navigateur web système par défaut pour l'aide, les liens Web, etc. Le navigateur intégré sera uniquement utilisé pour les liens LindenLab/SecondLife." value="1"/>
+ <radio_item label="Utiliser le navigateur intégré pour tous les liens" name="external_all" tool_tip="Utilisez le navigateur intégré pour obtenir de l’aide, ouvrir des liens etc. Ce navigateur s’ouvre dans [APP_NAME]." value="2"/>
</radio_group>
<check_box initial_value="true" label="Activer les plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Accepter les cookies" name="cookies_enabled"/>
<check_box initial_value="true" label="Activer Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Activer les fenêtres popup de navigateur de médias" name="media_popup_enabled"/>
<text name="Software updates:">
Mises à jour logicielles :
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="Installation automatique" name="Install_automatically"/>
- <combo_box.item label="Téléchargement et installation manuels" name="Install_manual"/>
+ <combo_box.item label="Je téléchargerai et installerai les mises à jour manuellement" name="Install_manual"/>
</combo_box>
<check_box label="Accepte de passer aux versions avant sortie officielle" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..124eea0716464a61e9abb6fa79a5d3a21a6c4c99
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ Préréglages graphiques
+ </text>
+ <button label="Ouvrir les préférences graphiques" name="open_prefs_btn" tool_tip="Ouvrir les préférences de graphiques"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index ad744b77608cf37edf37768e7a8290aa06301d1f..27152499576c002d313bb9777c6ef3b5824eca6a
--- a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="URL du média"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="Liste blanche activée"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Navigation sécurisée"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_region_experiences.xml b/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
index be9c99b0092199d13cfa5ba64a9ac5159bd1f8be..12dd77ba2bd09bd1bbc1e43156630957ce120f05 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
@@ -3,31 +3,31 @@
<panel.string name="trusted_estate_text">
Toute expérience peut être une expérience avec clé.
-Les expériences avec clé peuvent s'exécuter dans ce domaine.
+Les expériences avec clé peuvent s’exécuter dans ce domaine.
-En outre, si le domaine n'autorise pas l'accès public, les résidents participant à une expérience avec clé peuvent pénétrer dans ce domaine et y rester tant qu'ils participent à ladite expérience.
+En outre, si le domaine n’autorise pas l’accès public, les résidents participant à une expérience avec clé peuvent pénétrer dans ce domaine et y rester tant qu’ils participent à ladite expérience.
</panel.string>
<panel.string name="allowed_estate_text">
- Seules les expériences à l'échelle des terrains peuvent être autorisées.
+ Seules les expériences à l’échelle des terrains peuvent être autorisées.
-Les expériences autorisées peuvent s'exécuter dans ce domaine.
+Les expériences autorisées peuvent s’exécuter dans ce domaine.
</panel.string>
<panel.string name="blocked_estate_text">
- Seules les expériences à l'échelle de la grille peuvent être bloquées.
+ Seules les expériences à l’échelle de la grille peuvent être bloquées.
-Les expériences bloquées ne peuvent pas s'exécuter dans ce domaine.
+Les expériences bloquées ne peuvent pas s’exécuter dans ce domaine.
</panel.string>
<panel.string name="estate_caption">
Les modifications des paramètres de cet onglet affecteront toutes les régions du domaine.
</panel.string>
<panel.string name="allowed_parcel_text">
- Seules les expériences à l'échelle des terrains peuvent être autorisées.
+ Seules les expériences à l’échelle des terrains peuvent être autorisées.
-Les expériences autorisées peuvent s'exécuter sur cette parcelle si elles ne sont pas bloquées par le domaine.
+Les expériences autorisées peuvent s’exécuter sur cette parcelle si elles ne sont pas bloquées par le domaine.
</panel.string>
<panel.string name="blocked_parcel_text">
Toute expérience de résident peut être bloquée.
-Les expériences bloquées ne peuvent pas s'exécuter dans cette parcelle.
+Les expériences bloquées ne peuvent pas s’exécuter dans cette parcelle.
</panel.string>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index a560ff8d5ebbecc3b948b75b99cbc299a035a031..3cf64583d2de263525c4d44133c5245203e4eb8e
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
L'enregistrement d'une image dans l'inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez un format carré.
</text>
<combo_box label="Résolution" name="texture_size_combo">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+ <combo_box.item label="Fenêtre actuelle (512x512)" name="CurrentWindow"/>
<combo_box.item label="Petite (128 x 128)" name="Small(128x128)"/>
<combo_box.item label="Moyenne (256 x 256)" name="Medium(256x256)"/>
<combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
index c69cb61a9261cb8076ab9c06a77be5f7ce909636..de210f8b15af5cc31896501407b9221765429ef6 100644
--- a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Matériaux" name="Materials"/>
<combo_box.item label="Médias" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="Texture (diffuse)" name="Texture (diffuse)"/>
- <combo_box.item label="Relief (normal)" name="Bumpiness (normal)"/>
- <combo_box.item label="Brillance (spéculaire)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="Texture (diffuse)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="Relief (normal)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="Brillance (spéculaire)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
<text name="label alphamode">
Mode alpha
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
old mode 100755
new mode 100644
index 966e3440e568bcab068def974651f590288660a9..a52d4be1fb3ce8d0a4e06922a2bd04aca1e940ae
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -72,7 +72,7 @@
<action description="Modérer les chats" longdescription="Contrôlez l'accès et la participation aux chats de groupe écrits et vocaux." name="moderate group chat" value="37"/>
</action_set>
<action_set description="Ces pouvoirs incluent la possibilité de modifier les expériences appartenant à ce groupe." name="experience_tools_experience">
- <action description="Administrateur des expériences" longdescription="Les membres dotés d'un rôle avec ce pouvoir peuvent modifier les métadonnées pour cette expérience." name="experience admin" value="49"/>
- <action description="Contributeur aux expériences" longdescription="Les membres dotés d'un rôle avec ce pouvoir peuvent contribuer des scripts pour une expérience." name="experience contributor" value="50"/>
+ <action description="Administrateur des expériences" longdescription="Les membres dotés d’un rôle avec ce pouvoir peuvent modifier les métadonnées pour cette expérience." name="experience admin" value="49"/>
+ <action description="Contributeur aux expériences" longdescription="Les membres dotés d’un rôle avec ce pouvoir peuvent contribuer des scripts pour une expérience." name="experience contributor" value="50"/>
</action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
old mode 100755
new mode 100644
index e462b805e38631e7686cea9c0e694aff8dea990d..ae091aba3933508a81bed0f20e2b6d4fff5f5d23
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -38,12 +38,9 @@
Échec d'initialisation des graphiques. Veuillez mettre votre pilote graphique à jour.
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [Notes de version]]
</string>
- <string name="AboutCompiler">
- Compilé avec [COMPILER] version [COMPILER_VERSION]
- </string>
<string name="AboutPosition">
Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURLÂ : <nolink>[SLURL]</nolink>
@@ -64,10 +61,9 @@ Carte graphique : [GRAPHICS_CARD]
<string name="AboutLibs">
Version OpenGLÂ : [OPENGL_VERSION]
-Version libcurl : [LIBCURL_VERSION]
Version J2C Decoder : [J2C_VERSION]
Version Audio Driver : [AUDIO_DRIVER_VERSION]
-Version Qt Webkit : [QT_WEBKIT_VERSION]
+Version LLCEFLib/CEFÂ : [LLCEFLIB_VERSION]
Version serveur vocal : [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -178,6 +174,12 @@ Version serveur vocal : [VOICE_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Grille principale de Second Life (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Grille de test bêta Second Life (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -453,6 +455,9 @@ Veuillez réessayer de vous connecter dans une minute.
Vous ne pouvez pas porter un dossier contenant plus de [AMOUNT] articles. Vous pouvez modifier cette limite dans Avancé > Afficher les paramètres de débogage > WearFolderLimit.
</string>
<string name="TooltipPrice" value="[AMOUNT] L$Â :"/>
+ <string name="TooltipSLIcon">
+ Il s’agit d’un lien vers une page dans le domaine officiel SecondLife.com ou LindenLab.com.
+ </string>
<string name="TooltipOutboxDragToWorld">
Vous ne pouvez pas rezzer (charger) des articles du dossier Annonces de la Place de marché
</string>
@@ -472,7 +477,7 @@ Veuillez réessayer de vous connecter dans une minute.
Le nombre d'articles de stock dépasse [AMOUNT].
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Vous ne pouvez déposer des articles ou des dossiers que dans l'onglet TOUT. Veuillez activer cet onglet et déplacer à nouveau article(s) et dossier(s).
+ Vous pouvez uniquement déposer des articles ou des dossiers dans les onglets TOUS ou NON ASSOCIÉS. Sélectionnez l’un de ces onglets et déplacez à nouveau votre ou vos article ou dossiers.
</string>
<string name="TooltipOutboxNoTransfer">
Impossible de vendre ou de transférer un ou plusieurs de ces objets
@@ -556,6 +561,9 @@ Veuillez réessayer de vous connecter dans une minute.
Cliquez pour exécuter la commande secondlife://
</string>
<string name="CurrentURL" value=" URL actuelle : [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Cliquez pour composer un message
+ </string>
<string name="SLurlLabelTeleport">
Me téléporter vers
</string>
@@ -1081,7 +1089,7 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="AgentNameSubst">
(Vous)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Supprimer les alertes lors de la gestion des listes d'accès aux domaines
</string>
@@ -1860,6 +1868,21 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="TodayOld">
Inscrit aujourd'hui
</string>
+ <string name="av_render_everyone_now">
+ Désormais, tout le monde peut vous voir.
+ </string>
+ <string name="av_render_not_everyone">
+ Vous risquez de ne pas être rendu par tous les gens qui vous entourent.
+ </string>
+ <string name="av_render_over_half">
+ Vous risquez de ne pas être rendu par plus de la moitié des gens qui vous entourent.
+ </string>
+ <string name="av_render_most_of">
+ Vous risquez de ne pas être rendu par la plupart des gens qui vous entourent.
+ </string>
+ <string name="av_render_anyone">
+ Vous risquez de n’être rendu par aucune des personnes qui vous entourent.
+ </string>
<string name="AgeYearsA">
[COUNT] an
</string>
@@ -1977,6 +2000,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="CompileQueueUnknownFailure">
Échec du téléchargement, erreur inconnue
</string>
+ <string name="CompileNoExperiencePerm">
+ En train d’ignorer le script [SCRIPT] avec l’expérience [EXPERIENCE].
+ </string>
<string name="CompileQueueTitle">
Recompilation - progrès
</string>
@@ -2022,9 +2048,6 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="GroupsNone">
aucun
</string>
- <string name="CompileNoExperiencePerm">
- En train d'ignorer le script [SCRIPT] avec l'expérience [EXPERIENCE].
- </string>
<string name="Group" value=" (groupe)"/>
<string name="Unknown">
(Inconnu)
@@ -5380,18 +5403,6 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
<string name="UserDictionary">
[User]
</string>
- <string name="logging_calls_disabled_log_empty">
- Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat.
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat.
- </string>
- <string name="logging_calls_enabled_log_empty">
- Il n'y a aucune conversation enregistrée. Quand quelqu'un vous contacte ou quand vous contactez quelqu'un, une entrée de journal s'affiche ici.
- </string>
- <string name="loading_chat_logs">
- Chargement...
- </string>
<string name="experience_tools_experience">
Expérience
</string>
@@ -5402,10 +5413,10 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
(expérience sans titre)
</string>
<string name="Land-Scope">
- À l'échelle des terrains
+ À l’échelle des terrains
</string>
<string name="Grid-Scope">
- À l'échelle de la grille
+ À l’échelle de la grille
</string>
<string name="Allowed_Experiences_Tab">
AUTORISÉE
@@ -5447,7 +5458,7 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
vous téléporter
</string>
<string name="ExperiencePermission12">
- accepter automatiquement les permissions d'expérience
+ accepter automatiquement les permissions d’expérience
</string>
<string name="ExperiencePermissionShortUnknown">
a effectué une opération inconnue : [Permission]
@@ -5468,9 +5479,42 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
Contrôler la caméra
</string>
<string name="ExperiencePermissionShort11">
- Téléporter
+ Téléportation
</string>
<string name="ExperiencePermissionShort12">
Permission
</string>
+ <string name="logging_calls_disabled_log_empty">
+ Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Il n'y a aucune conversation enregistrée. Quand quelqu'un vous contacte ou quand vous contactez quelqu'un, une entrée de journal s'affiche ici.
+ </string>
+ <string name="loading_chat_logs">
+ Chargement...
+ </string>
+ <string name="preset_combo_label">
+ -Liste vide-
+ </string>
+ <string name="Default">
+ Valeur par défaut
+ </string>
+ <string name="none_paren_cap">
+ (Aucun/Aucune)
+ </string>
+ <string name="no_limit">
+ Aucune limite
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ La forme physique contient des triangles trop petits. Essayez de simplifier le modèle physique.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ La forme physique contient de mauvaises données de confirmation. Essayez de corriger le modèle physique.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ La forme physique n’a pas la version correcte. Configurez la version correcte pour le modèle physique.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
old mode 100755
new mode 100644
index f3b7effdaa9781aa8dd13988cbb68fcbda0e867b..9603238b66b0edf127272552ed851611c454b430
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Informazioni" name="support_panel">
<button label="Copia negli appunti" name="copy_btn"/>
+ <button label="Cerca aggiornamenti" name="update_btn"/>
</panel>
<panel label="Ringraziamenti" name="credits_panel">
<text name="linden_intro">Second Life vi è offerto dai Linden,
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
old mode 100755
new mode 100644
index 0c0d05308b59fbbe6f1afdfaf82e73eea26073b5..62960d8755901cda32f3c1999cce81f18c8e2f6d
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -10,13 +10,13 @@
"Parcel_R_Dark"
</floater.string>
<floater.string name="Minutes">
- [MINUTES] minuti
+ [MINUTES] min
</floater.string>
<floater.string name="Minute">
- minuto
+ min
</floater.string>
<floater.string name="Seconds">
- [SECONDS] secondi
+ [SECONDS] s
</floater.string>
<floater.string name="Remaining">
rimanenti
@@ -456,7 +456,7 @@ Media:
<spinner label="Ore di accesso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Consenti sempre" name="AllowedText">
- Residenti consentiti
+ Residenti consentiti ([COUNT])
</text>
<name_list name="AccessList" tool_tip="([LISTED] in lista, [MAX] max)"/>
<button label="Aggiungi" name="add_allowed"/>
@@ -464,7 +464,7 @@ Media:
</panel>
<panel name="Banned_layout_panel">
<text label="Espelli" name="BanCheck">
- Residenti con divieto
+ Residenti espulsi ([COUNT])
</text>
<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)"/>
<button label="Aggiungi" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/it/floater_activeim.xml b/indra/newview/skins/default/xui/it/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_auction.xml b/indra/newview/skins/default/xui/it/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
old mode 100755
new mode 100644
index 559a42cfae581f4ecd30c13cf81c2bf09fb669a5..0f0afcc6128c2920e444af608736faff7c3ff329
--- a/indra/newview/skins/default/xui/it/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Aggiungi..." name="autoreplace_add_entry"/>
<button label="Rimuovi" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Parola chiave:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Sostituzione:
+ </text>
<button label="Salva elemento" name="autoreplace_save_entry" tool_tip="Salva questo elemento."/>
<button label="Salva modifiche" name="autoreplace_save_changes" tool_tip="Salva tutte le modifiche."/>
<button label="Annulla" name="autoreplace_cancel" tool_tip="Annulla tutte le modifiche."/>
diff --git a/indra/newview/skins/default/xui/it/floater_avatar.xml b/indra/newview/skins/default/xui/it/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml
old mode 100755
new mode 100644
index ae661486593d86c3f5992d19be707ab37b827bb0..eacb7cfb6e8190ed539f6e79e7250c9f2b44af07
--- a/indra/newview/skins/default/xui/it/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/it/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] ti ha colpito con un oggetto fisico
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_choose_group.xml b/indra/newview/skins/default/xui/it/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_critical.xml b/indra/newview/skins/default/xui/it/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0876a6c7f47e3cff17bfdc4317221e8712d9a0ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="ELIMINA VALORE PREDEFINITO PREFERENZA">
+ <string name="title_graphic">
+ Elimina valore predefinito grafica
+ </string>
+ <string name="title_camera">
+ Elimina valore predefinito videocamera
+ </string>
+ <text name="Preset">
+ Seleziona un valore predefinito
+ </text>
+ <button label="Elimina" name="delete"/>
+ <button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_destinations.xml b/indra/newview/skins/default/xui/it/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_display_name.xml b/indra/newview/skins/default/xui/it/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_experienceprofile.xml b/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
index 031900825d40fcdfe33dda3b21bc3d834df4b187..c3e14fa1e1c1a0aec53b6ec0e0d8b4c729243454 100644
--- a/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
@@ -28,7 +28,7 @@
</layout_panel>
<layout_panel name="location panel">
<text name="Location">
- Luogo:
+ Posizione:
</text>
</layout_panel>
<layout_panel>
@@ -66,10 +66,10 @@
<icons_combo_box label="Moderato" name="edit_ContentRatingText" tool_tip="Se si aumenta la categoria di accesso di un'esperienza, vengono ripristinate le autorizzazioni per tutti i residenti che hanno consentito l'esperienza.">
<icons_combo_box.item label="Adulti" name="Adult" value="42"/>
<icons_combo_box.item label="Moderato" name="Mature" value="21"/>
- <icons_combo_box.item label="Generale" name="PG" value="13"/>
+ <icons_combo_box.item label="Generali" name="PG" value="13"/>
</icons_combo_box>
<text name="edit_Location">
- Luogo:
+ Posizione:
</text>
<button label="Imposta come attuale" name="location_btn"/>
<button label="Cancella luogo" name="clear_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_fast_timers.xml b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
old mode 100755
new mode 100644
index 52ab6b0c3d6c13b6f49d3986cc066e0e2244d551..921155df9b9b6e5948ef55344d3c16fb3f5fe0a7
--- a/indra/newview/skins/default/xui/it/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Correre
</string>
+ <combo_box name="time_scale_combo">
+ <item label="Doppio della media" name="2x Average"/>
+ <item label="Massimo" name="Max"/>
+ <item label="Massimo recente" name="Recent Max"/>
+ <item label="100 ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Giorno/ora" name="Time"/>
+ <item label="Numero di chiamate" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Pausa" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_font_test.xml b/indra/newview/skins/default/xui/it/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_god_tools.xml b/indra/newview/skins/default/xui/it/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_help_browser.xml b/indra/newview/skins/default/xui/it/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_how_to.xml b/indra/newview/skins/default/xui/it/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_hud.xml b/indra/newview/skins/default/xui/it/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_import_collada.xml b/indra/newview/skins/default/xui/it/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index e5543c741fe801abc66c8f4bbe7e744d12e101fe..97cf9d122c95abff1d159477246a7bb9ca195d11
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Precedenti al" name="older"/>
</radio_group>
<spinner label="Ore fa" name="spin_hours_ago"/>
+ <text name="label_hours">
+ Ore
+ </text>
<spinner label="Giorni fa" name="spin_days_ago"/>
+ <text name="label_days">
+ Giorni
+ </text>
<button label="Chiudi" label_selected="Chiudi" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/it/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bce7a45e3e2976c3ff6d066f2180cd0c4fc8154
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CARICA VALORE PREDEFINITO PREFERENZA">
+ <string name="title_graphic">
+ Carica valore predefinito grafica
+ </string>
+ <string name="title_camera">
+ Carica valore predefinito videocamera
+ </string>
+ <text name="Preset">
+ Seleziona un valore predefinito
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_media_settings.xml b/indra/newview/skins/default/xui/it/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index 02f257d4664dc25750cb3f142fd7f45f878db1e2..7a1f7f0a0cf2ada3c48bba00eb22b488290ee881
--- a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
Inizializzazione...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
- Caricamento...
+ Caricamento in corso...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Trascina elementi qui per creare cartelle
+ </text>
+ </panel>
<button label="Invia a Marketplace" name="outbox_import_btn" tool_tip="Push su negozio Marketplace"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
old mode 100755
new mode 100644
index e8df4d2d4b203cd6e0fbbcd4e3a51ab85725d4e0..1fe2659e4b2ed4f5c0b89519133ae791f93e870d
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
I materiali per il livello di dettaglio non sono un sottoinsieme del modello di riferimento.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Alcuni scafi fisici superano i limiti relativi ai vertici.
+ </string>
<string name="layer_all">
Tutto
</string>
@@ -93,52 +96,52 @@
<text initial_value="Vertici" name="vertices" value="Vertici"/>
<text initial_value="Alto" name="high_label" value="Alto"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Carica da file"/>
- <item name="Generate" value="Genera"/>
+ <item label="Carica da file" name="Load from file" value="Carica da file"/>
+ <item label="Genera" name="Generate" value="Genera"/>
</combo_box>
<button label="Sfoglia..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="Limite triangoli"/>
- <item name="Error Threshold" value="Limite errori"/>
+ <item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+ <item label="Limite errori" name="Error Threshold" value="Limite errori"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Medio" name="medium_label" value="Medio"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Carica da file"/>
- <item name="Generate" value="Genera"/>
- <item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+ <item label="Carica da file" name="Load from file" value="Carica da file"/>
+ <item label="Genera" name="Generate" value="Genera"/>
+ <item label="Usa livello di dettaglio indicato in precedenza" name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
</combo_box>
<button label="Sfoglia..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="Limite triangoli"/>
- <item name="Error Threshold" value="Limite errori"/>
+ <item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+ <item label="Limite errori" name="Error Threshold" value="Limite errori"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Basso" name="low_label" value="Basso"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Carica da file"/>
- <item name="Generate" value="Genera"/>
- <item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+ <item label="Carica da file" name="Load from file" value="Carica da file"/>
+ <item label="Genera" name="Generate" value="Genera"/>
+ <item label="Usa livello di dettaglio indicato in precedenza" name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
</combo_box>
<button label="Sfoglia..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="Limite triangoli"/>
- <item name="Error Threshold" value="Limite errori"/>
+ <item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+ <item label="Limite errori" name="Error Threshold" value="Limite errori"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="Bassissimo" name="lowest_label" value="Bassissimo"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Carica da file"/>
- <item name="Generate" value="Genera"/>
- <item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+ <item label="Carica da file" name="Load from file" value="Carica da file"/>
+ <item label="Genera" name="Generate" value="Genera"/>
+ <item label="Usa livello di dettaglio indicato in precedenza" name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
</combo_box>
<button label="Sfoglia..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="Limite triangoli"/>
- <item name="Error Threshold" value="Limite errori"/>
+ <item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+ <item label="Limite errori" name="Error Threshold" value="Limite errori"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_my_appearance.xml b/indra/newview/skins/default/xui/it/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_my_inventory.xml b/indra/newview/skins/default/xui/it/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/it/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6db1669bfde7c9836c3e05608bc2ddb2cc55617a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="AVVISI">
+ <floater.string name="system_tab_title">
+ Sistema ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Transazioni ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Inviti ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Gruppo ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ AVVISI
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="Sistema (0)" name="system_notification_list_tab"/>
+ <panel label="Transazioni (0)" name="transaction_notifications_tab"/>
+ <panel label="Inviti (0)" name="group_invite_notifications_tab"/>
+ <panel label="Gruppo (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Compatta tutti" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="Pannello spaziatura" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Elimina tutti" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_object_weights.xml b/indra/newview/skins/default/xui/it/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_openobject.xml b/indra/newview/skins/default/xui/it/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index 5122954edb1c86c91a40023876729e07e904bb68..4b512cdd5b79f09d611138254460e22efef96169
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[gruppo]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Nome" name="name"/>
<scroll_list.columns label="Descrizione" name="description"/>
@@ -42,7 +42,7 @@
<button label="Seleziona tutto" name="select_all_objects"/>
<button label="Non selezionare nessuno" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
Azioni per i personaggi selezionati:
</text>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index 77be220a2acafce137b19b31e0852f2665b9f394..b7e0cbc5957b329d01a81f325ffbd8a44d43d851
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Si è verificato un errore durante la generazione del percorso.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Stato del Viewer
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Stato del simulatore
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Visuale" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 7edac3ff463fbc709b2b75ad62a135c034550d35..32a27157f787b277740515cde7db98c45cee72b5
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
Seleziona uso set collegati...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Filtra per:
+ </text>
+ <text name="linksets_name_label">
+ Nome
+ </text>
+ <text name="linksets_desc_label">
+ Descrizione
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Filtra in base all'uso set collegati..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Camminabile" name="filter_by_linkset_use_walkable"/>
@@ -122,7 +131,10 @@
<button label="Seleziona tutto" name="select_all_objects"/>
<button label="Non selezionare nessuno" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Azioni sui set collegati selezionati (se si rimuove un set collegato dal mondo, si potrebbero perdere i relativi attributi):
+ </text>
<check_box label="Mostra marcatore" name="show_beacon"/>
<button label="Prendi" name="take_objects"/>
<button label="Prendi copia" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="Restituisci" name="return_objects"/>
<button label="Elimina" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Modifica gli attributi dei set collegati selezionati e premi il pulsante per applicare le modifiche
+ </text>
<text name="walkability_coefficients_label">
Camminabilità :
</text>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_people.xml b/indra/newview/skins/default/xui/it/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_perms_default.xml b/indra/newview/skins/default/xui/it/floater_perms_default.xml
index 3d1fd94b694f0e4470ef3c4b825c58730391984d..9a88f53d47187de1820aebe110225e4a6b0fa3c1 100644
--- a/indra/newview/skins/default/xui/it/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/it/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="DIRITTI DI CREAZIONE PREDEFINITI">
- <panel label="Diritti predefiniti" name="default permissions"/>
+ <panel label="Diritti predefiniti" name="default permissions">
+ <text name="label_1">
+ Proprietario successivo:
+ </text>
+ <text name="label_2">
+ Copia
+ </text>
+ <text name="label_3">
+ Modifica
+ </text>
+ <text name="label_4">
+ Trasferisci
+ </text>
+ <text name="label_5">
+ Condividi con il gruppo
+ </text>
+ <text name="label_6">
+ Consenti a chiunque di copiare
+ </text>
+ <text name="label_7" tool_tip="Imposta autorizzazioni predefinite per la creazione degli oggetti">
+ Oggetti
+ </text>
+ <text name="label_8" tool_tip="Imposta autorizzazioni predefinite per gli elementi caricati">
+ Caricamenti
+ </text>
+ <text name="label_9" tool_tip="Imposta autorizzazioni predefinite per la creazione degli script">
+ Script
+ </text>
+ <text name="label_10" tool_tip="Imposta autorizzazioni predefinite per la creazione dei biglietti">
+ Biglietti
+ </text>
+ <text name="label_11" tool_tip="Imposta autorizzazioni predefinite per la creazione delle gesture">
+ Gesture
+ </text>
+ <text name="label_12" tool_tip="Imposta autorizzazioni predefinite per la creazione di vestiti o parti del corpo">
+ Indossabili
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="Annulla" label_selected="Annulla" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_picks.xml b/indra/newview/skins/default/xui/it/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_places.xml b/indra/newview/skins/default/xui/it/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_post_process.xml b/indra/newview/skins/default/xui/it/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5baba9fcedcf2526c24044838b43d952af45698d
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PREFERENZE AVANZATE GRAFICA">
+ <text name="GeneralText">
+ Generali
+ </text>
+ <slider label="Distanza visualizzazione:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Numero massimo particelle:" name="MaxParticleCount"/>
+ <slider label="Qualità dopo l'elaborazione:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Basso
+ </text>
+ <text name="AvatarText">
+ Avatar
+ </text>
+ <slider label="Complessità massima:" name="IndirectMaxComplexity" tool_tip="Definisce il punto in cui un avatar dall'aspetto complesso viene visualizzato come una forma senza dettagli"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="N. max di non impostori:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="Dettagli:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ Basso
+ </text>
+ <slider label="Fisica:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ Basso
+ </text>
+ <text name="ShadersText">
+ Hardware
+ </text>
+ <slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da assegnare alle texture. Utilizza la memoria della scheda video come impostazione predefinita. La riduzione di questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le texture poco definite."/>
+ <slider label="Rapporto distanza nebbia:" name="fog"/>
+ <slider label="Gamma:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 = luminosità predefinita, più basso = più luminoso)
+ </text>
+ <check_box label="Filtro anisotropico (rallenta quando è attivato)" name="ani"/>
+ <check_box initial_value="true" label="Attiva oggetti buffer vertici OpenGL" name="vbo" tool_tip="Se si attiva questa impostazione su hardware più recente si migliorano le prestazioni. Con la funzione attiva, l'hardware meno recente potrebbe implementare VBO in maniera errata, causando interruzioni."/>
+ <check_box initial_value="true" label="Attiva compressione texture (richiede riavvio)" name="texture compression" tool_tip="Comprime le texture nella memoria video, consentendo il caricamento di texture a risoluzione maggiore al prezzo di una perdita di qualità del colore."/>
+ <text name="antialiasing label">
+ Antialiasing:
+ </text>
+ <combo_box label="Antialiasing" name="fsaa">
+ <combo_box.item label="Disattivato" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (richiede il riavvio)
+ </text>
+ <slider label="Dettagli mesh terreno:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ Basso
+ </text>
+ <slider label="Alberi:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ Basso
+ </text>
+ <slider label="Oggetti:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ Basso
+ </text>
+ <slider label="Prim flessibili:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ Basso
+ </text>
+ <check_box initial_value="true" label="Acqua trasparente" name="TransparentWater"/>
+ <check_box initial_value="true" label="Mappatura urti e brillantezza" name="BumpShiny"/>
+ <check_box initial_value="true" label="Luci locali" name="LocalLights"/>
+ <check_box initial_value="true" label="Shader di base" name="BasicShaders" tool_tip="Se si disattiva questa opzione, si possono evitare interruzioni nei driver di alcune schede grafiche"/>
+ <slider label="Dettagli terreno:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ Basso
+ </text>
+ <check_box initial_value="true" label="Hardware skinning avatar" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Stoffa avatar" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Riflessi nell’acqua:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="Minimo" name="0"/>
+ <combo_box.item label="Terreno e alberi" name="1"/>
+ <combo_box.item label="Tutti gli oggetti statici" name="2"/>
+ <combo_box.item label="Tutti gli avatar e gli oggetti" name="3"/>
+ <combo_box.item label="Tutto" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="Shader atmosfera" name="WindLightUseAtmosShaders"/>
+ <slider label="Cielo:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ Basso
+ </text>
+ <check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
+ <check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ Ombre:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Nessuno" name="0"/>
+ <combo_box.item label="Sole/Luna" name="1"/>
+ <combo_box.item label="Sole/Luna + Proiettori" name="2"/>
+ </combo_box>
+ <button label="Ripristina impostazioni consigliate" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Annulla" label_selected="Annulla" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preview_sound.xml b/indra/newview/skins/default/xui/it/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_publish_classified.xml b/indra/newview/skins/default/xui/it/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_region_info.xml b/indra/newview/skins/default/xui/it/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/it/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2a5f599aa262a699e73d976b891aa9fa0d26b213
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="SALVA VALORE PREDEFINITO PREFERENZA">
+ <string name="title_graphic">
+ Salva valore predefinito grafica
+ </string>
+ <string name="title_camera">
+ Salva valore predefinito videocamera
+ </string>
+ <text name="Preset">
+ Digita un nome per il valore predefinito o selezionane uno esistente.
+ </text>
+ <button label="Salva" name="save"/>
+ <button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_script_debug.xml b/indra/newview/skins/default/xui/it/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_script_limits.xml b/indra/newview/skins/default/xui/it/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_script_preview.xml b/indra/newview/skins/default/xui/it/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_select_key.xml b/indra/newview/skins/default/xui/it/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_sound_preview.xml b/indra/newview/skins/default/xui/it/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck.xml b/indra/newview/skins/default/xui/it/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index c04fc249a773ad9e595f0055045139d52853faf1..60324270e0c765355973e9c8f53317860806bafd
--- a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Imposta dizionario">
+ <text name="import_dict">
+ Dizionario:
+ </text>
<button label="Sfoglia" label_selected="Sfoglia" name="dictionary_path_browse"/>
+ <text name="import_name">
+ Nome:
+ </text>
+ <text name="import_lang">
+ Lingua:
+ </text>
<button label="Importa" name="ok_btn"/>
<button label="Annulla" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_sys_well.xml b/indra/newview/skins/default/xui/it/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml
old mode 100755
new mode 100644
index 28a2dfdda2d80ce5be037c812d6db6e3756ab9d1..0dd116d6135c971ff4575271c738494ed93b1239
--- a/indra/newview/skins/default/xui/it/floater_tos.xml
+++ b/indra/newview/skins/default/xui/it/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Sei pregato di leggere attentamente i Termini del servizio e le Regole sulla privacy di seguito. Per continuare l'accesso a [SECOND_LIFE], devi accettare le condizioni.
</text>
+ <text name="external_tos_required">
+ Per continuare, visita my.secondlife.com e accedi per accettare i Termini del servizio. Grazie.
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_toybox.xml b/indra/newview/skins/default/xui/it/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_translation_settings.xml b/indra/newview/skins/default/xui/it/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/inspect_group.xml b/indra/newview/skins/default/xui/it/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/inspect_remote_object.xml b/indra/newview/skins/default/xui/it/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/language_settings.xml b/indra/newview/skins/default/xui/it/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
old mode 100755
new mode 100644
index d4ce25e6a57e9e97192f42c91868a7b89b0cc2e1..60cdd2a91dc3f269dc3d0ac0ce3e1aa6efcbb11b
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Zoom avanti" name="Zoom In"/>
<menu_item_call label="Paga" name="Pay..."/>
<menu_item_call label="Profilo dell'oggetto" name="Object Inspect"/>
+ <menu_item_check label="Esegui il rendering normalmente" name="RenderNormally"/>
+ <menu_item_check label="Non eseguire il rendering" name="DoNotRender"/>
+ <menu_item_check label="Esegui il rendering completamente" name="AlwaysRenderFully"/>
<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
old mode 100755
new mode 100644
index a2b864b3e168b6bf493b0bfc4852bbb07ddf6a03..7042e5294386c943c711ff09a35052d89828b5ce
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Zoom avanti" name="Zoom In"/>
<menu_item_call label="Paga" name="Pay..."/>
+ <menu_item_check label="Esegui il rendering normalmente" name="RenderNormally"/>
+ <menu_item_check label="Non eseguire il rendering" name="DoNotRender"/>
+ <menu_item_check label="Esegui il rendering completamente" name="AlwaysRenderFully"/>
<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_edit.xml b/indra/newview/skins/default/xui/it/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_favorites.xml b/indra/newview/skins/default/xui/it/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_group_plus.xml b/indra/newview/skins/default/xui/it/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_landmark.xml b/indra/newview/skins/default/xui/it/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
old mode 100755
new mode 100644
index 126089aa6af48e483706a98f5c3165018fae32d0..33fa25cd38fcceba5b087f67668cd1585c4007e7
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
<menu_item_call label="Segnala bug" name="Report Bug"/>
<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Cerca aggiornamenti" name="Check for Updates"/>
</menu>
<menu_item_check label="Mostra menu Debug" name="Show Debug Menu"/>
<menu label="Debug" name="Debug">
diff --git a/indra/newview/skins/default/xui/it/menu_marketplace_view.xml b/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
index 63f0b7fc5059eb0576978f3e6cf23257ac353ca3..bd808f588f5944be8198853187ff92684ff2278b 100644
--- a/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+ <menu_item_check label="Mostra prima i più recenti" name="sort_by_recent"/>
<menu_item_check label="Ordina per quantità in magazzino (da bassa ad alta)" name="sort_by_stock_amount"/>
<menu_item_check label="Mostra solo cartelle annunci" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_navbar.xml b/indra/newview/skins/default/xui/it/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_picks.xml b/indra/newview/skins/default/xui/it/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_picks_plus.xml b/indra/newview/skins/default/xui/it/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_place.xml b/indra/newview/skins/default/xui/it/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_save_outfit.xml b/indra/newview/skins/default/xui/it/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_slurl.xml b/indra/newview/skins/default/xui/it/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_toolbars.xml b/indra/newview/skins/default/xui/it/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_topinfobar.xml b/indra/newview/skins/default/xui/it/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_email.xml b/indra/newview/skins/default/xui/it/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a8ef2cde932561a95dc1973dcbfe05f1ea284ec0
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="Componi un'email in un client esterno" name="email_open_external"/>
+ <menu_item_call label="Copia email negli Appunti" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_group.xml b/indra/newview/skins/default/xui/it/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_http.xml b/indra/newview/skins/default/xui/it/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_inventory.xml b/indra/newview/skins/default/xui/it/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_map.xml b/indra/newview/skins/default/xui/it/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_parcel.xml b/indra/newview/skins/default/xui/it/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_slapp.xml b/indra/newview/skins/default/xui/it/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_slurl.xml b/indra/newview/skins/default/xui/it/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_url_teleport.xml b/indra/newview/skins/default/xui/it/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
old mode 100755
new mode 100644
index 18ddad5ee8d25a49039ecdcf3cbf073236f4ddee..d52b022c496521f834fcb2ff620b1c8514dd10b1
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -64,7 +64,7 @@
<menu_item_call label="Istantanea" name="Take Snapshot"/>
<menu_item_call label="Profilo del luogo" name="Place Profile"/>
<menu_item_call label="Informazioni sul terreno" name="About Land"/>
- <menu_item_call label="Regione/proprietà immobiliare" name="RegionEstate"/>
+ <menu_item_call label="Regione / proprietà immobiliare" name="RegionEstate"/>
<menu_item_call label="Terreni posseduti..." name="My Land"/>
<menu_item_call label="Acquista questo terreno" name="Buy Land"/>
<menu label="Mostra" name="LandShow">
@@ -180,6 +180,7 @@
<menu_item_call label="Segnala bug" name="Report Bug"/>
<menu_item_call label="Urti, spinte e contatti" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Cerca aggiornamenti" name="Check for Updates"/>
</menu>
<menu label="Avanzate" name="Advanced">
<menu_item_call label="Ridisegna le texture" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
<menu_item_call label="Misuratore lag" name="Lag Meter"/>
<menu_item_check label="Barra statistiche" name="Statistics Bar"/>
<menu_item_call label="Statistiche caricamento scena" name="Scene Load Statistics"/>
- <menu_item_check label="Mostra peso visualizzazione per avatar" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Mostra informazioni sulla complessità dell'avatar" name="Avatar Draw Info"/>
</menu>
<menu label="Evidenziazione e visibilità " name="Highlighting and Visibility">
<menu_item_check label="Effetto marcatore lampeggiante" name="Cheesy Beacon"/>
@@ -298,8 +299,6 @@
<menu_item_check label="Particelle" name="Particles"/>
<menu_item_check label="Giunti" name="Joints"/>
<menu_item_check label="Vettori vento" name="Wind Vectors"/>
- <menu_item_check label="Complessità rendering" name="rendercomplexity"/>
- <menu_item_check label="Byte collegamento" name="attachment bytes"/>
<menu_item_check label="Scolpisci" name="Sculpt"/>
<menu label="Densità texture" name="Texture Density">
<menu_item_check label="Nessuna" name="None"/>
@@ -373,7 +372,6 @@
<menu_item_call label="Debug texture dell'avatar" name="Debug Avatar Textures"/>
</menu>
<menu_item_check label="Texture HTTP" name="HTTP Textures"/>
- <menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
<menu_item_call label="Attiva Visual Leak Detector" name="Enable Visual Leak Detector"/>
<menu_item_check label="Finestra Console al prossimo lancio" name="Console Window"/>
<menu label="Imposta livello di registrazione" name="Set Logging Level">
diff --git a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/mime_types.xml b/indra/newview/skins/default/xui/it/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/mime_types_linux.xml b/indra/newview/skins/default/xui/it/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/mime_types_mac.xml b/indra/newview/skins/default/xui/it/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
old mode 100755
new mode 100644
index 6aeabcc505debb96afb5fed7dc247c8725f16829..358f38a137285e0db96c20d5a2a329813ed7e8f2
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -164,6 +164,10 @@ L'inizializzazione con il Marketplace non ha avuto successo a causa di un e
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ Per creare l'annuncio, abbiamo corretto la gerarchia dei contenuti dell'annuncio.
+ <usetemplate ignoretext="Avvisami se la gerarchia del contenuto viene corretta per creare un annuncio" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Questa azione cambierà il contenuto attivo di questo annuncio. Vuoi continuare?
<usetemplate ignoretext="Conferma prima di modificare un annuncio attivo su Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
@@ -211,11 +215,9 @@ L'inizializzazione con il Marketplace non ha avuto successo a causa di un e
L'annuncio è stato rimosso perché il magazzino è esaurito. Aggiungi altre unità alla cartella di magazzino prima di pubblicare nuovamente l'annuncio.
<usetemplate ignoretext="Avverti quando un annuncio viene rimosso perché la cartella di magazzino è vuota" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- C'è stato un problema importando il testo di uno script per la seguente ragione: [REASON]. Riprova più tardi.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- C'è stato un problema importando lo script compilato per la seguente ragione: [REASON]. Riprova più tardi.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ L'annuncio è stato rimosso perché la cartella della versione è vuota. Aggiungi elementi alla cartella della versione prima di pubblicare nuovamente l'annuncio.
+ <usetemplate ignoretext="Avverti quando un annuncio non è elencato perché la cartella della versione è vuota" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
C'è stato un problema di scrittura dati dell'animazione. Riprova più tardi.
@@ -320,6 +322,14 @@ Se non desideri che queste abilità siano assegnate a questo ruolo, disattivale
Stai per espellere [COUNT] membri dal gruppo.
<usetemplate ignoretext="Conferma l'espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ Stai per espellere [AVATAR_NAME] dal gruppo.
+ <usetemplate ignoretext="Conferma di voler espellere un partecipante dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ Stai per espellere [COUNT] membri dal gruppo.
+ <usetemplate ignoretext="Conferma l'espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+ </notification>
<notification name="AttachmentDrop">
Stai per abbandonare il tuo accessorio.
Vuoi continuare?
@@ -404,7 +414,7 @@ Oggetti: [N]
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- Confermi di volere restituire tutti gli oggetti elencati nell'inventario dei loro proprietari?
+ Restituisci tutti gli oggetti elencati all'inventario del proprietario? Verranno restituiti TUTTI gli oggetti scriptati nella regione.
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -584,16 +594,10 @@ Vuoi ripristinare l'ultima versione salvata sul server?
(**Attenzione** Questa operazione non è reversibile)
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- C'è stato un problema salvando lo script a causa del seguente motivo : [REASON]. Riprova a salvare lo script più tardi.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
Non è stato possibile salvare lo script perchè l'oggetto che lo contiene non è stato trovato.
L'oggetto potrebbe essere troppo lontano oppure essere stato cancellato.
</notification>
- <notification name="SaveBytecodeFailReason">
- C'è stato un problema salvando lo script compilato a causa del seguente motivo: [REASON]. Riprova a salvare lo script più tardi.
- </notification>
<notification name="StartRegionEmpty">
La tua Regione di inizio non è stata definita.
Per scegliere il luogo dove vuoi trovarti all'accesso, digita il nome della regione nel campo del luogo di partenza oppure scegli La mia ultima Ubicazione o Casa mia.
@@ -606,6 +610,10 @@ L'oggetto potrebbe essere troppo lontano oppure essere stato cancellato.
<notification name="CannotDownloadFile">
Non è stato possibile scaricare il file
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ Hai richiesto il download di un file, cosa che non è supportata in [SECOND_LIFE].
+ <usetemplate ignoretext="Avvisa in caso di download di file non supportati" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
Non è stato possibile scrivere il file [[FILE]]
</notification>
@@ -1107,8 +1115,9 @@ Unisci il terreno?
In genere si tratta di un problema temporaneo. Attendi alcuni minuti per modificare e salvare nuovamente gli elementi indossabili.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Sei stato scollegato da [SECOND_LIFE].
- [MESSAGE]
+ Accidenti. Sei stato scollegato da [SECOND_LIFE].
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Esci" yestext="Vedi IM & Chat"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1357,6 +1366,13 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno
<ignore name="ignore" text="Lo scaricamento sta richiedendo parecchio tempo"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ La tua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità visiva] è [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ La tua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità visiva] è [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
L'installazione di [APP_NAME] è terminata.
@@ -1637,6 +1653,25 @@ Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
vedi [[INFO_URL] Informazioni su questo aggiornamento]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ È disponibile un aggiornamento.
+È in fase di download. Al termine ti verrà chiesto di riavviare il computer per completare l'installazione.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ È stato scaricato un aggiornamento. Verrà installato durante il riavvio.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ Si è verificato un errore durante la ricerca dell'aggiornamento.
+Riprova più tardi.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ Il Viewer è aggiornato.
+Per provare le funzioni e modifiche più recenti, visita la pagina Alternate Viewers. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
La cessione di questo oggetto farà in modo che il gruppo:
* Riceva i L$ pagati all'oggetto
@@ -1742,6 +1777,14 @@ Vuoi cancellare quell'elemento?
Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire o crearne uno nuovo.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ Il numero massimo di gruppi per gli account Basic è [MAX_BASIC] e
+per gli account [https://secondlife.com/premium/ Premium] è [MAX_PREMIUM].
+Se hai ridotto il livello del tuo account, dovrai essere iscritto a meno di [MAX_BASIC] gruppi prima di poter iscriverti a un nuovo gruppo.
+
+[https://secondlife.com/my/account/membership.php Passa a un livello superiore oggi stesso!]
+ <usetemplate name="okbutton" yestext="Chiudi"/>
+ </notification>
<notification name="KickUser">
Espelli questo residente con quale messaggio?
<form name="form">
@@ -1943,7 +1986,7 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
</notification>
<notification label="Seleziona proprietà immobiliare" name="EstateTrustedExperienceRemove">
- Rimuovi dall'elenco di elementi chiave per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+ Rimuovi dall'elenco di elementi chiave solo per questa proprietà immobiliare oppure per [ALL_ESTATES]?
<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
</notification>
<notification label="Conferma espulsione" name="EstateKickUser">
@@ -2254,6 +2297,10 @@ Trasferisci gli elementi nell'inventario?
Conferma che desideri pagare [AMOUNT] L$ a [TARGET].
<usetemplate ignoretext="Conferma prima di pagare (somme superiori a 200 L$)" name="okcancelignore" notext="Annulla" yestext="Paga"/>
</notification>
+ <notification name="PayObjectFailed">
+ Pagamento non riuscito: oggetto non trovato.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Non ci sono elementi in questo oggetto che tu possa copiare.
</notification>
@@ -2285,10 +2332,9 @@ Questa azione non può essere ripristinata
[QUESTION]
<usetemplate ignoretext="Conferma prima di cancellare gli elementi" name="okcancelignore" notext="Annulla" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- Usa questo strumento per segnalare violazioni a [http://secondlife.com/corporate/tos.php Terms of Service] e [http://secondlife.com/corporate/cs.php Community Standards].
-
-Ogni abuso segnalato verrà esaminato e risolto.
+ <notification name="ConfirmUnlink">
+ Questa è una selezione di grandi dimensioni con set collegati. Se viene scollegata, potrebbe non essere possibile ricollegarla. Come precauzione ti consigliamo di salvare copie dei set collegati nel tuo inventario.
+ <usetemplate ignoretext="Conferma per scollegare un set collegato" name="okcancelignore" notext="Annulla" yestext="Scollega"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Scegli una categoria per questa segnalazione di abuso.
@@ -3010,10 +3056,10 @@ OK?
[EXPERIENCE_LIST]
-Potrebbero essere disponibili altre esperienze chiave.
+Possono essere disponibili altre esperienze chiave.
</notification>
<notification name="ExperienceEvent">
- L'esperienza secondlife:///app/experience/[public_id]/profile ha consentito un oggetto la seguente azione: [EventType].
+ L'esperienza secondlife:///app/experience/[public_id]/profile ha consentito a un oggetto la seguente azione: [EventType].
Proprietario: secondlife:///app/agent/[OwnerID]/inspect
Nome oggetto: [ObjectName]
Nome lotto: [ParcelName]
@@ -3216,6 +3262,12 @@ Per sicurezza, verranno bloccati per alcuni secondi.
<notification name="AttachmentSaved">
L'elemento da collegare è stato salvato.
</notification>
+ <notification name="PresetNotSaved">
+ Errore durante il salvataggio del valore predefinito [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Errore durante l'eliminazione del valore predefinito [NAME].
+ </notification>
<notification name="UnableToFindHelpTopic">
Impossibile trovare l'argomento nell'aiuto per questo elemento.
</notification>
@@ -3248,9 +3300,8 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
Scegli i residenti con i quali condividere.
</notification>
<notification name="MeshUploadError">
- [LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER]
-
-Per informazioni dettagliate, vedi il file del registro.
+ [LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER]
+[DETAILS]Consulta SecondLife.log per informazioni dettagliate
</notification>
<notification name="MeshUploadPermError">
Errore durante la richiesta di autorizzazione al caricamento del reticolo.
diff --git a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_active_object_row.xml b/indra/newview/skins/default/xui/it/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_classified_info.xml b/indra/newview/skins/default/xui/it/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_hair.xml b/indra/newview/skins/default/xui/it/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pants.xml b/indra/newview/skins/default/xui/it/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_physics.xml b/indra/newview/skins/default/xui/it/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skin.xml b/indra/newview/skins/default/xui/it/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_experience_info.xml b/indra/newview/skins/default/xui/it/panel_experience_info.xml
index 706f139bcc79d76be7ca870b7db6aae347c84b38..23ba5fb32ebd85331554500e8c36dfdff3d72f23 100644
--- a/indra/newview/skins/default/xui/it/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/it/panel_experience_info.xml
@@ -9,7 +9,7 @@
</layout_panel>
<layout_panel name="location panel">
<text name="Location">
- Luogo:
+ Posizione:
</text>
<text name="LocationTextText">
in qualche posto
diff --git a/indra/newview/skins/default/xui/it/panel_experience_search.xml b/indra/newview/skins/default/xui/it/panel_experience_search.xml
index 124b060f20e3c81cd95167854c38e9a8ff518134..997639b6eb18a7a6b666cd83cf0f802ee7b2b626 100644
--- a/indra/newview/skins/default/xui/it/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/it/panel_experience_search.xml
@@ -26,7 +26,7 @@
<icons_combo_box label="Moderato" name="maturity">
<icons_combo_box.item label="Adulti" name="Adult" value="42"/>
<icons_combo_box.item label="Moderato" name="Mature" value="21"/>
- <icons_combo_box.item label="Generale" name="PG" value="13"/>
+ <icons_combo_box.item label="Generali" name="PG" value="13"/>
</icons_combo_box>
<scroll_list name="search_results">
<columns label="Nome" name="experience_name"/>
diff --git a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_notify.xml b/indra/newview/skins/default/xui/it/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_inventory_item.xml b/indra/newview/skins/default/xui/it/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_landmarks.xml b/indra/newview/skins/default/xui/it/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
old mode 100755
new mode 100644
index 446b51ffa3bea86e3836435716a313598ad4e795..6a6c7f4226f590f3f94ca7ba9a40e7918cee30c4
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] oggetti [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ Recuperati [ITEM_COUNT] elementi [FILTER]
+ </panel.string>
<text name="ItemcountText">
Oggetti:
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
+ <menu_button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="Aggiungi nuovo elemento"/>
diff --git a/indra/newview/skins/default/xui/it/panel_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_media.xml b/indra/newview/skins/default/xui/it/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
old mode 100755
new mode 100644
index 2f40d4bdc4a24b54db72639c7423cc0f3b512936..38a03fb4d29fae0be89b00c1dc0d0b7a79eb47dd
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -18,6 +18,7 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
+ <string name="GroupCountWithInfo" value="Fai parte di [COUNT] gruppi e puoi iscriverti a [REMAINING] altri. [secondlife:/// Ne vuoi altri?]"/>
<tab_container name="tabs">
<panel label="NELLE VICINANZE" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_pick_info.xml b/indra/newview/skins/default/xui/it/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_picks.xml b/indra/newview/skins/default/xui/it/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_message.xml b/indra/newview/skins/default/xui/it/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index ccca27cbfd1df0d313a52bff46fd374025435c91..85cbfb92efca67cae91c0dbd0dd7c86829cf1eb4
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="Consenti più Viewer" name="allow_multiple_viewer_check"/>
<check_box label="Mostra selezione griglia all'accesso" name="show_grid_selection_check"/>
<check_box label="Mostra menu Avanzato" name="show_advanced_menu_check"/>
- <check_box label="Mostra menu Sviluppatore" name="show_develop_menu_check"/>
+ <check_box label="Mostra menu sviluppo" name="show_develop_menu_check"/>
<button label="Diritti di creazione predefiniti" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 09d7c963708b6053341f0fbf5161cb89909c54d2..0dfd97d5f884a0001cd69e98dad33ffd093f4dae
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Offerta inventario" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ Salva:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Registrazione e trascrizioni" name="log_and_transcripts" value="2"/>
+ <item label="Solo registrazione" name="log_only" value="1"/>
+ <item label="Nessuna registrazione o trascrizione" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="Cancella registro..." name="clear_log"/>
<button label="Cancella trascrizioni..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ Posizione:
+ </text>
<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
</panel>
<button label="Traduzione..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 2978c48db6a7fc4a054ffa06d65bb22808184355..a042c43431d310fd9999fb96c47aedf253763994
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Grafica" name="Display panel">
+ <text name="preset_text">
+ (Nulla)
+ </text>
<text name="QualitySpeed">
Qualità e velocità :
</text>
- <text name="FasterText">
- Più veloce
- </text>
- <text name="BetterText">
- Migliore
- </text>
<text name="ShadersPrefText">
Basso
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
Ultra
</text>
- <panel label="CustomGraphics" name="CustomGraphics Panel">
- <text name="ShadersText">
- Effetti grafici:
- </text>
- <check_box initial_value="true" label="Acqua trasparente" name="TransparentWater"/>
- <check_box initial_value="true" label="Piccoli rilievi e scintillii" name="BumpShiny"/>
- <check_box initial_value="true" label="Luci locali" name="LocalLights"/>
- <check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
- <check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
- <check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
- <check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
- <text name="shadows_label">
- Ombre:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Nessuno" name="0"/>
- <combo_box.item label="Sole/Luna" name="1"/>
- <combo_box.item label="Sole/Luna + Proiettori" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Riflessi nell’acqua:
- </text>
- <combo_box initial_value="true" label="Riflessi dell'acqua" name="Reflections">
- <combo_box.item label="Minimo" name="0"/>
- <combo_box.item label="Terreno e alberi" name="1"/>
- <combo_box.item label="Tutti gli oggetti statici" name="2"/>
- <combo_box.item label="Tutti gli avatar e gli oggetti" name="3"/>
- <combo_box.item label="Tutto" name="4"/>
- </combo_box>
- <slider label="Fisica avatar:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Basso
- </text>
- <slider label="Distanza di disegno:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Conteggio massimo particelle:" name="MaxParticleCount"/>
- <slider label="N. max di avatar non impostori:" name="MaxNumberAvatarDrawn"/>
- <slider label="Qualità in post-produzione:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Dettagli reticolo:
- </text>
- <slider label=" Oggetti:" name="ObjectMeshDetail"/>
- <slider label=" Prims flessibili:" name="FlexibleMeshDetail"/>
- <slider label=" Alberi:" name="TreeMeshDetail"/>
- <slider label=" Avatar:" name="AvatarMeshDetail"/>
- <slider label=" Terreno:" name="TerrainMeshDetail"/>
- <slider label=" Cielo:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Basso
- </text>
- <text name="ObjectMeshDetailText">
- Basso
- </text>
- <text name="FlexibleMeshDetailText">
- Basso
- </text>
- <text name="TreeMeshDetailText">
- Basso
- </text>
- <text name="AvatarMeshDetailText">
- Basso
- </text>
- <text name="TerrainMeshDetailText">
- Basso
- </text>
- <text name="SkyMeshDetailText">
- Basso
- </text>
- <text name="AvatarRenderingText">
- Rendering avatar :
- </text>
- <check_box initial_value="true" label="Avatar bidimensionali (Impostor)" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Abiti dell'avatar" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- Dettagli terreno:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="Basso" name="0"/>
- <radio_item label="Alto" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Applica" label_selected="Applica" name="Apply"/>
- <button label="Reimposta" name="Defaults"/>
- <button label="Avanzate" name="Advanced"/>
- <button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ Più veloce
+ </text>
+ <text name="BetterText">
+ Migliore
+ </text>
+ <check_box initial_value="true" label="Shader atmosfera..." name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
+ <button label="Salva impostazioni come valori predefiniti..." name="PrefSaveButton"/>
+ <button label="Carica valore predefinito..." name="PrefLoadButton"/>
+ <button label="Elimina valore predefinito..." name="PrefDeleteButton"/>
+ <button label="Ripristina impostazioni consigliate" name="Defaults"/>
+ <button label="Impostazioni avanzate..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
old mode 100755
new mode 100644
index e204d70b03c68a58137af93ffb255422042a245c..093f7fc411dc1ae523a1ef2bd1b8f3c444f86e6f
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -17,11 +17,11 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="Usa il mio browser (Chrome, Firefox, IE) per tutti i link" name="internal" tool_tip="Utilizza il browser Web predefinito di sistema per l'aiuto, per i link Web e così via. Sconsigliato durante l'esecuzione a tutto schermo." value="0"/>
<radio_item label="Usa il browser incorporato solo per i link di Second Life" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l'aiuto, per i link Web e così via. Il browser incorporato verrà usato solo per i link LindenLab/SecondLife." value="1"/>
+ <radio_item label="Usa il browser incorporato per tutti i link" name="external_all" tool_tip="Utilizza il browser Web integrato per l'aiuto, per i link Web e così via. Questo browser si apre in una nuova finestra in [APP_NAME]." value="2"/>
</radio_group>
<check_box initial_value="true" label="Abilita plugin" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
<check_box initial_value="true" label="Abilita Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
<text name="Software updates:">
Aggiornamenti software:
</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/it/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9a3732269eb9df710a315b6c32e3575db3643d54
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ Valori predefiniti grafica
+ </text>
+ <button label="Apri preferenze grafica" name="open_prefs_btn" tool_tip="Accedi alle preferenze della grafica"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 4620d729770308bc47b5fdda955e29881a33c03f..f69ffa734af9ce0485895f941a8ba0c042e0b72e
--- a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
@@ -45,12 +45,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="URL multimedia"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="Lista bianca attivata"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Navigazione sicura"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index e6fba8e3bf4df32b7051d29ef7dc405ef7fb45e0..75b5d646604135ec02875fd3af6cda83ecdb354b
--- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
Salvare un'immagine nell'inventario costa L$[UPLOAD_COST]. Per salvare l'immagine come texture, selezionare uno dei formati quadrati.
</text>
<combo_box label="Risoluzione" name="texture_size_combo">
- <combo_box.item label="Finestra attuale" name="CurrentWindow"/>
+ <combo_box.item label="Finestra corrente (512x512)" name="CurrentWindow"/>
<combo_box.item label="Piccola (128x128)" name="Small(128x128)"/>
<combo_box.item label="Media (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history.xml b/indra/newview/skins/default/xui/it/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
index 36ad2980cb1afca36e22dfd1380ef351952221ec..f707871dd3221fb09fe8af8f2228796625d0f350 100644
--- a/indra/newview/skins/default/xui/it/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Materiali" name="Materials"/>
<combo_box.item label="Multimedia" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="Texture (diffusa)" name="Texture (diffuse)"/>
- <combo_box.item label="Irregolarità (normale)" name="Bumpiness (normal)"/>
- <combo_box.item label="Lucentezza (speculare)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="Texture (diffusa)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="Irregolarità (normale)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="Lucentezza (speculare)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere una fotografia"/>
<text name="label alphamode">
Modalità Alfa
diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
old mode 100755
new mode 100644
index b9a87a1527ea766e797b271cdb72ac30e25b4f81..effd6f50402b14c9e90ff90a619861d998f14d4a
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -35,12 +35,9 @@
Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica!
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">
- Generato con [COMPILER] versione [COMPILER_VERSION]
- </string>
<string name="AboutPosition">
Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURL: <nolink>[SLURL]</nolink>
@@ -61,11 +58,10 @@ Scheda grafica: [GRAPHICS_CARD]
<string name="AboutLibs">
Versione OpenGL: [OPENGL_VERSION]
-Versione libcurl: [LIBCURL_VERSION]
Versione J2C Decoder: [J2C_VERSION]
Versione Driver audio: [AUDIO_DRIVER_VERSION]
-Versione Qt Webkit: [QT_WEBKIT_VERSION]
-Versione Server voice: [VOICE_VERSION]
+Versione LLCEFLib/CEF: [LLCEFLIB_VERSION]
+Versione server voce: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
@@ -175,6 +171,12 @@ Versione Server voice: [VOICE_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Griglia principale di Second Life (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Griglia per beta test di Second Life (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download.
</string>
@@ -450,6 +452,9 @@ Prova ad accedere nuovamente tra un minuto.
Non puoi indossare una cartella che contiene più di [AMOUNT] elementi. Per modificare questo limite, accedi ad Avanzate > Mostra impostazioni di debug > WearFolderLimit.
</string>
<string name="TooltipPrice" value="L$ [AMOUNT]:"/>
+ <string name="TooltipSLIcon">
+ Questo link porta a una pagina nel dominio ufficiale SecondLife.com o LindenLab.com.
+ </string>
<string name="TooltipOutboxDragToWorld">
Non puoi rezzare articoli dalla cartella degli annunci di Marketplace
</string>
@@ -469,7 +474,7 @@ Prova ad accedere nuovamente tra un minuto.
Il numero di articoli in magazzino è maggiore di [AMOUNT].
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Puoi trascinare articoli o cartelle solo nella scheda TUTTI. Seleziona la scheda e sposta nuovamente gli articoli o le cartelle.
+ Puoi trascinare elementi o cartelle solo nelle schede TUTTI o NON ASSOCIATO. Seleziona una di quelle schede e sposta nuovamente gli elementi o le cartelle.
</string>
<string name="TooltipOutboxNoTransfer">
Almeno uno di questi oggetti non può essere venduto o trasferito
@@ -553,6 +558,9 @@ Prova ad accedere nuovamente tra un minuto.
Clicca per avviare il comando secondlife://
</string>
<string name="CurrentURL" value="URL attuale: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Fai clic per comporre un'email
+ </string>
<string name="SLurlLabelTeleport">
Teleportati a
</string>
@@ -1072,7 +1080,7 @@ Prova ad accedere nuovamente tra un minuto.
<string name="AgentNameSubst">
(Tu)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Omette gli avvisi durante la gestione degli elenchi di accesso alle proprietà immobiliari
</string>
@@ -1845,6 +1853,21 @@ Prova ad accedere nuovamente tra un minuto.
<string name="TodayOld">
Iscritto oggi
</string>
+ <string name="av_render_everyone_now">
+ Ora ti possono vedere tutti.
+ </string>
+ <string name="av_render_not_everyone">
+ Alcune persone vicine a te potrebbero non eseguire il tuo rendering.
+ </string>
+ <string name="av_render_over_half">
+ La maggioranza delle persone vicine a te potrebbe non eseguire il tuo rendering.
+ </string>
+ <string name="av_render_most_of">
+ La gran parte delle persone vicine a te potrebbe non eseguire il tuo rendering.
+ </string>
+ <string name="av_render_anyone">
+ Tutte le persone vicine a te potrebbero non eseguire il tuo rendering.
+ </string>
<string name="AgeYearsA">
[COUNT] anno
</string>
@@ -1962,6 +1985,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="CompileQueueUnknownFailure">
Errore di dowload sconosciuto
</string>
+ <string name="CompileNoExperiencePerm">
+ Saltato lo script [SCRIPT] con l'esperienza [EXPERIENCE].
+ </string>
<string name="CompileQueueTitle">
Avanzamento ricompilazione
</string>
@@ -2007,9 +2033,6 @@ Prova ad accedere nuovamente tra un minuto.
<string name="GroupsNone">
nessuno
</string>
- <string name="CompileNoExperiencePerm">
- Saltato lo script [SCRIPT] con l'esperienza [EXPERIENCE].
- </string>
<string name="Group" value="(gruppo)"/>
<string name="Unknown">
(Sconosciuto)
@@ -5293,18 +5316,6 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
<string name="UserDictionary">
[User]
</string>
- <string name="logging_calls_disabled_log_empty">
- Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat.
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat.
- </string>
- <string name="logging_calls_enabled_log_empty">
- Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
- </string>
- <string name="loading_chat_logs">
- Caricamento in corso...
- </string>
<string name="experience_tools_experience">
Esperienza
</string>
@@ -5360,7 +5371,7 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
ti teletrasporta
</string>
<string name="ExperiencePermission12">
- accettazione automaticamente delle autorizzazioni per le esperienze
+ accettazione automatica delle autorizzazioni per le esperienze
</string>
<string name="ExperiencePermissionShortUnknown">
ha eseguito un'operazione sconosciuta: [Permission]
@@ -5386,4 +5397,37 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
<string name="ExperiencePermissionShort12">
Autorizzazione
</string>
+ <string name="logging_calls_disabled_log_empty">
+ Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
+ </string>
+ <string name="loading_chat_logs">
+ Caricamento in corso...
+ </string>
+ <string name="preset_combo_label">
+ -Lista vuota-
+ </string>
+ <string name="Default">
+ Predefinita
+ </string>
+ <string name="none_paren_cap">
+ (Nulla)
+ </string>
+ <string name="no_limit">
+ Senza limite
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ La forma della fisica contiene triangoli troppo piccoli. Prova a semplificare il modello della fisica.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ La forma della fisica contiene dati di conferma errati. Prova a correggere il modello della fisica.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ La versione della forma fisica non è corretta. Imposta la versione corretta per il modello della fisica.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
old mode 100755
new mode 100644
index 91a61ab2256ff38375f1c93a92c8e472e7cf23d1..cf5e97bd8d12bebe414ebdbcc196710a40a37828
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="æƒ…å ±" name="support_panel">
<button label="クリップボードã«ã‚³ãƒ”ー" name="copy_btn"/>
+ <button label="アップデートを確èª" name="update_btn"/>
</panel>
<panel label="クレジット" name="credits_panel">
<text name="linden_intro">Second Life ã®æ供元： Lindens ã®ã€
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
old mode 100755
new mode 100644
index fc1ed5554a692e0f20711ebbc79f16f8d94a4ed4..8614335690c4f7c5e35bc477560b7364e7b74802
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -450,7 +450,7 @@
<spinner label="アクセス時間：" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="常ã«è¨±å¯" name="AllowedText">
- 立入を許å¯ã•ã‚ŒãŸä½äºº
+ 立入を許å¯ã•ã‚ŒãŸä½äºº ([COUNT])
</text>
<name_list name="AccessList" tool_tip="(åˆè¨ˆ[LISTED] 人ã€æœ€å¤§ [MAX] 人）"/>
<button label="è¿½åŠ " name="add_allowed"/>
@@ -458,13 +458,13 @@
</panel>
<panel name="Banned_layout_panel">
<text label="ç¦æ¢" name="BanCheck">
- 立入をç¦æ¢ã•ã‚ŒãŸä½äºº
+ 立入をç¦æ¢ã•ã‚ŒãŸä½äºº ([COUNT])
</text>
<name_list name="BannedList" tool_tip="(åˆè¨ˆ [LISTED] 人ã€æœ€å¤§ [MAX] 人）"/>
<button label="è¿½åŠ " name="add_banned"/>
<button label="削除" label_selected="削除" name="remove_banned"/>
</panel>
</panel>
- <panel label="経験" name="land_experiences_panel"/>
+ <panel label="体験" name="land_experiences_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
old mode 100755
new mode 100644
index 21abf5916061401e69b6a31a06963be370c7b5b3..cf75fa337222c5e478d38783ed84995eeb762f9a
--- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="è¿½åŠ ..." name="autoreplace_add_entry"/>
<button label="削除" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ ã‚ーワード：
+ </text>
+ <text name="autoreplace_replacement_txt">
+ ç½®æ›ï¼š
+ </text>
<button label="エントリをä¿å˜" name="autoreplace_save_entry" tool_tip="ã“ã®ã‚¨ãƒ³ãƒˆãƒªã‚’ä¿å˜ã—ã¾ã™ã€‚"/>
<button label="変更をä¿å˜" name="autoreplace_save_changes" tool_tip="変更をã™ã¹ã¦ä¿å˜ã—ã¾ã™ã€‚"/>
<button label="å–り消ã—" name="autoreplace_cancel" tool_tip="変更をã™ã¹ã¦ç ´æ£„ã—ã¾ã™ã€‚"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
old mode 100755
new mode 100644
index fd12a9e69a610faede106270895d73a080d7e0fa..62f8a0669ed724bb64cce0811a4266d4e117ee3b
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] ãŒç‰©ç†çš„オブジェクトã§ã‚ãªãŸã‚’ãŸãŸãã¾ã—ãŸ
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..50e508ad408dfac5627f5d6e67731b0e650ead99
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="優先プリセットを削除">
+ <string name="title_graphic">
+ グラフィックプリセットを削除
+ </string>
+ <string name="title_camera">
+ カメラプリセットを削除
+ </string>
+ <text name="Preset">
+ プリセットをé¸æŠž
+ </text>
+ <button label="削除" name="delete"/>
+ <button label="å–り消ã—" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
index 7819b887db5a5b909633d1be161b55d6c8b0aad6..be9cfd8c01389693a5d792fa1e306125507a25ed 100644
--- a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater title="EXPERIENCE PROFILE">
<floater.string name="empty_slurl">
- （ãªã—）
+ (ãªã—)
</floater.string>
<floater.string name="maturity_icon_general">
"Parcel_PG_Light"
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
old mode 100755
new mode 100644
index 5f538ecdb0ed2934c01e96f36e2ff1c337d7110e..b226dfbfe150078b5ee23a67404ae423d485eb3d
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
èµ°ã‚‹
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x å¹³å‡" name="2x Average"/>
+ <item label="最大" name="Max"/>
+ <item label="最近ã®æœ€å¤§" name="Recent Max"/>
+ <item label="100ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="時間" name="Time"/>
+ <item label="通話数" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="一時åœæ¢" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 19d767ab579c33c2aecead34204121dc8b6f0d61..e6b105e0dc2aa334f8750a4491358864b2788019
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="よりå¤ã„" name="older"/>
</radio_group>
<spinner label="経éŽæ™‚é–“" name="spin_hours_ago"/>
+ <text name="label_hours">
+ 時間
+ </text>
<spinner label="経éŽæ—¥æ•°" name="spin_days_ago"/>
+ <text name="label_days">
+ 日間
+ </text>
<button label="é–‰ã˜ã‚‹" label_selected="é–‰ã˜ã‚‹" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
old mode 100755
new mode 100644
index 864feef8cc9ede8fe83298b68d036f6097bd137f..f48cc642ee9e7a6c6484802dbc52d061818d0e5d
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -27,6 +27,6 @@
<button label="リセット" label_selected="リセット" name="Reset"/>
<check_box initial_value="true" label="実行ä¸" name="running"/>
<check_box initial_value="true" label="Mono" name="mono"/>
- <check_box label="次ã®ä½“験を使用：" name="enable_xp"/>
+ <check_box label="体験を使用：" name="enable_xp"/>
<button label=">" name="view_profile"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..351d8507cce97cd3436fd215ac0cd136f7dbda57
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="優先プリセットをãƒãƒ¼ãƒ‰">
+ <string name="title_graphic">
+ グラフィックプリセットをãƒãƒ¼ãƒ‰
+ </string>
+ <string name="title_camera">
+ カメラプリセットをãƒãƒ¼ãƒ‰
+ </string>
+ <text name="Preset">
+ プリセットをé¸æŠž
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="å–り消ã—" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index c59a3dc0ab7e4544e02368ceccfe85fb3df734ed..2edb3c624cbcd7c1793ac07e4e1a53f281d8f4c3
--- a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
åˆæœŸåŒ–ä¸...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
ãƒãƒ¼ãƒ‰ä¸...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ ã“ã“ã«ã‚¢ã‚¤ãƒ†ãƒ をドラッグã—ã¦ã€ãƒ•ã‚©ãƒ«ãƒ€ã‚’作æˆã™ã‚‹
+ </text>
+ </panel>
<button label="マーケットプレイスã«é€ä¿¡" name="outbox_import_btn" tool_tip="自分ã®ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイス店é ã«ç§»å‹•"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
old mode 100755
new mode 100644
index 942cc91317f2a2e06d6c7294a3cc5a1f90b87056..108892dd6db208ca4c9ef437b34afd86e9cff6b2
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
LOD 付ãã®ææ–™ã¯å‚考モデルã®ã‚µãƒ–セットã§ã¯ã‚ã‚Šã¾ã›ã‚“。
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ 一部ã®ç‰©ç†çš„ãªå¤–æ®»æ§‹é€ ãŒé ‚点ã®åˆ¶é™ã‚’超ãˆã¾ã™ã€‚
+ </string>
<string name="layer_all">
å…¨ã¦
</string>
@@ -93,52 +96,52 @@
<text initial_value="é ‚ç‚¹" name="vertices" value="é ‚ç‚¹"/>
<text initial_value="高" name="high_label" value="高"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
- <item name="Generate" value="生æˆ"/>
+ <item label="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰" name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
+ <item label="生æˆ" name="Generate" value="生æˆ"/>
</combo_box>
<button label="å‚ç…§" name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
- <item name="Error Threshold" value="エラーã—ãã„値"/>
+ <item label="三角形ã®é™åº¦æ•°" name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
+ <item label="エラーã—ãã„値" name="Error Threshold" value="エラーã—ãã„値"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="ä¸" name="medium_label" value="ä¸"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
- <item name="Generate" value="生æˆ"/>
- <item name="Use LoD above" value="上記㮠LoD を使用"/>
+ <item label="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰" name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
+ <item label="生æˆ" name="Generate" value="生æˆ"/>
+ <item label="上記㮠LoD を使用" name="Use LoD above" value="上記㮠LoD を使用"/>
</combo_box>
<button label="å‚ç…§" name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
- <item name="Error Threshold" value="エラーã—ãã„値"/>
+ <item label="三角形ã®é™åº¦æ•°" name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
+ <item label="エラーã—ãã„値" name="Error Threshold" value="エラーã—ãã„値"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="低" name="low_label" value="低"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
- <item name="Generate" value="生æˆ"/>
- <item name="Use LoD above" value="上記㮠LoD を使用"/>
+ <item label="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰" name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
+ <item label="生æˆ" name="Generate" value="生æˆ"/>
+ <item label="上記㮠LoD を使用" name="Use LoD above" value="上記㮠LoD を使用"/>
</combo_box>
<button label="å‚ç…§" name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
- <item name="Error Threshold" value="エラーã—ãã„値"/>
+ <item label="三角形ã®é™åº¦æ•°" name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
+ <item label="エラーã—ãã„値" name="Error Threshold" value="エラーã—ãã„値"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="最低" name="lowest_label" value="最低"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
- <item name="Generate" value="生æˆ"/>
- <item name="Use LoD above" value="上記㮠LoD を使用"/>
+ <item label="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰" name="Load from file" value="ファイルã‹ã‚‰ãƒãƒ¼ãƒ‰"/>
+ <item label="生æˆ" name="Generate" value="生æˆ"/>
+ <item label="上記㮠LoD を使用" name="Use LoD above" value="上記㮠LoD を使用"/>
</combo_box>
<button label="å‚ç…§" name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
- <item name="Error Threshold" value="エラーã—ãã„値"/>
+ <item label="三角形ã®é™åº¦æ•°" name="Triangle Limit" value="三角形ã®é™åº¦æ•°"/>
+ <item label="エラーã—ãã„値" name="Error Threshold" value="エラーã—ãã„値"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..feac052d6cf2c1a316b05ab7dd1aa60debd1a3bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="通知">
+ <floater.string name="system_tab_title">
+ システム([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ å–引 ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ 招待 ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ グループ ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ 通知
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="システム(0)" name="system_notification_list_tab"/>
+ <panel label="å–引 (0)" name="transaction_notifications_tab"/>
+ <panel label="招待 (0)" name="group_invite_notifications_tab"/>
+ <panel label="グループ (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="å…¨ã¦æŠ˜ã‚Šç•³ã‚€" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="ギャップパãƒãƒ«" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="å…¨ã¦å‰Šé™¤" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index ada96b5b6238f7b0d277824196d2a6256934d3f8..0e72b40dc6ba455ff48c39fb42293b40aa04bee8
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[group]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="åå‰" name="name"/>
<scroll_list.columns label="説明" name="description"/>
@@ -36,15 +36,15 @@
<scroll_list.columns label="高度" name="altitude"/>
</scroll_list>
<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>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
- é¸æŠžã—ãŸã‚ャラクターã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³:
+ é¸æŠžã—ãŸã‚ャラクターã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ï¼š
</text>
<check_box label="ビーコンを表示" name="show_beacon"/>
<check_box label="物ç†åŠ¹æžœã‚«ãƒ—セルを表示" name="show_physics_capsule"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index ec107f3e6b914bfcb87bc44354e693b2a3c0f90c..d531d588f7136191b19ccff1c5099cad2bf7a299
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
パスã®ç”Ÿæˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ ビューワステータス
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ シミュレータステータス
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="表示" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 4441d5e7381c35c7bf64052bce7611f02a9c6914..b65207a0254b37c8a6ff5127b5bc20cf2b3d5450
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
リンクセットã®ç”¨é€”ã‚’é¸æŠž...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ フィルター：
+ </text>
+ <text name="linksets_name_label">
+ åå‰
+ </text>
+ <text name="linksets_desc_label">
+ 説明
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="リンクセットã®ç”¨é€”ã§ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼..." name="filter_by_linkset_use_none"/>
<combo_box.item label="æ©è¡Œå¯èƒ½" name="filter_by_linkset_use_walkable"/>
@@ -103,8 +112,8 @@
<button label="é©ç”¨" name="apply_filters"/>
<button label="クリア" name="clear_filters"/>
<scroll_list name="objects_scroll_list">
- <scroll_list.columns label="åå‰ï¼ˆãƒ«ãƒ¼ãƒˆãƒ—リム）" name="name"/>
- <scroll_list.columns label="説明（ルートプリム）" name="description"/>
+ <scroll_list.columns label="åå‰ (ルートプリム)" name="name"/>
+ <scroll_list.columns label="説明 (ルートプリム)" name="description"/>
<scroll_list.columns label="所有者" name="owner"/>
<scroll_list.columns label="スクリプト" name="scripted"/>
<scroll_list.columns label="è² è·" name="land_impact"/>
@@ -116,13 +125,16 @@
<scroll_list.columns label="D %" name="d_percent"/>
</scroll_list>
<text name="messaging_status">
- リンクセット:
+ リンクセット：
</text>
<button label="リスト更新" name="refresh_objects_list"/>
<button label="ã™ã¹ã¦é¸æŠž" name="select_all_objects"/>
<button label="何もé¸æŠžã—ãªã„" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ é¸æŠžã—ãŸãƒªãƒ³ã‚¯ã‚»ãƒƒãƒˆã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ (リンクセットãŒãƒ¯ãƒ¼ãƒ«ãƒ‰ã‹ã‚‰å‰Šé™¤ã•ã‚Œã‚‹ã¨ã€ãã®å±žæ€§ãŒå¤±ã‚ã‚Œã‚‹å ´åˆãŒã‚ã‚Šã¾ã™)：
+ </text>
<check_box label="ビーコンを表示" name="show_beacon"/>
<button label="å–ã‚‹" name="take_objects"/>
<button label="コピーをå–ã‚‹" name="take_copy_objects"/>
@@ -130,9 +142,12 @@
<button label="è¿”å´" name="return_objects"/>
<button label="削除" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ é¸æŠžã—ãŸãƒªãƒ³ã‚¯ã‚»ãƒƒãƒˆã®å±žæ€§ã‚’編集ã—ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦å¤‰æ›´ã‚’é©ç”¨ã—ã¾ã™
+ </text>
<text name="walkability_coefficients_label">
- æ©è¡Œå¯èƒ½æ€§:
+ æ©è¡Œå¯èƒ½æ€§ï¼š
</text>
<text name="edit_a_label">
A
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
index 1eac6b9e3579a78a84455add8961b81c5e2997e3..0dfc75014e8241dad71f367c81e085e13c00e1e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="デフォルトã®ä½œæˆæ¨©é™">
- <panel label="デフォルト権é™" name="default permissions"/>
+ <panel label="デフォルト権é™" name="default permissions">
+ <text name="label_1">
+ 次ã®æ‰€æœ‰è€…：
+ </text>
+ <text name="label_2">
+ コピー
+ </text>
+ <text name="label_3">
+ ä¿®æ£
+ </text>
+ <text name="label_4">
+ å†è²©ãƒ»ãƒ—レゼント
+ </text>
+ <text name="label_5">
+ グループã§å…±åŒç®¡ç†
+ </text>
+ <text name="label_6">
+ 誰ã«å¯¾ã—ã¦ã‚‚コピーを許å¯
+ </text>
+ <text name="label_7" tool_tip="オブジェクトを作æˆã™ã‚‹ã¨ãã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’è¨å®šã™ã‚‹">
+ オブジェクト
+ </text>
+ <text name="label_8" tool_tip="アップãƒãƒ¼ãƒ‰ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’è¨å®šã™ã‚‹">
+ アップãƒãƒ¼ãƒ‰
+ </text>
+ <text name="label_9" tool_tip="スクリプトを作æˆã™ã‚‹ã¨ãã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’è¨å®šã™ã‚‹">
+ スクリプト
+ </text>
+ <text name="label_10" tool_tip="ノートカードを作æˆã™ã‚‹ã¨ãã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’è¨å®šã™ã‚‹">
+ ノートカード
+ </text>
+ <text name="label_11" tool_tip="ジェスãƒãƒ£ãƒ¼ã‚’作æˆã™ã‚‹ã¨ãã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’è¨å®šã™ã‚‹">
+ ジェスãƒãƒ£ãƒ¼
+ </text>
+ <text name="label_12" tool_tip="è¡£æœã¾ãŸã¯ãƒœãƒ‡ã‚£ãƒ‘ーツを作æˆã™ã‚‹ã¨ãã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æ¨©é™ã‚’è¨å®šã™ã‚‹">
+ ç€ç”¨ç‰©
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="å–り消ã—" label_selected="å–り消ã—" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a95c45c275f2e051bb4e9c98a672d92dc1d4981d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="詳細グラフィックスè¨å®š">
+ <text name="GeneralText">
+ 全般
+ </text>
+ <slider label="æç”»è·é›¢ï¼š" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="最大パーティクル数：" name="MaxParticleCount"/>
+ <slider label="ãƒã‚¹ãƒˆãƒ—ãƒã‚»ã‚¹å“質：" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ 低
+ </text>
+ <text name="AvatarText">
+ ã‚¢ãƒã‚¿ãƒ¼
+ </text>
+ <slider label="最大ã®è¤‡é›‘ã•ï¼š" name="IndirectMaxComplexity" tool_tip="ã©ã®æ™‚点ã§è¤‡é›‘ãªè¡¨ç¤ºã®ã‚¢ãƒã‚¿ãƒ¼ã‚’ベタ色ã®äººå½¢ã¨ã—ã¦è¡¨ç¤ºã™ã‚‹ã‹ã‚’管ç†ã—ã¾ã™"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="簡略化ã›ãšã«æç”»ã™ã‚‹æœ€å¤§æ•°ï¼š" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="詳細：" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ 低
+ </text>
+ <slider label="物ç†æ¼”算：" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ 低
+ </text>
+ <text name="ShadersText">
+ ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢
+ </text>
+ <slider label="テクスãƒãƒ£ãƒ¡ãƒ¢ãƒª (MB)：" name="GraphicsCardTextureMemory" tool_tip="テクスãƒãƒ£ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸãƒ¡ãƒ¢ãƒªã®é‡ã€‚ビデオカードã®ãƒ¡ãƒ¢ãƒªã«æ—¢å®šã€‚数値を下ã’ã‚‹ã¨ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ãŒã€ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ç²¾åº¦ãŒè½ã¡ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚"/>
+ <slider label="フォグã®è·é›¢æ¯”率：" name="fog"/>
+ <slider label="ガンマ：" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 ã§ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã€ä½Žã„ã»ã©æ˜Žã‚‹ã„)
+ </text>
+ <check_box label="異方的フィルタリング (有効ã«ã™ã‚‹ã¨é€Ÿåº¦ãŒä½Žä¸‹)" name="ani"/>
+ <check_box initial_value="true" label="OpenGL Vertex Buffer Objects を有効化" name="vbo" tool_tip="最新ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã“ã®ã‚ªãƒ—ションを有効ã«ã™ã‚‹ã¨ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ã€‚ãŸã ã—ã€å¤ã„ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã¯ VBO ã®å®Ÿè£…ãŒè²§å¼±ãªãŸã‚ã€ã“ã®ã‚ªãƒ—ションを有効ã«ã™ã‚‹ã¨ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚"/>
+ <check_box initial_value="true" label="テクスãƒãƒ£åœ§ç¸®ã®æœ‰åŠ¹åŒ– (å†èµ·å‹•å¾Œã«åæ˜ )" name="texture compression" tool_tip="ビデオメモリã§ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’圧縮ã™ã‚‹ã¨ã€ä¸€éƒ¨ã®ã‚«ãƒ©ãƒ¼å“è³ªã‚’çŠ ç‰²ã«ã—ã¦ã€é«˜è§£åƒåº¦ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚"/>
+ <text name="antialiasing label">
+ アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚·ãƒ³ã‚°ï¼š
+ </text>
+ <combo_box label="アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚·ãƒ³ã‚°" name="fsaa">
+ <combo_box.item label="無効" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (å†èµ·å‹•å¾Œã«åæ˜ )
+ </text>
+ <slider label="地形ã®ãƒ¡ãƒƒã‚·ãƒ¥ã®è©³ç´°ï¼š" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ 低
+ </text>
+ <slider label="木：" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ 低
+ </text>
+ <slider label="オブジェクト：" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ 低
+ </text>
+ <slider label="フレã‚シプリム：" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="é€æ˜Žãªæ°´" name="TransparentWater"/>
+ <check_box initial_value="true" label="ãƒãƒ³ãƒ—マッピングã¨å…‰æ²¢" name="BumpShiny"/>
+ <check_box initial_value="true" label="è¿‘ãã®å…‰" name="LocalLights"/>
+ <check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã¨ã€ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ã®ãƒ‰ãƒ©ã‚¤ãƒã®ç¨®é¡žã«ã‚ˆã£ã¦ã¯ã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã™ã‚‹ã®ã‚’防ãŽã¾ã™ã€‚"/>
+ <slider label="地形詳細：" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="ã‚¢ãƒã‚¿ãƒ¼ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¹ã‚ﾆï¾ï½¸ï¾ž" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="ã‚¢ãƒã‚¿ãƒ¼ã®å¸ƒ" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ æ°´ã®å射：
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="最å°" name="0"/>
+ <combo_box.item label="地形ã¨æ¨¹æœ¨" name="1"/>
+ <combo_box.item label="ã™ã¹ã¦ã®é™æ¢ã‚ªãƒ–ジェクト" name="2"/>
+ <combo_box.item label="ã™ã¹ã¦ã®ã‚¢ãƒã‚¿ãƒ¼ã¨ã‚ªãƒ–ジェクト" name="3"/>
+ <combo_box.item label="ã™ã¹ã¦" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
+ <slider label="空：" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="高度ãªãƒ©ã‚¤ãƒ†ã‚£ãƒ³ã‚°ãƒ¢ãƒ‡ãƒ«" name="UseLightShaders"/>
+ <check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
+ <check_box initial_value="true" label="フィールドã®é è¿‘æ„Ÿ" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ 影：
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="ãªã—" name="0"/>
+ <combo_box.item label="太陽/月" name="1"/>
+ <combo_box.item label="太陽/月・プãƒã‚¸ã‚§ã‚¯ã‚¿" name="2"/>
+ </combo_box>
+ <button label="推奨è¨å®šã«ãƒªã‚»ãƒƒãƒˆ" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="å–り消ã—" label_selected="å–り消ã—" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cdc67b314861f809f55f6e55fa9d2f09b7aba642
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="優先プリセットをä¿å˜">
+ <string name="title_graphic">
+ グラフィックプリセットをä¿å˜
+ </string>
+ <string name="title_camera">
+ カメラプリセットをä¿å˜
+ </string>
+ <text name="Preset">
+ プリセットã®åå‰ã‚’入力ã™ã‚‹ã‹ã€æ—¢å˜ã®ãƒ—リセットをé¸æŠžã—ã¾ã™ã€‚
+ </text>
+ <button label="ä¿å˜" name="save"/>
+ <button label="å–り消ã—" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index febe153d25f60af300c8756ee0436fd77212775a..81bfbe15f5b7eac33386b08fb8f29e9a834b42f7
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="辞書をインãƒãƒ¼ãƒˆ">
+ <text name="import_dict">
+ 辞書：
+ </text>
<button label="å‚ç…§" label_selected="å‚ç…§" name="dictionary_path_browse"/>
+ <text name="import_name">
+ åå‰ï¼š
+ </text>
+ <text name="import_lang">
+ 言語：
+ </text>
<button label="インãƒãƒ¼ãƒˆ" name="ok_btn"/>
<button label="å–り消ã—" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
old mode 100755
new mode 100644
index ae064724c03a1ef1ead2fe2609e0708180bad22e..dc7165b1ed0e7e9435e41dbec8814ed665c8abfb
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
次ã®åˆ©ç”¨è¦ç´„ã¨ãƒ—ライãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼ã‚’よããŠèªã¿ãã ã•ã„。 [SECOND_LIFE] ã¸ã®ãƒã‚°ã‚¤ãƒ³ã‚’続ã‘ã‚‹ã«ã¯ã€è¦ç´„ã«åŒæ„ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
</text>
+ <text name="external_tos_required">
+ æ“作を続ã‘ã‚‹ã«ã¯ã€my.secondlife.com ã«ç§»å‹•ã—ã¦ã€ãƒã‚°ã‚¤ãƒ³ã—ã€åˆ©ç”¨è¦ç´„を承諾ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸã€‚
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
old mode 100755
new mode 100644
index 930af106923a9b69b35d30f93117b7da9fd82e3d..7705dd909030cf66d5e7347f01cd5f3e55f41641
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="ズームイン" name="Zoom In"/>
<menu_item_call label="支払ã†" name="Pay..."/>
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Object Inspect"/>
+ <menu_item_check label="通常表示" name="RenderNormally"/>
+ <menu_item_check label="表示ã—ãªã„" name="DoNotRender"/>
+ <menu_item_check label="完全表示" name="AlwaysRenderFully"/>
<menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
old mode 100755
new mode 100644
index f9cadc36ac5adbc074ed057b962d56ad89ad03f2..482f2bdaa5f21e4923fb4bb16e07512502ed46c2
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="ダンプ XML" name="Dump XML"/>
<menu_item_call label="ズームイン" name="Zoom In"/>
<menu_item_call label="支払ã†" name="Pay..."/>
+ <menu_item_check label="通常表示" name="RenderNormally"/>
+ <menu_item_check label="表示ã—ãªã„" name="DoNotRender"/>
+ <menu_item_check label="完全表示" name="AlwaysRenderFully"/>
<menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
old mode 100755
new mode 100644
index cd8bd52f91e92f5753efc451b5dccd327a249148..abf7bce067f65b847b50685d5ecdd538e6ac0f68
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="[SECOND_LIFE] ブãƒã‚°" name="Second Life Blogs"/>
<menu_item_call label="ãƒã‚°ã‚’å ±å‘Šã™ã‚‹" name="Report Bug"/>
<menu_item_call label="[APP_NAME] ã«ã¤ã„ã¦" name="About Second Life"/>
+ <menu_item_call label="アップデートを確èª" name="Check for Updates"/>
</menu>
<menu_item_check label="デãƒãƒƒã‚°ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示ã™ã‚‹" name="Show Debug Menu"/>
<menu label="デãƒãƒƒã‚°" name="Debug">
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
index ad36aa3f77c2816f1220607d8047f6788659da04..bf3807555665ebc3fbe191c656eb02621e98a175 100644
--- a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="åå‰ã«ã‚ˆã‚‹ä¸¦ã¹æ›¿ãˆ" name="sort_by_name"/>
+ <menu_item_check label="æ–°ã—ã„é †ã«ä¸¦ã¹æ›¿ãˆ" name="sort_by_recent"/>
<menu_item_check label="åœ¨åº«é«˜é †ã«ä¸¦ã¹æ›¿ãˆ (低ã‹ã‚‰é«˜ã¸)" name="sort_by_stock_amount"/>
<menu_item_check label="リストフォルダã®ã¿è¡¨ç¤º" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_email.xml b/indra/newview/skins/default/xui/ja/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6c41d759fe04542d0c19d98ff0c0eb21bbdf5373
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="外部クライアントã§é›»åメールを作æˆ" name="email_open_external"/>
+ <menu_item_call label="é›»åメールをクリップボードã«ã‚³ãƒ”ー" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
old mode 100755
new mode 100644
index 0384dc1efcd6ad876289591b27e0a0f79776f160..3c2e29486837521acd6d8074b99a54229b4a9dec
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -180,6 +180,7 @@
<menu_item_call label="ãƒã‚°ã‚’å ±å‘Šã™ã‚‹" name="Report Bug"/>
<menu_item_call label="è¡çªãƒ»ãƒ—ッシュ・打撃" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="[APP_NAME] ã«ã¤ã„ã¦" name="About Second Life"/>
+ <menu_item_call label="アップデートを確èª" name="Check for Updates"/>
</menu>
<menu label="アドãƒãƒ³ã‚¹" name="Advanced">
<menu_item_call label="テクスãƒãƒ£ã®ãƒªãƒ™ãƒ¼ã‚¯ã‚’ã™ã‚‹" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
<menu_item_call label="ラグ計測器" name="Lag Meter"/>
<menu_item_check label="統計ãƒãƒ¼" name="Statistics Bar"/>
<menu_item_call label="シーン ãƒãƒ¼ãƒ‰çµ±è¨ˆæƒ…å ±" name="Scene Load Statistics"/>
- <menu_item_check label="ã‚¢ãƒã‚¿ãƒ¼ã®æ画ウェイトを表示" name="Avatar Rendering Cost"/>
+ <menu_item_check label="ã‚¢ãƒã‚¿ãƒ¼ã®è¤‡é›‘ã•æƒ…å ±ã‚’è¡¨ç¤º" name="Avatar Draw Info"/>
</menu>
<menu label="ãƒã‚¤ãƒ©ã‚¤ãƒˆã¨ç›®ã«è¦‹ãˆã‚‹ã‚‚ã®" name="Highlighting and Visibility">
<menu_item_check label="ãƒãƒ¼ã‚¸ãƒ¼ãƒ“ーコン" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
<menu_item_check label="ジョイント" name="Joints"/>
<menu_item_check label="レイã‚ャスト" name="Raycast"/>
<menu_item_check label="風ã®ãƒ™ã‚¯ãƒˆãƒ«" name="Wind Vectors"/>
- <menu_item_check label="æç”»ã®è©³ç´°åº¦" name="rendercomplexity"/>
- <menu_item_check label="添付アイテムã®ãƒã‚¤ãƒˆæ•°" name="attachment bytes"/>
<menu_item_check label="スカルプト" name="Sculpt"/>
<menu label="テクスãƒãƒ£ã®å¯†åº¦" name="Texture Density">
<menu_item_check label="ãªã—" name="None"/>
@@ -423,13 +422,11 @@
<menu_item_check label="ã‚ャラクター Vis ã®ãƒ‡ãƒãƒƒã‚°" name="Debug Character Vis"/>
<menu_item_check label="骨組ã¿ã®è¡çªåˆ¤å®šã‚’表示ã™ã‚‹" name="Show Collision Skeleton"/>
<menu_item_check label="エージェントã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã‚’表示ã™ã‚‹" name="Display Agent Target"/>
- -->
<menu_item_call label="アタッãƒãƒ¡ãƒ³ãƒˆã‚’ダンプ" name="Dump Attachments"/>
<menu_item_call label="ã‚¢ãƒã‚¿ãƒ¼ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’デãƒãƒƒã‚°" name="Debug Avatar Textures"/>
<menu_item_call label="ãƒãƒ¼ã‚«ãƒ«ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’ダンプ" name="Dump Local Textures"/>
</menu>
<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
- <menu_item_check label="HTTP インベントリ" name="HTTP Inventory"/>
<menu_item_call label="圧縮画åƒ" name="Compress Images"/>
<menu_item_call label="Visual Leak Detector を有効ã«ã™ã‚‹" name="Enable Visual Leak Detector"/>
<menu_item_check label="デãƒãƒƒã‚°ç”¨ã®ãƒŸãƒ‹ãƒ€ãƒ³ãƒ—を出力ã™ã‚‹" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
old mode 100755
new mode 100644
index b3b4e06a68ea25d758c67bd5f4e38aef5b5e6cf9..a573e86e5f6e6f532f65dbb6a5f4276a7f60eaab
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -163,6 +163,10 @@
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ リストを作æˆã™ã‚‹ãŸã‚ã«ã€ãƒªã‚¹ãƒˆã™ã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®éšŽå±¤ã‚’固定ã—ã¾ã—ãŸã€‚
+ <usetemplate ignoretext="リストã®ä½œæˆã«ã‚ˆã‚Šã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®éšŽå±¤ãŒä¿®æ£ã•ã‚Œã‚‹ã“ã¨ã‚’è¦å‘Šã™ã‚‹" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
ã“ã®æ“作ã«ã‚ˆã‚Šã€ã“ã®ãƒªã‚¹ãƒˆã®æœ‰åŠ¹ãªå†…容ãŒå¤‰æ›´ã•ã‚Œã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ
<usetemplate ignoretext="マーケットプレイスã§æœ‰åŠ¹ãªãƒªã‚¹ãƒˆã‚’変更ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
@@ -210,15 +214,9 @@
在庫ãŒç©ºã®ãŸã‚ã€ãƒªã‚¹ãƒˆã‚’削除ã—ã¾ã—ãŸã€‚ã‚‚ã†ä¸€åº¦ãƒªã‚¹ãƒˆã‚’表示ã™ã‚‹ã«ã¯ã€åœ¨åº«ãƒ•ã‚©ãƒ«ãƒ€ã«ãƒ¦ãƒ‹ãƒƒãƒˆã‚’è¿½åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
<usetemplate ignoretext="在庫フォルダãŒç©ºã®ãŸã‚ã«ãƒªã‚¹ãƒˆãŒè¡¨ç¤ºã•ã‚Œãªã„ã¨è¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- 次ã®ç†ç”±ã§ã€ã‚¹ã‚¯ãƒªãƒ—ト用テã‚ストã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚
-[REASON]
-後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
- </notification>
- <notification name="CompileQueueSaveBytecode">
- 次ã®ç†ç”±ã§ã€ã‚³ãƒ³ãƒ‘イルã—ãŸã‚¹ã‚¯ãƒªãƒ—トã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚
-[REASON]
-後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
+ <notification name="AlertMerchantVersionFolderEmpty">
+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ãŒç©ºã®ãŸã‚ã€ãƒªã‚¹ãƒˆã‚’削除ã—ã¾ã—ãŸã€‚ã‚‚ã†ä¸€åº¦ãƒªã‚¹ãƒˆã‚’表示ã™ã‚‹ã«ã¯ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚¢ã‚¤ãƒ†ãƒ ã‚’è¿½åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ <usetemplate ignoretext="ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ•ã‚©ãƒ«ãƒ€ãŒç©ºã®ãŸã‚ã«ãƒªã‚¹ãƒˆãŒè¡¨ç¤ºã•ã‚Œãªã„ã¨è¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
アニメーションデータã®æ›¸ãè¾¼ã¿ã«å•é¡ŒãŒã‚ã‚Šã¾ã™ã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
@@ -331,6 +329,14 @@
[COUNT] åã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’グループã‹ã‚‰è¿½æ”¾ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚
<usetemplate ignoretext="グループã‹ã‚‰ã®è¤‡æ•°ã®ãƒ¡ãƒ³ãƒãƒ¼ã®è¿½æ”¾ã‚’確èªã—ã¾ã™" name="okcancelignore" notext="å–り消ã—" yestext="追放"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ [AVATAR_NAME] をグループã‹ã‚‰è¿½æ”¾ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="グループã‹ã‚‰ã®å‚åŠ è€…ã®è¿½æ”¾ã‚’確èªã—ã¾ã™" name="okcancelignore" notext="å–り消ã—" yestext="ç¦æ¢"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ [COUNT] åã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’グループã‹ã‚‰è¿½æ”¾ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="グループã‹ã‚‰ã®è¤‡æ•°ã®ãƒ¡ãƒ³ãƒãƒ¼ã®è¿½æ”¾ã‚’確èªã—ã¾ã™" name="okcancelignore" notext="å–り消ã—" yestext="ç¦æ¢"/>
+ </notification>
<notification name="AttachmentDrop">
アタッãƒãƒ¡ãƒ³ãƒˆã‚’下ã«ç½®ã“ã†ã¨ã—ã¦ã„ã¾ã™ã€‚
続ã‘ã¾ã™ã‹ï¼Ÿ
@@ -425,7 +431,7 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- å…¨ã¦ã®ãƒªã‚¹ãƒˆã•ã‚ŒãŸã‚ªãƒ–ジェクトを所有者ã«æœ¬å½“ã«è¿”å´ã—ã¾ã™ã‹ï¼Ÿ
+ リストã•ã‚ŒãŸå…¨ã¦ã®ã‚ªãƒ–ジェクトを所有者ã®æŒã¡ç‰©ã«æˆ»ã—ã¾ã™ã‹?ã“ã‚Œã«ã‚ˆã‚Šã™ã¹ã¦ã®ã‚¹ã‚¯ãƒªãƒ—ト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトãŒãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æˆ»ã‚Šã¾ã™!
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -609,16 +615,10 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
（**è¦å‘Š**：ã“ã®æ“作後元ã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“）
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- 次ã®ç†ç”±ã§ã€ã‚¹ã‚¯ãƒªãƒ—トã®ä¿å˜ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ [REASON]。 後ã§ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。
- </notification>
<notification name="SaveScriptFailObjectNotFound">
スクリプトã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚スクリプトãŒå…¥ã£ãŸã‚ªãƒ–ジェクトãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。
オブジェクトã¯ç¯„囲外ã‹ã€ã¾ãŸã¯å‰Šé™¤ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
</notification>
- <notification name="SaveBytecodeFailReason">
- 次ã®ç†ç”±ã§ã€ã‚³ãƒ³ãƒ‘イルã—ãŸã‚¹ã‚¯ãƒªãƒ—トã®ä¿å˜æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ [REASON]。 後ã§ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。
- </notification>
<notification name="StartRegionEmpty">
ãƒã‚°ã‚¤ãƒ³ä½ç½®ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。
ãƒã‚°ã‚¤ãƒ³ä½ç½®ã®æ¬„ã«ãƒªãƒ¼ã‚¸ãƒ§ãƒ³åを入力ã™ã‚‹ã‹ã€ã€Œæœ€å¾Œã«ãƒã‚°ã‚¢ã‚¦ãƒˆã—ãŸå ´æ‰€ã€ã‹ã€Œè‡ªå®…（ホーム）ã€ã‚’é¸æŠžã—ã¦ãã ã•ã„。
@@ -631,6 +631,10 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
<notification name="CannotDownloadFile">
ファイルをダウンãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ [SECOND_LIFE] ã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ファイルã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚’è¦æ±‚ã—ã¾ã—ãŸã€‚
+ <usetemplate ignoretext="サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ファイルã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚’è¦å‘Šã™ã‚‹" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
ファイル [[FILE]] を書ãè¾¼ã‚ã¾ã›ã‚“。
</notification>
@@ -1139,8 +1143,9 @@ L$ ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。
通常ã“ã‚Œã¯ä¸€æ™‚çš„ãªã‚¨ãƒ©ãƒ¼ã§ã™ã€‚ 数分後ã«ã‚‚ã†ä¸€åº¦ç€ç”¨ç‰©ã‚’カスタマイズ・ä¿å˜ã—ã¦ãã ã•ã„。
</notification>
<notification name="YouHaveBeenLoggedOut">
- ã—ã¾ã£ãŸã€ [SECOND_LIFE] ã‹ã‚‰ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¦ã—ã¾ã„ã¾ã—ãŸã€‚
- [MESSAGE]
+ ã—ã¾ã£ãŸã€[SECOND_LIFE] ã‹ã‚‰ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¦ã—ã¾ã„ã¾ã—ãŸã€‚
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="終了" yestext="IMã¨ãƒãƒ£ãƒƒãƒˆã‚’表示"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1390,6 +1395,13 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries ã‚’å‚ç…§ã—ã¦ã
<ignore name="ignore" text="衣類ãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã‚‹ã¾ã§æ™‚é–“ãŒã‹ã‹ã£ã¦ã„ã‚‹ã¨ã"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ ã”使用㮠[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示ã®è¤‡é›‘ã•] 㯠[AGENT_COMPLEXITY] ã§ã™ã€‚
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ ã”使用㮠[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示ã®è¤‡é›‘ã•] 㯠[AGENT_COMPLEXITY] ã§ã™ã€‚
+ </notification>
<notification name="FirstRun">
[APP_NAME] ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ã¾ã—ãŸã€‚
@@ -1669,6 +1681,25 @@ http://secondlife.com/download ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰
[[INFO_URL] ã“ã®ã‚¢ãƒƒãƒ—デートã«é–¢ã™ã‚‹æƒ…å ±] ã‚’å‚ç…§
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ アップデートを利用ã§ãã¾ã™ã€‚
+ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™ã€‚準備ãŒã§ã次第ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’完了ã™ã‚‹ãŸã‚ã«ã€ãƒ“ューワをå†èµ·å‹•ã™ã‚‹ã‚ˆã†ã«æ±‚ã‚るメッセージãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ アップデートãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸã€‚å†èµ·å‹•ä¸ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ アップデートã®ç¢ºèªä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
+ã‚ã¨ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ ã”利用ã®ãƒ“ューワã¯æœ€æ–°ã§ã™!
+最新ã®æ©Ÿèƒ½ã¨ä¿®æ£ã‚’今ã™ã試ã—ãŸã„å ´åˆã¯ã€ä»£æ›¿ãƒ“ューワページ (http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers) ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
ã“ã®ã‚ªãƒ–ジェクトをè²æ¸¡ã™ã‚‹ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã¯ä»¥ä¸‹ã®ã“ã¨ãŒå¯èƒ½ã§ã™ï¼š
* オブジェクトã«æ”¯æ‰•ã‚れ㟠L$ ã‚’å—é ˜ã—ã¾ã™ã€‚
@@ -1776,6 +1807,14 @@ http://secondlife.com/download ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰
åŠ å…¥ã§ãるグループã®æœ€å¤§é™ã«é”ã—ã¾ã—ãŸã€‚ æ–°ã—ãグループã«å‚åŠ ã€ã¾ãŸã¯ä½œæˆã™ã‚‹å‰ã«ã€ã©ã‚Œã‹ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰æŠœã‘ã¦ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ ベースアカウントã®ã‚°ãƒ«ãƒ¼ãƒ—制é™ã¯ [MAX_BASIC]ã€[https://secondlife.com/premium/ プレミアム] アカウントã®
+グループ制é™ã¯ [MAX_PREMIUM] ã§ã™ã€‚
+アカウントをダウングレードã—ãŸå ´åˆã€ã•ã‚‰ã«ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹å‰ã«ã€ä¸‹ã® [MAX_BASIC] グループ制é™ã‚’å–å¾—ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+
+[https://secondlife.com/my/account/membership.php 今ã™ãアップグレード!]
+ <usetemplate name="okbutton" yestext="é–‰ã˜ã‚‹"/>
+ </notification>
<notification name="KickUser">
ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã‚’追ã„出ã—ã¾ã™ã‹ï¼Ÿ
<form name="form">
@@ -1973,11 +2012,11 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã
<usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
</notification>
<notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateTrustedExperienceAdd">
- ã“ã®ä¸å‹•ç”£ã®ã‚ー体験リストã«ã®ã¿è¿½åŠ ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ã‚ー体験リストã«è¿½åŠ ã—ã¾ã™ã‹?
+ ã“ã®ä¸å‹•ç”£ã®ã‚ー リストã«ã®ã¿è¿½åŠ ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ã‚ー リストã«è¿½åŠ ã—ã¾ã™ã‹?
<usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
</notification>
<notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateTrustedExperienceRemove">
- ã“ã®ä¸å‹•ç”£ã®ä¿¡é ¼æ¸ˆã¿ä½“験リストã‹ã‚‰ã®ã¿å‰Šé™¤ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ä¿¡é ¼æ¸ˆã¿ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?
+ ã“ã®ä¸å‹•ç”£ã®ã‚ーリストã‹ã‚‰ã®ã¿å‰Šé™¤ã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ã‚ーリストã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?
<usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/>
</notification>
<notification label="ã‚ックを確èª" name="EstateKickUser">
@@ -2291,6 +2330,10 @@ L$ [AMOUNT] ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™
L$[AMOUNT] ã‚’ [TARGET] ã«æ”¯æ‰•ã†ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。
<usetemplate ignoretext="支払ã„å‰ã«ç¢ºèª (åˆè¨ˆé‡‘é¡ãŒ L$200 以上ã®å ´åˆ)" name="okcancelignore" notext="å–り消ã—" yestext="支払ã„"/>
</notification>
+ <notification name="PayObjectFailed">
+ 支払ã„ãŒå¤±æ•—ã—ã¾ã—ãŸï¼š オブジェクトãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
ã“ã®ã‚ªãƒ–ジェクトã«ã¯ã€ã‚ãªãŸãŒã‚³ãƒ”ーã§ãるアイテムã¯ã‚ã‚Šã¾ã›ã‚“。
</notification>
@@ -2322,10 +2365,9 @@ L$ [AMOUNT] ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™
[QUESTION]
<usetemplate ignoretext="アイテムを削除ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- ã“ã®ãƒ„ールを利用ã—㦠[http://secondlife.com/corporate/tos.php 利用è¦ç´„] ã‚„ [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] ã®é•åã‚’å ±å‘Šã—ã¦ãã ã•ã„。
-
-å ±å‘Šã•ã‚ŒãŸå«ŒãŒã‚‰ã›ã¯ã™ã¹ã¦èª¿æŸ»ãƒ»è§£æ±ºã•ã‚Œã¾ã™ã€‚
+ <notification name="ConfirmUnlink">
+ ã“ã‚Œã¯ã€ãƒªãƒ³ã‚¯ã‚»ãƒƒãƒˆã«ã‚ˆã‚‹åºƒç¯„囲ã®é¸æŠžã§ã™ã€‚リンクを解除ã™ã‚‹ã¨ã€ã‚‚ã†ä¸€åº¦ãƒªãƒ³ã‚¯ã§ããªããªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ãã®ã‚ˆã†ãªå ´åˆã«å‚™ãˆã¦ã€ãƒªãƒ³ã‚¯ã‚»ãƒƒãƒˆã‚’自分ã®æŒã¡ç‰©ã«ã‚³ãƒ”ーã§ãã¾ã™ã€‚
+ <usetemplate ignoretext="リンクセットã®ãƒªãƒ³ã‚¯ã‚’解除ã™ã‚‹ã¨ãã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="リンクを外ã™"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
å«ŒãŒã‚‰ã›å ±å‘Šã®ã‚«ãƒ†ã‚´ãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„。
@@ -3034,7 +3076,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
所有者ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã‚ˆã‚Šé«˜ã„レーティング区分ã®ä½“験をè¨å®šã§ãã¾ã›ã‚“。
</notification>
<notification name="RestrictedTermExperienceProfileMessage">
- 次ã®æ¡ä»¶ã«ã‚ˆã‚Šã€ä½“験プãƒãƒ•ã‚£ãƒ¼ãƒ«åãŠã‚ˆã³èª¬æ˜Žã®æ›´æ–°ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ: [extra_info]
+ 次ã®æ¡ä»¶ã«ã‚ˆã‚Šã€ä½“験プãƒãƒ•ã‚£ãƒ¼ãƒ«åãŠã‚ˆã³èª¬æ˜Žã®æ›´æ–°ãŒã§ãã¾ã›ã‚“ã§ã—ãŸï¼š [extra_info]
</notification>
<notification name="TeleportedHomeExperienceRemoved">
体験 secondlife:///app/experience/[public_id]/profile を削除ã™ã‚‹ãŸã‚ã«ã€[region_name] リージョンã‹ã‚‰ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ã¯ã§ããªããªã‚Šã¾ã—ãŸã€‚
@@ -3049,7 +3091,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
</form>
</notification>
<notification name="TrustedExperiencesAvailable">
- ã“ã®ç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒã‚ã‚Šã¾ã›ã‚“。下ã®ä½“験をå—ã‘入れるã“ã¨ã«ã‚ˆã‚Šã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã™:
+ ã“ã®ç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒã‚ã‚Šã¾ã›ã‚“。下ã®ä½“験をå—ã‘入れるã“ã¨ã«ã‚ˆã‚Šã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼š
[EXPERIENCE_LIST]
@@ -3058,7 +3100,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
<notification name="ExperienceEvent">
[EventType] by the secondlife:///app/experience/[public_id]/profile experience ã«ã‚ˆã‚Šã€ã‚ªãƒ–ジェクトã§ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ ([EventType]) を実行ã™ã‚‹ã“ã¨ãŒè¨±å¯ã•ã‚Œã¾ã—ãŸã€‚
所有者：secondlife:///app/agent/[OwnerID]/inspect
-オブジェクトå:[ObjectName]
+オブジェクトå：[ObjectName]
区画å：[ParcelName]
</notification>
<notification name="ExperienceEventAttachment">
@@ -3072,9 +3114,9 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
権é™ãŒè¨±å¯ã•ã‚Œã‚‹ã¨ã€ä½“験プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‹ã‚‰å‘¼ã³å‡ºã•ãªã„é™ã‚Šã€ã“ã®ä½“験ã«ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå†ã³è¡¨ç¤ºã•ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。
-ã“ã®ä½“験ã«é–¢é€£ä»˜ã‘られãŸã‚¹ã‚¯ãƒªãƒ—トã«ã‚ˆã‚Šã€ã“ã®ä½“験ãŒæœ‰åŠ¹ãªãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ä»¥ä¸‹ã®ã“ã¨ã‚’実行ã§ãã¾ã™:
+ã“ã®ä½“験ã«é–¢é€£ä»˜ã‘られãŸã‚¹ã‚¯ãƒªãƒ—トã«ã‚ˆã‚Šã€ã“ã®ä½“験ãŒæœ‰åŠ¹ãªãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ä»¥ä¸‹ã®ã“ã¨ã‚’実行ã§ãã¾ã™ï¼š
-[QUESTIONS]よã‚ã—ã„ã§ã™ã‹ï¼Ÿ
+[QUESTIONS] よã‚ã—ã„ã§ã™ã‹ï¼Ÿ
<form name="form">
<button name="BlockExperience" text="体験をブãƒãƒƒã‚¯"/>
<button name="Mute" text="オブジェクトをブãƒãƒƒã‚¯ã™ã‚‹"/>
@@ -3256,6 +3298,12 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="AttachmentSaved">
アタッãƒãƒ¡ãƒ³ãƒˆãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚
</notification>
+ <notification name="PresetNotSaved">
+ プリセット [NAME] ã®ä¿å˜ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
+ </notification>
+ <notification name="PresetNotDeleted">
+ プリセット [NAME] ã®å‰Šé™¤ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
+ </notification>
<notification name="UnableToFindHelpTopic">
ヘルプトピックãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
</notification>
@@ -3288,9 +3336,8 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
共有ã™ã‚‹ä½äººã‚’é¸æŠžã—ã¾ã™ã€‚
</notification>
<notification name="MeshUploadError">
- [LABEL] をアップãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸï¼š[MESSAGE] [IDENTIFIER]
-
-詳細ã«ã¤ã„ã¦ã¯ãƒã‚°ã‚’ã”覧ãã ã•ã„。
+ [LABEL] をアップãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸï¼š[MESSAGE] [IDENTIFIER]
+[DETAILS] 詳ã—ãã¯ã€SecondLife.log ã‚’ã”覧ãã ã•ã„。
</notification>
<notification name="MeshUploadPermError">
メッシュã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰è¨±å¯ã‚’リクエストä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
index 39e0e27b057777bf336efa0fa6d3cb741e04dfbf..16976df035be5afa9eaa510e6c1f7bf86f850224 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -15,7 +15,7 @@
<button label="å ±å‘Š" name="btn_report_xp"/>
</layout_panel>
<layout_panel name="button_panel">
- <check_box label="ã™ã¹ã¦ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’通知 日数" name="notify_all"/>
+ <check_box label="ã™ã¹ã¦ã®ã‚¤ãƒ™ãƒ³ãƒˆ 日数を通知" name="notify_all"/>
<button label="クリア" name="btn_clear"/>
<button label="<" name="btn_prev"/>
<button label=">" name="btn_next"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
old mode 100755
new mode 100644
index f908262f4f0ecfb670034b8fbfd300819d080edf..1e7c260061872b8a8c5917357dd7b74f9a927f60
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="ã‚‚ã®" name="main inventory panel">
<panel.string name="ItemcountFetching">
[ITEM_COUNT] 個ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å–å¾—ä¸ã§ã™... [FILTER]
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] 個ã®ã‚¢ã‚¤ãƒ†ãƒ 　[FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ [ITEM_COUNT] 個ã®å–得アイテム　[FILTER]
+ </panel.string>
<text name="ItemcountText">
アイテム：
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="オプションを表示ã—ã¾ã™"/>
+ <menu_button name="options_gear_btn" tool_tip="オプションを表示ã—ã¾ã™"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="æ–°ã—ã„ã‚¢ã‚¤ãƒ†ãƒ ã‚’è¿½åŠ ã—ã¾ã™"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
old mode 100755
new mode 100644
index dd8fd416815eed727835ba48cac545ef08f8317c..5fc4b57a0814d96369956194f90ae5ba1d70c827
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -18,6 +18,7 @@
<string name="no_groups_msg" value="グループをãŠæŽ¢ã—ã§ã™ã‹ï¼Ÿ [secondlife:///app/search/groups 検索] ã‚’ãŠè©¦ã—ãã ã•ã„。"/>
<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックã§åœ°å›³ã‚’é–‹ã。Shiftâ€ãƒ‰ãƒ©ãƒƒã‚°ã§æ°´å¹³ãƒ»åž‚直移動）"/>
<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックã§ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã€‚Shiftâ€ãƒ‰ãƒ©ãƒƒã‚°ã§æ°´å¹³ãƒ»åž‚直移動）"/>
+ <string name="GroupCountWithInfo" value="ã‚ãªãŸã¯ [COUNT] グループã«å±žã—ã¦ã„ã‚‹ã®ã§ã€ã¾ã [REMAINING] å‚åŠ ã§ãã¾ã™ã€‚[secondlife:/// 詳細]"/>
<tab_container name="tabs">
<panel label="è¿‘ã" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_pick_info.xml b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 6e8797ec5e9de4fe65146d2acd0beb27897b3e6e..62b8daeb4ef03d44b7ad0949ce8107ae91eb47a2
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="複数ã®ãƒ“ューワを許å¯" name="allow_multiple_viewer_check"/>
<check_box label="ãƒã‚°ã‚¤ãƒ³æ™‚ã«ã‚°ãƒªãƒƒãƒ‰é¸æŠžã‚’表示" name="show_grid_selection_check"/>
<check_box label="アドãƒãƒ³ã‚¹ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示" name="show_advanced_menu_check"/>
- <check_box label="デベãƒãƒƒãƒ‘ーメニューを表示" name="show_develop_menu_check"/>
+ <check_box label="開発メニューを表示" name="show_develop_menu_check"/>
<button label="デフォルト作æˆè¨±å¯" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 1c3204ea04d2410138ef8e497c9dc92a91b81b56..147328150262d478e560308770a2e5fc8ae0e174
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="インベントリをé€ã‚‹" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ ä¿å˜ï¼š
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="ãƒã‚°ãŠã‚ˆã³ãƒ†ã‚ストãƒãƒ£ãƒƒãƒˆ" name="log_and_transcripts" value="2"/>
+ <item label="ãƒã‚°ã®ã¿" name="log_only" value="1"/>
+ <item label="ãƒã‚°ã¾ãŸã¯ãƒ†ã‚ストãƒãƒ£ãƒƒãƒˆãªã—" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="ãƒã‚°ã‚’消去..." name="clear_log"/>
<button label="テã‚ストãƒãƒ£ãƒƒãƒˆã‚’削除..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ å ´æ‰€ï¼š
+ </text>
<button label="å‚ç…§..." label_selected="å‚ç…§" name="log_path_button"/>
</panel>
<button label="ä»–ã®è¨€èªž..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
old mode 100755
new mode 100644
index 39bc05c845ba88e56369f7f2f12acff133b70697..e2b74354fa5089d5523d49bcae8bae0693c478aa
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -6,12 +6,12 @@
<combo_box name="language_combobox">
<combo_box.item label="システムデフォルト" name="System Default Language"/>
<combo_box.item label="English （英語）" name="English"/>
- <combo_box.item label="Dansk （デンマーク語） – ベータ" name="Danish"/>
+ <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="Polski （ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªžï¼‰ - ベータ" name="Polish"/>
+ <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="Türkçe （トルコ語） - ベータ" name="Turkish"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 15017e330e42171a0819bf146c6c17a75eba61d5..8fbe9b56b9cca1b153d3d3406fb8716cecb861f5
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="表示" name="Display panel">
+ <text name="preset_text">
+ (ãªã—)
+ </text>
<text name="QualitySpeed">
クオリティã¨ã‚¹ãƒ”ード：
</text>
- <text name="FasterText">
- 速ã„
- </text>
- <text name="BetterText">
- é…ã„
- </text>
<text name="ShadersPrefText">
低
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
超高
</text>
- <panel label="カスタムグラフィック" name="CustomGraphics Panel">
- <text name="ShadersText">
- シェーダー：
- </text>
- <check_box initial_value="true" label="é€æ˜Žãªæ°´" name="TransparentWater"/>
- <check_box initial_value="true" label="ãƒãƒ³ãƒ—マッピングã¨å…‰æ²¢" name="BumpShiny"/>
- <check_box initial_value="true" label="è¿‘ãã®å…‰" name="LocalLights"/>
- <check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã¨ã€ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ã®ãƒ‰ãƒ©ã‚¤ãƒã®ç¨®é¡žã«ã‚ˆã£ã¦ã¯ã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã™ã‚‹ã®ã‚’防ãŽã¾ã™ã€‚"/>
- <check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="高度ãªãƒ©ã‚¤ãƒ†ã‚£ãƒ³ã‚°ãƒ¢ãƒ‡ãƒ«" name="UseLightShaders"/>
- <check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
- <check_box initial_value="true" label="フィールドã®é è¿‘æ„Ÿ" name="UseDoF"/>
- <text name="shadows_label">
- 影：
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="ãªã—" name="0"/>
- <combo_box.item label="太陽/月" name="1"/>
- <combo_box.item label="太陽/月・プãƒã‚¸ã‚§ã‚¯ã‚¿" name="2"/>
- </combo_box>
- <text name="reflection_label">
- æ°´ã®å射：
- </text>
- <combo_box initial_value="true" label="æ°´ã®åå°„" name="Reflections">
- <combo_box.item label="最å°" name="0"/>
- <combo_box.item label="地形ã¨æ¨¹æœ¨" name="1"/>
- <combo_box.item label="ã™ã¹ã¦ã®é™æ¢ã‚ªãƒ–ジェクト" name="2"/>
- <combo_box.item label="ã™ã¹ã¦ã®ã‚¢ãƒã‚¿ãƒ¼ã¨ã‚ªãƒ–ジェクト" name="3"/>
- <combo_box.item label="ã™ã¹ã¦" name="4"/>
- </combo_box>
- <slider label="ã‚¢ãƒã‚¿ãƒ¼ã®ç‰©ç†ä½œç”¨ï¼š" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- 低
- </text>
- <slider label="æç”»è·é›¢ï¼š" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="最大パーティクル数：" name="MaxParticleCount"/>
- <slider label="簡略化ã›ãšã«æç”»ã™ã‚‹ã‚¢ãƒã‚¿ãƒ¼ã®æœ€å¤§æ•°ï¼š" name="MaxNumberAvatarDrawn"/>
- <slider label="ãƒã‚¹ãƒˆãƒ—ãƒã‚»ã‚¹å“質：" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- メッシュ詳細：
- </text>
- <slider label=" オブジェクト：" name="ObjectMeshDetail"/>
- <slider label=" フレã‚シプリム：" name="FlexibleMeshDetail"/>
- <slider label=" 樹木：" name="TreeMeshDetail"/>
- <slider label=" ã‚¢ãƒã‚¿ãƒ¼ï¼š" name="AvatarMeshDetail"/>
- <slider label=" 地形：" name="TerrainMeshDetail"/>
- <slider label=" 空：" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- 低
- </text>
- <text name="ObjectMeshDetailText">
- 低
- </text>
- <text name="FlexibleMeshDetailText">
- 低
- </text>
- <text name="TreeMeshDetailText">
- 低
- </text>
- <text name="AvatarMeshDetailText">
- 低
- </text>
- <text name="TerrainMeshDetailText">
- 低
- </text>
- <text name="SkyMeshDetailText">
- 低
- </text>
- <text name="AvatarRenderingText">
- ã‚¢ãƒã‚¿ãƒ¼ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ï¼š
- </text>
- <check_box initial_value="true" label="ã‚¢ãƒã‚¿ãƒ¼ã®æ画を簡略化" name="AvatarImpostors"/>
- <check_box initial_value="true" label="ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¹ã‚ニング" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="ã‚¢ãƒã‚¿ãƒ¼ã®å¸ƒ" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- 地形詳細：
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="低" name="0"/>
- <radio_item label="高" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="é©ç”¨" label_selected="é©ç”¨" name="Apply"/>
- <button label="リセット" name="Defaults"/>
- <button label="詳ã—ã„è¨å®š" name="Advanced"/>
- <button label="ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢" label_selected="ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ 速ã„
+ </text>
+ <text name="BetterText">
+ é…ã„
+ </text>
+ <check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="高度ãªãƒ©ã‚¤ãƒ†ã‚£ãƒ³ã‚°ãƒ¢ãƒ‡ãƒ«" name="UseLightShaders"/>
+ <button label="è¨å®šã‚’プリセットã¨ã—ã¦ä¿å˜..." name="PrefSaveButton"/>
+ <button label="プリセットをãƒãƒ¼ãƒ‰..." name="PrefLoadButton"/>
+ <button label="事å‰è¨å®šã‚’削除..." name="PrefDeleteButton"/>
+ <button label="推奨è¨å®šã«ãƒªã‚»ãƒƒãƒˆ" name="Defaults"/>
+ <button label="詳細è¨å®š..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
old mode 100755
new mode 100644
index c1ddf0846577afeabc20ccd5280ac592add34c76..be823938a2496a4afdfe8b7e9d4d8badf6a91591
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -16,19 +16,18 @@
</text>
<radio_group name="preferred_browser_behavior">
<radio_item label="ã™ã¹ã¦ã®ãƒªãƒ³ã‚¯ã«ãƒžã‚¤ ブラウザ (Chromeã€Firefoxã€IE) を使用" name="internal" tool_tip="デフォルトã®ã‚·ã‚¹ãƒ†ãƒ Web ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンク先ãªã©ã‚’見ã¾ã™ã€‚全画é¢ã§èµ·å‹•ä¸ã«ã¯ãŠã™ã™ã‚ã—ã¾ã›ã‚“。" value="0"/>
- <radio_item label="Second Life リンクã«ã®ã¿å†…蔵ブラウザを使用" name="external" tool_tip="ヘルプã€Web リンクãªã©ã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚·ã‚¹ãƒ†ãƒ ã®ãƒ–ラウザを使用ã—ã¾ã™ã€‚
-内蔵ブラウザ㯠LindenLab/SecondLife リンクã«ã®ã¿ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" value="1"/>
+ <radio_item label="Second Life リンクã«ã®ã¿å†…蔵ブラウザを使用" name="external" tool_tip="ヘルプã€Web リンクãªã©ã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚·ã‚¹ãƒ†ãƒ ã®ãƒ–ラウザを使用ã—ã¾ã™ã€‚ 内蔵ブラウザ㯠LindenLab/SecondLife リンクã«ã®ã¿ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" value="1"/>
+ <radio_item label="ã™ã¹ã¦ã®ãƒªãƒ³ã‚¯ã«å†…蔵ブラウザを使用" name="external_all" tool_tip="内蔵ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンクãªã©ã‚’見ã¾ã™ã€‚[APP_NAME] 内ã«æ–°ã—ã„ウィンドウã§ã“ã®ãƒ–ラウザãŒé–‹ãã¾ã™ã€‚" value="2"/>
</radio_group>
<check_box initial_value="true" label="プラグインを有効ã«ã™ã‚‹" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Cookie ã‚’å—ã‘入れる" name="cookies_enabled"/>
<check_box initial_value="true" label="Javascript を有効ã«ã™ã‚‹" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="メディアブラウザã®ãƒãƒƒãƒ—アップを有効ã«ã™ã‚‹" name="media_popup_enabled"/>
<text name="Software updates:">
ソフトウェアアップデート：
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="自動的ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" name="Install_automatically"/>
- <combo_box.item label="手動ã§ã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰&インストール" name="Install_manual"/>
+ <combo_box.item label="更新を手動ã§ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¾ã™" name="Install_manual"/>
</combo_box>
<check_box label="release candidate ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..422ed01cbbfc7d04eda8130fe700d151d6be5b7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ グラフィックプリセット
+ </text>
+ <button label="グラフィックスè¨å®šã‚’é–‹ã" name="open_prefs_btn" tool_tip="グラフィックスè¨å®šã‚’é–‹ãã¾ã™"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 5506373eb08a01300d271345c08be6ab3ffb6b9f..6e9d7341a0d187d6fe2695df7f21a69b9c28203c
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="メディア URL"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="安全ãªé–²è¦§"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
index f13c7bea4d9379dc7b3c9862fd89210bd41fd7b9..711b8e7291fb8a56c7201406e4c91cfc1cece6b3 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -3,7 +3,7 @@
<panel.string name="trusted_estate_text">
ã©ã‚“ãªä½“験ã§ã‚‚ã‚ーã«ãªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
-ã‚ー体験ã«ã¯ã€ã“ã®ä¸å‹•ç”£ã§å‹•ä½œã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã™ã€‚
+ã‚ー体験ã«ã¯ã€ã“ã®ä¸å‹•ç”£ã§å®Ÿè¡Œã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã™ã€‚
ã•ã‚‰ã«ã€ä¸å‹•ç”£ã§ãƒ‘ブリックアクセスãŒè¨±å¯ã•ã‚Œãªã„å ´åˆã€ã‚ー体験ã«å‚åŠ ã™ã‚‹ä½äººã¯ä¸å‹•ç”£ã«å…¥ã£ã¦ã€ã‚ー体験ã«ã„る間滞在ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
</panel.string>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
index 1c5ea2958bb70977b84a10215b2d2c8840b677f6..eb8a510b20138a08617a9ab0515f1661035f468f 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<panel name="script_experience" title="体験">
<button label="体験" name="Expand Experience"/>
- <check_box label="次ã®ä½“験を使用：" name="enable_xp"/>
+ <check_box label="体験を使用" name="enable_xp"/>
<layout_stack name="xp_details">
<layout_panel>
<combo_box label="体験をé¸æŠž..." name="Experiences..."/>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index a42dd12a9c61116390c725ddc4511900fc820c5f..32aeca0026dfcf189601bbf944d8cf4d7ef7626f
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
ç”»åƒã‚’インベントリã«ä¿å˜ã™ã‚‹ã«ã¯ L$[UPLOAD_COST] ã®è²»ç”¨ãŒã‹ã‹ã‚Šã¾ã™ã€‚ç”»åƒã‚’テクスãƒãƒ£ã¨ã—ã¦ä¿å˜ã™ã‚‹ã«ã¯å¹³æ–¹å½¢å¼ã® 1 ã¤ã‚’é¸æŠžã—ã¦ãã ã•ã„。
</text>
<combo_box label="解åƒåº¦" name="texture_size_combo">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/>
+ <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ (512x512)" name="CurrentWindow"/>
<combo_box.item label="å°ï¼ˆ128x128）" name="Small(128x128)"/>
<combo_box.item label="ä¸ï¼ˆ256x256）" name="Medium(256x256)"/>
<combo_box.item label="大（512x512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index 34763f78c12a5ab785a62d5e8ab91fd94361de91..1c55992336d7e7b06373bc442244c258fafd2552 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="æ質" name="Materials"/>
<combo_box.item label="メディア" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="テクスãƒãƒ£ (æ‹¡æ•£)" name="Texture (diffuse)"/>
- <combo_box.item label="凹凸 (標準)" name="Bumpiness (normal)"/>
- <combo_box.item label="è¼ã (åå°„)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="テクスãƒãƒ£ (æ‹¡æ•£)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="è¼ã (åå°„)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="テクスãƒãƒ£" name="texture control" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
<text name="label alphamode">
アルファモード
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
old mode 100755
new mode 100644
index d88847084617a4f8891349d96d5e9c199b6a7dbf..35e9b66bc8879f78bb5c1acdd8112259841a1580
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="item properties" title="アイテムã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«">
<panel.string name="loading_experience">
- （ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ï¼‰
+ (ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°)
</panel.string>
<panel.string name="unknown">
（ä¸æ˜Žï¼‰
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
old mode 100755
new mode 100644
index 22eb9ce88827f7a421b81873f6e7937e97c135ce..1ad977fe88550f4721af9115726165654148a45e
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -38,10 +38,7 @@
グラフィックをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚グラフィックドライãƒã‚’æ›´æ–°ã—ã¦ãã ã•ã„。
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
- </string>
- <string name="AboutCompiler">
- コンパイラー [COMPILER] [COMPILER_VERSION] ãƒãƒ¼ã‚¸ãƒ§ãƒ³
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
<string name="AboutPosition">
ã‚ãªãŸã®ç¾åœ¨åœ°ã¯ã€[POSITION_LOCAL_0,number,1]ã€[POSITION_LOCAL_1,number,1]ã€[POSITION_LOCAL_2,number,1] ã® [REGION] ã§ã™ã€‚ä½ç½®ã¯ <nolink>[HOSTNAME]</nolink> ã§ã™ã€‚（[HOSTIP]）
@@ -63,11 +60,10 @@ OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[OS_VERSION]
<string name="AboutLibs">
OpenGL ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[OPENGL_VERSION]
-libcurl ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[LIBCURL_VERSION]
J2C デコーダãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[J2C_VERSION]
オーディオドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[AUDIO_DRIVER_VERSION]
-Qt Webkit ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[QT_WEBKIT_VERSION]
-ボイスサーãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³:[VOICE_VERSION]
+LLCEFLib/CEF ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [LLCEFLIB_VERSION]
+ボイスサーãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [VOICE_VERSION]
</string>
<string name="AboutTraffic">
パケットãƒã‚¹ï¼š[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）
@@ -177,6 +173,12 @@ Qt Webkit ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[QT_WEBKIT_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Second Life メイングリッド (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Second Life ベータテストグリッド (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -452,6 +454,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
[AMOUNT] 以上ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å«ã‚€ãƒ•ã‚©ãƒ«ãƒ€ã‚’装ç€ã§ãã¾ã›ã‚“。「詳細è¨å®šã€ > 「デãƒãƒƒã‚°è¨å®šã‚’表示〠> 「WearFolderLimitã€ã§ã“ã®åˆ¶é™ã‚’変更ã§ãã¾ã™ã€‚
</string>
<string name="TooltipPrice" value="L$[AMOUNT]："/>
+ <string name="TooltipSLIcon">
+ ã“ã‚Œã¯ã€SecondLife.com ã¾ãŸã¯ LindenLab.com ã®å…¬å¼ãƒ‰ãƒ¡ã‚¤ãƒ³ä¸Šã®ãƒšãƒ¼ã‚¸ã«ãƒªãƒ³ã‚¯ã—ã¾ã™ã€‚
+ </string>
<string name="TooltipOutboxDragToWorld">
マーケットプレイスã®ãƒªã‚¹ãƒˆãƒ•ã‚©ãƒ«ãƒ€ã‹ã‚‰ã‚¢ã‚¤ãƒ†ãƒ ã‚’ Rez ã§ãã¾ã›ã‚“
</string>
@@ -471,7 +476,7 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
在庫アイテム数㌠[AMOUNT] 個を超ãˆã¦ã„ã¾ã™ã€‚
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- アイテムã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã¯ã€Œã™ã¹ã¦ã€ã‚¿ãƒ–ã«ã‚ˆã£ã¦ã®ã¿ãƒ‰ãƒãƒƒãƒ—ã§ãã¾ã™ã€‚ã“ã®ã‚¿ãƒ–ã‚’é¸æŠžã—ã¦ã‹ã‚‰ã€ã‚‚ã†ä¸€åº¦ã‚¢ã‚¤ãƒ†ãƒ ã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„。
+ アイテムã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã¯ã€Œã™ã¹ã¦ã€ã¾ãŸã¯ã€Œé–¢é€£ä»˜ã‘ã•ã‚Œã¦ã„ãªã„ã€ã‚¿ãƒ–ã«ã‚ˆã£ã¦ã®ã¿ãƒ‰ãƒãƒƒãƒ—ã§ãã¾ã™ã€‚ã“れらã®ã‚¿ãƒ–ã®ã„ãšã‚Œã‹ã‚’é¸æŠžã—ã¦ã‹ã‚‰ã€ã‚‚ã†ä¸€åº¦ã‚¢ã‚¤ãƒ†ãƒ ã¾ãŸã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„。
</string>
<string name="TooltipOutboxNoTransfer">
ã“れらã®ã‚ªãƒ–ジェクト㮠1 ã¤ã¾ãŸã¯è¤‡æ•°ã¯å£²ã‚Šæ¸¡ã—ãŸã‚Šè²æ¸¡ã—ãŸã‚Šã§ããªã„ã‚‚ã®ã§ã™
@@ -555,6 +560,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
クリックã—㦠secondlife:// コマンドを出ã—ã¾ã™
</string>
<string name="CurrentURL" value=" ç¾åœ¨ã® URL： [CurrentURL]"/>
+ <string name="TooltipEmail">
+ クリックã—ã¦é›»åメールを作æˆ
+ </string>
<string name="SLurlLabelTeleport">
テレãƒãƒ¼ãƒˆ
</string>
@@ -1080,7 +1088,7 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="AgentNameSubst">
(ã‚ãªãŸ)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
土地ã®ã‚¢ã‚¯ã‚»ã‚¹ãƒªã‚¹ãƒˆã‚’管ç†ã™ã‚‹ã¨ãã«ã‚¢ãƒ©ãƒ¼ãƒˆã‚’表示ã—ãªã„
</string>
@@ -1859,6 +1867,21 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="TodayOld">
今日å‚åŠ
</string>
+ <string name="av_render_everyone_now">
+ 全員ã«ã‚ãªãŸãŒè¦‹ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã—ãŸã€‚
+ </string>
+ <string name="av_render_not_everyone">
+ ã‚ãªãŸã®ã¾ã‚ã‚Šã®ä¸€éƒ¨ã®äººã«ã¯ã€ã‚ãªãŸãŒè¦‹ãˆãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ </string>
+ <string name="av_render_over_half">
+ ã‚ãªãŸã®å‘¨å›²ã®åŠåˆ†ä»¥ä¸Šã®äººã«ã€ã‚ãªãŸãŒè¡¨ç¤ºã•ã‚Œãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ </string>
+ <string name="av_render_most_of">
+ ã‚ãªãŸã®ã¾ã‚ã‚Šã®ã»ã¨ã‚“ã©ã®äººã«ã€ã‚ãªãŸãŒè¦‹ãˆãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ </string>
+ <string name="av_render_anyone">
+ ã‚ãªãŸã®ã¾ã‚ã‚Šã®èª°ã«ã‚‚ã‚ãªãŸãŒè¦‹ãˆãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
+ </string>
<string name="AgeYearsA">
[COUNT] å¹´
</string>
@@ -1976,6 +1999,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="CompileQueueUnknownFailure">
åŽŸå› ä¸æ˜Žã®å¤±æ•—ã«ã‚ˆã‚Šãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ãŒã§ãã¾ã›ã‚“
</string>
+ <string name="CompileNoExperiencePerm">
+ [EXPERIENCE] 体験ã«ã‚ˆã‚‹ [SCRIPT] スクリプトã®ã‚¹ã‚ップ。
+ </string>
<string name="CompileQueueTitle">
リコンパイル進行
</string>
@@ -2021,9 +2047,6 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="GroupsNone">
ãªã—
</string>
- <string name="CompileNoExperiencePerm">
- [EXPERIENCE] 体験ã«ã‚ˆã‚‹ [SCRIPT] スクリプトã®ã‚¹ã‚ップ。
- </string>
<string name="Group" value=" （グループ）"/>
<string name="Unknown">
（ä¸æ˜Žï¼‰
@@ -5379,23 +5402,11 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="UserDictionary">
[User]
</string>
- <string name="logging_calls_disabled_log_empty">
- 会話ã¯ãƒã‚°ã«è¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“。ãƒã‚°ã®è¨˜éŒ²ã‚’開始ã™ã‚‹ã«ã¯ã€ã€Œç’°å¢ƒè¨å®šã€>「ãƒãƒ£ãƒƒãƒˆã€ã§ã€Œä¿å˜: ãƒã‚°ã®ã¿ã€ã¾ãŸã¯ã€Œä¿å˜: ãƒã‚°ã¨ä¼šè©±ã®ãƒ†ã‚ストã€ã‚’é¸æŠžã—ã¾ã™ã€‚
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- ã“れ以上ã®ä¼šè©±ã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“。ãƒã‚°ã®è¨˜éŒ²ã‚’å†é–‹ã™ã‚‹ã«ã¯ã€ã€Œç’°å¢ƒè¨å®šã€>「ãƒãƒ£ãƒƒãƒˆã€ã§ã€Œä¿å˜: ãƒã‚°ã®ã¿ã€ã¾ãŸã¯ã€Œä¿å˜: ãƒã‚°ã¨ä¼šè©±ã®ãƒ†ã‚ストã€ã‚’é¸æŠžã—ã¾ã™ã€‚
- </string>
- <string name="logging_calls_enabled_log_empty">
- ãƒã‚°ã‚¤ãƒ³æ™‚ã®ä¼šè©±ã¯ã‚ã‚Šã¾ã›ã‚“。誰ã‹ã«ã”連絡ã—ãŸå¾Œã€ã¾ãŸã¯èª°ã‹ãŒã‚ãªãŸã«é€£çµ¡ã—ãŸå¾Œã€ãƒã‚°ã‚¨ãƒ³ãƒˆãƒªãŒã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
- </string>
- <string name="loading_chat_logs">
- ãƒãƒ¼ãƒ‰ä¸...
- </string>
<string name="experience_tools_experience">
体験
</string>
<string name="ExperienceNameNull">
- （体験ãªã—）
+ (体験ãªã—)
</string>
<string name="ExperienceNameUntitled">
(タイトルã®ãªã„体験)
@@ -5449,7 +5460,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
体験ã®æ¨©é™ã‚’自動的ã«æ‰¿è«¾
</string>
<string name="ExperiencePermissionShortUnknown">
- ãŒä¸æ˜Žãªæ“作を実行ã—ã¾ã—ãŸ: [Permission]
+ ãŒä¸æ˜Žãªæ“作を実行ã—ã¾ã—ãŸï¼š [Permission]
</string>
<string name="ExperiencePermissionShort1">
コントãƒãƒ¼ãƒ«ã™ã‚‹
@@ -5472,4 +5483,37 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="ExperiencePermissionShort12">
権é™
</string>
+ <string name="logging_calls_disabled_log_empty">
+ 会話ã¯ãƒã‚°ã«è¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“。ãƒã‚°ã®è¨˜éŒ²ã‚’開始ã™ã‚‹ã«ã¯ã€ã€Œç’°å¢ƒè¨å®šã€>「ãƒãƒ£ãƒƒãƒˆã€ã§ã€Œä¿å˜: ãƒã‚°ã®ã¿ã€ã¾ãŸã¯ã€Œä¿å˜: ãƒã‚°ã¨ä¼šè©±ã®ãƒ†ã‚ストã€ã‚’é¸æŠžã—ã¾ã™ã€‚
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ ã“れ以上ã®ä¼šè©±ã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“。ãƒã‚°ã®è¨˜éŒ²ã‚’å†é–‹ã™ã‚‹ã«ã¯ã€ã€Œç’°å¢ƒè¨å®šã€>「ãƒãƒ£ãƒƒãƒˆã€ã§ã€Œä¿å˜: ãƒã‚°ã®ã¿ã€ã¾ãŸã¯ã€Œä¿å˜: ãƒã‚°ã¨ä¼šè©±ã®ãƒ†ã‚ストã€ã‚’é¸æŠžã—ã¾ã™ã€‚
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ ãƒã‚°ã‚¤ãƒ³æ™‚ã®ä¼šè©±ã¯ã‚ã‚Šã¾ã›ã‚“。誰ã‹ã«ã”連絡ã—ãŸå¾Œã€ã¾ãŸã¯èª°ã‹ãŒã‚ãªãŸã«é€£çµ¡ã—ãŸå¾Œã€ãƒã‚°ã‚¨ãƒ³ãƒˆãƒªãŒã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
+ </string>
+ <string name="loading_chat_logs">
+ ãƒãƒ¼ãƒ‰ä¸...
+ </string>
+ <string name="preset_combo_label">
+ -空リスト-
+ </string>
+ <string name="Default">
+ デフォルト
+ </string>
+ <string name="none_paren_cap">
+ (ãªã—)
+ </string>
+ <string name="no_limit">
+ 無制é™
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ 物ç†å½¢çŠ¶ã«å°ã•ã™ãŽã‚‹ä¸‰è§’å½¢ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚物ç†ãƒ¢ãƒ‡ãƒ«ã‚’簡略化ã—ã¦ãã ã•ã„。
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ 物ç†å½¢çŠ¶ã«ä¸æ£ãªç¢ºèªãƒ‡ãƒ¼ã‚¿ãŒã‚ã‚Šã¾ã™ã€‚物ç†ãƒ¢ãƒ‡ãƒ«ã‚’ä¿®æ£ã—ã¦ãã ã•ã„。
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ 物ç†å½¢çŠ¶ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。物ç†ãƒ¢ãƒ‡ãƒ«ã«æ£ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è¨å®šã—ã¦ãã ã•ã„。
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
old mode 100755
new mode 100644
index f5098ba33cd38e2adfce57491cf1d06cdca51515..b9c75e8e88d0313feb21bd757f1a09b4aff96443
--- a/indra/newview/skins/default/xui/pl/floater_about.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -1,42 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_about" title="O [CAPITALIZED_APP_NAME]">
<tab_container name="about_tab">
- <panel label="Info" name="support_panel">
- <button label="Kopiuj do schowka" name="copy_btn"/>
+ <panel label="Informacje" name="support_panel">
+ <button label="Kopiuj do schowka" name="copy_btn" />
</panel>
- <panel label="Podziękowania" name="credits_panel">
- <text name="linden_intro">Second Life zostało dla Ciebie stworzone przez Lindenów,
-z wkładem open source od::</text>
- </panel>
- <panel label="Licencje" name="licenses_panel">
- <text_editor name="licenses_editor">3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
- APR Copyright (C) 2011 The Apache Software Foundation
- Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
- cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
- DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
- expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
- GL Copyright (C) 1999-2004 Brian Paul.
- GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
- google-perftools Copyright (c) 2005, Google Inc.
- Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
- jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
- jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
- ogg/vorbis Copyright (C) 2002, Xiphophorus
- OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
- PCRE Copyright (c) 1997-2012 University of Cambridge
- SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
- SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
-
- Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.
-
- This software contains source code provided by NVIDIA Corporation.
-
- All rights reserved. See licenses.txt for details.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)</text_editor>
+ <panel label="Podziękowania" name="credits_panel">
+ <text name="linden_intro">
+ Second Life zostało dla Ciebie stworzone przez Lindenów,
+ z wkładem open source od:
+ </text>
</panel>
+ <panel label="Licencje" name="licenses_panel" />
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
old mode 100755
new mode 100644
index badff11a5924367d15b7b04af81be3937f8da9f2..1646db897abfce00ed3a78e75ab4f7b16c79ffaf
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -1,14 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="O POSIADÅOÅšCI">
- <floater.string name="maturity_icon_general">
- "Parcel_PG_Dark"
- </floater.string>
- <floater.string name="maturity_icon_moderate">
- "Parcel_M_Dark"
- </floater.string>
- <floater.string name="maturity_icon_adult">
- "Parcel_R_Dark"
- </floater.string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterland" title="O DZIAÅCE">
<floater.string name="Minutes">
[MINUTES] minuty
</floater.string>
@@ -16,10 +7,10 @@
minuta
</floater.string>
<floater.string name="Seconds">
- [SECONDS] sekundy
+ [SECONDS] sekund
</floater.string>
<floater.string name="Remaining">
- pozostały
+ pozostało
</floater.string>
<tab_container name="landtab">
<panel label="OGÓLNE" name="land_general_panel">
@@ -30,25 +21,22 @@
Każdy
</panel.string>
<panel.string name="area_text">
- Obszar:
- </panel.string>
- <panel.string name="area_size_text">
- [AREA] m²
+ Obszar
</panel.string>
<panel.string name="auction_id_text">
- Numer aukcji: [ID]
+ ID aukcji: [ID]
</panel.string>
<panel.string name="need_tier_to_modify">
- Musisz zaakceptować zakup by móc modyfikować Posiadłość.
+ Musisz zaakceptować zakup by móc modyfikować tą działkę.
</panel.string>
<panel.string name="group_owned_text">
(Własność Grupy)
</panel.string>
<panel.string name="profile_text">
- Profil...
+ Profil
</panel.string>
<panel.string name="info_text">
- Info...
+ Informacje
</panel.string>
<panel.string name="public_text">
(publiczne)
@@ -57,14 +45,10 @@
(brak)
</panel.string>
<panel.string name="sale_pending_text">
- (Sprzedaż w toku realizacji)
+ (Sprzedaż w toku)
</panel.string>
<panel.string name="no_selection_text">
- Posiadłość nie wybrana.
-Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokazać jej dane.
- </panel.string>
- <panel.string name="time_stamp_template">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+ Nie wybrano działki.
</panel.string>
<text name="Name:">
Nazwa:
@@ -75,35 +59,36 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz
<text name="LandType">
Typ:
</text>
- <text name="LandTypeText">
- Region Główny / Ziemia
- </text>
<text name="ContentRating">
Rodzaj:
</text>
- <text name="ContentRatingText">
- 'Adult'
- </text>
<text name="Owner:">
Właściciel:
</text>
+ <text name="OwnerText">
+ Åadowanie...
+ </text>
+ <button label="Profil" name="Profile..." />
<text name="Group:">
Grupa:
</text>
- <button label="Ustaw" name="Set..."/>
- <check_box label="Udostępnij przypisywanie na Grupę" name="check deed" tool_tip="Oficer Grupy ma prawo przepisać prawo własności Posiadłości na Grupę. Posiadłość wspierana jest przez przydziały pochodzące od członków Grupy."/>
- <button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania Posiadłości na Grupę może dokonać jedynie oficer Grupy."/>
- <check_box label="Właścicel dokonuje wpłat związanych z Posiadłością" name="check contrib" tool_tip="Kiedy Posiadłość zostaje przypisana na Grupę, poprzedni Właściciel realizuje wpłaty z nią związane w celu jej utrzymania."/>
+ <text name="GroupText">
+ Åadowanie...
+ </text>
+ <button label="Ustaw" name="Set..." />
+ <check_box label="Udostępnij przypisywanie na Grupę" name="check deed" tool_tip="Oficer Grupy ma prawo przepisać prawo własności działki na Grupę. Działka wspierana jest przez przydziały pochodzące od członków Grupy." />
+ <button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania działki na Grupę może dokonać jedynie oficer Grupy." />
+ <check_box label="Właściciel opłaca działkę" name="check contrib" tool_tip="Kiedy działka zostaje przypisana na Grupę, poprzedni Właściciel realizuje wpłaty z nią związane w celu jej utrzymania." />
<text name="For Sale:">
- Na Sprzedaż:
+ Na sprzedaż:
</text>
<text name="Not for sale.">
- Nie
+ Nie na sprzedaż
</text>
<text name="For Sale: Price L$[PRICE].">
Cena: [PRICE]L$ ([PRICE_PER_SQM]L$/m²).
</text>
- <button label="Sprzedaj posiadłość" name="Sell Land..."/>
+ <button label="Sprzedaj działkę" name="Sell Land..." />
<text name="For sale to">
Na sprzedaż dla: [BUYER]
</text>
@@ -113,100 +98,85 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz
<text name="Selling with no objects in parcel.">
Obiekty nie są zawarte w sprzedaży.
</text>
- <button label="Anuluj sprzedaż" label_selected="Anuluj sprzedaż" name="Cancel Land Sale"/>
+ <button label="Anuluj sprzedaż" label_selected="Anuluj sprzedaż" name="Cancel Land Sale" />
<text name="Claimed:">
Data:
</text>
- <text name="DateClaimText">
- Tue Aug 15 13:47:25 2006
- </text>
<text name="PriceLabel">
Obszar:
</text>
- <text name="PriceText">
- 4048 m²
- </text>
<text name="Traffic:">
Ruch:
</text>
<text name="DwellText">
- 0
- </text>
- <button label="Kup Posiadłość..." label_selected="Kup Posiadłość..." left="130" name="Buy Land..." width="125"/>
- <button label="Skrypt" name="Scripts..."/>
- <button label="Kup dla Grupy" name="Buy For Group..."/>
- <button label="Kup Przepustkę..." label_selected="Kup Przeputkę..." left="130" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na posiadłość." width="125"/>
- <button label="Porzuć Posiadłość" name="Abandon Land..."/>
- <button label="Odzyskaj Posiadłość" name="Reclaim Land..."/>
- <button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Posiadłość musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję."/>
+ Wczytywanie...
+ </text>
+ <button label="Kup działkę" name="Buy Land..." />
+ <button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Działka musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję." />
+ <button label="Skrypty" name="Scripts..."/>
+ <button label="Kup dla Grupy" name="Buy For Group..." />
+ <button label="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę." />
+ <button label="Porzuć działkę" name="Abandon Land..." />
+ <button label="Odzyskaj działkę" name="Reclaim Land..." />
</panel>
<panel label="UMOWA" name="land_covenant_panel">
<panel.string name="can_resell">
- Posiadłość zakupiona w tym Regionie może być odsprzedana.
+ Działka zakupiona w tym Regionie może być odsprzedana.
</panel.string>
<panel.string name="can_not_resell">
- Posiadłość zakupiona w tym Regionie nie może być odsprzedana.
+ Działka zakupiona w tym Regionie nie może być odsprzedana.
</panel.string>
<panel.string name="can_change">
- Posiadłość zakupiona w tym Regionie może być łączona/dzielona.
+ Działka zakupiona w tym Regionie może być łączona/dzielona.
</panel.string>
<panel.string name="can_not_change">
- Posiadłość zakupiona w tym Regionie nie może być
+ Działka zakupiona w tym Regionie nie może być
Å‚Ä…czona/dzielona.
</panel.string>
<text name="estate_section_lbl">
MajÄ…tek:
</text>
- <text left="115" name="estate_name_text">
+ <text name="estate_name_text">
Główne
</text>
<text name="estate_owner_lbl">
Właściciel:
</text>
- <text left="115" name="estate_owner_text">
+ <text name="estate_owner_text">
(brak)
</text>
- <text_editor left="115" name="covenant_editor">
- Ta posiadłość nie wymaga żadej umowy.
+ <text_editor name="covenant_editor">
+ Ta działka nie posiada żadnej umowy.
</text_editor>
- <text left="115" name="covenant_timestamp_text">
- Ostatnia Modyfikacja Wed Dec 31 16:00:00 1969
+ <text name="covenant_timestamp_text">
+ Ostatnia modyfikacja Wed Dec 31 16:00:00 1969
</text>
- <text name="region_section_lbl">
- Region:
- </text>
- <text left="115" name="region_name_text">
- leyla
+ <text name="region_name_text">
+ Wczytywanie...
</text>
<text name="region_landtype_lbl">
Typ:
</text>
- <text left="115" name="region_landtype_text">
- Region Główny / Ziemia
- </text>
<text name="region_maturity_lbl">
Rodzaj:
</text>
- <text left="115" name="region_maturity_text">
- 'Adult'
- </text>
<text name="resellable_lbl">
Odsprzedaj:
</text>
- <text left="115" name="resellable_clause">
- Posiadłość zakupiona w tym Regionie nie może być odsprzedana.
+ <text name="resellable_clause">
+ Działka zakupiona w tym Regionie nie może być odsprzedana.
</text>
<text name="changeable_lbl">
Podziel:
</text>
- <text left="115" name="changeable_clause">
- Posiadłość zakupiona w tym Regionie nie może być
+ <text name="changeable_clause">
+ Działka zakupiona w tym Regionie nie może być
Å‚Ä…czona/dzielona.
</text>
</panel>
<panel label="OBIEKTY" name="land_objects_panel">
<panel.string name="objects_available_text">
- [COUNT] z [MAX] ([AVAILABLE] jest dostępne)
+ [COUNT] z [MAX] ([AVAILABLE] jest dostępnych)
</panel.string>
<panel.string name="objects_deleted_text">
[COUNT] z [MAX] ([DELETED] zostanie usunięte)
@@ -215,247 +185,235 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz
Ilość ekstra obiektów: [BONUS]
</text>
<text name="Simulator primitive usage:">
- Ilość używanych primów:
+ Pojemność regionu:
</text>
<text name="objects_available">
- [COUNT] z [MAX] ([AVAILABLE] jest dostępne)
+ [COUNT] z [MAX] ([AVAILABLE] jest dostępnych)
</text>
<text name="Primitives parcel supports:">
Maksymalna ilość primów:
</text>
- <text name="object_contrib_text">
- [COUNT]
- </text>
<text name="Primitives on parcel:">
- Primy na Posiadłości:
- </text>
- <text name="total_objects_text">
- [COUNT]
+ Primy na działce:
</text>
<text name="Owned by parcel owner:">
- Właściciela Posiadłości:
- </text>
- <text name="owner_objects_text">
- [COUNT]
+ Właściciela działki:
</text>
- <button label="Pokaż" label_selected="Pokaż" name="ShowOwner"/>
- <button label="Zwróć" name="ReturnOwner..." tool_tip="Zwróć obiekty do ich Właścicieli."/>
+ <button label="Pokaż" label_selected="Pokaż" name="ShowOwner" />
+ <button label="Zwróć" name="ReturnOwner..." tool_tip="Zwróć obiekty do ich Właścicieli." />
<text name="Set to group:">
Grupy:
</text>
- <text name="group_objects_text">
- [COUNT]
- </text>
- <button label="Pokaż" label_selected="Pokaż" name="ShowGroup"/>
- <button label="Zwróć" name="ReturnGroup..." tool_tip="Zwróć obiekty do ich Właścicieli.."/>
+ <button label="Pokaż" label_selected="Pokaż" name="ShowGroup" />
+ <button label="Zwróć" name="ReturnGroup..." tool_tip="Zwróć obiekty do ich Właścicieli." />
<text name="Owned by others:">
Innych Rezydentów:
</text>
- <text name="other_objects_text">
- [COUNT]
- </text>
- <button label="Pokaż" label_selected="Pokaż" name="ShowOther"/>
- <button label="Zwróć" name="ReturnOther..." tool_tip="Zwróć obiekty do ich Właścicieli."/>
+ <button label="Pokaż" label_selected="Pokaż" name="ShowOther" />
+ <button label="Zwróć" name="ReturnOther..." tool_tip="Zwróć obiekty do ich Właścicieli." />
<text name="Selected / sat upon:">
Wybranych:
</text>
- <text name="selected_objects_text">
- [COUNT]
- </text>
<text name="Autoreturn">
Zwracaj obiekty innych Rezydentów (minut, 0 = wyłącz):
</text>
<text name="Object Owners:">
- Właściciel obiektów:
+ Właściciele:
</text>
- <button label="Odśwież listę" label_selected="Odśwież listę" name="Refresh List" tool_tip="Refresh Object List"/>
- <button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." name="Return objects..."/>
+ <button name="Refresh List" tool_tip="Odśwież listę obiektów" />
+ <button label="Zwróć obiekty" name="Return objects..." />
<name_list name="owner list">
- <name_list.columns label="Typ" name="type"/>
- <name_list.columns name="online_status"/>
- <name_list.columns label="Nazwa" name="name"/>
- <name_list.columns label="Liczba" name="count"/>
- <name_list.columns label="Najbardziej aktualne" name="mostrecent"/>
+ <name_list.columns label="Typ" name="type" />
+ <name_list.columns label="Nazwa" name="name" />
+ <name_list.columns label="Ilość" name="count" />
+ <name_list.columns label="Najnowsze" name="mostrecent" />
</name_list>
</panel>
<panel label="OPCJE" name="land_options_panel">
<panel.string name="search_enabled_tooltip">
- Udostępnij wyświetlanie tej Posiadłości w wyszukiwarce
+ Udostępnij tą działkę w wyszukiwarce
</panel.string>
<panel.string name="search_disabled_small_tooltip">
- Wybrana opcja jest wyłączona, ponieważ wielkość Posiadłości wynosi 128 m² bądź mniej.
-Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki.
+ Wybrana opcja jest wyłączona, ponieważ wielkość działki wynosi 128 m² bądź mniej.
+Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
</panel.string>
<panel.string name="search_disabled_permissions_tooltip">
- Wybrana opcja jest wyłączona ponieważ nie posiadasz prawa do modyfikacji Posiadłości.
+ Wybrana opcja jest wyłączona, ponieważ nie posiadasz prawa do modyfikacji działki.
</panel.string>
<panel.string name="mature_check_mature">
- Treść 'Mature'
+ Treść Moderate
</panel.string>
<panel.string name="mature_check_adult">
- Treść 'Adult'
+ Treść Adult
</panel.string>
<panel.string name="mature_check_mature_tooltip">
- Twoja Posiadłość bądź treść jaką zawiera klasyfikowana jest jako 'Mature'.
+ Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Moderate.
</panel.string>
<panel.string name="mature_check_adult_tooltip">
- Informacje o Twojej Posiadłości i treści jaką zawiera klasyfikowane są jako 'Adult'.
+ Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Adult
</panel.string>
<panel.string name="landing_point_none">
(brak)
</panel.string>
<panel.string name="push_restrict_text">
- Popychanie niedozwolone
+ Zakaz popychania
</panel.string>
<panel.string name="push_restrict_region_text">
- Popychanie niedozwolone (Ustawienie Regionu)
+ Zakaz popychania (cały Region)
</panel.string>
<text name="allow_label">
Udostępnij innym Rezydentom:
</text>
- <check_box label="Edytowanie Terenu" name="edit land check" tool_tip="Wybrana - każdy może kształtować Twój teren. Najlepiej jest zostawić tą opcję nie wybraną, Ty zawsze możesz kształtować Twój teren."/>
- <check_box label="Latanie" name="check fly" tool_tip="Wybrana - Rezydenci mogą latać na Twojej Posiadłości. Nie jest wybrana - mogą tylko wlatywać do lub latać ponad Twoją Posiadłością."/>
+ <text name="allow_label0">
+ Latanie:
+ </text>
+ <check_box label="Wszyscy" name="check fly" tool_tip="Wybrana - Rezydenci mogą latać na Twojej działce. Nie jest wybrana - mogą tylko wlatywać do lub latać ponad Twoją działką." />
<text name="allow_label2">
Budowanie:
</text>
- <check_box label="Wszyscy" name="edit objects check"/>
- <check_box label="Grupa" name="edit group objects check"/>
+ <check_box label="Wszyscy" name="edit objects check" />
+ <check_box label="Grupa" name="edit group objects check" />
<text name="allow_label3">
Nowe obiekty:
</text>
- <check_box label="Wszyscy" name="all object entry check"/>
- <check_box label="Grupa" name="group object entry check"/>
+ <check_box label="Wszyscy" name="all object entry check" />
+ <check_box label="Grupa" name="group object entry check" />
<text name="allow_label4">
Skrypty:
</text>
- <check_box label="Wszyscy" name="check other scripts"/>
- <check_box label="Grupa" name="check group scripts"/>
- <text name="land_options_label">
- Opcje Posiadłości:
- </text>
- <check_box label="Bezpieczna (brak zniszczeń)" name="check safe" tool_tip="Wybrana - Posiadłość jest bezpieczna - zniszczenia w walce są zablokowane. Nie jest wybrana - zniszczenia w walce są włączone."/>
- <check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju w Twojej Posiadłości."/>
- <check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy Posiadłości w wyszukiwarce"/>
- <combo_box name="land category with adult">
- <combo_box.item label="Każda kategoria" name="item0"/>
- <combo_box.item label="Linden Lokalizacja" name="item1"/>
- <combo_box.item label="'Adult'" name="item2"/>
- <combo_box.item label="Sztuka i kultura" name="item3"/>
- <combo_box.item label="Biznes" name="item4"/>
- <combo_box.item label="Edukacyjna" name="item5"/>
- <combo_box.item label="Gra" name="item6"/>
- <combo_box.item label="Poznawanie ludzi" name="item7"/>
- <combo_box.item label="Przyjazne dla nowych" name="item8"/>
- <combo_box.item label="Park i natura" name="item9"/>
- <combo_box.item label="Mieszkalna" name="item10"/>
- <combo_box.item label="Zakupy" name="item11"/>
- <combo_box.item label="Opłata za wynajęcie" name="item13"/>
- <combo_box.item label="Inna" name="item12"/>
- </combo_box>
+ <check_box label="Wszyscy" name="check other scripts" />
+ <check_box label="Grupa" name="check group scripts" />
+ <check_box label="Bezpieczna (brak uszkodzeń)" name="check safe" tool_tip="Wybrana - działka jest bezpieczna - uszkodzenia w walce są zablokowane. Nie jest wybrana - uszkodzenia w walce są włączone." />
+ <check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju na Twojej działce." />
+ <check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy działki w wyszukiwarce" />
<combo_box name="land category">
- <combo_box.item label="Każda kategoria" name="item0"/>
- <combo_box.item label="Linden Lokalizacja" name="item1"/>
- <combo_box.item label="Sztuka i kultura" name="item3"/>
- <combo_box.item label="Biznes" name="item4"/>
- <combo_box.item label="Edukacyjna" name="item5"/>
- <combo_box.item label="Gra" name="item6"/>
- <combo_box.item label="Poznawanie ludzi" name="item7"/>
- <combo_box.item label="Przyjazna dla nowych" name="item8"/>
- <combo_box.item label="Parki i natura" name="item9"/>
- <combo_box.item label="Mieszkalna" name="item10"/>
- <combo_box.item label="Zakupy" name="item11"/>
- <combo_box.item label="Opłata za wynajęcie" name="item13"/>
- <combo_box.item label="Inna" name="item12"/>
+ <combo_box.item label="Każda kategoria" name="item0" />
+ <combo_box.item label="Lokalizacja Lindenów" name="item1" />
+ <combo_box.item label="Sztuka i kultura" name="item3" />
+ <combo_box.item label="Biznes" name="item4" />
+ <combo_box.item label="Edukacyjna" name="item5" />
+ <combo_box.item label="Gra" name="item6" />
+ <combo_box.item label="Poznawanie ludzi" name="item7" />
+ <combo_box.item label="Przyjazna dla nowych" name="item8" />
+ <combo_box.item label="Parki i natura" name="item9" />
+ <combo_box.item label="Mieszkalna" name="item10" />
+ <combo_box.item label="Zakupy" name="item11" />
+ <combo_box.item label="Wynajem" name="item13" />
+ <combo_box.item label="Inna" name="item12" />
</combo_box>
- <check_box label="Treść 'Mature'" name="MatureCheck" tool_tip=""/>
+ <check_box label="Treść Moderate" name="MatureCheck" />
<text name="Snapshot:">
Zdjęcie:
</text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Kliknij by wybrać zdjęce"/>
+ <texture_picker name="snapshot_ctrl" tool_tip="Kliknij by wybrać zdjęcie" />
+ <text name="allow_label5">
+ Awatary na innych działkach mogą rozmawiać/widzieć awatary na tej działce
+ </text>
+ <check_box name="SeeAvatarsCheck" tool_tip="Pozwala Rezydentom z innych działek widzieć i rozmawiać z Rezydentami na tej działce - oraz Tobie, widzieć ich i rozmawiać z nimi." />
<text name="landing_point">
Punkt LÄ…dowania: [LANDING]
</text>
- <button label="Ustaw" label_selected="Ustaw" name="Set" tool_tip="Ustal miejsce lądowania dla przybywających gości. Używa położenia Twojego awatara na tej posiadłości."/>
- <button label="Nowy" label_selected="Nowy" name="Clear" tool_tip="Usuń dotychczasowe miejsce lądowania."/>
+ <button label="Ustaw" label_selected="Ustaw" name="Set" tool_tip="Ustal miejsce lądowania dla przybywających gości. Używa położenia Twojego awatara na tej działce." />
+ <button label="Wyczyść" label_selected="Wyczyść" name="Clear" tool_tip="Usuń dotychczasowe miejsce lądowania" />
<text name="Teleport Routing: ">
Trasa teleportacji:
</text>
- <combo_box name="landing type" tool_tip="Trasa teleportacj-ustaw w jaki sposób będzie sę odbywać proces telportacji w Posiadłości.">
- <combo_box.item label="Zablokowana" name="Blocked"/>
- <combo_box.item label="Punkt LÄ…dowania" name="LandingPoint"/>
- <combo_box.item label="Gdziekolwiek" name="Anywhere"/>
+ <combo_box name="landing type" tool_tip="Trasa teleportacji - ustaw w jaki sposób będzie się odbywać proces teleportacji na działce">
+ <combo_box.item label="Zablokowana" name="Blocked" />
+ <combo_box.item label="Punkt LÄ…dowania" name="LandingPoint" />
+ <combo_box.item label="Gdziekolwiek" name="Anywhere" />
</combo_box>
</panel>
- <panel label="MEDIA" name="land_media_panel">
+ <panel name="land_media_panel">
<text name="with media:">
Typ mediów:
</text>
- <combo_box name="media type" tool_tip=""/>
+ <combo_box name="media type" tool_tip="Określa, czy URL prowadzi do filmu, strony internetowej albo innego typu mediów" />
<text name="at URL:">
URL mediów:
</text>
- <button label="Ustaw" name="set_media_url"/>
+ <button label="Ustaw" name="set_media_url" />
<text name="Description:">
Opis:
</text>
- <line_editor name="url_description" tool_tip="Text displayed next to play/load button"/>
+ <line_editor name="url_description" tool_tip="Tekst wyświetlany obok przycisku odtwórz/załaduj" />
<text name="Media texture:">
- Zmień
-TeksturÄ™:
+ Zmień teksturę:
</text>
- <texture_picker label="" name="media texture" tool_tip="Kliknij by wybrać zdjęcie"/>
+ <texture_picker name="media texture" tool_tip="Kliknij by wybrać zdjęcie" />
<text name="replace_texture_help">
Obiekty używające tej tekstury będą wyświetlały film lub stronę internetową po naciśnięciu przycisku odtwarzania. Wybierz miniaturę, jeśli chcesz zmienić teksturę.
</text>
- <check_box label="Automatyczna Skala" name="media_auto_scale" tool_tip="Wybranie tej opcji dobierze odpowiedni rozmiar zawartości mediów dla tej posiadłości automatycznie. Może to mieć znaczący wpływ na jakość odtwarzanego materialu - może zwolnić i zmniejszyć jakość materiału."/>
+ <check_box label="Skaluj automatycznie" name="media_auto_scale" tool_tip="Wybranie tej opcji dobierze rozmiar zawartości mediów dla tej działki automatycznie. Może to mieć znaczący wpływ na jakość odtwarzanego materiału - może on być odtwarzany wolniej i w gorszej jakości, ale żadne dalsze działania nie będą potrzebne." />
<text name="media_size" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych.">
Rozmiar:
</text>
- <spinner name="media_size_width" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych."/>
- <spinner name="media_size_height" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych."/>
+ <spinner name="media_size_width" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych." />
+ <spinner name="media_size_height" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych." />
<text name="pixels">
- pixeli
+ pikseli
</text>
<text name="Options:">
- Opcje
-Mediów:
+ Opcje:
</text>
- <check_box label="Powtórka Odtwarzania" name="media_loop" tool_tip="Odtwarzaj media z powtórką. Po wyświetleniu materialu, rozpocznie się odtwarzanie od początku."/>
+ <check_box label="Odtwarzanie mediów w pętli" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku." />
</panel>
<panel label="DŹWIĘK" name="land_audio_panel">
- <check_box label="Rozmowy dozwolone" name="parcel_enable_voice_channel"/>
- <check_box label="Rozmowy dozwolone (ustawione przez MajÄ…tek)" name="parcel_enable_voice_channel_is_estate_disabled"/>
- <check_box label="Ogranicz komunikację głosową w tej Posiadłości." name="parcel_enable_voice_channel_local"/>
+ <text name="MusicURL:">
+ URL muzyki:
+ </text>
+ <text name="Sound:">
+ Dźwięk:
+ </text>
+ <check_box label="Ogranicz dźwięki gestów i obiektów do obszaru tej działki" name="check sound local" />
+ <text name="Avatar Sounds:">
+ Dźwięki awatarów:
+ </text>
+ <check_box label="Wszyscy" name="all av sound check" />
+ <check_box label="Grupa" name="group av sound check" />
+ <text name="Voice settings:">
+ Rozmowy głosowe:
+ </text>
+ <check_box label="Rozmowy włączone" name="parcel_enable_voice_channel" />
+ <check_box label="Rozmowy włączone (ustawione przez Majątek)" name="parcel_enable_voice_channel_is_estate_disabled" />
+ <check_box label="Ogranicz komunikację głosową do obszaru tej działki" name="parcel_enable_voice_channel_local" />
</panel>
<panel label="DOSTĘP" name="land_access_panel">
<panel.string name="access_estate_defined">
(Zdefiniowane przez MajÄ…tek)
</panel.string>
- <panel.string name="allow_public_access">
- Udostępniaj publicznie ([MATURITY]) (Pamiętaj: w przypadku braku zaznaczenia tej opcji widoczne będą linie bana.)
- </panel.string>
<panel.string name="estate_override">
- Jedna lub więcej z tych opcji ustawiona jest z poziomu Posiadłości
+ Jedna lub więcej z tych opcji ustawiona jest z poziomu Majątku
</panel.string>
- <text name="Limit access to this parcel to:">
- Dostęp do tej Posiadłości:
- </text>
- <check_box label="Publiczny [MATURITY]" name="public_access"/>
+ <check_box name="public_access" label="Dostęp publiczny (brak zaznaczenia tej opcji = widoczne linie zakazu)" />
<text name="Only Allow">
- Zablokuj dostęp dla:
+ Umożliwiaj dostęp tylko dla:
</text>
- <check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym z Linden Lab."/>
- <check_box label="Weryfikacja Wieku: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów bez Weryfikacji Wieku. Odwiedź support.secondlife.com po więcej informacji."/>
- <check_box label="Udostępnij wejście Grupie: [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce"/>
- <check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej Posiadłości"/>
+ <check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
+ <check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
+ <check_box label="Udostępnij wejście grupie [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce." />
+ <check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej działki" />
<combo_box name="pass_combo">
- <combo_box.item label="Każdemu" name="Anyone"/>
- <combo_box.item label="Grupie" name="Group"/>
+ <combo_box.item label="Każdemu" name="Anyone" />
+ <combo_box.item label="Grupie" name="Group" />
</combo_box>
- <spinner label="Cena w L$:" name="PriceSpin"/>
- <spinner label="Ilość godzin dostępu:" name="HoursSpin"/>
+ <spinner label="Cena w L$:" name="PriceSpin" />
+ <spinner label="Godziny dostępu:" name="HoursSpin" />
<panel name="Allowed_layout_panel">
- <name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)"/>
+ <text label="Zawsze Zezwalaj" name="AllowedText">
+ Dozwoleni Rezydenci
+ </text>
+ <name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] maksimum)" />
+ <button label="Dodaj" name="add_allowed" />
+ <button label="Usuń" label_selected="Usuń" name="remove_allowed" />
+ </panel>
+ <panel name="Banned_layout_panel">
+ <text label="Banuj" name="BanCheck">
+ Zbanowani Rezydenci
+ </text>
+ <name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] maksimum)" />
+ <button label="Dodaj" name="add_banned" />
+ <button label="Usuń" label_selected="Usuń" name="remove_banned" />
</panel>
</panel>
</tab_container>
diff --git a/indra/newview/skins/default/xui/pl/floater_activeim.xml b/indra/newview/skins/default/xui/pl/floater_activeim.xml
old mode 100755
new mode 100644
index 2a34409f8bc21b6c1b8fbdc34ac3eff3803a59d6..6e3b73b8fb7d29c2383a32c6d38ff9e4636c2aa0
--- a/indra/newview/skins/default/xui/pl/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/pl/floater_activeim.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_activeim" title="AKTYWNY IM"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_activeim" title="AKTYWNA ROZMOWA PRYWATNA" />
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff2fee6f2f33dea7aeabe1a1ab9126b0b1732776
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_animation_anim_preview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Anim Preview">
+ <text name="name_label">
+ Nazwa:
+ </text>
+ <text name="description_label">
+ Opis:
+ </text>
+ <button label="Załaduj ([AMOUNT]L$)" name="ok_btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18212fad9cdf098faa639fa4f351431a87976641
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Animation Preview">
+ <floater.string name="failed_to_initialize">
+ Inicjalizacja ruchu nie powiodła się.
+ </floater.string>
+ <floater.string name="anim_too_long">
+ Długość pliku animacji wynosi [LENGTH] sekund.
+Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund.
+ </floater.string>
+ <floater.string name="failed_file_read">
+ Nie można odczytać pliku animacji.
+[STATUS]
+ </floater.string>
+ <floater.string name="E_ST_EOF">
+ Przedwczesny koniec pliku.
+ </floater.string>
+ <floater.string name="E_ST_NO_CONSTRAINT">
+ Nie można odczytać definicji więzów.
+ </floater.string>
+ <floater.string name="E_ST_NO_FILE">
+ Plik BVH nie może zostać otworzony.
+ </floater.string>
+ <floater.string name="E_ST_NO_HIER">
+ Niewłaściwy nagłówek HIERARCHII.
+ </floater.string>
+ <floater.string name="E_ST_NO_JOINT">
+ ROOT lub JOINT nieodnalezione.
+ </floater.string>
+ <floater.string name="E_ST_NO_NAME">
+ Brak nazwy JOINT.
+ </floater.string>
+ <floater.string name="E_ST_NO_OFFSET">
+ OFFSET nieodnalezione.
+ </floater.string>
+ <floater.string name="E_ST_NO_CHANNELS">
+ CHANNELS nieodnalezione.
+ </floater.string>
+ <floater.string name="E_ST_NO_ROTATION">
+ Nie można uzyskać kolejności obrotu.
+ </floater.string>
+ <floater.string name="E_ST_NO_AXIS">
+ Brak osi obrotu.
+ </floater.string>
+ <floater.string name="E_ST_NO_MOTION">
+ MOTION nieodnalezione.
+ </floater.string>
+ <floater.string name="E_ST_NO_FRAMES">
+ Nie można uzyskać liczby klatek obrazu.
+ </floater.string>
+ <floater.string name="E_ST_NO_FRAME_TIME">
+ Nie można uzyskać czasu klatki obrazu.
+ </floater.string>
+ <floater.string name="E_ST_NO_POS">
+ Nie można uzyskać wartości pozycji.
+ </floater.string>
+ <floater.string name="E_ST_NO_ROT">
+ Nie można odczytać wartości obrotu.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_FILE">
+ Nie można otworzyć pliku tłumaczenia.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_HEADER">
+ Nie można przeczytać tłumaczenia nagłówka.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_NAME">
+ Nie można przetłumaczyć nazw.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_IGNORE">
+ Nie można przeczytać wartości ignorowania dla tłumaczenia.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_RELATIVE">
+ Nie można przeczytać wartości relatywnej dla tłumaczenia.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_OUTNAME">
+ Nie można przeczytać wartości rozszerzenia nazw dla tłumaczenia.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_MATRIX">
+ Nie można odczytać macierzy translacji.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_MERGECHILD">
+ Nie można uzyskać nazwy dla mergechild.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_MERGEPARENT">
+ Nie można uzyskać nazwy dla mergeparent.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_PRIORITY">
+ Nie można uzyskać wartości priorytetu.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_LOOP">
+ Nie można uzyskać wartości powtórzeń.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_EASEIN">
+ Nie można uzyskać wartości easeIn.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_EASEOUT">
+ Nie można uzyskać wartości dla easeOut.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_HAND">
+ Nie można uzyskać wartości morfizacji dla ręki.
+ </floater.string>
+ <floater.string name="E_ST_NO_XLT_EMOTE">
+ Nie można odczytać nazwy emocji.
+ </floater.string>
+ <floater.string name="E_ST_BAD_ROOT">
+ Nieprawidłowa nazwa dla roota, użyj "hip".
+ </floater.string>
+ <text name="name_label">
+ Nazwa:
+ </text>
+ <text name="description_label">
+ Opis:
+ </text>
+ <spinner label="Pierwszeństwo" name="priority" tool_tip="Kontroluj animacje, które mogą zostać zdominowane przez tą animację" />
+ <check_box label="Powtarzaj" name="loop_check" tool_tip="Powtarzaj tą animację w pętli" />
+ <spinner label="Od(%)" name="loop_in_point" tool_tip="Wybierz punkt, od którego chcesz zacząć powtarzać animację" />
+ <spinner label="Do(%)" name="loop_out_point" tool_tip="Wybierz punkt, od którego chcesz zakończyć powtarzanie animacji" />
+ <text name="hand_label">
+ Poz. ręki
+ </text>
+ <combo_box name="hand_pose_combo" tool_tip="Kontroluje co robi ręka podczas animacji">
+ <combo_box.item label="RozciÄ…gaj" name="Spread" />
+ <combo_box.item label="Odpocznij" name="Relaxed" />
+ <combo_box.item label="Wskazuj" name="PointBoth" />
+ <combo_box.item label="Pięść" name="Fist" />
+ <combo_box.item label="Lewa-Odpocznij" name="RelaxedLeft" />
+ <combo_box.item label="Wskazuj lewÄ…" name="PointLeft" />
+ <combo_box.item label="Zaciśnij lewą" name="FistLeft" />
+ <combo_box.item label="Prawa-odpocznij" name="RelaxedRight" />
+ <combo_box.item label="Wskazuj prawÄ…" name="PointRight" />
+ <combo_box.item label="Zaciśnij prawą" name="FistRight" />
+ <combo_box.item label="Salutuj prawÄ…" name="SaluteRight" />
+ <combo_box.item label="Pisz" name="Typing" />
+ <combo_box.item label="Prawa-pokój" name="PeaceRight" />
+ </combo_box>
+ <text name="emote_label">
+ Ekspresja
+ </text>
+ <combo_box name="emote_combo" tool_tip="Kontroluj mimikÄ™ twarzy w czasie animacji">
+ <item label="(Brak)" name="[None]" />
+ <item label="Obawa" name="Afraid" />
+ <item label="Złość" name="Angry" />
+ <item label="Duży uśmiech" name="BigSmile" />
+ <item label="Znudzenie" name="Bored" />
+ <item label="PÅ‚acz" name="Cry" />
+ <item label="Wzgarda" name="Disdain" />
+ <item label="Zakłopotanie" name="Embarrassed" />
+ <item label="Marszczenie brwi" name="Frown" />
+ <item label="Pocałunek" name="Kiss" />
+ <item label="Åšmiech" name="Laugh" />
+ <item label="Odrzucenie" name="Repulsed" />
+ <item label="Smutek" name="Sad" />
+ <item label="Wzruszenie ramionami" name="Shrug" />
+ <item label="Uśmiech" name="Smile" />
+ <item label="Niespodzianka" name="Surprise" />
+ <item label="Mrugnięcie" name="Wink" />
+ <item label="Zmartwienie" name="Worry" />
+ </combo_box>
+ <text name="preview_label">
+ PodglÄ…d gdy
+ </text>
+ <combo_box name="preview_base_anim" tool_tip="Przetestuj zachowanie animacji kiedy awatar wykonuje normalne czynności">
+ <item label="Stoisz" name="Standing" />
+ <item label="Chodzisz" name="Walking" />
+ <item label="Siedzisz" name="Sitting" />
+ <item label="Latasz" name="Flying" />
+ </combo_box>
+ <spinner label="Åagodź wej. (sek)" name="ease_in_time" tool_tip="Ilość czasu (w sekundach), po których animacje mieszajÄ… siÄ™" />
+ <spinner label="Åagodź wyj. (sek)" name="ease_out_time" tool_tip="Ilość czasu (w sekundach), po których animacje oddzielajÄ… siÄ™" />
+ <button name="play_btn" tool_tip="Odtwarzaj animacjÄ™" />
+ <button name="pause_btn" tool_tip="Pauzuj animacjÄ™" />
+ <button name="stop_btn" tool_tip="Zakończ odtwarzanie" />
+ <text name="bad_animation_text">
+ Nie można wczytać pliku animacji.
+Doradzamy eksport plików BVH z Poser 4.
+ </text>
+ <button label="Załaduj ([AMOUNT]L$)" name="ok_btn" />
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
deleted file mode 100755
index 3402d8d31fd287f20e4c2ca5b50ac9c7a83d0de1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
- <floater.string name="failed_to_initialize">
- Inicjalizacja ruchu nie powiodła się.
- </floater.string>
- <floater.string name="anim_too_long">
- Długość pliku animacji wynosi [LENGTH] sekund.
-
-Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund.
- </floater.string>
- <floater.string name="failed_file_read">
- Brak możliwości odczytania plików animacji do wyświetlenia.
-
-[STATUS]
- </floater.string>
- <floater.string name="E_ST_OK">
- Ok
- </floater.string>
- <floater.string name="E_ST_EOF">
- Niewłaściwe zakończenie nazwy pliku.
- </floater.string>
- <floater.string name="E_ST_NO_CONSTRAINT">
- Brak możliwości wyświetlenia definicji ograniczenia.
- </floater.string>
- <floater.string name="E_ST_NO_FILE">
- Plik BVH nie może zostać otworzony.
- </floater.string>
- <floater.string name="E_ST_NO_HIER">
- Niewłaściwy nagłówek HIERARCHII.
- </floater.string>
- <floater.string name="E_ST_NO_JOINT">
- ROOT oraz JOINT nieodnalezione.
- </floater.string>
- <floater.string name="E_ST_NO_NAME">
- Brak nazwy JOINT.
- </floater.string>
- <floater.string name="E_ST_NO_OFFSET">
- OFFSET nieodnalezione.
- </floater.string>
- <floater.string name="E_ST_NO_CHANNELS">
- CHANNELS nieodnalezione.
- </floater.string>
- <floater.string name="E_ST_NO_ROTATION">
- Brak otrzymania kolejności obrotu.
- </floater.string>
- <floater.string name="E_ST_NO_AXIS">
- Brak osi obrotu.
- </floater.string>
- <floater.string name="E_ST_NO_MOTION">
- MOTION nieodnalezione.
- </floater.string>
- <floater.string name="E_ST_NO_FRAMES">
- Brak otrzymania liczby klatek obrazu.
- </floater.string>
- <floater.string name="E_ST_NO_FRAME_TIME">
- Brak otrzymania czasu dla ilości klatek obrazu.
- </floater.string>
- <floater.string name="E_ST_NO_POS">
- Brak otrzymania wartości pozycji.
- </floater.string>
- <floater.string name="E_ST_NO_ROT">
- Nie można odczytać wartości obrotu.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_FILE">
- Nie można otworzyć pliku tłumaczenia.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_HEADER">
- Nie można przeczytać tłumaczenia nagłówka.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_NAME">
- Nie można przetłumaczyć nazw.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_IGNORE">
- Nie można przeczytać tłumaczenia dla wartości ignorowania.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_RELATIVE">
- Nie można przeczytać tłumaczenia wartości relatywnej.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_OUTNAME">
- Nie można przeczytać nazw wartości tłumaczenia.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_MATRIX">
- Nie można przeczytać tłumaczenia pola.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_MERGECHILD">
- Brak otrzymania nazwy dla mergechild.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_MERGEPARENT">
- Brak otrzymania nazwy dla mergeparent.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_PRIORITY">
- Brak wartości prerogatywy.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_LOOP">
- Brak otrzymania wartości powtórzeń.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_EASEIN">
- Brak otrzymawnia wartości easeIn.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_EASEOUT">
- Brak otrzymania wartości dla easeOut.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_HAND">
- Brak otrzymania wartości morfizacji.
- </floater.string>
- <floater.string name="E_ST_NO_XLT_EMOTE">
- Nie można odczytać nazwy emocji.
- </floater.string>
- <floater.string name="E_ST_BAD_ROOT">
- Nieprawidłowa nazwa, użyj "hip".
- </floater.string>
- <text name="name_label">
- Nazwa:
- </text>
- <text name="description_label">
- Opis:
- </text>
- <spinner label="Pierwszeństwo" name="priority" tool_tip="Kontroluj animacje,które mogą zostać zdominowane przez tą animację"/>
- <check_box label="Powtarzaj" name="loop_check" tool_tip="Powtarzaj tÄ… animacjÄ™"/>
- <spinner label="Od(%)" name="loop_in_point" tool_tip="Wybierz punkt, od którego chcesz zacząć powtarzać animację"/>
- <spinner label="Do(%)" name="loop_out_point" tool_tip="Wybierz punkt, od którego chcesz zakończyć powtarzanie animacji"/>
- <text name="hand_label">
- Pozycja ręki
- </text>
- <combo_box label="" name="hand_pose_combo" tool_tip="Kontroluje co robi ręka podczas animacji">
- <combo_box.item label="RozciÄ…gaj" name="Spread"/>
- <combo_box.item label="Odpocznij" name="Relaxed"/>
- <combo_box.item label="Wskazuj" name="PointBoth"/>
- <combo_box.item label="Pięść" name="Fist"/>
- <combo_box.item label="Lewa-Odpocznij" name="RelaxedLeft"/>
- <combo_box.item label="Wskazuj lewÄ…" name="PointLeft"/>
- <combo_box.item label="Zaciśnij lewą" name="FistLeft"/>
- <combo_box.item label="Prawa-odpocznij" name="RelaxedRight"/>
- <combo_box.item label="Wskazuj prawÄ…" name="PointRight"/>
- <combo_box.item label="Zaciśnij prawą" name="FistRight"/>
- <combo_box.item label="Salutuj prawÄ…" name="SaluteRight"/>
- <combo_box.item label="Pisz" name="Typing"/>
- <combo_box.item label="Prawa-pokój" name="PeaceRight"/>
- </combo_box>
- <text name="emote_label">
- Ekspresja
- </text>
- <combo_box label="" name="emote_combo" tool_tip="Kontroluj mimikÄ™ twarzy w czasie animacji">
- <item label="(Żadne)" name="[None]" value=""/>
- <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
- <item label="Obawa" name="Afraid" value="Obawa"/>
- <item label="Złość" name="Angry" value="Złość"/>
- <item label="Duży uśmiech" name="BigSmile" value="Duży uśmiech"/>
- <item label="Znudzenie" name="Bored" value="Znudzenie"/>
- <item label="PÅ‚acz" name="Cry" value="PÅ‚acz"/>
- <item label="Wzgarda" name="Disdain" value="Wzgarda"/>
- <item label="Zakłopotanie" name="Embarrassed" value="Zakłopotanie"/>
- <item label="Marszczenie brwi" name="Frown" value="Marszczenie brwi"/>
- <item label="Pocałunek" name="Kiss" value="Pocałunek"/>
- <item label="Åšmiech" name="Laugh" value="Åšmiech"/>
- <item label="Plllppt" name="Plllppt" value="Plllppt"/>
- <item label="Odrzucenie" name="Repulsed" value="Odrzucenie"/>
- <item label="Smutek" name="Sad" value="Smutek"/>
- <item label="Wzruszenie ramionami" name="Shrug" value="Wzruszenie ramionami"/>
- <item label="Uśmiech" name="Smile" value="Uśmiech"/>
- <item label="Niespodzianka" name="Surprise" value="Niespodzianka"/>
- <item label="Mrugnięcie" name="Wink" value="Mrugnięcie"/>
- <item label="Zmartwienie" name="Worry" value="Zmartwienie"/>
- </combo_box>
- <text name="preview_label">
- PrzeglÄ…daj kiedy:
- </text>
- <combo_box label="" name="preview_base_anim" tool_tip="Przetestuj zachowanie animacji kiedy awatar wykonuje normalne czynności">
- <item label="Stoisz" name="Standing" value="Stoisz"/>
- <item label="Chodzisz" name="Walking" value="Chodzisz"/>
- <item label="Siedzisz" name="Sitting" value="Siedzisz"/>
- <item label="Latasz" name="Flying" value="Latasz"/>
- </combo_box>
- <spinner label="Złagodzić w (sekund)" name="ease_in_time" tool_tip="Ilość Czasu (w sekundach), w których animacje mieszają się"/>
- <spinner label="Złagodzić na zewnątrz (sekund)" name="ease_out_time" tool_tip="Ilość Czasu (w sekundach), w których animacje oddzielają się"/>
- <button label="" name="play_btn" tool_tip="Odtwarzaj animacjÄ™"/>
- <button name="pause_btn" tool_tip="Zatrzymaj animacjÄ™"/>
- <button label="" name="stop_btn" tool_tip="Zakończ odtwarzanie animacji"/>
- <slider label="" name="playback_slider"/>
- <text name="bad_animation_text">
- Brak możliwości wczytania pliku animacji.
-
-Doradzamy eksport plików BVH z Poser 4.
- </text>
- <button label="Załaduj ([AMOUNT]L$)" name="ok_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml
old mode 100755
new mode 100644
index 9399fa11153a4c565944805739fc876c35ee5595..0ab64955d03107eefd58849be2a7888d954cada4
--- a/indra/newview/skins/default/xui/pl/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pl/floater_auction.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAÅ» POSIADÅOÅšCI LINDENÓW">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAÅ» DZIAÅKI LINDENÓW">
<floater.string name="already for sale">
- Nie możesz umieścić Posiadłości na Aukcji, jeżeli już została wystawiona na sprzedaż.
+ Nie możesz umieścić działki na Aukcji, jeżeli już została wystawiona na sprzedaż.
</floater.string>
- <check_box initial_value="true" label="Zawierając żółte ogrodzenie" name="fence_check"/>
- <button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn"/>
- <button label="Sprzedaj każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/>
- <button label="Wyczyść ustawienia" label_selected="Wyczyść ustawienia" name="reset_parcel_btn"/>
- <button label="Rozpocznij AukcjÄ™" label_selected="Rozpocznij AukcjÄ™" name="start_auction_btn"/>
+ <check_box label="Dołącz żółte ogrodzenie" name="fence_check" />
+ <button label="Zdjęcie" label_selected="Zdjęcie" name="snapshot_btn" />
+ <button label="Sprzedaj każdemu" label_selected="Sprzedaj każdemu" name="sell_to_anyone_btn" />
+ <button label="Wyczyść ustawienia" label_selected="Wyczyść ustawienia" name="reset_parcel_btn" />
+ <button label="Rozpocznij AukcjÄ™" label_selected="Rozpocznij AukcjÄ™" name="start_auction_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_autoreplace.xml b/indra/newview/skins/default/xui/pl/floater_autoreplace.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67ee83eeca41efeef0ce6d9c1e6b00e9f2295c9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_autoreplace.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="autoreplace_floater" title="Ustawienia Autokorekty">
+ <check_box label="Włącz Autokorektę" name="autoreplace_enable" tool_tip="Autokorekta będzie sprawdzać wszystko co napiszesz w poszukiwaniu słów zdefiniowanych na pierwszej liście i wstawiać na ich na miejsce zamienniki z drugiej listy."/>
+ <button name="autoreplace_import_list" label="Importuj listę" tool_tip="Kliknij, aby wczytać z pliku wyeksportowaną wcześniej listę."/>
+ <button name="autoreplace_export_list" label="Eksportuj listę" tool_tip="Kliknij, aby zapisać listę do pliku i podzielić się nią z kimś."/>
+ <button name="autoreplace_new_list" label="Nowa lista" tool_tip="Stwórz nową listę."/>
+ <button name="autoreplace_delete_list" label="Usuń listę" tool_tip="Usuń wybraną listę."/>
+ <button name="autoreplace_list_up" tool_tip="Nadaj tej liście wyższy priorytet."/>
+ <button name="autoreplace_list_down" tool_tip="Nadaj tej liście niższy priorytet."/>
+ <scroll_list name="autoreplace_list_replacements">
+ <scroll_list.columns label="Szukane" name="keyword"/>
+ <scroll_list.columns label="Zamiennik" name="replacement"/>
+ </scroll_list>
+ <button name="autoreplace_add_entry" label="Dodaj"/>
+ <button name="autoreplace_delete_entry" label="Usuń"/>
+ <text name="autoreplace_keyword_txt">
+ Szukane:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Zamiennik:
+ </text>
+ <button name="autoreplace_save_entry" label="Zapisz pozycjÄ™" tool_tip="Zapisz tÄ… pozycjÄ™."/>
+ <button name="autoreplace_save_changes" label="Zapisz zmiany" tool_tip="Zapisz wszystkie zmiany."/>
+ <button name="autoreplace_cancel" label="Anuluj" tool_tip="Anuluj wszytkie zmiany."/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar.xml b/indra/newview/skins/default/xui/pl/floater_avatar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..50e65b0e3add189fcdc0c16e8eda1f128633b609
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_avatar.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Avatar" title="WYBIERZ AWATARA" />
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
old mode 100755
new mode 100644
index da0e947683ed50644a1f7e637fc9fbe13fe3ed4b..2ddb3ba21805a7b884a83da904013e845fd78c3d
--- a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="avatarpicker" title="WYBIERZ REZYDENTA">
<floater.string name="not_found">
'[TEXT]' nie zostało odnalezione
</floater.string>
<floater.string name="no_one_near">
- Nie ma nikogo w pobliżu
+ Nikogo w pobliżu
</floater.string>
<floater.string name="no_results">
Brak wyników
@@ -12,7 +12,7 @@
<floater.string name="searching">
Wyszukiwanie...
</floater.string>
- <string label="Wybierz" label_selected="Wybierz" name="Select">
+ <string name="Select">
Wybierz
</string>
<string name="Close">
@@ -23,10 +23,10 @@
<text name="InstructSearchResidentName">
Wpisz fragment imienia:
</text>
- <button label="Szukaj" label_selected="Szukaj" name="Find"/>
+ <button label="Szukaj" label_selected="Szukaj" name="Find" />
<scroll_list name="SearchResults">
- <columns label="ImiÄ™" name="name"/>
- <columns label="Nazwa użytkownika" name="username"/>
+ <columns label="ImiÄ™" name="name" />
+ <columns label="Nazwa użytkownika" name="username" />
</scroll_list>
</panel>
<panel label="Znajomi" name="FriendsPanel">
@@ -34,21 +34,19 @@
Wybierz osobÄ™:
</text>
</panel>
- <panel label="Obok mnie:" name="NearMePanel">
+ <panel label="Obok mnie" name="NearMePanel">
<text name="InstructSelectResident">
Wybierz osobę w pobliżu:
</text>
- <slider label="Zasięg" name="near_me_range"/>
+ <slider label="Zasięg" name="near_me_range" />
<text name="meters">
Metry
</text>
- <button label="Odśwież" label_selected="Odśwież" name="Refresh"/>
<scroll_list name="NearMe">
- <columns label="ImiÄ™" name="name"/>
- <columns label="Nazwa użytkownika" name="username"/>
+ <columns label="ImiÄ™" name="name" />
+ <columns label="Nazwa użytkownika" name="username" />
</scroll_list>
</panel>
</tab_container>
- <button label="OK" label_selected="OK" name="ok_btn"/>
- <button label="Cofnij" label_selected="Cofnij" name="cancel_btn"/>
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
old mode 100755
new mode 100644
index 45b9e066e958cc1b5eab283916ef9f9a4c5fe210..18f5a40ea5bf7904874ae905a5f11676a2183c49
--- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="avatar_texture_debug" title="TEKSTURY AWATARA">
<floater.string name="InvalidAvatar">
NIEWÅAÅšCIWY AWATAR
@@ -6,42 +6,44 @@
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
<text name="label">
- Tekstury bakowane
+ Tekstury
+prerenderowane
</text>
<text name="composite_label">
- Tekstury kompozytowe
+ Tekstury
+kompozytowe
</text>
- <button label="Dump IDs to Console" label_selected="Dump" name="Dump"/>
+ <button label="Zrzuć ID do Konsoli" label_selected="Zrzuć" name="Dump" />
<panel name="scroll_content_panel">
- <texture_picker label="WÅ‚osy" name="hair-baked"/>
- <texture_picker label="WÅ‚osy" name="hair_grain"/>
- <texture_picker label="Alpha włosów" name="hair_alpha"/>
- <texture_picker label="GÅ‚owa" name="head-baked"/>
- <texture_picker label="Makijaż" name="head_bodypaint"/>
- <texture_picker label="Alpha głowy" name="head_alpha"/>
- <texture_picker label="Tatuaż głowy" name="head_tattoo"/>
- <texture_picker label="Oczy" name="eyes-baked"/>
- <texture_picker label="Oko" name="eyes_iris"/>
- <texture_picker label="Alpha oczu" name="eyes_alpha"/>
- <texture_picker label="Górna część ciała" name="upper-baked"/>
- <texture_picker label="Górny rysunek na ciele" name="upper_bodypaint"/>
- <texture_picker label="Podkoszulek" name="upper_undershirt"/>
- <texture_picker label="Rękawiczki" name="upper_gloves"/>
- <texture_picker label="Koszula" name="upper_shirt"/>
- <texture_picker label="Kurtka górna" name="upper_jacket"/>
- <texture_picker label="Górna alpha" name="upper_alpha"/>
- <texture_picker label="Górny tatuaż" name="upper_tattoo"/>
- <texture_picker label="Dolna część ciała" name="lower-baked"/>
- <texture_picker label="Dolny rysunek na ciele" name="lower_bodypaint"/>
- <texture_picker label="Bielizna" name="lower_underpants"/>
- <texture_picker label="Skarpetki" name="lower_socks"/>
- <texture_picker label="Buty" name="lower_shoes"/>
- <texture_picker label="Spodnie" name="lower_pants"/>
- <texture_picker label="Kurtka" name="lower_jacket"/>
- <texture_picker label="Dolna alpha" name="lower_alpha"/>
- <texture_picker label="Dolny tatuaż" name="lower_tattoo"/>
- <texture_picker label="Spódnica" name="skirt-baked"/>
- <texture_picker label="Spódnica" name="skirt"/>
+ <texture_picker label="WÅ‚osy" name="hair-baked" />
+ <texture_picker label="WÅ‚osy" name="hair_grain" />
+ <texture_picker label="Alpha włosów" name="hair_alpha" />
+ <texture_picker label="GÅ‚owa" name="head-baked" />
+ <texture_picker label="Makijaż" name="head_bodypaint" />
+ <texture_picker label="Alpha głowy" name="head_alpha" />
+ <texture_picker label="Tatuaż głowy" name="head_tattoo" />
+ <texture_picker label="Oczy" name="eyes-baked" />
+ <texture_picker label="Tęczówka" name="eyes_iris" />
+ <texture_picker label="Alpha oczu" name="eyes_alpha" />
+ <texture_picker label="Górna cz. ciała" name="upper-baked" />
+ <texture_picker label="Górny rys. ciała" name="upper_bodypaint" />
+ <texture_picker label="Podkoszulek" name="upper_undershirt" />
+ <texture_picker label="Rękawiczki" name="upper_gloves" />
+ <texture_picker label="Koszula" name="upper_shirt" />
+ <texture_picker label="Kurtka górna" name="upper_jacket" />
+ <texture_picker label="Górna alpha" name="upper_alpha" />
+ <texture_picker label="Górny tatuaż" name="upper_tattoo" />
+ <texture_picker label="Dolna cz. ciała" name="lower-baked" />
+ <texture_picker label="Dolny rys. ciała" name="lower_bodypaint" />
+ <texture_picker label="Bielizna" name="lower_underpants" />
+ <texture_picker label="Skarpetki" name="lower_socks" />
+ <texture_picker label="Buty" name="lower_shoes" />
+ <texture_picker label="Spodnie" name="lower_pants" />
+ <texture_picker label="Kurtka" name="lower_jacket" />
+ <texture_picker label="Dolna alpha" name="lower_alpha" />
+ <texture_picker label="Dolny tatuaż" name="lower_tattoo" />
+ <texture_picker label="Spódnica" name="skirt-baked" />
+ <texture_picker label="Spódnica" name="skirt" />
</panel>
</panel>
</scroll_container>
diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml
old mode 100755
new mode 100644
index e6286a6ac129d76b2f54c7930fc211f8da6d73cb..93a946550eecfdb061659dfe589d77f15bcc83cd
--- a/indra/newview/skins/default/xui/pl/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="beacons" title="EMITERY">
<panel name="beacons_panel">
<text name="label_show">
- Pokaż emitery:
+ Pokaż:
</text>
- <check_box label="Emitery" name="beacons"/>
- <check_box label="Podkreśl emitery" name="highlights"/>
- <text name="beacon_width_label" tool_tip="Zasięg emiterów">
+ <check_box label="Emitery" name="beacons" />
+ <check_box label="Podświetlenia" name="highlights" />
+ <text tool_tip="Zasięg emiterów" name="beacon_width_label">
Szer.
</text>
<text name="label_objects">
Dla tych obiektów:
</text>
- <check_box label="Obiekty fizyczne" name="physical"/>
- <check_box label="Obiekty skryptowane" name="scripted"/>
- <check_box label="Obiekty dotykalne" name="touch_only"/>
- <check_box label="Źródła dźwięku" name="sounds"/>
- <check_box label="Źródła cząsteczek" name="particles"/>
- <check_box label="Źródła mediów" name="moapbeacon"/>
+ <check_box label="Fizycznych" name="physical" />
+ <check_box label="Skryptowanych" name="scripted" />
+ <check_box label="Dotykalnych" name="touch_only" />
+ <check_box label="Źródeł dźwięku" name="sounds" />
+ <check_box label="Źródeł cząsteczek" name="particles" />
+ <check_box label="Źródeł mediów" name="moapbeacon" />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_big_preview.xml b/indra/newview/skins/default/xui/pl/floater_big_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e730cff6189ed9c4e42f07652a982b7967817161
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_big_preview.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_big_preview" title="PODGLÄ„D" />
diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml
old mode 100755
new mode 100644
index 5d296aa7255ae4877af894d387e385917065a528..d82f6e742df9b72cba8ea6da8c935b180bfa6983
--- a/indra/newview/skins/default/xui/pl/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="build options floater" title="OPCJE SIATKI">
- <spinner label="Jednostki siatki (metery)" name="GridResolution"/>
- <spinner label="Rozmiary siatki (metry)" name="GridDrawSize"/>
- <check_box label="Pokaż podjednostki" name="GridSubUnit"/>
- <check_box label="Pokaż przekroje" name="GridCrossSection"/>
- <text name="grid_opacity_label" tool_tip="Nieprzeźroczystość siatki:">
- Nieprzeźroczystość:
+ <spinner label="Jednostki (metry)" name="GridResolution" />
+ <spinner label="Rozmiary (metry)" name="GridDrawSize" />
+ <check_box label="PrzyciÄ…gaj do podjednostek" name="GridSubUnit" />
+ <check_box label="Pokaż przekroje" name="GridCrossSection" />
+ <text tool_tip="Nieprzezroczystość siatki" name="grid_opacity_label">
+ Nieprzezroczystość:
</text>
- <slider label="Nieprzezroczystość siatki" name="GridOpacity"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
old mode 100755
new mode 100644
index 1c24e0b35e64b82fc63403e4aa70a0b24c0b8423..2858b4e0505fb6b57dce7d1e62c722e2f806f8ae
--- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="HURTOWA ZMIANA PRAW ZAWARTOÅšCI">
+<floater name="floaterbulkperms" title="WSADOWE REGULOWANIE PRAW ZAWARTOÅšCI">
<floater.string name="nothing_to_modify_text">
- Selekcja zawiera zawartość niemodfyfikowalną
+ Selekcja nie zawiera zawartości edytowalnej
</floater.string>
<floater.string name="status_text">
Ustawienie praw na [NAME]
@@ -12,43 +12,34 @@
<floater.string name="done_text">
Zakończenie prośby o zmianę praw.
</floater.string>
- <check_box label="Animacje" name="check_animation"/>
- <icon name="icon_animation" tool_tip="Animacja"/>
- <check_box label="Części ciała" name="check_bodypart"/>
- <icon name="icon_bodypart" tool_tip="Części Ciała"/>
- <check_box label="Ubranie" name="check_clothing"/>
- <icon name="icon_clothing" tool_tip="Ubranie"/>
- <check_box label="Gesturki" name="check_gesture"/>
- <icon name="icon_gesture" tool_tip="Gesturki"/>
- <check_box label="Noty" name="check_notecard"/>
- <icon name="icon_notecard" tool_tip="Noty"/>
- <check_box label="Obiekty" name="check_object"/>
- <icon name="icon_object" tool_tip="Obiekty"/>
- <check_box label="Skrypty" name="check_script"/>
- <icon name="icon_script" tool_tip="Skrypty"/>
- <check_box label="Dźwięki" name="check_sound"/>
- <icon name="icon_sound" tool_tip="Dźwięki"/>
- <check_box label="Tekstury" name="check_texture"/>
- <icon name="icon_texture" tool_tip="Tekstury"/>
- <button font="SansSerifSmall" label="√ Wszystkie" label_selected="Wszystkie" name="check_all"/>
- <button font="SansSerifSmall" label="Żadne" label_selected="Żadne" name="check_none"/>
+ <icon name="icon_animation" tool_tip="Animacje" />
+ <icon name="icon_bodypart" tool_tip="Części ciała" />
+ <icon name="icon_clothing" tool_tip="Ubrania" />
+ <icon name="icon_gesture" tool_tip="Gesty" />
+ <icon name="icon_notecard" tool_tip="Noty" />
+ <icon name="icon_object" tool_tip="Obiekty" />
+ <icon name="icon_script" tool_tip="Skrypty" />
+ <icon name="icon_sound" tool_tip="Dźwięki" />
+ <icon name="icon_texture" tool_tip="Tekstury" />
+ <button label="√ Wszystkie" name="check_all" />
+ <button label="Żadne" label_selected="Żadne" name="check_none" />
<text name="newperms">
- Nowe prawa zawartości
+ Reguluj prawa zawartości:
</text>
<text name="GroupLabel">
Grupa:
</text>
- <check_box label="Udostępnij" name="share_with_group"/>
+ <check_box label="Udostępnij" name="share_with_group" />
<text name="AnyoneLabel">
Każdy:
</text>
- <check_box label="Kopiuj" name="everyone_copy"/>
+ <check_box label="Kopiowanie" name="everyone_copy" />
<text name="NextOwnerLabel">
- Następny Właściciel:
+ Nast. właściciel:
</text>
- <check_box label="Modyfikuje" name="next_owner_modify"/>
- <check_box label="Kopiuje" name="next_owner_copy"/>
- <check_box initial_value="true" label="Oddaj/Sprzedaj" name="next_owner_transfer" tool_tip="Następny Właściciel może oddać lub sprzedać ten obiekt."/>
- <button label="OK" name="apply"/>
- <button label="Anuluj" name="close"/>
+ <check_box label="Modyfikacja" name="next_owner_modify" />
+ <check_box label="Kopiowanie" name="next_owner_copy" />
+ <check_box label="Transferowanie" name="next_owner_transfer" tool_tip="Następny Właściciel może oddać lub sprzedać ten obiekt." />
+ <button label="Zastosuj" name="apply" />
+ <button label="Anuluj" name="close" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml
old mode 100755
new mode 100644
index c1045ece9aeaa5821f3611d6c93771578c9a98ac..23e44da1fa06faa31b22f5c9efbb98e38f446b35
--- a/indra/newview/skins/default/xui/pl/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pl/floater_bumps.xml
@@ -1,24 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_bumps" title="ZDERZENIA, POPCHNIĘCIA, UDERZENIA">
<floater.string name="none_detected">
Brak
</floater.string>
<floater.string name="bump">
- [TIME] [NAME] awatar zderzył się z Tobą
+ [TIME] [NAME] zderzył/a się z Tobą
</floater.string>
<floater.string name="llpushobject">
- [TIME] [NAME] awatar popchnÄ…Å‚ CiÄ™ swoim skryptem
+ [TIME] [NAME] popchnął/ęła Cię swoim skryptem
</floater.string>
<floater.string name="selected_object_collide">
- [TIME] [NAME] awatar uderzył Cię obiektem
+ [TIME] [NAME] uderzył/a Cię obiektem
</floater.string>
<floater.string name="scripted_object_collide">
- [TIME] [NAME] watar uderzył Cię skryptowanym obiektem
+ [TIME] [NAME] uderzył/a Cię skryptowanym obiektem
</floater.string>
<floater.string name="physical_object_collide">
- [TIME] [NAME] awatar uderzył Cię fizycznym obiektem
- </floater.string>
- <floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [TIME] [NAME] uderzył/a Cię fizycznym obiektem
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
old mode 100755
new mode 100644
index 94f2b50450eb85b779ea94bd3c70b3e5adf676e4..782f1cc12234bed928a6c8ba63aca76e526d3cda
--- a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_buy_contents" title="KUP ZAWARTOŚĆ">
+ <floater.string name="no_copy_text">
+ (bez prawa kopiowania)
+ </floater.string>
+ <floater.string name="no_modify_text">
+ (bez prawa modyfikacji)
+ </floater.string>
+ <floater.string name="no_transfer_text">
+ (bez prawa transferu)
+ </floater.string>
<text name="contains_text">
- [NAME] zawiera:
+ <nolink>[NAME]</nolink> zawiera:
</text>
<text name="buy_text">
Kupić za [AMOUNT]L$ od [NAME]?
</text>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
- <button label="Kup" label_selected="Kup" name="buy_btn"/>
- <check_box label="Załóż ubrania teraz" name="wear_check"/>
- <string name="no_copy_text">
- (bez prawa kopiowania)
- </string>
- <string name="no_modify_text">
- (bez prawa modyfikacji)
- </string>
- <string name="no_transfer_text">
- (bez prawa transferu)
- </string>
+ <check_box label="Załóż ubrania teraz" name="wear_check" />
+ <button label="Kup" label_selected="Kup" name="buy_btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
old mode 100755
new mode 100644
index 3e51761b37e9daa430c1dade09ba890244d50589..72167e0d3c42e8a081056d1d19b0524b22697896
--- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="buy currency" title="KUP L$">
<floater.string name="buy_currency">
Kup [LINDENS] L$ za [LOCALAMOUNT]
@@ -13,20 +13,14 @@
Kup L$
</text>
<text name="balance_label">
- Obecnie posiadasz
+ Obecnie posiadam
</text>
<text name="balance_amount">
[AMT]L$
</text>
<text name="currency_action">
- Kup
+ Chcę kupić
</text>
- <text name="currency_label">
- L$
- </text>
- <line_editor label="L$" left_delta="32" name="currency_amt">
- 1234
- </line_editor>
<text name="buying_label">
Cena
</text>
@@ -36,11 +30,8 @@
<text name="getting_data">
Kalkulowanie...
</text>
- <text name="buy_action">
- [ACTION]
- </text>
<text name="total_label">
- Twój nowy stan konta
+ Mój nowy stan konta
</text>
<text name="total_amount">
[AMT]L$
@@ -51,16 +42,16 @@
<text name="exchange_rate_note">
Wpisz ponownie kwotę aby zobaczyć ostatni kurs wymiany.
</text>
- <text bottom_delta="-64" height="48" name="purchase_warning_repurchase" right="-10">
+ <text name="purchase_warning_repurchase">
Potwierdzasz zakup L$, nie obiektu.
</text>
- <text bottom_delta="16" name="purchase_warning_notenough">
+ <text name="purchase_warning_notenough">
Nie zakupiono wystarczającej ilości L$. Proszę zwiększyć kwotę.
</text>
- <button label="Kup teraz" name="buy_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
+ <button label="Kup teraz" name="buy_btn" />
+ <button label="Anuluj" name="cancel_btn" />
<text name="info_cannot_buy">
Nie można kupić
</text>
- <button label="Przejdź na stronę WWW" name="error_web" width="168"/>
+ <button label="Odwiedź stronę WWW" name="error_web" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
old mode 100755
new mode 100644
index 36ac88f7f6581746d4ba7d92b1c9458787010550..e54daa70de23acde32fe9d356b5856e006741529
--- a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_currency_html" title="KUP WALUTĘ"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_buy_currency_html" title="KUP WALUTĘ" />
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
old mode 100755
new mode 100644
index 7b4f459b4e4a1b2b66709b603fbdae20b86a747d..4f5d8b43263768b02af751043e7f5b8078c44360
--- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="KUP POSIADÅOŚĆ">
+<floater name="buy land" title="KUP DZIAÅKĘ">
<floater.string name="can_resell">
Może być odsprzedana.
</floater.string>
@@ -13,47 +13,47 @@
Nie mogą być łączone ani dzielone.
</floater.string>
<floater.string name="cant_buy_for_group">
- Nie masz pozwolenia na zakup Posiadłości dla Twojej aktywnej Grupy.
+ Nie masz pozwolenia na zakup działki dla Twojej aktywnej Grupy.
</floater.string>
<floater.string name="no_land_selected">
Obszar nie jest wybrany.
</floater.string>
<floater.string name="multiple_parcels_selected">
- Wybrałeś wiele różnych Posiadłości.
+ Wybrałeś/aś wiele różnych działek.
Spróbuj wybrać mniejszy obszar.
</floater.string>
<floater.string name="no_permission">
- Nie masz pozwolenia na zakup Posiadłości dla Twojej aktywnej Grupy.
+ Nie masz pozwolenia na zakup działki dla Twojej aktywnej Grupy.
</floater.string>
<floater.string name="parcel_not_for_sale">
- Wybrana Posiadłość nie jest na sprzedaż.
+ Wybrana działka nie jest na sprzedaż.
</floater.string>
<floater.string name="group_already_owns">
- Ta Posiadłość już należy do Grupy.
+ Ta działka już należy do Grupy.
</floater.string>
<floater.string name="you_already_own">
- Ta Posiadłość już należy do Ciebie.
+ Ta działka już należy do Ciebie.
</floater.string>
<floater.string name="set_to_sell_to_other">
- Wybrana Posiadłość będzie sprzedana komuś innemu.
+ Wybrana działka będzie sprzedana komuś innemu.
</floater.string>
<floater.string name="no_public_land">
- Wybrany obszar nie ma publicznych Posiadłości.
+ Wybrany obszar nie ma publicznych działek.
</floater.string>
<floater.string name="not_owned_by_you">
- Wybrałeś Posiadłość, której Właścicielem jest inny Rezydent.
-Spróbuj wybrać ponownie mniejszą powierzchnię Posiadłości.
+ Wybrałeś/aś działkę, której Właścicielem jest inny Rezydent.
+Spróbuj wybrać ponownie mniejszą powierzchnię działki.
</floater.string>
<floater.string name="processing">
Przetwarzanie Twojego zakupu...
-
+
(Może zająć kilka minut)
</floater.string>
<floater.string name="fetching_error">
- Błąd podczas wczytywania informacji zakupu Posiadłości.
+ Błąd podczas wczytywania informacji zakupu działki.
</floater.string>
<floater.string name="buying_will">
- Zakup tej Posiadłości spowoduje:
+ Zakup tej działki spowoduje:
</floater.string>
<floater.string name="buying_for_group">
Zakup ziemi dla Grupy:
@@ -68,28 +68,28 @@ Spróbuj wybrać ponownie mniejszą powierzchnię Posiadłości.
Poprawność danych.
</floater.string>
<floater.string name="must_upgrade">
- Musisz mieć konto Premium żebyś mógł mieć Posiadłości.
+ Musisz mieć konto Premium żebyś mógł/mogła mieć działki.
</floater.string>
<floater.string name="cant_own_land">
- Twoje konto pozwala Ci mieć Posiadłości.
+ Twoje konto pozwala Ci mieć działki.
</floater.string>
<floater.string name="land_holdings">
Jesteś właścicielem [BUYER] m² ziemi.
</floater.string>
<floater.string name="pay_to_for_land">
- Zapłać [SELLER] [AMOUNT]L$ za Posiadłość
+ Zapłać [SELLER] [AMOUNT]L$ za działkę
</floater.string>
<floater.string name="buy_for_US">
Kup L$ [AMOUNT] za [LOCAL_AMOUNT],
</floater.string>
<floater.string name="parcel_meters">
- Podana posiadłość to [AMOUNT] m² ziemi.
+ Podana działka to [AMOUNT] m² ziemi.
</floater.string>
<floater.string name="premium_land">
- Podana posiadłość jest w cenie premium adekwatnie jak za [AMOUNT] m².
+ Podana działka jest w cenie premium adekwatnie jak za [AMOUNT] m².
</floater.string>
<floater.string name="discounted_land">
- Wybrana posiadłość jest w cenie zniżkowej adekwatnie jak za [AMOUNT] m².
+ Wybrana działka jest w cenie zniżkowej adekwatnie jak za [AMOUNT] m².
</floater.string>
<floater.string name="meters_supports_object">
[AMOUNT] m²
@@ -101,17 +101,11 @@ wspiera [AMOUNT2] obiektów
<floater.string name="sold_without_objects">
obiekty nie są zawarte w sprzedaży
</floater.string>
- <floater.string name="info_price_string">
- L$ [PRICE]
-(L$ [PRICE_PER_SQM]/m²)
-[SOLD_WITH_OBJECTS]
- </floater.string>
<floater.string name="insufficient_land_credits">
- Grupa [GROUP] musi mieć wystarczający kredyt na
-używanie Posiadłości żeby sfinalizować ten zakup.
+ Grupa [GROUP] musi mieć wystarczający kredyt na używanie działki, żeby sfinalizować ten zakup.
</floater.string>
<floater.string name="have_enough_lindens">
- Masz [AMOUNT]L$ co wystarcza na zakup tej Posiadłości.
+ Masz [AMOUNT]L$ co wystarcza na zakup tej działki.
</floater.string>
<floater.string name="not_enough_lindens">
Masz tylko [AMOUNT]L$ i potrzebujesz [AMOUNT2]L$ dodatkowo.
@@ -120,14 +114,11 @@ używanie Posiadłości żeby sfinalizować ten zakup.
Po zakupie zostanie Ci [AMOUNT]L$.
</floater.string>
<floater.string name="balance_needed">
- Musisz dokupić [AMOUNT]L$ żeby kupić tą Posiadłość.
+ Musisz dokupić [AMOUNT]L$ żeby kupić tą działkę.
</floater.string>
<floater.string name="no_parcel_selected">
- (Posiadłość nie została wybrana)
+ (niczego nie wybrano)
</floater.string>
- <text name="region_name_label">
- Region:
- </text>
<text name="region_name_text">
(brak danych)
</text>
@@ -144,19 +135,19 @@ używanie Posiadłości żeby sfinalizować ten zakup.
(brak danych)
</text>
<text name="estate_owner_label">
- Właściciel Majątku:
+ Właśc. Majątku:
</text>
<text name="estate_owner_text">
(brak danych)
</text>
<text name="resellable_changeable_label">
- Posiadłości zakupione w tym Regionie:
+ Działki zakupione w tym Regionie:
</text>
<text name="resellable_clause">
- Posiadłość może lub nie może być odsprzedana.
+ Działka może lub nie może być odsprzedana.
</text>
<text name="changeable_clause">
- Posiadłość może lub nie może być dzielona i łączona.
+ Działka może lub nie może być dzielona i łączona.
</text>
<text name="covenant_text">
Musisz zaakceptować Umowę z Majątku:
@@ -164,71 +155,62 @@ używanie Posiadłości żeby sfinalizować ten zakup.
<text_editor name="covenant_editor">
Åadowanie...
</text_editor>
- <check_box label="Zgadzam się na Powyższą Umowę." name="agree_covenant"/>
- <text name="info_parcel_label" width="60">
- Posiadłość:
- </text>
- <text left_delta="62" name="info_parcel">
- Scotopteryx 138,204
+ <check_box label="Zgadzam się na powyższą umowę." name="agree_covenant" />
+ <text name="info_parcel_label">
+ Działka:
</text>
<text name="info_size_label">
Obszar:
</text>
- <text left_delta="62" name="info_size">
- 1024 m²
- </text>
<text name="info_price_label">
Cena:
</text>
- <text left_delta="62" name="info_price">
+ <text name="info_price">
L$ 1500
(L$ 1.1/m²)
sprzedaż z obiektami
</text>
<text name="info_action">
- Zakup tej Posiadłości spowoduje:
+ Zakup tej działki spowoduje:
</text>
<text name="error_message">
Wystąpił błąd.
</text>
- <button label="Idź na stronę www" name="error_web"/>
+ <button label="Idź na stronę www" name="error_web" />
<text name="account_action">
ZmianÄ™ Twojego konta na Premium.
</text>
<text name="account_reason">
- Tylko członkowie z kontem Premium mogą mieć Posiadłosci.
+ Tylko osoby z kontem Premium mogą mieć działki.
</text>
<combo_box name="account_level">
- <combo_box.item label="US$9.95/miesięcznie, naliczane miesięcznie" name="US$9.95/month,billedmonthly"/>
- <combo_box.item label="US$7.50/miesięcznie, naliczane kwartalnie" name="US$7.50/month,billedquarterly"/>
- <combo_box.item label="US$6.00/miesięcznie, naliczane rocznie" name="US$6.00/month,billedannually"/>
+ <combo_box.item label="US$9.95/miesięcznie, naliczane miesięcznie" name="US$9.95/month,billedmonthly" />
+ <combo_box.item label="US$7.50/miesięcznie, naliczane kwartalnie" name="US$7.50/month,billedquarterly" />
+ <combo_box.item label="US$6.00/miesięcznie, naliczane rocznie" name="US$6.00/month,billedannually" />
</combo_box>
<text name="land_use_action">
- Zwiększ opłatę za używanie Posiadłości do 40US$/miesiąc.
+ Zwiększy opłatę za używanie działek do 40 US$/miesiąc.
</text>
<text name="land_use_reason">
- Jesteś właścicielem 1309 m² ziemi.
-Posiadłość ta zawiera 512 m² ziemi.
+ Jesteś właścicielem 1309 m² ziemi.
+Działka ta zawiera 512 m² ziemi.
</text>
<text name="purchase_action">
- Pay Joe Resident L$ 4000 for the land
+ Zapłać Joe Resident 4000 L$ za działkę
</text>
<text name="currency_reason">
- You have L$ 2,100.
+ Masz 2,100 L$.
</text>
<text name="currency_action">
Kup więcej L$
</text>
- <line_editor name="currency_amt">
- 1000
- </line_editor>
<text name="currency_est">
za [LOCAL_AMOUNT]
</text>
<text name="currency_balance">
- Masz 2,100L$.
+ Masz 2,100 L$.
</text>
- <check_box label="Usuń [AMOUNT] m² z kontrybucji w grupie." name="remove_contribution"/>
- <button label="Zakup" name="buy_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
+ <check_box label="Usuń [AMOUNT] m² z kontrybucji w grupie." name="remove_contribution" />
+ <button label="Zakup" name="buy_btn" />
+ <button label="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
old mode 100755
new mode 100644
index 85861d9e764d6670b89e581a9d2d94a200f82256..901dce9eb275bccff64dbe7ca85995cda41b0409
--- a/indra/newview/skins/default/xui/pl/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="KUP KOPIĘ">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="KUP KOPIĘ OBIEKTU">
<floater.string name="title_buy_text">
Kup
</floater.string>
@@ -16,14 +16,11 @@
(bez prawa transferu)
</floater.string>
<text name="contents_text">
- i jej zawartość
+ i jej zawartość:
</text>
<text name="buy_text">
- Kup za L$[AMOUNT] od:
+ Kup za [AMOUNT]L$ od:
</text>
- <text name="buy_name_text">
- [NAME]?
- </text>
- <button label="Kup" label_selected="Kup" name="buy_btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+ <button label="Kup" label_selected="Kup" name="buy_btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
old mode 100755
new mode 100644
index 60f3cd0fffda088f6bfaee9f83e32e0bc71deb27..3021a55c3bf3deead804ef42696383d31f339c84
--- a/indra/newview/skins/default/xui/pl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="camera_floater" title="">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="camera_floater" title="USTAWIENIA KAMERY">
<floater.string name="rotate_tooltip">
- Obracaj kamerę wokół obiektu
+ Obróć kamerę wokół punktu skupienia
</floater.string>
<floater.string name="zoom_tooltip">
- Najedź kamerą w kierunku obiektu
+ Przybliż kamerę do punktu skupienia
</floater.string>
<floater.string name="move_tooltip">
- Poruszaj kamerą w dół/górę oraz w prawo/lewo
+ Poruszaj kamerą w górę, w dół, w lewo i w prawo
</floater.string>
<floater.string name="free_mode_title">
- Zobacz obiekt
+ Pokazywanie obiektu
</floater.string>
<panel name="controls">
<panel name="preset_views_list">
<panel_camera_item name="front_view">
<panel_camera_item.text name="front_view_text">
- Widok z przodu
+ Widok od przodu
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item name="group_view">
<panel_camera_item.text name="side_view_text">
- PodglÄ…d grupy
+ Widok ponad ramieniem
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item name="rear_view">
<panel_camera_item.text name="rear_view_text">
- Widok z tyłu
+ Widok od tyłu
</panel_camera_item.text>
</panel_camera_item>
</panel>
<panel name="camera_modes_list">
<panel_camera_item name="object_view">
<panel_camera_item.text name="object_view_text">
- Widok obiektu
+ Pokazywanie obiektu
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item name="mouselook_view">
<panel_camera_item.text name="mouselook_view_text">
- Widok panoramiczny
+ Widok pierwszoosobowy
</panel_camera_item.text>
</panel_camera_item>
</panel>
- <panel name="zoom" tool_tip="Najedź kamerą w kierunku obiektu">
- <joystick_rotate name="cam_rotate_stick" tool_tip="Obracaj kamerę wokoł osi"/>
- <slider_bar name="zoom_slider" tool_tip="Przybliż kamerę do ogniskowej"/>
- <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w górę, w dół, w lewo i w prawo"/>
+ <panel name="zoom">
+ <joystick_rotate name="cam_rotate_stick" tool_tip="Obróć kamerę wokół punktu skupienia" />
+ <slider_bar name="zoom_slider" tool_tip="Przybliż kamerę do punktu skupienia" />
+ <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w górę, w dół, w lewo i w prawo" />
</panel>
</panel>
<panel name="buttons">
- <button label="" name="presets_btn" tool_tip="Ustaw widok"/>
- <button label="" name="pan_btn" tool_tip="Kamera horyzontalna"/>
- <button label="" name="avatarview_btn" tool_tip="Ustawienia"/>
+ <button name="presets_btn" tool_tip="Zapisane widoki" />
+ <button name="pan_btn" tool_tip="Obróć, powiększ, panoramuj" />
+ <button name="avatarview_btn" tool_tip="Tryby kamery" />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
old mode 100755
new mode 100644
index 877cedc0bcd10c4a36af871c8910b1769113e310..3df1712dd18720c4177101f032b6dd6dab5a7653
--- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="groups" title="GRUPY">
<text name="groupdesc">
- Wybierz GrupÄ™:
+ Wybierz grupÄ™:
</text>
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
old mode 100755
new mode 100644
index a607ca982f899cac84925990724a84dba4dea889..a61edd12eae0b993534526b1ca34955a7ed0a7bc
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="ColorPicker" title="WYBIERZ KOLOR">
<text name="r_val_text">
Czerwony:
@@ -18,14 +18,12 @@
<text name="l_val_text">
Luminacja:
</text>
- <check_box label="Zastosuj teraz" name="apply_immediate"/>
- <button label="" label_selected="" name="color_pipette"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
- <button label="OK" label_selected="OK" name="select_btn"/>
+ <check_box label="Stosuj teraz" name="apply_immediate" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
<text name="Current color:">
Obecny kolor:
</text>
<text name="(Drag below to save.)">
- (Przeciągnij tutaj aby zapisać)
+ (Przeciągnij by zapisać)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_conversation_log.xml b/indra/newview/skins/default/xui/pl/floater_conversation_log.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d64a23e675aa0888d88696e7e6de029933abfdae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_conversation_log" title="DZIENNIK ROZMÓW">
+ <panel name="buttons_panel">
+ <filter_editor label="Filtruj ludzi" name="people_filter_input" />
+ <menu_button name="conversation_view_btn" tool_tip="Opcje widoku/sortowania" />
+ <menu_button name="conversations_gear_btn" tool_tip="Akcje dotyczÄ…ce wybranej osoby lub grupy" />
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pl/floater_conversation_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18ed247869ae96552661ad21867ace002217eb08
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_conversation" title="ROZMOWA:">
+ <floater.string name="Title">
+ Rozmowa: [NAME]
+ </floater.string>
+ <text name="page_label" value="Str." />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml
old mode 100755
new mode 100644
index 8221a4e1bdf2442ca8ed7ff008604909e91d60f4..f67f3c625ea9f79e4a18a784c3ded587c7ea924c
--- a/indra/newview/skins/default/xui/pl/floater_critical.xml
+++ b/indra/newview/skins/default/xui/pl/floater_critical.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title="">
+<floater name="modal container">
<button label="Kontynuuj" label_selected="Kontynuuj" name="Continue" />
- <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
<text name="tos_heading">
- Proszę przeczytać poniższą wiadomość dokładnie.
+ Przeczytaj uważnie poniższą wiadomość.
</text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc750715c616f38dad7b5d941e5a61d4ee443159
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater name="Delete Env Preset" title="USUŃ UST. OTOCZENIA">
+ <string name="title_water">
+ Usuń Ustawienie wody
+ </string>
+ <string name="title_sky">
+ Usuń Ustawienie nieba
+ </string>
+ <string name="title_day_cycle">
+ Usuń cykl dnia
+ </string>
+ <string name="label_water">
+ Wybierz:
+ </string>
+ <string name="label_sky">
+ Wybierz:
+ </string>
+ <string name="label_day_cycle">
+ Cykl dnia:
+ </string>
+ <string name="msg_confirm_deletion">
+ Masz absolutną pewność, że chcesz usunąć wybrane Ustawienie?
+ </string>
+ <string name="msg_sky_is_referenced">
+ Nie można usunąć Ustawienia odwołującego się do jakiegoś cyklu dnia.
+ </string>
+ <string name="combo_label">
+ -Wybierz Ustawienie-
+ </string>
+ <text name="label">
+ Wybierz:
+ </text>
+ <button label="Usuń" name="delete" />
+ <button label="Anuluj" name="cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_destinations.xml b/indra/newview/skins/default/xui/pl/floater_destinations.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2fe70876676b15fbdfe2b3bbb165eec480c6237f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_destinations.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Destinations" title="CELE PODRÓŻY" />
diff --git a/indra/newview/skins/default/xui/pl/floater_display_name.xml b/indra/newview/skins/default/xui/pl/floater_display_name.xml
old mode 100755
new mode 100644
index ea28e6572804a78ccc9d73f98c7bcc819eea6c54..6c3c70d6093aafc247023581dcf66b252667db37
--- a/indra/newview/skins/default/xui/pl/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/pl/floater_display_name.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Display Name" title="ZMIEŃ WYŚWIETLANĄ NAZWĘ">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Display Name" title="ZMIEŃ WYŚWIETLANE IMIĘ">
<text name="info_text">
- Nazwa, którą nadałaś/nadałeś Twojemu awatarowi jest określana jako wyświetlana nazwa. Możesz ją zmieniać raz w tygodniu.
+ Imię, które nadałaś/eś Twojemu awatarowi jest nazywane Wyświetlanym Imieniem. Możesz je zmienić raz w tygodniu.
</text>
<text name="lockout_text">
- Nie możesz zmienić swojej wyświetlanej nazwy do: [TIME].
+ Nie możesz zmienić swojego Imienia do: [TIME].
</text>
<text name="set_name_label">
- Nowa wyświetlana nazwa:
+ Nowe Wyświetlane Imię:
</text>
<text name="name_confirm_label">
- Wpisz Twoją nową nazwę aby potwierdzić:
+ Wpisz Twoje nowe Imię aby potwierdzić:
</text>
- <button label="Zapisz" name="save_btn" tool_tip="Zapisz swoją nową wyświetlaną nazwę"/>
- <button label="Resetuj" name="reset_btn" tool_tip="Uczyń wyświetlaną nazwę taką samą jak nazwa użytkownika"/>
- <button label="Cofnij" name="cancel_btn"/>
+ <button label="Zapisz" name="save_btn" tool_tip="Zapisz swoje nowe Wyświetlane Imię" />
+ <button label="Resetuj" name="reset_btn" tool_tip="Uczyń Wyświetlane Imię takim samym, jak nazwa konta użytkownika" />
+ <button label="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d3a0701915a505074fd4fea7c8dc6ddcd556fa4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Edit Day cycle" title="Edytuj cykl dnia">
+ <string name="title_new">
+ Stwórz nowy cykl dnia
+ </string>
+ <string name="title_edit">
+ Edytuj cykl dnia
+ </string>
+ <string name="hint_new">
+ Nazwij cykl dnia, ustaw co trzeba i kliknij na "Zapisz".
+ </string>
+ <string name="hint_edit">
+ Aby edytować cykl dnia ustaw co trzeba i kliknij na "Zapisz".
+ </string>
+ <string name="combo_label">
+ -Wybierz Ustawienie-
+ </string>
+ <text name="label">
+ Nazwa:
+ </text>
+ <text name="note">
+ Uwaga: jeśli zmienisz nazwę Ustawienia, to zaczniesz tworzyć nowe, a obecne pozostanie bez zmian.
+ </text>
+ <text name="hint_item1">
+ - Kliknij na zakładce, aby edytować ust. nieba i czas.
+ </text>
+ <text name="hint_item2">
+ - Klikaj i przeciągaj zakładki, aby ustawić czasy przejść.
+ </text>
+ <text name="hint_item3">
+ - Użyj suwaka, aby podglądać cykl dnia.
+ </text>
+ <panel name="day_cycle_slider_panel">
+ <button label="Dodaj zakł." label_selected="Dodaj zakł." name="WLAddKey" />
+ <button label="Usuń zakł." label_selected="Usuń zakł." name="WLDeleteKey" />
+ <text name="WL12am">
+ 24:00
+ </text>
+ <text name="WL3am">
+ 3:00
+ </text>
+ <text name="WL6am">
+ 6:00
+ </text>
+ <text name="WL9amHash">
+ 9:00
+ </text>
+ <text name="WL12pmHash">
+ 12:00
+ </text>
+ <text name="WL3pm">
+ 15:00
+ </text>
+ <text name="WL6pm">
+ 18:00
+ </text>
+ <text name="WL9pm">
+ 21:00
+ </text>
+ <text name="WL12am2">
+ 24:00
+ </text>
+ </panel>
+ <text name="WLCurKeyPresetText">
+ Niebo:
+ </text>
+ <combo_box label="Ustawienie" name="WLSkyPresets" />
+ <text name="WLCurKeyTimeText">
+ Czas:
+ </text>
+ <time name="time" value="6:00" />
+ <check_box label="Ustaw jako mój cykl dnia" name="make_default_cb" />
+ <button label="Zapisz" name="save" />
+ <button label="Anuluj" name="cancel" />
+ </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml
index 80e481c0bcf53a006664dbcad914de0d1b99cfe0..7cedc17c59610bb7ba86e37b4b015b912509921e 100644
--- a/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="HoverHeight" title="USTAW UNIESIENIE">
- <slider label="UnieÅ›" name="HoverHeightSlider"/>
+ <slider label="UnieÅ›" name="HoverHeightSlider" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pl/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a30ac4ed99f534bf7be54377faf3bbdd6e67b2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_edit_sky_preset.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Edit Sky Preset" title="Edytuj ustawienie nieba">
+ <string name="title_new">
+ Stwórz nowe Ustawienie nieba
+ </string>
+ <string name="title_edit">
+ Edytuj Ustawienie nieba
+ </string>
+ <string name="hint_new">
+ Nazwij Ustawienie, ustaw co trzeba i kliknij na "Zapisz".
+ </string>
+ <string name="hint_edit">
+ Aby edytować Ustawienie ustaw co trzeba i kliknij na "Zapisz".
+ </string>
+ <string name="combo_label">
+ -Wybierz Ustawienie-
+ </string>
+ <text name="hint">
+ Aby edytować Ustawienie ustaw co trzeba i kliknij na "Zapisz".
+ </text>
+ <text name="label">
+ Nazwa:
+ </text>
+ <text name="note">
+ Uwaga: jeśli zmienisz nazwę Ustawienia, to zaczniesz tworzyć nowe, a obecne pozostanie bez zmian.
+ </text>
+ <tab_container name="WindLight Tabs">
+ <panel label="ATMOSFERA" name="Atmosphere">
+ <text name="BHText">
+ Horyzont błękitu
+ </text>
+ <text name="BDensText">
+ Horyzont mgły
+ </text>
+ <text name="BDensText2">
+ Gęstość
+ </text>
+ <text name="HDText">
+ Gęstość mgły
+ </text>
+ <text name="DensMultText">
+ Mnożnik gęstości
+ </text>
+ <text name="WLDistanceMultText">
+ Mnożnik odległości
+ </text>
+ <text name="MaxAltText">
+ Maks. wysokość
+ </text>
+ </panel>
+ <panel label="OÅšWIETLENIE" name="Lighting">
+ <text name="SLCText">
+ Kolor Słońca/Księżyca
+ </text>
+ <text name="WLAmbientText">
+ Otoczenie
+ </text>
+ <text name="SunGlowText">
+ Blask Słońca
+ </text>
+ <slider label="Skupienie" name="WLGlowB" />
+ <slider label="Rozmiar" name="WLGlowR" />
+ <text name="WLStarText">
+ Jasność gwiazd
+ </text>
+ <text name="SceneGammaText">
+ Gamma sceny
+ </text>
+ <text name="TODText">
+ Poz. Słońca/Księżyca
+ </text>
+ <text name="WL12am">
+ 24:00
+ </text>
+ <text name="WL6am">
+ 6:00
+ </text>
+ <text name="WL12pmHash">
+ 12:00
+ </text>
+ <text name="WL6pm">
+ 18:00
+ </text>
+ <text name="WL12am2">
+ 24:00
+ </text>
+ <time name="WLDayTime" value="6:00" />
+ <text name="WLEastAngleText">
+ KÄ…t wschodu
+ </text>
+ </panel>
+ <panel label="CHMURY" name="Clouds">
+ <text name="WLCloudColorText">
+ Kolor chmur
+ </text>
+ <text name="WLCloudColorText2">
+ Gęstość chmur XY
+ </text>
+ <slider label="G" name="WLCloudDensity" />
+ <text name="WLCloudCoverageText">
+ Zachmurzenie
+ </text>
+ <text name="WLCloudScaleText">
+ Rozmiar chmur
+ </text>
+ <text name="WLCloudDetailText">
+ Detale chmur (XY/Gęstość)
+ </text>
+ <slider label="G" name="WLCloudDetailDensity" />
+ <text name="WLCloudScrollXText">
+ Przesuwanie X
+ </text>
+ <check_box label="Blokada" name="WLCloudLockX" />
+ <text name="WLCloudScrollYText">
+ Przesuwanie Y
+ </text>
+ <check_box label="Blokada" name="WLCloudLockY" />
+ </panel>
+ </tab_container>
+ <check_box label="Ustaw jako moje Ustawienie Nieba" name="make_default_cb" />
+ <button label="Zapisz" name="save" />
+ <button label="Anuluj" name="cancel" />
+ </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pl/floater_edit_water_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb3846cd215d2a071bd1cd2e2c4ba0eaec356dc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_edit_water_preset.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Edit Water Preset" title="Edytuj ustawienie wody">
+ <string name="title_new">
+ Stwórz nowe Ustawienie wody
+ </string>
+ <string name="title_edit">
+ Edytuj Ustawienie wody
+ </string>
+ <string name="hint_new">
+ Nazwij Ustawienie, ustaw co trzeba i kliknij na "Zapisz".
+ </string>
+ <string name="hint_edit">
+ Aby edytować Ustawienie ustaw co trzeba i kliknij na "Zapisz".
+ </string>
+ <string name="combo_label">
+ -Wybierz Ustawienie-
+ </string>
+ <text name="hint">
+ Aby edytować Ustawienie ustaw co trzeba i kliknij na "Zapisz".
+ </text>
+ <text name="label">
+ Nazwa:
+ </text>
+ <text name="note">
+ Uwaga: jeśli zmienisz nazwę Ustawienia, to zaczniesz tworzyć nowe, a obecne pozostanie bez zmian.
+ </text>
+ <panel name="panel_water_preset">
+ <text name="water_color_label">
+ Kolor mgły wody
+ </text>
+ <text name="water_fog_density_label">
+ Gęstość mgły
+ </text>
+ <text name="underwater_fog_modifier_label">
+ Modyfikator mgły pod wodą
+ </text>
+ <text name="BHText">
+ Kierunek Wielkiej Fali
+ </text>
+ <text name="BDensText">
+ Skala odbicia falkowego
+ </text>
+ <text name="HDText">
+ Skala Fresnela
+ </text>
+ <text name="FresnelOffsetText">
+ Przesun. Fresnela
+ </text>
+ <text name="BHText2">
+ Kierunek Małej Fali
+ </text>
+ <text name="DensMultText">
+ Skala załamania ponad
+ </text>
+ <text name="WaterScaleBelowText">
+ Skala załamania poniżej
+ </text>
+ <text name="MaxAltText">
+ Mnożnik rozmycia
+ </text>
+ <text name="BHText3">
+ Mapa normalnych
+ </text>
+ </panel>
+ <check_box label="Ustaw jako moje Ustawienie Wody" name="make_default_cb" />
+ <button label="Zapisz" name="save" />
+ <button label="Anuluj" name="cancel" />
+ </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_environment_settings.xml b/indra/newview/skins/default/xui/pl/floater_environment_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8a13ece8f597cbe71cbc0f15e920dbe784f15cb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Environment Editor Floater" title="USTAWIENIA OTOCZENIA">
+ <text name="note">
+ Użyj opcji poniżej, aby dostosować ustawienia otoczenia w swojej przeglądarce.
+ </text>
+ <radio_group name="region_settings_radio_group">
+ <radio_item label="Użyj ustawień regionu" name="use_region_settings" />
+ <radio_item label="Dostosuj otoczenie" name="use_my_settings" />
+ </radio_group>
+ <panel name="user_environment_settings">
+ <text name="note">
+ UWAGA: Twoje ustawienia będą niewidoczne dla innych.
+ </text>
+ <text name="water_settings_title">
+ Ustaw. wody
+ </text>
+ <combo_box name="water_settings_preset_combo">
+ <combo_box.item label="-Wybierz Ustawienie-" name="item0" />
+ </combo_box>
+ <text name="sky_dayc_settings_title">
+ Ustaw. nieba (stałe lub cykliczne):
+ </text>
+ <radio_group name="sky_dayc_settings_radio_group">
+ <radio_item label="Stałe" name="my_sky_settings" />
+ <radio_item label="Cykl dnia" name="my_dayc_settings" />
+ </radio_group>
+ <combo_box name="sky_settings_preset_combo">
+ <combo_box.item label="-Wybierz Ustawienie-" name="item0" />
+ </combo_box>
+ <combo_box name="dayc_settings_preset_combo">
+ <combo_box.item label="-Wybierz Ustawienie-" name="item0" />
+ </combo_box>
+ </panel>
+ <button label="Gotowe" name="ok_btn" />
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml
old mode 100755
new mode 100644
index d27811496919f917bbe86e6e7fe8f321c7a0aa4b..43492b5dd41035f1208f5ed4bc4337bfad1696dd
--- a/indra/newview/skins/default/xui/pl/floater_event.xml
+++ b/indra/newview/skins/default/xui/pl/floater_event.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater can_resize="true" follows="all" height="400" help_topic="event_details" label="Event" layout="topleft" name="Event" save_rect="true" save_visibility="false" title="EVENT DETAILS" width="600">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="Wydarzenie" name="Event" title="SZCZEGÓÅY WYDARZENIA">
<floater.string name="loading_text">
Åadowanie...
</floater.string>
<floater.string name="done_text">
- Zakończono
+ Gotowe
</floater.string>
- <web_browser follows="left|right|top|bottom" height="365" layout="topleft" left="10" name="browser" top="0" trusted_content="true" width="580"/>
- <text follows="bottom|left" height="16" layout="topleft" left_delta="0" name="status_text" top_pad="10" width="150"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_facebook.xml b/indra/newview/skins/default/xui/pl/floater_facebook.xml
new file mode 100644
index 0000000000000000000000000000000000000000..588285ea7bfa73b7f96a9315d17fdc2a308170dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_facebook.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_facebook" title="WYÅšLIJ NA FACEBOOKA">
+ <tab_container name="tabs">
+ <panel label="ZDJĘCIE" name="panel_facebook_photo" />
+ <panel label="MIEJSCE" name="panel_facebook_place" />
+ <panel label="ZNAJOMI" name="panel_facebook_friends" />
+ <panel label="KONTO" name="panel_facebook_account" />
+ </tab_container>
+ <text name="connection_error_text">
+ BÅ‚Ä…d
+ </text>
+ <text name="connection_loading_text">
+ Åadowanie...
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f7fd596789b93dc46248000f47e3dc9107b8ade
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="fast_timers">
+ <string name="pause">
+ Pauza
+ </string>
+ <string name="run">
+ Start
+ </string>
+ <combo_box name="time_scale_combo">
+ <item name="2x Average" label="2x średnia" />
+ <item name="Max" label="Maksimum" />
+ <item name="Recent Max" label="Ostatnie maksimum" />
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item name="Time" label="Czas" />
+ <item name="Number of Calls" label="Ilość odwołań" />
+ </combo_box>
+ <button name="pause_btn" label="Pauza" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_flickr.xml b/indra/newview/skins/default/xui/pl/floater_flickr.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9522695e3cada1cea5d893f0a9bf253212cfbb9a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_flickr.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_flickr" title="WYÅšLIJ NA FLICKR">
+ <panel name="background">
+ <tab_container name="tabs">
+ <panel label="ZDJĘCIE" name="panel_flickr_photo" />
+ <panel label="KONTO" name="panel_flickr_account" />
+ </tab_container>
+ <panel name="connection_status_panel">
+ <text name="connection_error_text">
+ BÅ‚Ä…d
+ </text>
+ <text name="connection_loading_text">
+ Åadowanie...
+ </text>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml
old mode 100755
new mode 100644
index 019cee3e1e55da88866422f5fab45bad04590cc1..7bf6c11d218a98f5dc0b896151b40f886acd3d46
--- a/indra/newview/skins/default/xui/pl/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml
@@ -1,6 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="CZCIONKA TEKSTU">
- <text name="linea">
- OverrideTest, powinno wyświetlać się jako Times. (From default/xui/en-us)
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="TEST CZCIONKI" />
diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml
old mode 100755
new mode 100644
index 0c27e4d0bb6e3a3dfa13c31266e5f840eefcde95..8600e31c72b8b1c4e602d4affc7eaa50b03bf843
--- a/indra/newview/skins/default/xui/pl/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Miejsca" name="gestures" title="GESTY">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gestures" title="GESTY" label="Miejsca">
<floater.string name="loading">
Åadowanie...
</floater.string>
@@ -10,18 +10,17 @@
Kopia [COPY_NAME]
</floater.string>
<scroll_list name="gesture_list">
- <scroll_list.columns label="Nazwa" name="name"/>
- <scroll_list.columns label="Czat" name="trigger"/>
- <scroll_list.columns label="" name="key"/>
- <scroll_list.columns label="Klucz" name="shortcut"/>
+ <scroll_list.columns label="Nazwa" name="name" />
+ <scroll_list.columns label="Czat" name="trigger" />
+ <scroll_list.columns label="Skrót" name="shortcut" />
</scroll_list>
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="gear_btn" tool_tip="Więcej opcji"/>
- <button name="new_gesture_btn" tool_tip="Stwórz nową gesturę"/>
- <button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybranÄ… gesturÄ™"/>
- <button name="del_btn" tool_tip="Usuń gesturę"/>
+ <panel name="bottom_panel">
+ <menu_button name="gear_btn" tool_tip="Więcej opcji" />
+ <button name="new_gesture_btn" tool_tip="Stwórz nowy gest" />
+ <button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybrany gest" />
+ <button name="del_btn" tool_tip="Usuń gest" />
</panel>
- <button label="Edytuj" name="edit_btn"/>
- <button label="Odtwarzaj" name="play_btn"/>
- <button label="Zatrzymaj" name="stop_btn"/>
+ <button label="Edytuj" name="edit_btn" />
+ <button label="Odtwarzaj" name="play_btn" />
+ <button label="Zatrzymaj" name="stop_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
old mode 100755
new mode 100644
index 828898de546470c40c0e53b9072b40c7a6d9f894..6d71b1908015ccfe2f405c453351798e31ca9ef4
--- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
@@ -1,100 +1,93 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="godtools floater" title="BOSKIE NARZĘDZIA">
<tab_container name="GodTools Tabs">
- <panel label="Grid" name="grid">
- <button label="Wyrównaj widoczność buforu mapy Regionu" label_selected="Wyrównaj widoczność buforu mapy Regionu" name="Flush This Region's Map Visibility Caches" width="285"/>
+ <panel name="grid">
+ <button label="Odśwież bufor widoczności mapy Regionu" label_selected="Odśwież bufor widoczności mapy Regionu" name="Flush This Region's Map Visibility Caches" />
</panel>
- <panel label="Region" name="region">
+ <panel name="region">
<text name="Region Name:">
- Nazwa Regionu:
+ Region:
</text>
- <line_editor left="115" name="region name" width="178"/>
- <check_box label="Wstęp" name="check prelude" tool_tip="Set this to make the region a prelude"/>
- <check_box label="Korekta słońca" name="check fixed sun" tool_tip="Skoryguj ustawienia pozycji słońca."/>
- <check_box height="32" label="Zresetuj pozycję Miejsca Startowego" name="check reset home" tool_tip="Zresetuj miejsce startu Rezydentów po teleportacji"/>
- <check_box bottom_delta="-32" label="Widoczny" name="check visible" tool_tip="Wybierz tą opcję by ustawić region widocznym dla wszystkich."/>
- <check_box label="Zniszczenia" name="check damage" tool_tip="Wybierz tę opcję by uruchomić opcję zniszczeń w regionie."/>
- <check_box label="Zablokuj monitorowanie trafficu" name="block dwell" tool_tip="Wybierz tą opcję by zablokować monitorowanie trafficu w regionie."/>
- <check_box label="Zablokuj terraformowanie" name="block terraform" tool_tip="Wybierz tą opcję by zablokować terraforming w regionie"/>
- <check_box label="Piaskownica" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/>
- <button label="Ustal teren" label_selected="Ustal teren" name="Bake Terrain" tool_tip="Zapamiętaj obecny teren jako początkowy dla cofnięcia modyfikacji terenu." width="138"/>
- <button label="Cofnięcie modyfikacji" label_selected="Cofnięcie modyfikacji" name="Revert Terrain" tool_tip="Przywróć ustawienia domyślne Regionu." width="138"/>
- <button label="Zamień teren" label_selected="Zamień teren" name="Swap Terrain" tool_tip="Zmień bieżący teren domyślnie" width="138"/>
+ <check_box label="Wstęp" name="check prelude" tool_tip="Zaznacz, aby ustawić region jako Wstęp" />
+ <check_box label="Stałe słońce" name="check fixed sun" tool_tip="Stałe słońce (jak w Region/Majtek > Teren)." />
+ <check_box label="Resetuj Start po teleportacji" name="check reset home" tool_tip="Gdy Rezydent siÄ™ wyteleportowywuje, to jego pozycja startowa zostaje ustawiona na pozycjÄ™ docelowÄ…." />
+ <check_box label="Widoczny" name="check visible" tool_tip="Wybierz tą opcję by ustawić region widocznym dla wszystkich." />
+ <check_box label="Uszkodzenia" name="check damage" tool_tip="Wybierz tę opcję by uruchomić opcję uszkodzeń w regionie." />
+ <check_box label="Zablokuj śledzenie ruchu" name="block dwell" tool_tip="Wybierz tą opcję by zablokować monitorowanie ruchu (trafficu) w regionie." />
+ <check_box label="Zablokuj terraformowanie" name="block terraform" tool_tip="Wybierz tą opcję by zablokować terraforming w regionie" />
+ <check_box label="Piaskownica" name="is sandbox" tool_tip="Ustawia region jako piaskownicÄ™ (sandbox)" />
+ <button label="Ustal teren" label_selected="Ustal teren" name="Bake Terrain" tool_tip="(Bake Terrain) Zapamiętaj obecny teren jako początkowy dla cofnięcia modyfikacji terenu." />
+ <button label="Cofnij modyfikacje" label_selected="Cofnij modyfikacje" name="Revert Terrain" tool_tip="Przywróć ustawienia domyślne Regionu dla terenu." />
+ <button label="Zamień teren" label_selected="Zamień teren" name="Swap Terrain" tool_tip="Zamień bieżący teren na domyślny" />
<text name="estate id">
ID Regionu:
</text>
- <line_editor name="estate"/>
<text name="parent id">
- Parent ID:
+ ID Rodzica:
</text>
- <line_editor name="parentestate" tool_tip="This is the parent estate for this region"/>
+ <line_editor name="parentestate" tool_tip="To jest MajÄ…tek-Rodzic dla tego regionu" />
<text name="Grid Pos: ">
- Pozycje Gridu:
+ Poz. Siatki:
</text>
- <line_editor left_delta="110" name="gridposx" tool_tip="Pozycja x gridu dla regionu" width="35"/>
- <line_editor left_delta="45" name="gridposy" tool_tip="Pozycja y gridu dla regionu" width="35"/>
+ <line_editor name="gridposx" tool_tip="Pozycja x siatki dla regionu" />
+ <line_editor name="gridposy" tool_tip="Pozycja y siatki dla regionu" />
<text name="Redirect to Grid: ">
- Przełącz do gridu:
+ Kier. na siatkÄ™:
</text>
- <line_editor left_delta="110" name="redirectx" width="35"/>
- <line_editor left_delta="45" name="redirecty" width="35"/>
<text name="billable factor text">
Czynnik płatności:
</text>
- <spinner name="billable factor"/>
<text name="land cost text">
L$/m²:
</text>
- <spinner name="land cost"/>
- <button label="Odśwież" label_selected="Odśwież" name="Refresh" tool_tip="Kliknij tutaj aby odswieżyć powyższe informacje"/>
- <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Kliknij tutaj aby zastosować powyższe zmiany"/>
- <button label="Wybierz Region" label_selected="Wybierz Region" left="156" name="Select Region" tool_tip="Wybierz cały Region za pomocą narzędzi edycji terenu" width="150"/>
- <button label="Automatyczne zapisanie" label_selected="Automatyczne zapisanie" left="156" name="Autosave now" tool_tip="Save gzipped state to autosave directory" width="150"/>
+ <button label="Odśwież" label_selected="Odśwież" name="Refresh" tool_tip="Kliknij tutaj aby odswieżyć powyższe informacje" />
+ <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Kliknij tutaj aby zastosować powyższe zmiany" />
+ <button label="Wybierz Region" label_selected="Wybierz Region" name="Select Region" tool_tip="Wybierz cały Region za pomocą narzędzi edycji terenu" />
+ <button label="Autozapisz teraz" label_selected="Autozapisz teraz" name="Autosave now" tool_tip="Zapisz spakowany gzipem stan do katalogu autozapisu" />
</panel>
<panel label="Obiekty" name="objects">
+ <panel.string name="no_target">
+ (brak celu)
+ </panel.string>
<text name="Region Name:">
Nazwa Regionu:
</text>
- <text left_delta="110" name="region name">
- Welsh
- </text>
- <check_box label="Wyłącz skrypty" name="disable scripts" tool_tip="Wybierz aby wyłączyć skrypty w tym Regionie"/>
- <check_box label="Deaktywuj kolizje" name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region"/>
- <check_box label="Wylącz fizykę" name="disable physics" tool_tip="Wybierz aby wyłączyć fizykę w tym Regionie"/>
- <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Kliknij tu aby zastosować powyższe zmiany"/>
- <button label="Ustaw cel" label_selected="Ustaw cel" name="Set Target" tool_tip="Ustaw docelowego awatara w celu skasowania obiektów"/>
+ <check_box label="Wyłącz skrypty" name="disable scripts" tool_tip="Wybierz aby wyłączyć skrypty w tym Regionie" />
+ <check_box label="Wyłącz kolizje" name="disable collisions" tool_tip="Wybierz aby wyłączyć kolizje inne niż awatarów w tym Regionie" />
+ <check_box label="Wyłącz fizykę" name="disable physics" tool_tip="Wybierz aby wyłączyć fizykę w tym Regionie" />
+ <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Kliknij tu aby zastosować powyższe zmiany" />
+ <button label="Ustaw cel" label_selected="Ustaw cel" name="Set Target" tool_tip="Ustaw docelowego awatara w celu skasowania obiektów" />
<text name="target_avatar_name">
- (brak)
+ (brak celu)
</text>
- <button label="Usuń cel z oskryptowanych obiektów na innych posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na innych posiadłościach" name="Delete Target's Scripted Objects On Others Land" tool_tip="Skasuj wszystkie oskryptowane obiekty posiadane przez cel na Posiadłości, której nie jest właścicielem. (obiekty bez praw kopiowania zostaną zwrócone)"/>
- <button label="Usuń cel z oskryptowanych obiektów na jakichkolwiek posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Skasuj wszystkie oksryptowane obiekty posiadane przez cel w tym Regionie. (obiekty bez praw kopiowania zostaną zwrócone)"/>
- <button label="Usuń wszystkie cele i obiekty" label_selected="Usuń wszystkie cele i obiekty" name="Delete *ALL* Of Target's Objects" tool_tip="Skasuj wszystkie obiekty posiadane przez cel w tym Regionie. (obiekty bez praw kopiowania zostaną zwrócone)"/>
- <button label="Główne kolizje" label_selected="Główne kolizje" name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks"/>
- <button label="Główne skrypty" label_selected="Główne skrypty" name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts"/>
- <button label="Treść skryptów" label_selected="Treść skryptów" name="Scripts digest" tool_tip="Wyświetla listę wszystkich skryptów i liczbę ich zastosowań."/>
+ <button label="Usuń oskryptowane obiekty celu na innych działkach" label_selected="Usuń oskryptowane obiekty celu na innych działkach" name="Delete Target's Scripted Objects On Others Land" tool_tip="Skasuj wszystkie oskryptowane obiekty posiadane przez cel na działki, której nie jest właścicielem (obiekty bez praw kopiowania zostaną zwrócone)." />
+ <button label="Usuń oskryptowane obiekty celu na jakichkolwiek działkach" label_selected="Usuń oskryptowane obiekty celu na jakichkolwiek działkach" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Skasuj wszystkie oksryptowane obiekty posiadane przez cel w tym Regionie (obiekty bez praw kopiowania zostaną zwrócone)." />
+ <button label="Usuń wszystkie obiekty celu" label_selected="Usuń wszystkie obiekty celu" name="Delete *ALL* Of Target's Objects" tool_tip="Skasuj wszystkie obiekty posiadane przez cel w tym Regionie (obiekty bez praw kopiowania zostaną zwrócone)." />
+ <button label="Główne kolizje" label_selected="Główne kolizje" name="Get Top Colliders" tool_tip="Lista obiektów, które najbardziej doświadczają kolizji" />
+ <button label="Główne skrypty" label_selected="Główne skrypty" name="Get Top Scripts" tool_tip="Lista obiektów, które najdłużej podtrzymują działanie skryptów" />
+ <button label="Skrócone: skrypty" label_selected="Skrócone: skrypty" name="Scripts digest" tool_tip="Wyświetla listę wszystkich skryptów i liczbę ich wystąpień." />
</panel>
<panel label="Zażądaj" name="request">
<text name="Destination:">
Cel:
</text>
<combo_box name="destination">
- <combo_box.item label="Selekcja" name="item1"/>
- <combo_box.item label="Agent Regionu" name="item2"/>
+ <combo_box.item label="Selekcja" name="item1" />
+ <combo_box.item label="Agent Regionu" name="item2" />
</combo_box>
<text name="Request:">
Żądanie:
</text>
<combo_box name="request">
- <combo_box.item label="kolidery <kroki>" name="item1"/>
- <combo_box.item label="skrypty <policz>,<opcjonalnie powtórzenie>" name="item2"/>
- <combo_box.item label="obiekty <powtórzenia>" name="item3"/>
- <combo_box.item label="rez <asset_id>" name="item4"/>
+ <combo_box.item label="kolizje <kroki>" name="item1" />
+ <combo_box.item label="skrypty <policz>,<opcjonalny wzorzec>" name="item2" />
+ <combo_box.item label="obiekty <wzorzec>" name="item3" />
+ <combo_box.item label="rezzuj <asset_id>" name="item4" />
</combo_box>
<text name="Parameter:">
- Parameter:
+ Parametr:
</text>
- <line_editor name="parameter"/>
- <button label="Zażądaj" label_selected="Zażądaj" name="Make Request"/>
+ <button label="Zażądaj" label_selected="Zażądaj" name="Make Request" />
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_goto_line.xml b/indra/newview/skins/default/xui/pl/floater_goto_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eab991fbb7636d61f48dfdded5b72a3ed3bb2dcb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_goto_line.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script goto" title="IDŹ DO LINII">
+ <text name="txt">
+ Idź do linii
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
old mode 100755
new mode 100644
index 471d2c39baf2571cd487108b858625a008520771..e908e30705ff3e36704062ceadf3e0b15fab3dee
--- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
@@ -1,31 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Hardware Settings Floater" title="USTAWIENIA SPRZĘTOWE">
<text name="Filtering:">
Filtrowanie:
</text>
- <check_box label="Filtr anizotropowy" name="ani"/>
+ <check_box label="Filtr anizotropowy (wolniej!)" name="ani" />
<text name="Antialiasing:">
Antyaliasing:
</text>
- <combo_box label="Antialiasing" name="fsaa" width="84">
- <combo_box.item label="Wyłączone" name="FSAADisabled"/>
- <combo_box.item label="2x" name="2x"/>
- <combo_box.item label="4x" name="4x"/>
- <combo_box.item label="8x" name="8x"/>
- <combo_box.item label="16x" name="16x"/>
+ <combo_box label="Antyaliasing" name="fsaa">
+ <combo_box.item label="Wyłączony" name="FSAADisabled" />
</combo_box>
<text name="antialiasing restart">
(Restart wymagany)
</text>
- <spinner label="Gamma:" name="gamma"/>
<text name="(brightness, lower is brighter)">
- (0=domyślna jaskrawość, niższa wartość=jaśniej)
+ (0 = domyślna jasność, niżej = jaśniej)
</text>
<text name="Enable VBO:">
WÅ‚Ä…cz VBO:
</text>
- <check_box initial_value="true" label="WÅ‚Ä…cz rozszerzenie OpenGL" name="vbo" tool_tip=""/>
- <slider label="Pamięć na tekstury (MB):" name="GraphicsCardTextureMemory" tool_tip="Ilość alokacji pamięci dla tekstur. Domyślne dla karty pamięci video. Obniżenie poziomu tych funkcji może polepszyć wydajność systemową jednak spowoduje zmniejszenie jakości i wyrazistości tekstur."/>
- <spinner label="Stosunek dystansu mgły:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
+ <check_box label="Włącz OpenGL VBO" name="vbo" tool_tip="OpenGL Vertex Buffer Object (opis geometrii obiektów). Włączenie tej opcji na nowoczesnym sprzęcie spowoduje wzrost wydajności. Starszy sprzęt jednak ma często słabe wsparcie dla VBO i mogą wystąpić na nim awarie." />
+ <text name="tc label">
+ WÅ‚Ä…cz S3TC:
+ </text>
+ <check_box label="Włącz 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." />
+ <slider label="Bufor pamięci tekstur (MB):" name="GraphicsCardTextureMemory" tool_tip="Ilość pamięci przeznaczona na tekstury. Domyślnie jest to maksymalna wielkość pamięci karty graficznej, ale nie więcej niż 512 MB. Zmniejszenie tej wartości może spowodować wzrost wydajności, ale tekstury będą bardziej rozmazane. Zwiększanie tej wartości ponad 512 MB nie jest wskazane nawet, jeśli Twoja karta to obsługuje - ogólna wydajność Przeglądarki związana z pamięcią operacyjną widocznie spadnie." />
+ <spinner label="Stosunek odległości dla mgły:" name="fog" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_help_browser.xml b/indra/newview/skins/default/xui/pl/floater_help_browser.xml
old mode 100755
new mode 100644
index dfd5f907e5135e50a93c55229a54c8bdc488d237..d253d8bda5ca990154ef09891a8f513307a234bb
--- a/indra/newview/skins/default/xui/pl/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/pl/floater_help_browser.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_help_browser" title="PRZEGLÄ„DARKA POMOCY">
<floater.string name="loading_text">
Åadowanie...
</floater.string>
- <layout_stack name="stack1">
- <layout_panel name="external_controls"/>
- </layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_how_to.xml b/indra/newview/skins/default/xui/pl/floater_how_to.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2c412de30abdd1b90b772a950bac7471528725df
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_how_to.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_how_to" title="SAMOUCZEK" />
diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml
old mode 100755
new mode 100644
index a5d85aca4ec40a8f0c334965a896d109b8f21b37..f17ea927780f077cfe2bf8fae0f17dbdb6a90de0
--- a/indra/newview/skins/default/xui/pl/floater_hud.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hud.xml
@@ -1,2 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="SAMOUCZEK"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="SAMOUCZEK">
+ <web_browser name="floater_hud_browser" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0AWczytywanie...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_im_container.xml b/indra/newview/skins/default/xui/pl/floater_im_container.xml
old mode 100755
new mode 100644
index ddf0790fa8cb38f84f62a16c51ab398a0cd32f6f..c460ba74359dd2f18158f4a15732e92d72bd4cfc
--- a/indra/newview/skins/default/xui/pl/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pl/floater_im_container.xml
@@ -1,2 +1,27 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ROZMOWY"/>
+<multi_floater name="floater_im_box" title="ROZMOWY">
+ <layout_stack name="conversations_stack">
+ <layout_panel name="conversations_layout_panel">
+ <layout_stack name="conversations_pane_buttons_stack">
+ <layout_panel name="conversations_pane_buttons_expanded">
+ <menu_button name="sort_btn" tool_tip="Opcje widoku/sortowania" />
+ <button name="add_btn" tool_tip="Rozpocznij nowÄ… rozmowÄ™" />
+ <button name="speak_btn" tool_tip="Rozmawiaj z ludźmi przy użyciu mikrofonu" />
+ </layout_panel>
+ <layout_panel name="conversations_pane_buttons_collapsed">
+ <button name="expand_collapse_btn" tool_tip="Zwiń/Rozwiń tą listę" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="messages_layout_panel">
+ <panel_container name="im_box_tab_container">
+ <panel name="stub_panel">
+ <button name="stub_collapse_btn" tool_tip="Zwiń ten panel" />
+ <text name="stub_textbox">
+ Ta rozmowa jest w osobnym oknie. [secondlife:/// Z powrotem.]
+ </text>
+ </panel>
+ </panel_container>
+ </layout_panel>
+ </layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml
old mode 100755
new mode 100644
index 9041ff7416c74d0d345f7f09a8aea3d7a2a0cb3c..ee6e465ea3cfe3617280faaf1f741a3ddc1a3654
--- a/indra/newview/skins/default/xui/pl/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml
@@ -1,8 +1,42 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="panel_im">
- <layout_stack name="im_panels">
- <layout_panel>
- <line_editor label="Do" name="chat_editor"/>
- </layout_panel>
- </layout_stack>
+ <floater.string name="participant_added" value="[NAME] został/a zaproszony/a do rozmowy." />
+ <floater.string name="multiple_participants_added" value="[NAME] zostali zaproszeni do rozmowy." />
+ <floater.string name="tooltip_to_separate_window" value="PrzenieÅ› rozmowÄ™ do osobnego okna" />
+ <floater.string name="tooltip_to_main_window" value="Przenieś rozmowę z powrotem do głównego okna" />
+ <floater.string name="start_call_button_tooltip" value="Rozpocznij rozmowę głosową" />
+ <floater.string name="end_call_button_tooltip" value="Zakończ rozmowę głosową" />
+ <floater.string name="expcol_button_not_tearoff_tooltip" value="Zwiń ten panel" />
+ <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Zwiń listę uczestników" />
+ <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Rozwiń listę uczestników" />
+ <view name="contents_view">
+ <layout_stack name="main_stack">
+ <layout_panel name="toolbar_panel">
+ <menu_button name="view_options_btn" tool_tip="Opcje widoku/sortowania" />
+ <menu_button name="gear_btn" tool_tip="Akcje dotyczÄ…ce wybranej osoby" />
+ <button name="add_btn" tool_tip="Dodaj osobÄ™ do tej rozmowy" />
+ <button name="voice_call_btn" tool_tip="Rozpocznij rozmowę głosową" />
+ <button name="close_btn" tool_tip="Zakończ tą rozmowę" />
+ <button name="expand_collapse_btn" tool_tip="Zwiń/Rozwiń ten panel" />
+ </layout_panel>
+ <layout_panel name="body_panel">
+ <layout_stack name="im_panels">
+ <layout_panel name="right_part_holder">
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="TÅ‚umacz czat" name="translate_chat_checkbox" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="chat_layout_panel">
+ <layout_stack name="input_panels">
+ <layout_panel name="input_button_layout_panel">
+ <button name="minz_btn" tool_tip="Pokaż/ukryj panel wiadomości" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+ </view>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
old mode 100755
new mode 100644
index ba9724ff9a85e45fcef23a940db02a5b35fd12f8..dd20fd0be25ee059dce07a0acf85029e39c94158
--- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Image Preview" title="">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Image Preview">
<text name="name_label">
Nazwa:
</text>
@@ -10,23 +10,23 @@
Wyświetl obraz jako:
</text>
<combo_box label="Rodzaj Ubrania" name="clothing_type_combo">
- <item label="Obraz" name="Image" value="Tekstura"/>
- <item label="WÅ‚osy" name="Hair" value="WÅ‚osy"/>
- <item label="GÅ‚owa kobiety" name="FemaleHead" value="GÅ‚owa kobiety"/>
- <item label="Górna część ciała kobiety" name="FemaleUpperBody" value="Górna część ciała kobiety"/>
- <item label="Dolna część ciała kobiety" name="FemaleLowerBody" value="Dolna część ciała kobiety"/>
- <item label="Głowa mężczyzny" name="MaleHead" value="Głowa mężczyzny"/>
- <item label="Górna część ciała mężczyzny" name="MaleUpperBody" value="Górna część ciała mężczyzny"/>
- <item label="Dona część ciała mężczyzny" name="MaleLowerBody" value="Dolna część ciała mężczyzny"/>
- <item label="Spódnica" name="Skirt" value="Spódnica"/>
- <item label="Prim sculptowy" name="SculptedPrim" value="Prim sculptowy"/>
+ <item label="Obraz" name="Image" />
+ <item label="WÅ‚osy" name="Hair" />
+ <item label="GÅ‚owa kobiety" name="FemaleHead" />
+ <item label="Górna część ciała kobiety" name="FemaleUpperBody" />
+ <item label="Dolna część ciała kobiety" name="FemaleLowerBody" />
+ <item label="Głowa mężczyzny" name="MaleHead" />
+ <item label="Górna część ciała mężczyzny" name="MaleUpperBody" />
+ <item label="Dolna część ciała mężczyzny" name="MaleLowerBody" />
+ <item label="Spódnica" name="Skirt" />
+ <item label="Prim skulptowy" name="SculptedPrim" />
</combo_box>
<text name="bad_image_text">
Nie można wczytać obrazu.
Spróbuj zapisać obraz jako 24 bitową Targa (.tga).
</text>
- <check_box label="Użyj kompresji bez strat" name="lossless_check"/>
- <button label="Anuluj" name="cancel_btn"/>
- <button label="Załaduj ([AMOUNT]L$)" name="ok_btn"/>
+ <check_box label="Kompresja bezstratna" name="lossless_check" />
+ <button label="Anuluj" name="cancel_btn" />
+ <button label="Załaduj ([AMOUNT]L$)" name="ok_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_import_collada.xml b/indra/newview/skins/default/xui/pl/floater_import_collada.xml
new file mode 100644
index 0000000000000000000000000000000000000000..596ecabbfe91a574d33f77ec7bc00a84fd341daa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_import_collada.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Import Collada" title="Importuj scenÄ™">
+ <text name="mesh count">
+ Mesze: [COUNT]
+ </text>
+ <text name="texture count">
+ Tekstury: [COUNT]
+ </text>
+ <text name="status">
+ Status: [STATUS]
+ </text>
+ <button name="cancel" label="Anuluj" />
+ <string name="status_idle">
+ Bezczynny
+ </string>
+ <string name="status_uploading">
+ Åadowanie [NAME]
+ </string>
+ <string name="status_creating">
+ Tworzenie obiektu [NAME]
+ </string>
+ </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
old mode 100755
new mode 100644
index b06b6d713d24ea16afabc04a08b5624f5ca7928d..515391bc1485c6503589aeba9475dfc45683df13
--- a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="incoming call" title="Rozmowa głosowa">
- <floater.string name="lifetime">
- 5
- </floater.string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="incoming call">
<floater.string name="localchat">
Rozmowy głosowe w pobliżu
</floater.string>
@@ -13,21 +10,21 @@
dzwoni.
</floater.string>
<floater.string name="VoiceInviteAdHoc">
- rozpoczął rozmowę głosową w czacie konferencji.
+ dołączył do rozmowy głosowej w czacie konferencji.
</floater.string>
<floater.string name="VoiceInviteGroup">
- dołączył/dołączyła do '[GROUP]' rozmowy głosowej.
+ dołączył/a do rozmowy głosowej '[GROUP]'.
</floater.string>
<floater.string name="VoiceInviteQuestionGroup">
- Czy chcesz opuścić [CURRENT_CHAT] i dołączyć do rozmowy z '[GROUP]'?
+ Czy chcesz opuścić [CURRENT_CHAT] i dołączyć do rozmowy z '[GROUP]'?
</floater.string>
<floater.string name="VoiceInviteQuestionDefault">
Czy chcesz opuścić [CURRENT_CHAT] i dołączyć do tej rozmowy głosowej?
</floater.string>
+ <button label="Odbierz" label_selected="Odbierz" name="Accept" />
+ <button label="Odrzuć" label_selected="Odrzuć" name="Reject" />
+ <button label="Rozpocznij IM" name="Start IM" />
<text name="question">
- Czy chcesz opuścić [CURRENT_CHAT] i dołączyć do tej rozmowy głosowej?
+ Jeśli odbierzesz, to zostaniesz rozłączony/a z obecnej rozmowy głosowej.
</text>
- <button label="Zaakceptuj" label_selected="Zaakceptuj" name="Accept"/>
- <button label="Odmów" label_selected="Odmów" name="Reject"/>
- <button label="Rozpocznij IM" name="Start IM"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml
old mode 100755
new mode 100644
index 2c66f2851dab30953a3cc90dcbf72b5cccf9ea0c..09b1ba45fd56c2b3c32bcae5033ccc8d4c45cd28
--- a/indra/newview/skins/default/xui/pl/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect" title="INSPEKCJA OBIEKTÓW">
- <floater.string name="timeStamp">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </floater.string>
- <scroll_list name="object_list" tool_tip="">
- <scroll_list.columns label="Nazwa" name="object_name"/>
- <scroll_list.columns label="Właściciel" name="owner_name"/>
- <scroll_list.columns label="Twórca" name="creator_name"/>
- <scroll_list.columns label="Data kreacji" name="creation_date"/>
+ <scroll_list name="object_list" tool_tip="Wybierz obiekt z tej listy, aby podświetlić go w świecie">
+ <scroll_list.columns label="Nazwa" name="object_name" />
+ <scroll_list.columns label="Właściciel" name="owner_name" />
+ <scroll_list.columns label="Twórca" name="creator_name" />
+ <scroll_list.columns label="Utworzony" name="creation_date" />
</scroll_list>
- <button label="Profil Właściciela..." label_selected="" name="button owner" tool_tip=""/>
- <button label="Profil Twórcy..." label_selected="" name="button creator" tool_tip=""/>
+ <button label="Profil Właściciela..." name="button owner" tool_tip="Zobacz profil Właściciela podświetlonego obiektu" />
+ <button label="Profil Twórcy..." name="button creator" tool_tip="Zobacz profil Twórcy podświetlonego obiektu" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml
deleted file mode 100755
index c42f57fb551ec7f6c568124a752b91c6c1aef205..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MOJA SZAFA">
- <floater.string name="Title">
- MOJA SZAFA
- </floater.string>
- <floater.string name="TitleFetching">
- MOJA SZAFA (Dostarczanie [ITEM_COUNT] obiektów...) [FILTER]
- </floater.string>
- <floater.string name="TitleCompleted">
- MOJA SZAFA ([ITEM_COUNT] obiektów) [FILTER]
- </floater.string>
- <floater.string name="Fetched">
- Dostarczono
- </floater.string>
- <panel label="Panel Moja Szafa" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
index 97d13c4dfeea53e0b68acb63f2fb854ac7fe555e..d2844e117f07069d1ccd389becc35972422b9f31
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
@@ -1,36 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="item properties" title="WÅAÅšCIWOÅšCI OBIEKTÓW W SZAFIE">
- <floater.string name="unknown">(nieznany)</floater.string>
- <floater.string name="public">(publiczny)</floater.string>
- <floater.string name="you_can">Opcje:</floater.string>
- <floater.string name="owner_can">Właściciel może:</floater.string>
- <floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
- <text name="LabelItemNameTitle">Nazwa:</text>
- <text name="LabelItemDescTitle">Opis:</text>
- <text name="LabelCreatorTitle">Twórca:</text>
- <button label="Profil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">Właściciel:</text>
- <button label="Profil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">Nabyte:</text>
- <text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
- <text name="OwnerLabel">Ty:</text>
- <check_box label="Edytuj" name="CheckOwnerModify"/>
- <check_box label="Kopiuj" name="CheckOwnerCopy"/>
- <check_box label="Odsprzedaż" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">Każdy:</text>
- <check_box label="Kopiuj" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">Grupa:</text>
- <check_box label="Udostępnij" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">Następny właściciel:</text>
- <check_box label="Edytuj" name="CheckNextOwnerModify"/>
- <check_box label="Kopiuje" name="CheckNextOwnerCopy"/>
- <check_box label="Odsprzedaż" name="CheckNextOwnerTransfer"/>
- <check_box label="Sprzedaż" name="CheckPurchase"/>
+ <floater.string name="unknown">
+ (nieznany)
+ </floater.string>
+ <floater.string name="public">
+ (publiczny)
+ </floater.string>
+ <floater.string name="you_can">
+ Ty możesz:
+ </floater.string>
+ <floater.string name="owner_can">
+ Właściciel może:
+ </floater.string>
+ <text name="LabelItemNameTitle">
+ Nazwa:
+ </text>
+ <text name="LabelItemDescTitle">
+ Opis:
+ </text>
+ <text name="LabelCreatorTitle">
+ Twórca:
+ </text>
+ <button label="Profil..." name="BtnCreator" />
+ <text name="LabelOwnerTitle">
+ Właściciel:
+ </text>
+ <button label="Profil..." name="BtnOwner" />
+ <text name="LabelAcquiredTitle">
+ Nabyte:
+ </text>
+ <text name="OwnerLabel">
+ Ty:
+ </text>
+ <check_box label="Modyfikacja" name="CheckOwnerModify" />
+ <check_box label="Kopiowanie" name="CheckOwnerCopy" />
+ <check_box label="Transferowanie" name="CheckOwnerTransfer" />
+ <text name="AnyoneLabel">
+ Każdy:
+ </text>
+ <check_box label="Kopiowanie" name="CheckEveryoneCopy" />
+ <text name="GroupLabel">
+ Grupa:
+ </text>
+ <check_box label="Udostępnij" name="CheckShareWithGroup" />
+ <text name="NextOwnerLabel">
+ Nast. właściciel:
+ </text>
+ <check_box label="Modyfikacja" name="CheckNextOwnerModify" />
+ <check_box label="Kopiowanie" name="CheckNextOwnerCopy" />
+ <check_box label="Transferowanie" name="CheckNextOwnerTransfer" />
+ <check_box label="Sprzedaż" name="CheckPurchase" />
<combo_box name="ComboBoxSaleType">
- <combo_box.item label="Kopia" name="Copy"/>
- <combo_box.item label="Zawartość" name="Contents"/>
- <combo_box.item label="Oryginał" name="Original"/>
+ <combo_box.item label="Kopia" name="Copy" />
+ <combo_box.item label="Zawartość" name="Contents" />
+ <combo_box.item label="Oryginał" name="Original" />
</combo_box>
- <spinner label="Cena:" name="Edit Cost"/>
- <text name="CurrencySymbol">L$</text>
+ <spinner name="Edit Cost" label="Cena:" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index bd7b221c5d68c67c5f352bcbe719b06366196b6a..4c09b3d6432595884c20806ad2fdcf94ace84ed0
--- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
@@ -6,19 +6,28 @@
<check_box label="Gesty" name="check_gesture" />
<check_box label="Landmarki" name="check_landmark" />
<check_box label="Noty" name="check_notecard" />
+ <check_box label="Mesze" name="check_mesh" />
<check_box label="Obiekty" name="check_object" />
<check_box label="Skrypty" name="check_script" />
<check_box label="Dźwięki" name="check_sound" />
<check_box label="Tekstury" name="check_texture" />
<check_box label="Zdjęcia" name="check_snapshot" />
- <button label="Wszystko" label_selected="Wszystko" name="All" />
+ <button label="Wszystko" label_selected="Wszystko" name="All" />
<button label="Żadne" label_selected="Żadne" name="None" />
- <check_box label="Zawsze pokazuj foldery" name="check_show_empty" />
- <check_box label="Od czasu wylogowania" name="check_since_logoff" />
+ <check_box label="Zawsze pokaż foldery" name="check_show_empty" />
+ <check_box label="Od wylogowania" name="check_since_logoff" />
<text name="- OR -">
- LUB -
</text>
- <spinner label="Od godzin" name="spin_hours_ago" />
- <spinner label="Od dni" name="spin_days_ago" />
+ <radio_group name="date_search_direction">
+ <radio_item label="Nowsze niż" name="newer" />
+ <radio_item label="Starsze niż" name="older" />
+ </radio_group>
+ <text name="label_hours">
+ Godzin
+ </text>
+ <text name="label_days">
+ Dni
+ </text>
<button label="Zamknij" label_selected="Zamknij" name="Close" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
old mode 100755
new mode 100644
index 2b1e362b9831afaef897ecd7f687b17ac319388e..f01c137dc9a2a29e3de6ef5523a710d124286cc5
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -1,119 +1,78 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Joystick" title="KONFIGURACJA JOYSTICKA">
- <check_box label="Aktywuj Joystick:" name="enable_joystick"/>
- <text left="130" name="joystick_type" width="360"/>
- <spinner label="Kalibracja Osi X" label_width="130" left="20" name="JoystickAxis1" width="170"/>
- <spinner label="Kalibracja Osi Y" label_width="130" left="210" name="JoystickAxis2" width="170"/>
- <spinner label="Kalibracja Osi Z" label_width="100" left="400" name="JoystickAxis0" width="140"/>
- <spinner label="Kalibracja wznoszenia" label_width="130" left="20" name="JoystickAxis4" width="170"/>
- <spinner label="Kalibracja wychylania" label_width="130" left="210" name="JoystickAxis5" width="170"/>
- <spinner label="Kalibracja obrotu" label_width="100" left="400" name="JoystickAxis3" width="140"/>
- <spinner label="Kalibracja powiększania" label_width="130" name="JoystickAxis6" width="170"/>
- <check_box label="Bezpośrednie" left="205" name="ZoomDirect"/>
- <check_box label="Kursor 3D" left="340" name="Cursor3D"/>
- <check_box label="Automatyczne" left="450" name="AutoLeveling"/>
+ <floater.string name="NoDevice">
+ nie wykryto urzÄ…dzenia
+ </floater.string>
+ <check_box label="WÅ‚Ä…cz joystick:" name="enable_joystick" />
+ <spinner label="Kalibruj oÅ› X" name="JoystickAxis1" />
+ <spinner label="Kalibruj oÅ› Y" name="JoystickAxis2" />
+ <spinner label="Kalibruj oÅ› Z" name="JoystickAxis0" />
+ <spinner label="Kalibruj wznoszenie" name="JoystickAxis4" />
+ <spinner label="Kalibruj wychył" name="JoystickAxis5" />
+ <spinner label="Kalibruj obrót" name="JoystickAxis3" />
+ <spinner label="Kalibruj powiększenie" name="JoystickAxis6" />
+ <check_box label="Bezp. powięk." name="ZoomDirect" />
+ <check_box label="Kursor 3D" name="Cursor3D" />
+ <check_box label="Autopoziom" name="AutoLeveling" />
<text name="Control Modes:">
Kontroluj:
</text>
- <check_box label="Awatara" name="JoystickAvatarEnabled" width="90"/>
- <check_box label="Budowanie" name="JoystickBuildEnabled" width="90"/>
- <check_box label="KamerÄ™ podczas latania" left="300" name="JoystickFlycamEnabled" width="90"/>
+ <check_box label="Awatara" name="JoystickAvatarEnabled" />
+ <check_box label="Budow." name="JoystickBuildEnabled" />
+ <check_box label="KamerÄ™ latajÄ…c" name="JoystickFlycamEnabled" />
+ <stat_view label="Monitor Joysticka" name="axis_view">
+ <stat_bar label="OÅ› 0" name="axis0" />
+ <stat_bar label="OÅ› 1" name="axis1" />
+ <stat_bar label="OÅ› 2" name="axis2" />
+ <stat_bar label="OÅ› 3" name="axis3" />
+ <stat_bar label="OÅ› 4" name="axis4" />
+ <stat_bar label="OÅ› 5" name="axis5" />
+ </stat_view>
<text name="XScale">
Skala X
</text>
- <spinner name="AvatarAxisScale1"/>
- <spinner name="BuildAxisScale1"/>
- <spinner left="300" name="FlycamAxisScale1"/>
<text name="YScale">
Skala Y
</text>
- <spinner name="AvatarAxisScale2"/>
- <spinner name="BuildAxisScale2"/>
- <spinner left="300" name="FlycamAxisScale2"/>
<text name="ZScale">
Skala Z
</text>
- <spinner name="AvatarAxisScale0"/>
- <spinner name="BuildAxisScale0"/>
- <spinner left="300" name="FlycamAxisScale0"/>
<text name="PitchScale">
Skala wznoszenia
</text>
- <spinner name="AvatarAxisScale4"/>
- <spinner name="BuildAxisScale4"/>
- <spinner left="300" name="FlycamAxisScale4"/>
<text name="YawScale">
Skala odchylania
</text>
- <spinner name="AvatarAxisScale5"/>
- <spinner name="BuildAxisScale5"/>
- <spinner left="300" name="FlycamAxisScale5"/>
<text name="RollScale">
Skala obrotu
</text>
- <spinner name="BuildAxisScale3"/>
- <spinner left="300" name="FlycamAxisScale3"/>
<text name="XDeadZone">
Tolerancja osi X
</text>
- <spinner name="AvatarAxisDeadZone1"/>
- <spinner name="BuildAxisDeadZone1"/>
- <spinner left="300" name="FlycamAxisDeadZone1"/>
<text name="YDeadZone">
Tolerancja osi Y
</text>
- <spinner name="AvatarAxisDeadZone2"/>
- <spinner name="BuildAxisDeadZone2"/>
- <spinner left="300" name="FlycamAxisDeadZone2"/>
<text name="ZDeadZone">
Tolerancja osi Z
</text>
- <spinner name="AvatarAxisDeadZone0"/>
- <spinner name="BuildAxisDeadZone0"/>
- <spinner left="300" name="FlycamAxisDeadZone0"/>
<text name="PitchDeadZone">
Tolerancja wznoszenia
</text>
- <spinner name="AvatarAxisDeadZone4"/>
- <spinner name="BuildAxisDeadZone4"/>
- <spinner left="300" name="FlycamAxisDeadZone4"/>
<text name="YawDeadZone">
Tolerancja odchylania
</text>
- <spinner name="AvatarAxisDeadZone5"/>
- <spinner name="BuildAxisDeadZone5"/>
- <spinner left="300" name="FlycamAxisDeadZone5"/>
<text name="RollDeadZone">
Tolerancja obrotu
</text>
- <spinner name="BuildAxisDeadZone3"/>
- <spinner left="300" name="FlycamAxisDeadZone3"/>
<text name="Feathering">
Przenikanie
</text>
- <slider label="" name="AvatarFeathering"/>
- <slider label="" name="BuildFeathering"/>
- <slider label="" left_delta="81" name="FlycamFeathering"/>
<text name="ZoomScale2">
Skala powiększania
</text>
- <spinner label="" left="300" name="FlycamAxisScale6"/>
<text name="ZoomDeadZone">
Tolerancja powiększania
</text>
- <spinner label="" left="300" name="FlycamAxisDeadZone6"/>
- <button label="Ustawienia domyślne" name="SpaceNavigatorDefaults"/>
- <button label="OK" label_selected="OK" left="366" name="ok_btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
- <stat_view label="Monitor Joysticka" name="axis_view">
- <stat_bar label="OÅ› 0" name="axis0"/>
- <stat_bar label="OÅ› 1" name="axis1"/>
- <stat_bar label="OÅ› 2" name="axis2"/>
- <stat_bar label="OÅ› 3" name="axis3"/>
- <stat_bar label="OÅ› 4" name="axis4"/>
- <stat_bar label="OÅ› 5" name="axis5"/>
- </stat_view>
- <string name="NoDevice">
- brak podłącznego urządzenia
- </string>
+ <button label="Ustawienia domyślne" name="SpaceNavigatorDefaults" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
index 8038550bcb30637ac063dfd4edf0ea17ae6dd2d0..aff5458c655c2181112e4411f83e68e21c6d3d97 100644
--- a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="POMIAR LAGÓW">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="MIERNIK LAGÓW">
<floater.string name="max_title_msg">
- Pomiar lagów
- </floater.string>
- <floater.string name="max_width_px">
- 360
- </floater.string>
- <floater.string name="min_title_msg">
- Lag
- </floater.string>
- <floater.string name="min_width_px">
- 90
+ Miernik lagów
</floater.string>
<floater.string name="client_text_msg">
Klient
</floater.string>
- <floater.string name="client_frame_rate_critical_fps">
- 10
- </floater.string>
- <floater.string name="client_frame_rate_warning_fps">
- 15
- </floater.string>
<floater.string name="client_frame_time_window_bg_msg">
W normie, okno w tle
</floater.string>
@@ -34,26 +19,20 @@
W normie
</floater.string>
<floater.string name="client_draw_distance_cause_msg">
- Przyczyna: dystans rysowania jest za wysoki
+ Przyczyna: Pole widzenia jest zbyt duże
</floater.string>
<floater.string name="client_texture_loading_cause_msg">
- Przyczyna: Å‚adowanie obrazu
+ Przyczyna: Åadowanie obrazów
</floater.string>
<floater.string name="client_texture_memory_cause_msg">
- Przyczyna: za dużo obrazów w pamięci
+ Przyczyna: Za dużo obrazów w pamięci
</floater.string>
<floater.string name="client_complex_objects_cause_msg">
- Przyczyna: za dużo złożonych obiektów
+ Przyczyna: Za dużo złożonych obiektów
</floater.string>
<floater.string name="network_text_msg">
Sieć
</floater.string>
- <floater.string name="network_packet_loss_critical_pct">
- 10
- </floater.string>
- <floater.string name="network_packet_loss_warning_pct">
- 5
- </floater.string>
<floater.string name="network_packet_loss_critical_msg">
Utrata pakietów przekracza [NETWORK_PACKET_LOSS_CRITICAL]%
</floater.string>
@@ -63,12 +42,6 @@
<floater.string name="network_performance_normal_msg">
W normie
</floater.string>
- <floater.string name="network_ping_critical_ms">
- 600
- </floater.string>
- <floater.string name="network_ping_warning_ms">
- 300
- </floater.string>
<floater.string name="network_ping_critical_msg">
Fatalny ping - [NETWORK_PING_CRITICAL] ms
</floater.string>
@@ -76,7 +49,7 @@
Wolny ping - [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
</floater.string>
<floater.string name="network_packet_loss_cause_msg">
- Złe połączenie lub przepustowość.
+ Złe połączenie lub za wysoka przepustowość w opcjach.
</floater.string>
<floater.string name="network_ping_cause_msg">
Złe połączenie lub aplikacja współdzieląca pliki.
@@ -84,15 +57,6 @@
<floater.string name="server_text_msg">
Serwer
</floater.string>
- <floater.string name="server_frame_rate_critical_fps">
- 20
- </floater.string>
- <floater.string name="server_frame_rate_warning_fps">
- 30
- </floater.string>
- <floater.string name="server_single_process_max_time_ms">
- 20
- </floater.string>
<floater.string name="server_frame_time_critical_msg">
Ilość klatek na sekundę poniżej [SERVER_FRAME_RATE_CRITICAL]
</floater.string>
@@ -103,49 +67,43 @@
W normie
</floater.string>
<floater.string name="server_physics_cause_msg">
- Przyczyna: za dużo obiektów fizycznych
+ Przyczyna: Za dużo obiektów fizycznych
</floater.string>
<floater.string name="server_scripts_cause_msg">
- Przyczyna: za dużo obieków skryptowanych
+ Przyczyna: Za dużo obieków oskryptowanych
</floater.string>
<floater.string name="server_net_cause_msg">
- Przyczyna: za duży ruch w sieci
+ Przyczyna: Za duży ruch w sieci
</floater.string>
<floater.string name="server_agent_cause_msg">
- Przyczyna: za dużo poruszających się awatarów w regionie
+ Przyczyna: Za dużo poruszających się awatarów w regionie
</floater.string>
<floater.string name="server_images_cause_msg">
- Przyczyna: za dużo kalkulacji obrazu
+ Przyczyna: Za dużo kalkulacji obrazu
</floater.string>
<floater.string name="server_generic_cause_msg">
- Przyczyna: symulator Å‚aduje siÄ™ zbyt powoli
- </floater.string>
- <floater.string name="smaller_label">
- >>
- </floater.string>
- <floater.string name="bigger_label">
- <<
+ Przyczyna: Obciążenie symulatora zbyt duże
</floater.string>
- <button label="" label_selected="" name="client_lagmeter" tool_tip="Status lagów klienta"/>
+ <button name="client_lagmeter" tool_tip="Status lagów klienta" />
<text name="client">
Klient
</text>
<text name="client_text">
W normie
</text>
- <button label="" label_selected="" name="network_lagmeter" tool_tip="Network lag status"/>
+ <button name="network_lagmeter" tool_tip="Status lagów sieci" />
<text name="network">
Sieć
</text>
<text name="network_text">
W normie
</text>
- <button label="" label_selected="" name="server_lagmeter" tool_tip="Server lag status"/>
+ <button name="server_lagmeter" tool_tip="Status lagów serwera" />
<text name="server">
Serwer
</text>
<text name="server_text">
W normie
</text>
- <button label=">>" name="minimize" tool_tip="ZÅ‚Ä…cz rozmiar pliku xml"/>
+ <button name="minimize" tool_tip="Zmień rozmiar okna" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
old mode 100755
new mode 100644
index 72a078949a8823deb8144e2dc6041ea5a7b65b57..6500e4aa2426955adafa79aa7db62abf18079558
--- a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
@@ -1,40 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="MOJA POSIADÅOŚĆ">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="land holdings floater" title="MOJE DZIAÅKI">
<scroll_list name="parcel list">
- <column label="Posiadłość" name="name"/>
- <column label="Region" name="location"/>
- <column label="Typ" name="type"/>
- <column label="Obszar" name="area"/>
- <column label="" name="hidden"/>
+ <scroll_list.columns label="Działka" name="name" />
+ <scroll_list.columns label="Typ" name="type" />
+ <scroll_list.columns label="Obszar" name="area" />
</scroll_list>
- <button label="Teleportuj" label_selected="Teleport" name="Teleport" tool_tip="Teleportuj się do centrum tej Posiadłości."/>
- <button label="Mapa" label_selected="Mapa" name="Show on Map" tool_tip="Pokaż to miejsce na mapie świata."/>
+ <button label="Teleportuj" label_selected="Teleportuj" name="Teleport" tool_tip="Teleportuj się do centrum tej działki." />
+ <button label="Mapa" label_selected="Mapa" name="Show on Map" tool_tip="Pokaż to miejsce na mapie świata." />
<text name="contrib_label">
- Kontrybucje do Twoich Grup:
+ Kontrybucje do Twoich grup:
</text>
<scroll_list name="grant list">
- <column label="Grupa" name="group"/>
- <column label="Obszar" name="area"/>
+ <scroll_list.columns label="Grupa" name="group" />
+ <scroll_list.columns label="Obszar" name="area" />
</scroll_list>
<text name="allowed_label">
Dozwolone udziały przy obecnym planie płatności:
</text>
- <text name="allowed_text">
- [AREA] m²
- </text>
<text name="current_label">
- Udziały w Posiadłościach:
- </text>
- <text name="current_text">
- [AREA] m²
+ Udziały w działkach:
</text>
<text name="available_label">
- Dostępne na zakup Posiadłości:
- </text>
- <text name="available_text">
- [AREA] m²
+ Dostępne na zakup działek:
</text>
- <string name="area_string">
- [AREA] m²
- </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
old mode 100755
new mode 100644
index e03c5faaeb51b77ae65d879c6bbb5e18d1b97304..1b3e0d0e7451595e8069f22fcfda6e3e0f0f4f98
--- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="script ed float" title="SKRYPT: NOWY SKRYPT">
<floater.string name="not_allowed">
- Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to "brak kopiowania". Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
+ Nie posiadasz praw do podejrzenia lub edycji kodu tego skryptu, ponieważ ma on ustawione ograniczone zezwolenia. Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu wewnątrz obiektu.
</floater.string>
<floater.string name="script_running">
- WÅ‚Ä…cz
+ WÅ‚Ä…czony
</floater.string>
<floater.string name="Title">
SKRYPT: [NAME]
</floater.string>
- <button label="Zresetuj" label_selected="Zresetuj" name="Reset"/>
- <check_box initial_value="true" label="WÅ‚Ä…cz" name="running"/>
- <check_box initial_value="true" label="Mono" name="mono"/>
+ <button label="Zresetuj" label_selected="Zresetuj" name="Reset" />
+ <check_box label="WÅ‚Ä…czony" name="running" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
old mode 100755
new mode 100644
index 7b1b395f8712647c79e1ab6fa605bfc20e788c20..f2769c47f7e74ae6203673554623d9f2f2c94408
--- a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL WIKI">
- <check_box label="Idź za kursorem" name="lock_check"/>
- <combo_box label="Zablokuj" name="history_combo"/>
- <button label="Wróć" name="back_btn"/>
- <button label="Do przodu" name="fwd_btn"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="INFORMACJE O LSL">
+ <check_box label="Åšledzenie" name="lock_check" />
+ <combo_box label="Zablokuj" name="history_combo" />
+ <button label="Wstecz" name="back_btn" />
+ <button label="Do przodu" name="fwd_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml
old mode 100755
new mode 100644
index e01c4c8a82cfec069c409b44cc178b720f43ece2..f061a4a8a522f94e0e4c7a21c508780b03902c1d
--- a/indra/newview/skins/default/xui/pl/floater_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_map.xml
@@ -1,36 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map" title="">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Map" title="MINIMAPA">
<floater.string name="ToolTipMsg">
- [REGION](Podwójne kliknięcie otwiera Mapę, Shift i przeciągnięcie kursorem zmienia skalę)
+ [REGION](Kliknij dwa razy by otworzyć Mapę, przeciągaj z shiftem by zmienić skalę)
</floater.string>
<floater.string name="AltToolTipMsg">
- [REGION](Podwójne kliknięcie aktywuje teleportację, wciśnij Shift i przeciągnij aby przesunąć)
+ [REGION](Kliknij dwa razy by teleportować, przeciągaj z shiftem by przesunąć)
</floater.string>
<floater.string name="mini_map_caption">
- MINIMAPA
+ Minimapa
</floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SW" name="floater_map_southwest" text="SW">
- SW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
old mode 100755
new mode 100644
index 9787736ad8f11b255fff8c0179749f2bd7a4b294..1492bdaee0ff5df4c36e32482dd7161d0305fa6a
--- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_about" title="PRZEGLĄDARKA MEDIÓW">
<layout_stack name="stack1">
<layout_panel name="nav_controls">
- <button label="Wróć" name="back"/>
- <button label="Do przodu" name="forward"/>
- <button label="Załaduj" name="reload"/>
- <button label="Idź" name="go"/>
+ <button label="Wstecz" name="back" />
+ <button label="Dalej" name="forward" />
+ <button label="Odśwież" name="reload" />
+ <button label="Idź" name="go" />
+ </layout_panel>
+ <layout_panel name="time_controls">
+ <button label="przewiń" name="rewind" />
+ <button label="dalej" name="seek" />
</layout_panel>
<layout_panel name="parcel_owner_controls">
- <button label="Wyślij bieżącą stronę do Parceli" name="assign"/>
+ <button label="Wyślij obecną stronę na działkę" name="assign" />
</layout_panel>
<layout_panel name="external_controls">
- <button label="Użyj mojej przeglądarki" name="open_browser"/>
- <check_box label="Zawsze otwieraj w mojej przeglÄ…darce internetowej" name="open_always"/>
- <button label="Zamknij" name="close"/>
+ <button label="Użyj mojej przeglądarki" name="open_browser" />
+ <check_box label="Zawsze w mojej przeglÄ…darce" name="open_always" />
+ <button label="Zamknij" name="close" />
</layout_panel>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_media_settings.xml b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
old mode 100755
new mode 100644
index 5a36331c9aab75aa3ed97a91685c4dd6a7239da4..caec1629bf11063d6a37674864cd1108ba9ef0d2
--- a/indra/newview/skins/default/xui/pl/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="media_settings" title="MEDIA">
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
- <button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="media_settings" title="USTAWIENIA MEDIÓW">
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+ <button label="Zastosuj" label_selected="Zastosuj" name="Apply" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
old mode 100755
new mode 100644
index 9ce99692d094473c1fd8b6c455515af4b20b0c39..d2ec417fed9afe57a509b6a91d90a5b34d7e8658
--- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
@@ -1,18 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="MemLeak" title="STYMULACJA WYCIEKU PAMIĘCI">
- <spinner label="Prędkość przecieków (byty na klatkę):" name="leak_speed"/>
- <spinner label="Max przecieki (MB):" name="max_leak"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="SYMULACJA WYCIEKU PAMIĘCI">
+ <spinner label="Prędkość wycieków (bajty na klatkę):" name="leak_speed" />
+ <spinner label="Maks. wycieki (MB):" name="max_leak" />
<text name="total_leaked_label">
- Przeciekło: [SIZE] KB
+ Wyciekło: [SIZE] KB
</text>
- <text name="note_label_1">
- [NOTE1]
- </text>
- <text name="note_label_2">
- [NOTE2]
- </text>
- <button label="Start" name="start_btn"/>
- <button label="Stop" name="stop_btn"/>
- <button label="Uwolnij" name="release_btn"/>
- <button label="Zamknij" name="close_btn"/>
+ <button label="Uwolnij" name="release_btn" />
+ <button label="Zamknij" name="close_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9cc88ba288161f596fac36e99a202ebb8dd1d0d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_merchant_outbox" title="SKRZYNKA NADAWCZA KUPCA">
+ <string name="OutboxFolderCountN">
+ Folderów: [NUM]
+ </string>
+ <string name="OutboxImporting">
+ Wysyłanie folderów...
+ </string>
+ <string name="OutboxInitializing">
+ Inicjalizacja...
+ </string>
+ <panel name="panel_1">
+ <panel name="panel_2">
+ <panel name="outbox_inventory_placeholder_panel">
+ <text name="outbox_inventory_placeholder_title">
+ Åadowanie...
+ </text>
+ </panel>
+ </panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Przeciągaj tu przedmioty by tworzyć foldery
+ </text>
+ </panel>
+ <button label="Wyślij na Marketplace" tool_tip="Wyślij na witrynę Marketplace" name="outbox_import_btn" />
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_model_preview.xml b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1234764dac6deabacf62bbe7d29308ddda6564f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Model Preview" title="ÅADOWANIE MODELU">
+ <string name="status_parse_error">
+ BÅ‚Ä…d: Problem z parsowaniem Dae, zobacz log.
+ </string>
+ <string name="status_material_mismatch">
+ Błąd: Materiał nie jest podzbiorem modelu referencyjnego.
+ </string>
+ <string name="status_reading_file">
+ Wczytywanie...
+ </string>
+ <string name="status_generating_meshes">
+ Generowanie meszy...
+ </string>
+ <string name="status_vertex_number_overflow">
+ Błąd: Ilość wierzchołków większa niż 65534, przerwano!
+ </string>
+ <string name="bad_element">
+ Błąd: element nieprawidłowy
+ </string>
+ <string name="high">
+ Wysokie
+ </string>
+ <string name="medium">
+ Åšrednie
+ </string>
+ <string name="low">
+ Niskie
+ </string>
+ <string name="lowest">
+ Najniższe
+ </string>
+ <string name="mesh_status_good">
+ Dostarcz!
+ </string>
+ <string name="mesh_status_na">
+ ???
+ </string>
+ <string name="mesh_status_none">
+ Brak
+ </string>
+ <string name="mesh_status_submesh_mismatch">
+ Poziomy detali majÄ… innÄ… liczbÄ™ stron do teksturowania.
+ </string>
+ <string name="mesh_status_mesh_mismatch">
+ Poziomy detali majÄ… innÄ… liczbÄ™ instancji meszy.
+ </string>
+ <string name="mesh_status_too_many_vertices">
+ Poziomy detali mają za dużo wierzchołków.
+ </string>
+ <string name="mesh_status_missing_lod">
+ Brakuje poziomu detali.
+ </string>
+ <string name="mesh_status_invalid_material_list">
+ Materiały LOD nie są podzbiorem modelu referencyjnego.
+ </string>
+ <string name="layer_all">
+ Wszystko
+ </string>
+ <string name="decomposing">
+ Analizowanie...
+ </string>
+ <string name="simplifying">
+ Upraszczanie...
+ </string>
+ <panel name="left_panel">
+ <panel name="model_name_representation_panel">
+ <text name="name_label">
+ Nazwa modelu:
+ </text>
+ <text name="model_category_label">
+ Ten model to...
+ </text>
+ <combo_box name="model_category_combo">
+ <combo_item name="Choose one" label="Wybierz..." />
+ <combo_item name="Avatar shape" label="Kształt awatara" />
+ <combo_item name="Avatar attachment" label="Dodatek awatara" />
+ <combo_item name="Moving object (vehicle, animal)" label="PoruszajÄ…cy siÄ™ obiekt (pojazd, zwierzÄ™)" />
+ <combo_item name="Building Component" label="Element budynku" />
+ <combo_item name="Large, non moving etc" label="Duży obiekt, statyczny" />
+ <combo_item name="Smaller, non-moving etc" label="Mały obiekt, statyczny" />
+ <combo_item name="Not really any of these" label="Żadne z powyższych" />
+ </combo_box>
+ </panel>
+ <tab_container name="import_tab">
+ <panel label="Poziom detali" name="lod_panel" title="Poziom detali">
+ <text initial_value="Źródło" name="source" value="Źródło" />
+ <text initial_value="Trójkąty" name="triangles" value="Trójkąty" />
+ <text initial_value="Wierzchołki" name="vertices" value="Wierzchołki" />
+ <text initial_value="Wysoki" name="high_label" value="Wysoki" />
+ <combo_box name="lod_source_high">
+ <item name="Load from file" label="Åaduj z pliku" />
+ <item name="Generate" label="Generuj" />
+ </combo_box>
+ <button label="PrzeglÄ…daj" name="lod_browse_high" />
+ <combo_box name="lod_mode_high">
+ <item name="Triangle Limit" label="Limit trójkątów" />
+ <item name="Error Threshold" label="Próg błędu" />
+ </combo_box>
+ <text initial_value="Åšredni" name="medium_label" value="Åšredni" />
+ <combo_box name="lod_source_medium">
+ <item name="Load from file" label="Åaduj z pliku" />
+ <item name="Generate" label="Generuj" />
+ <item name="Use LoD above" label="Użyj poziomu detali (LoD) powyżej" />
+ </combo_box>
+ <button label="PrzeglÄ…daj" name="lod_browse_medium" />
+ <combo_box name="lod_mode_medium">
+ <item name="Triangle Limit" label="Limit trójkątów" />
+ <item name="Error Threshold" label="Próg błędu" />
+ </combo_box>
+ <text initial_value="Niski" name="low_label" value="Niski" />
+ <combo_box name="lod_source_low">
+ <item name="Load from file" label="Åaduj z pliku" />
+ <item name="Generate" label="Generuj" />
+ <item name="Use LoD above" label="Użyj poziomu detali (LoD) powyżej" />
+ </combo_box>
+ <button label="PrzeglÄ…daj" name="lod_browse_low" />
+ <combo_box name="lod_mode_low">
+ <item name="Triangle Limit" label="Limit trójkątów" />
+ <item name="Error Threshold" label="Próg błędu" />
+ </combo_box>
+ <text initial_value="Najniższy" name="lowest_label" value="Najniższy" />
+ <combo_box name="lod_source_lowest">
+ <item name="Load from file" label="Åaduj z pliku" />
+ <item name="Generate" label="Generuj" />
+ <item name="Use LoD above" label="Użyj poziomu detali (LoD) powyżej" />
+ </combo_box>
+ <button label="PrzeglÄ…daj" name="lod_browse_lowest" />
+ <combo_box name="lod_mode_lowest">
+ <item name="Triangle Limit" label="Limit trójkątów" />
+ <item name="Error Threshold" label="Próg błędu" />
+ </combo_box>
+ <check_box label="Generuj wektory normalne" name="gen_normals" />
+ <text initial_value="Kąt zagnieceń:" name="crease_label" value="Kąt zagnieceń:" />
+ </panel>
+ <panel label="Fizyka" name="physics_panel">
+ <panel name="physics geometry">
+ <text name="first_step_name">
+ Krok 1: Poziom detali
+ </text>
+ <combo_box name="physics_lod_combo" tool_tip="Poziom detali (LoD) używany dla kształtu fizycznego">
+ <combo_item name="choose_one">Wybierz...</combo_item>
+ <combo_item name="physics_high">Wysoki</combo_item>
+ <combo_item name="physics_medium">Åšredni</combo_item>
+ <combo_item name="physics_low">Niski</combo_item>
+ <combo_item name="physics_lowest">Najniższy</combo_item>
+ <combo_item name="load_from_file">Z pliku</combo_item>
+ </combo_box>
+ <button name="physics_browse" label="PrzeglÄ…daj" />
+ <check_box name="physics_optimize" label="Optymalizuj" />
+ <check_box name="physics_use_hull" label="Użyj powłoki wypukłej" />
+ </panel>
+ <panel name="physics analysis">
+ <text name="method_label">
+ Krok 2: Analiza
+ </text>
+ <text name="analysis_method_label">
+ Metoda:
+ </text>
+ <text name="quality_label">
+ Jakość:
+ </text>
+ <text name="smooth_method_label">
+ Wygładź:
+ </text>
+ <check_box label="Domknij otwory" name="Close Holes (Slow)" />
+ <button label="Analizuj" name="Decompose" />
+ <button label="Anuluj" name="decompose_cancel" />
+ </panel>
+ <panel name="physics simplification">
+ <text name="second_step_label">
+ Krok 3: Upraszczanie
+ </text>
+ <text name="simp_method_header">
+ Metoda:
+ </text>
+ <text name="pass_method_header">
+ Przejść:
+ </text>
+ <text name="Detail Scale label">
+ Skala detali:
+ </text>
+ <text name="Retain%_label">
+ Utrzymaj:
+ </text>
+ <button label="Uprość" name="Simplify" />
+ <button label="Anuluj" name="simplify_cancel" />
+ </panel>
+ <panel name="physics info">
+ <text name="results_text">
+ Wyniki:
+ </text>
+ <text name="physics_triangles">
+ Trójkąty: [TRIANGLES],
+ </text>
+ <text name="physics_points">
+ Wierzch.: [POINTS],
+ </text>
+ <text name="physics_hulls">
+ Powłoki: [HULLS]
+ </text>
+ </panel>
+ </panel>
+ <panel label="Opcje Å‚adowania" name="modifiers_panel">
+ <text name="scale_label">
+ Skala (1=bez skali):
+ </text>
+ <text name="dimensions_label">
+ Wymiary:
+ </text>
+ <check_box name="upload_textures" label="Dołącz tekstury" />
+ <text name="include_label">
+ Tylko dla modeli awatarów:
+ </text>
+ <check_box label="Dołącz wagę skórki" name="upload_skin" />
+ <check_box label="Dołącz pozycje stawów" name="upload_joints" />
+ <text name="pelvis_offset_label">
+ Przesunięcie Z (podnieś/obniż awatara):
+ </text>
+ </panel>
+ </tab_container>
+ <panel name="weights_and_warning_panel">
+ <button label="Przelicz wagi i opłatę" name="calculate_btn" tool_tip="Przelicz wagi i opłatę" />
+ <button label="Anuluj" name="cancel_btn" />
+ <button label="Załaduj" name="ok_btn" tool_tip="Załaduj na serwer" />
+ <button label="Wyczyść i zresetuj" name="reset_btn" />
+ <text name="upload_fee">
+ Opłata: [FEE]L$
+ </text>
+ <text name="prim_weight">
+ Ziemia/wpływ: [EQ]
+ </text>
+ <text name="download_weight">
+ ÅšciÄ…ganie: [ST]
+ </text>
+ <text name="physics_weight">
+ Fizyka: [PH]
+ </text>
+ <text name="server_weight">
+ Serwer: [SIM]
+ </text>
+ <text name="warning_title">
+ UWAGA:
+ </text>
+ <text name="warning_message">
+ Nie masz uprawnień do ładowania modeli meszowych. [[VURL] Zobacz jak] uzyskać certyfikat.
+ </text>
+ </panel>
+ </panel>
+ <text name="lod_label">
+ PodglÄ…d:
+ </text>
+ <panel name="right_panel">
+ <combo_box name="preview_lod_combo" tool_tip="Poziom detali (LOD) do wyświetlania w podglądzie">
+ <combo_item name="high">Wysoki</combo_item>
+ <combo_item name="medium">Åšredni</combo_item>
+ <combo_item name="low">Niski</combo_item>
+ <combo_item name="lowest">Najniższy</combo_item>
+ </combo_box>
+ <text name="label_display">
+ Pokaż...
+ </text>
+ <check_box label="Krawędzie" name="show_edges"/>
+ <check_box label="FizykÄ™" name="show_physics"/>
+ <check_box label="Tekstury" name="show_textures"/>
+ <check_box label="Wagę skórki" name="show_skin_weight"/>
+ <check_box label="Stawy/przeguby" name="show_joint_positions"/>
+ <text name="physics_explode_label">
+ Rozpiętość podglądu:
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml
old mode 100755
new mode 100644
index 592814dbc0c17994c07bfed3f759a841268d83b4..ae9ac2368918130dd86eaec95d7912d8925abfd6
--- a/indra/newview/skins/default/xui/pl/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move_floater">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move_floater" title="CHODZENIE / BIEGANIE / LATANIE">
<string name="walk_forward_tooltip">
- Idź (naciśnij Strzałkę w Górę lub W)
+ Idź w przód (Strzałka w górę lub W)
</string>
<string name="walk_back_tooltip">
- Idź do tyłu (naciśnij Strzałkę w Dół lub S)
+ Idź do tyłu (Strzałka w dół lub S)
</string>
<string name="walk_left_tooltip">
- Idź w lewo (naciśnij Shift + lewą strzałkę lub A)
+ Idź w lewo (Shift + strzałka w lewo lub A)
</string>
<string name="walk_right_tooltip">
- Idź w prawo (naciśnij Shift + prawą strzałkę lub D)
+ Idź w prawo (Shift + strzałka w prawo lub D)
</string>
<string name="run_forward_tooltip">
- Biegnij do przodu (naciśnij Strzałkę w Górę lub W)
+ Biegnij do przodu (Strzałka w górę lub W)
</string>
<string name="run_back_tooltip">
- Biegnij do przodu (naciśnij Strzałkę w Dół lub S)
+ Biegnij do tyłu (Strzałka w dół lub S)
</string>
<string name="run_left_tooltip">
- Biegnij w lewo (naciśnij Shift + lewą strzałkę lub A)
+ Biegnij w lewo (Shift + strzałka w lewo lub A)
</string>
<string name="run_right_tooltip">
- Biegnij w lewo (naciśnij Shift + prawą strzałkę lub D)
+ Biegnij w prawo (Shift + strzałka w prawo lub D)
</string>
<string name="fly_forward_tooltip">
- Leć do przodu (naciśnij Strzałkę w Górę lub W)
+ Leć do przodu (Strzałka w górę lub W)
</string>
<string name="fly_back_tooltip">
- Leć do tyłu (naciśnij Strzałkę na Dół lub S)
+ Leć do tyłu (Strzałka w dół lub S)
</string>
<string name="fly_left_tooltip">
- Leć w lewo (naciśnij Shift + lewą strzałkę lub A)
+ Leć w lewo (Shift + strzałka w lewo lub A)
</string>
<string name="fly_right_tooltip">
- Leć w prawo (naciśnij Shift + prawą strzałkę lub D)
+ Leć w prawo (Shift + strzałka w prawo lub D)
</string>
<string name="fly_up_tooltip">
- Leć do góry (nacisnij E)
+ Leć do góry (Klawisz E)
</string>
<string name="fly_down_tooltip">
- Leć w dół (naciśnij C)
+ Leć w dół (Klawisz C)
</string>
<string name="jump_tooltip">
- Skacz (naciśnij E)
+ Skacz (Klawisz E)
</string>
<string name="crouch_tooltip">
- Crouch (naciśnij C)
+ Kucaj (Klawisz C)
</string>
<string name="walk_title">
- Idź
+ Chodzenie
</string>
<string name="run_title">
- Biegnij
+ Bieganie
</string>
<string name="fly_title">
- Lataj
+ Latanie
</string>
<panel name="panel_actions">
- <button label="" label_selected="" name="move up btn" tool_tip="Leć do góry (naciśnij E)"/>
- <button label="" label_selected="" name="turn left btn" tool_tip="Obróć w lewo (naciśnij Lewą Strzałkę lub A)"/>
- <joystick_slide name="move left btn" tool_tip="Idź w lewo (naciśnij Shift + lewą strzałkę lub A)"/>
- <button label="" label_selected="" name="move down btn" tool_tip="Leć w dół (naciśnij C)"/>
- <button label="" label_selected="" name="turn right btn" tool_tip="Obróć w prawo (naciśnij Prawą Strzałkę lub D)"/>
- <joystick_slide name="move right btn" tool_tip="Idź w prawo (naciśnij Shift + prawą strzałkę lub D)"/>
- <joystick_turn name="forward btn" tool_tip="Idź (naciśnij Strzałkę w Górę lub W)"/>
- <joystick_turn name="backward btn" tool_tip="Cofaj się (naciśnij Strzałkę w Dół lub S)"/>
+ <button name="turn left btn" tool_tip="Obróć w lewo (Strzałka w lewo lub A)" />
+ <joystick_slide name="move left btn" tool_tip="Idź w lewo (Shift + strzałka w lewo lub A)" />
+ <button name="turn right btn" tool_tip="Obróć w prawo (Strzałka w prawo lub D)" />
+ <joystick_slide name="move right btn" tool_tip="Idź w prawo (Shift + strzałka w prawo lub D)" />
+ <joystick_turn name="forward btn" tool_tip="Idź w przód (Strzałka w górę lub W)" />
+ <joystick_turn name="backward btn" tool_tip="Idź do tyłu (Strzałka w dół lub S)" />
+ <button name="move up btn" tool_tip="Leć do góry (Klawisz E)" />
+ <button name="move down btn" tool_tip="Leć w dół (Klawisz C)" />
</panel>
<panel name="panel_modes">
- <button label="" name="mode_walk_btn" tool_tip="Tryb chodzenia"/>
- <button label="" name="mode_run_btn" tool_tip="Tryb biegu"/>
- <button label="" name="mode_fly_btn" tool_tip="Tryb latania"/>
+ <button name="mode_walk_btn" tool_tip="Tryb chodzenia" />
+ <button name="mode_run_btn" tool_tip="Tryb biegu" />
+ <button name="mode_fly_btn" tool_tip="Tryb latania" />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
old mode 100755
new mode 100644
index 4af5872ef528b0211868918fc93bcda429746911..b91234c44c0b3a9d90aae45393044769eaac9676
--- a/indra/newview/skins/default/xui/pl/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater height="160" min_height="160" name="mute by name" title="ZABLOKUJ OBIEKT WEDÅUG NAZWY">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="block by name" title="ZABLOKUJ OBIEKT WEDÅUG NAZWY">
<text name="message">
Zablokuj obiekt:
</text>
- <line_editor bottom_delta="-60" name="object_name">
- Nazwa Obiektu
+ <line_editor name="object_name">
+ Nazwa obiektu
</line_editor>
<text name="note">
- * Zablokuj jedynie tekst obiektu, bez dźwięku
+ * Blokuje jedynie tekst obiektu, nie dźwięk
</text>
- <button label="OK" name="OK"/>
- <button label="Anuluj" name="Cancel"/>
+ <button label="Anuluj" name="Cancel" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_appearance.xml b/indra/newview/skins/default/xui/pl/floater_my_appearance.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f51c00799b3f21646f9ea2f69398e803486eeb99
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_my_appearance.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_my_appearance" title="WYGLÄ„D">
+ <panel name="main_panel" label="Edytuj wyglÄ…d" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_inventory.xml b/indra/newview/skins/default/xui/pl/floater_my_inventory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9d30df51f07683f4765e8bf34091d6a1f2f4ffc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_my_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_my_inventory" title="MOJA SZAFA" />
diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
deleted file mode 100755
index 214d465f1cc1052b63719a5a217cb92d730e252b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CZAT LOKALNY">
- <check_box label="TÅ‚umaczenie czatu" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_notification.xml b/indra/newview/skins/default/xui/pl/floater_notification.xml
new file mode 100644
index 0000000000000000000000000000000000000000..26070cdacd83dc61bccfd51ebc3f691a6f97ffe2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_notification.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="notification" title="KONSOLA POWIADOMIEŃ">
+ <text_editor name="payload">
+ Wczytywanie...
+ </text_editor>
+ <combo_box label="Odpowiedź" name="response" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_notifications_console.xml b/indra/newview/skins/default/xui/pl/floater_notifications_console.xml
new file mode 100644
index 0000000000000000000000000000000000000000..05971930cee093dbf564819cc632b98bca916e22
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_notifications_console.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="notifications_console" title="KONSOLA POWIADOMIEŃ">
+ <combo_box label="Wybierz typ powiadomień" name="notification_types" />
+ <button label="Dodaj" name="add_notification" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_object_weights.xml b/indra/newview/skins/default/xui/pl/floater_object_weights.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e79ea3213f19da4d9aba8362dc48a68d173549d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_object_weights.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="object_weights" title="ZAAWANSOWANE">
+ <text name="selected_text" value="WYBRANE"/>
+ <text name="objects_label" value="Obiekty"/>
+ <text name="prims_label" value="Primy"/>
+ <text name="weights_of_selected_text" value="WAGA ZAZNACZONYCH"/>
+ <text name="download_label" value="Pobieranie"/>
+ <text name="physics_label" value="Fizyka"/>
+ <text name="server_label" value="Serwer"/>
+ <text name="display_label" value="Ekran"/>
+ <text name="land_impacts_text" value="WPÅYW NA ZIEMIĘ"/>
+ <text name="selected_label" value="Zaznaczone"/>
+ <text name="rezzed_on_land_label" value="Zrezzowane na ziemi"/>
+ <text name="remaining_capacity_label" value="Pozostała pojemność"/>
+ <text name="total_capacity_label" value="Całkowita pojemność"/>
+ <text name="help_SLURL" value="[secondlife:///app/help/object_weights Co to jest?...]"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml
old mode 100755
new mode 100644
index 20c9760e6f39d7e1013c2e68111e22e83cdda9aa..f27e4ff8580a77b935dfbf111ccd9029690c1d20
--- a/indra/newview/skins/default/xui/pl/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml
@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="objectcontents" title="ZAWARTOŚĆ OBIEKTU">
- <text name="object_name">
- [DESC]:
- </text>
<text name="border_note">
Kopiuj do Szafy i załóż
</text>
- <button label="Dodaj do stroju" label_selected="Dodaj do stroju" name="copy_and_wear_button"/>
- <button label="Zastąp strój" label_selected="Zastąp strój" name="copy_and_replace_button"/>
- <button label="Tylko skopiuj do Szafy" label_selected="Tylko skopiuj do Szafy" name="copy_to_inventory_button"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_button"/>
+ <button label="Dodaj do stroju" label_selected="Dodaj do stroju" name="copy_and_wear_button" />
+ <button label="Zastąp strój" label_selected="Zastąp strój" name="copy_and_replace_button" />
+ <button label="Tylko skopiuj do Szafy" label_selected="Tylko skopiuj do Szafy" name="copy_to_inventory_button" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_button" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a2bbc426dba0ed4566c03c90c7610d97963644c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater title="ZAPISZ STRÓJ" name="modal container">
+ <button label="Zapisz" label_selected="Zapisz" name="Save" />
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+ <text name="Save item as:">
+ Zapisz co mam na sobie
+jako nowy strój:
+ </text>
+ <line_editor name="name ed">
+ [DESC] (nowy)
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
old mode 100755
new mode 100644
index de0b4d08c00a1eb4e47f394998717521184085db..293d15b3f462a4d7c89f993e75ced3154641162c
--- a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="outgoing call" title="ROZMOWA GÅOSOWA">
- <floater.string name="lifetime">
- 5
- </floater.string>
<floater.string name="localchat">
Rozmowy głosowe w pobliżu
</floater.string>
@@ -16,25 +13,25 @@
uczestniczy w konferencyjnej rozmowie głosowej
</floater.string>
<text name="connecting">
- ÅÄ…czy z [CALLEE_NAME]
+ ÅÄ…czenie: [CALLEE_NAME]
</text>
<text name="calling">
- Dzwoni [CALEE_NAME]
+ Dzwonienie: [CALEE_NAME]
</text>
<text name="noanswer">
- Brak odpowiedzi. Proszę spróbować ponownie później.
+ Brak odpowiedzi. Proszę spróbować później.
</text>
<text name="nearby">
- Zostaleś rozłączony z [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
+ Zostałeś/aś rozłączony/a z [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
</text>
<text name="nearby_P2P_by_other">
- Twoja rozmowa głosowa została zakończona. [RECONNECT_NEARBY]
+ Twoja rozmowa została zakończona. [RECONNECT_NEARBY]
</text>
<text name="nearby_P2P_by_agent">
- Zakończyłeś rozmowę. [RECONNECT_NEARBY]
+ Zakończyłeś/aś rozmowę. [RECONNECT_NEARBY]
</text>
<text name="leaving">
- Opuszcza [CURRENT_CHAT]
+ Opuszczanie: [CURRENT_CHAT].
</text>
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pl/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000000000000000000000000000000000..05f158555af75014ab4e00317a5169f069e90e0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_pathfinding_characters.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_pathfinding_characters" title="Postacie odnajdywania ścieżek">
+ <floater.string name="messaging_get_inprogress">
+ Odpytywanie o postacie odnajdywania ścieżek...
+ </floater.string>
+ <floater.string name="messaging_get_error">
+ Błąd podczas odpytywania o postacie odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="messaging_complete_none_found">
+ Brak postaci odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="messaging_complete_available">
+ [NUM_SELECTED] zaznaczonych postaci z [NUM_TOTAL].
+ </floater.string>
+ <floater.string name="messaging_not_enabled">
+ Ten region nie ma włączonego odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="character_owner_loading">
+ [Åadowanie]
+ </floater.string>
+ <floater.string name="character_owner_unknown">
+ [Nieznane]
+ </floater.string>
+ <floater.string name="character_owner_group">
+ [grupa]
+ </floater.string>
+ <panel name="pathfinding_chars_main">
+ <scroll_list name="objects_scroll_list">
+ <scroll_list.columns label="Nazwa" name="name" />
+ <scroll_list.columns label="Opis" name="description" />
+ <scroll_list.columns label="Właściciel" name="owner" />
+ <scroll_list.columns label="Wysokość" name="altitude" />
+ </scroll_list>
+ <text name="messaging_status">
+ Postacie:
+ </text>
+ <button label="Odśwież listę" name="refresh_objects_list" />
+ <button label="Zaznacz wszystko" name="select_all_objects" />
+ <button label="Odznacz wszystko" name="select_none_objects" />
+ </panel>
+ <panel name="pathfinding_chars_actions">
+ <text name="actions_label">
+ Operacje na zazn. postaciach:
+ </text>
+ <check_box label="Podświetlenia" name="show_beacon" />
+ <check_box label="Kapsuła fizyczna" name="show_physics_capsule" />
+ <button label="Weź" name="take_objects" />
+ <button label="Weź kopię" name="take_copy_objects" />
+ <button label="Teleportuj mnie" name="teleport_me_to_object" tool_tip="Włączone tylko wtedy, gdy postać jest zaznaczona." />
+ <button label="Zwróć" name="return_objects" />
+ <button label="Usuń" name="delete_objects" />
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c9ee53c4ece651cddedb7a5377e8122a8c21582
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_pathfinding_console" title="Podgląd odnajdywania ścieżek">
+ <floater.string name="navmesh_viewer_status_library_not_implemented">
+ Nie można znaleźć implementacji biblioteki szukania ścieżek.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_region_not_enabled">
+ Ten region ma wyłączone odnajdywanie ścieżek.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_region_loading">
+ Oczekiwanie na dokończenie ładowania regionu.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_checking_version">
+ Sprawdzanie statusu Navmesha.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_downloading">
+ Pobieranie Navmesha.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_updating">
+ Navmesh zmienił się na serwerze, pobieranie najnowszego.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_has_navmesh">
+ Najnowszy Navmesh został pobrany.
+ </floater.string>
+ <floater.string name="navmesh_viewer_status_error">
+ Nie można pobrać Navmesha.
+ </floater.string>
+ <floater.string name="navmesh_simulator_status_pending">
+ Navmesh ma oczekujÄ…ce zmiany.
+ </floater.string>
+ <floater.string name="navmesh_simulator_status_building">
+ Navmesh siÄ™ tworzy.
+ </floater.string>
+ <floater.string name="navmesh_simulator_status_some_pending">
+ Niektóre regiony Navmesha mają oczekujące zmiany.
+ </floater.string>
+ <floater.string name="navmesh_simulator_status_some_building">
+ Niektóre regiony Navmesha się tworzą.
+ </floater.string>
+ <floater.string name="navmesh_simulator_status_pending_and_building">
+ Niektóre regiony Navmesha mają oczekujące zmiany, a inne się tworzą.
+ </floater.string>
+ <floater.string name="navmesh_simulator_status_complete">
+ Navmesh jest aktualny.
+ </floater.string>
+ <floater.string name="pathing_library_not_implemented">
+ Nie można znaleźć implementacji biblioteki szukania ścieżek.
+ </floater.string>
+ <floater.string name="pathing_region_not_enabled">
+ Ten region ma wyłączone odnajdywanie ścieżek.
+ </floater.string>
+ <floater.string name="pathing_choose_start_and_end_points">
+ Wybierz punkt startowy i końcowy.
+ </floater.string>
+ <floater.string name="pathing_choose_start_point">
+ Wybierz punkt startowy.
+ </floater.string>
+ <floater.string name="pathing_choose_end_point">
+ Wybierz punkt końcowy.
+ </floater.string>
+ <floater.string name="pathing_path_valid">
+ Ścieżka jest pomarańczowa.
+ </floater.string>
+ <floater.string name="pathing_path_invalid">
+ Ścieżka pomiędzy punktami nie może zostać znaleziona.
+ </floater.string>
+ <floater.string name="pathing_error">
+ Wystąpił błąd podczas generowania ścieżki.
+ </floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Stan przeglÄ…darki
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Stan symulatora
+ </text>
+ </panel>
+ <tab_container name="view_test_tab_container">
+ <panel name="view_panel" label="Widok">
+ <text name="show_label">
+ Pokaż:
+ </text>
+ <check_box label="Åšwiat" name="show_world" />
+ <check_box label="Tylko ruchome" name="show_world_movables_only" />
+ <text name="show_walkability_label">
+ Pokaż mapę dostępności:
+ </text>
+ <combo_box name="show_heatmap_mode">
+ <combo_box.item label="Nie pokazuj" name="show_heatmap_mode_none" />
+ <combo_box.item label="Typ postaci A" name="show_heatmap_mode_a" />
+ <combo_box.item label="Typ postaci B" name="show_heatmap_mode_b" />
+ <combo_box.item label="Typ postaci C" name="show_heatmap_mode_c" />
+ <combo_box.item label="Typ postaci D" name="show_heatmap_mode_d" />
+ </combo_box>
+ <check_box label="Dostępne do przejścia" name="show_walkables" />
+ <check_box label="Objętości materiałów" name="show_material_volumes" />
+ <check_box label="Statyczne przeszkody" name="show_static_obstacles" />
+ <check_box label="Objętości wykluczenia" name="show_exclusion_volumes" />
+ <check_box label="Wody gruntowe" name="show_water_plane" />
+ <check_box label="Tryb rentgenowski" name="show_xray" />
+ </panel>
+ <panel name="test_panel" label="Test ścieżki">
+ <text name="ctrl_click_label">
+ Ctrl-klik aby wybrać punkt startu.
+ </text>
+ <text name="shift_click_label">
+ Shift-klik aby wybrać punkt końca.
+ </text>
+ <text name="character_width_label">
+ Szerokość postaci
+ </text>
+ <text name="character_type_label">
+ Typ postaci
+ </text>
+ <combo_box name="path_character_type">
+ <combo_box.item label="Brak" name="path_character_type_none" />
+ </combo_box>
+ <button label="Czyść ścieżkę" name="clear_path" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pl/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40f7141e6a9a21e64323fb4c8582d345697d5445
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_pathfinding_linksets.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_pathfinding_linksets" title="Zbiory części odnajdywania ścieżek">
+ <floater.string name="messaging_get_inprogress">
+ Odpytywanie o zbiory części odnajdywania ścieżek...
+ </floater.string>
+ <floater.string name="messaging_get_error">
+ Błąd podczas odpytywanie o zbiory części odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="messaging_set_inprogress">
+ Modyfikowanie wybranych zbiorów części odnajdywania ścieżek...
+ </floater.string>
+ <floater.string name="messaging_set_error">
+ Błąd podczas modyfikowania wybranych zbiorów części odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="messaging_complete_none_found">
+ Brak zbiorów części odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="messaging_complete_available">
+ [NUM_SELECTED] zbiorów wybranych z [NUM_TOTAL].
+ </floater.string>
+ <floater.string name="messaging_not_enabled">
+ Ten region nie ma włączonego odnajdywania ścieżek.
+ </floater.string>
+ <floater.string name="linkset_terrain_name">
+ [Podłoże]
+ </floater.string>
+ <floater.string name="linkset_owner_loading">
+ [Åadowanie]
+ </floater.string>
+ <floater.string name="linkset_owner_unknown">
+ [Nieznane]
+ </floater.string>
+ <floater.string name="linkset_owner_group">
+ [grupa]
+ </floater.string>
+ <floater.string name="linkset_is_scripted">
+ Tak
+ </floater.string>
+ <floater.string name="linkset_is_not_scripted">
+ Nie
+ </floater.string>
+ <floater.string name="linkset_is_unknown_scripted">
+ Nieznane
+ </floater.string>
+ <floater.string name="linkset_use_walkable">
+ Dostępne do przejścia
+ </floater.string>
+ <floater.string name="linkset_use_static_obstacle">
+ Statyczna przeszkoda
+ </floater.string>
+ <floater.string name="linkset_use_dynamic_obstacle">
+ Ruchoma przeszkoda
+ </floater.string>
+ <floater.string name="linkset_use_material_volume">
+ Objętość materiału
+ </floater.string>
+ <floater.string name="linkset_use_exclusion_volume">
+ Objętość wykluczenia
+ </floater.string>
+ <floater.string name="linkset_use_dynamic_phantom">
+ Ruchomy widmowy
+ </floater.string>
+ <floater.string name="linkset_is_terrain">
+ [niemodyfikowalny]
+ </floater.string>
+ <floater.string name="linkset_is_restricted_state">
+ [ograniczony]
+ </floater.string>
+ <floater.string name="linkset_is_non_volume_state">
+ [wklęsły]
+ </floater.string>
+ <floater.string name="linkset_is_restricted_non_volume_state">
+ [ograniczony,wklęsły]
+ </floater.string>
+ <floater.string name="linkset_choose_use">
+ Zastosowanie zbioru...
+ </floater.string>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Filtrowanie:
+ </text>
+ <text name="linksets_name_label">
+ Nazwa
+ </text>
+ <text name="linksets_desc_label">
+ Opis
+ </text>
+ <combo_box name="filter_by_linkset_use">
+ <combo_box.item label="Filtr po zastosowaniu zbioru..." name="filter_by_linkset_use_none" />
+ <combo_box.item label="Dostępne do przejścia" name="filter_by_linkset_use_walkable" />
+ <combo_box.item label="Statyczna przeszkoda" name="filter_by_linkset_use_static_obstacle" />
+ <combo_box.item label="Ruchoma przeszkoda" name="filter_by_linkset_use_dynamic_obstacle" />
+ <combo_box.item label="Objętość materiału" name="filter_by_linkset_use_material_volume" />
+ <combo_box.item label="Objętość wykluczenia" name="filter_by_linkset_use_exclusion_volume" />
+ <combo_box.item label="Ruchomy widmowy" name="filter_by_linkset_use_dynamic_phantom" />
+ </combo_box>
+ <button label="Zastosuj" name="apply_filters" />
+ <button label="Czyść" name="clear_filters" />
+ <scroll_list name="objects_scroll_list">
+ <scroll_list.columns label="Nazwa (gł. prima)" name="name" />
+ <scroll_list.columns label="Opis (gł. prima)" name="description" />
+ <scroll_list.columns label="Właściciel" name="owner" />
+ <scroll_list.columns label="Skrypty" name="scripted" />
+ <scroll_list.columns label="Wpływ" name="land_impact" />
+ <scroll_list.columns label="Odległość" name="dist_from_you" />
+ <scroll_list.columns label="Zastosowanie" name="linkset_use" />
+ </scroll_list>
+ <text name="messaging_status">
+ Zbiory:
+ </text>
+ <button label="Odśwież listę" name="refresh_objects_list" />
+ <button label="Zaznacz wszystko" name="select_all_objects" />
+ <button label="Odznacz wszystko" name="select_none_objects" />
+ </panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Akcje na zazn. zbiorach (jeśli zbiór jest usunięty ze świata jego atrybuty mogą być utracone):
+ </text>
+ <check_box label="Podświetlenie" name="show_beacon" />
+ <button label="Weź" name="take_objects" />
+ <button label="Weź kopię" name="take_copy_objects" />
+ <button label="Teleportuj mnie" name="teleport_me_to_object" />
+ <button label="Zwróć" name="return_objects" />
+ <button label="Usuń" name="delete_objects" />
+ </panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Zmień atrybuty zaznaczonych zbiorów i naciśnij na przycisk by zachować zmiany
+ </text>
+ <text name="walkability_coefficients_label">
+ Dostępność:
+ </text>
+ <line_editor name="edit_a_value" tool_tip="Możliwość przejścia dla postaci typu A. Przykładowa postać jest humanoidem." />
+ <line_editor name="edit_b_value" tool_tip="Możliwość przejścia dla postaci typu B. Przykładowa postać jest stworzeniem." />
+ <line_editor name="edit_c_value" tool_tip="Możliwość przejścia dla postaci typu C. Przykładowa postać jest mechaniczna." />
+ <line_editor name="edit_d_value" tool_tip="Możliwość przejścia dla postaci typu D. Przykładowa postać jest inna." />
+ <button label="Zastosuj zmiany" name="apply_edit_values" />
+ <text name="suggested_use_b_label">
+ (Stworzenie)
+ </text>
+ <text name="suggested_use_c_label">
+ (Mechaniczna)
+ </text>
+ <text name="suggested_use_d_label">
+ (Inna)
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml
old mode 100755
new mode 100644
index cb9c0bd552ac585b778cbac484e90b914a85a3a2..7d628b883d7f84bd953be811726d9f3b7b18675d
--- a/indra/newview/skins/default/xui/pl/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pl/floater_pay.xml
@@ -1,18 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
- <string name="payee_group">Zapłać grupie</string>
- <string name="payee_resident">Zapłać Rezydentowi</string>
- <text name="paying_text">PÅ‚acisz:</text>
- <text name="payee_name">Przetestuj nazwę, która jest bardzo długa aby sprawdzić skracanie.</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money">
+ <string name="payee_group">
+ Zapłać grupie
+ </string>
+ <string name="payee_resident">
+ Zapłać Rezydentowi
+ </string>
+ <text name="paying_text">
+ PÅ‚acisz:
+ </text>
<panel label="Szukaj" name="PatternsPanel">
- <button label="Płać 1L$" label_selected="Płać 1L$" name="fastpay 1"/>
- <button label="Płać 5L$" label_selected="Płać 5L$" name="fastpay 5"/>
- <button label="Płać 10L$" label_selected="Płać 10L$" name="fastpay 10"/>
- <button label="Płać 20L$" label_selected="Płać 20L$" name="fastpay 20"/>
+ <button label="Płać 1L$" label_selected="Płać 1L$" name="fastpay 1" />
+ <button label="Płać 5L$" label_selected="Płać 5L$" name="fastpay 5" />
+ <button label="Płać 10L$" label_selected="Płać 10L$" name="fastpay 10" />
+ <button label="Płać 20L$" label_selected="Płać 20L$" name="fastpay 20" />
</panel>
<panel label="Szukaj" name="InputPanel">
- <text name="amount text">Inna kwota:</text>
- <button label="Zapłać" label_selected="Zapłać" name="pay btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel btn"/>
+ <text name="amount text">
+ Inna kwota:
+ </text>
+ <button label="Zapłać" label_selected="Zapłać" name="pay btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
old mode 100755
new mode 100644
index d196e08feec3bf4922901ce06d77a95251383582..f351c059e5170542e8d935e49ea353b2874cab30
--- a/indra/newview/skins/default/xui/pl/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
@@ -1,21 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
- <string halign="left" name="payee_group" width="100">Zapłać grupie</string>
- <string halign="left" name="payee_resident" width="120">Zapłać Rezydentowi</string>
- <text name="paying_text">PÅ‚acisz:</text>
- <text left="125" name="payee_name">Ericacita Moostopolison</text>
- <text halign="left" left="5" name="object_name_label" width="95">Poprzez obiekt:</text>
- <icon name="icon_object" tool_tip="Obiekt"/>
- <text left="105" name="object_name_text">Poprzez obiekt</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money">
+ <string name="payee_group">
+ Zapłać grupie
+ </string>
+ <string name="payee_resident">
+ Zapłać Rezydentowi
+ </string>
+ <text name="paying_text">
+ PÅ‚acisz:
+ </text>
+ <text name="object_name_label">
+ Przez obiekt:
+ </text>
+ <icon name="icon_object" tool_tip="Obiekty" />
<panel label="Szukaj" name="PatternsPanel">
- <button label="Płać 1L$" label_selected="Płać 1L$" name="fastpay 1"/>
- <button label="Płać 5L$" label_selected="Płać 5L$" name="fastpay 5"/>
- <button label="Płać 10L$" label_selected="Płać 10L$" name="fastpay 10"/>
- <button label="Płać 20L$" label_selected="Płać 20L$" name="fastpay 20"/>
+ <button label="Płać 1L$" label_selected="Płać 1L$" name="fastpay 1" />
+ <button label="Płać 5L$" label_selected="Płać 5L$" name="fastpay 5" />
+ <button label="Płać 10L$" label_selected="Płać 10L$" name="fastpay 10" />
+ <button label="Płać 20L$" label_selected="Płać 20L$" name="fastpay 20" />
</panel>
<panel label="Szukaj" name="InputPanel">
- <text name="amount text">Inna kwota:</text>
- <button label="Zapłać" label_selected="Zapłać" name="pay btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel btn"/>
+ <text name="amount text">
+ Inna kwota:
+ </text>
+ <button label="Zapłać" label_selected="Zapłać" name="pay btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_people.xml b/indra/newview/skins/default/xui/pl/floater_people.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb8dfeeaaa59a3bb8fe5067f3fb767566764fe16
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_people.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_people" title="LUDZIE">
+ <panel_container name="main_panel">
+ <panel name="panel_group_info_sidetray" label="Profil grupy"/>
+ </panel_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
deleted file mode 100755
index 2128cfa3c876c4e8ac3850a66dc732017c1294cc..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="USTAWIENIA DOMYÅšLNE ÅADOWANIA">
- <panel label="Prawa" name="permissions">
- <button label="?" label_selected="?" name="help"/>
- <check_box label="Udostępnij grupie" name="share_with_group"/>
- <check_box label="Pozwól kopiować każdemu" name="everyone_copy"/>
- <text name="NextOwnerLabel">
- Następny Właściciel:
- </text>
- <check_box label="Modyfikuje" name="next_owner_modify"/>
- <check_box label="Kopiuje" name="next_owner_copy"/>
- <check_box label="Oddaje/Sprzedaje" name="next_owner_transfer"/>
- </panel>
- <button label="OK" label_selected="OK" name="ok"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_perms_default.xml b/indra/newview/skins/default/xui/pl/floater_perms_default.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0bb4cef844c0cdcaede22822817cb2e8059f0d6a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_perms_default.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="perms default" title="DOMYÅšLNE UPRAWNIENIA TWORZENIA">
+ <panel label="Domyślne uprawnienia" name="default permissions">
+ <text name="label_1">
+ Następny właściciel:
+ </text>
+ <text name="label_2">
+ Kopiowanie
+ </text>
+ <text name="label_3">
+ Modyfikacja
+ </text>
+ <text name="label_4">
+ Transferowanie
+ </text>
+ <text name="label_5">
+ Udostępnianie grupie
+ </text>
+ <text name="label_6">
+ Każdy może kopiować
+ </text>
+ <text name="label_7" tool_tip="Domyślne uprawnienia dla nowych obiektów">
+ Obiekty
+ </text>
+ <text name="label_8" tool_tip="Domyślne uprawnienia dla nowych przedmiotów ładowanych z dysku">
+ Z dysku
+ </text>
+ <text name="label_9" tool_tip="Domyślne uprawnienia dla nowych skryptów">
+ Skrypty
+ </text>
+ <text name="label_10" tool_tip="Domyślne uprawnienia dla nowych notek">
+ Notki
+ </text>
+ <text name="label_11" tool_tip="Domyślne uprawnienia dla nowych gestów">
+ Gesty
+ </text>
+ <text name="label_12" tool_tip="Domyślne uprawnienia dla nowych ubrań i części ciała">
+ Ubrania
+ </text>
+ </panel>
+ <button label="Anuluj" label_selected="Anuluj" name="cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_picks.xml b/indra/newview/skins/default/xui/pl/floater_picks.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a329e834dbd498e53b80ffa64c827ccbcd31e53a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_picks.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_picks" title="Miejsca" />
diff --git a/indra/newview/skins/default/xui/pl/floater_places.xml b/indra/newview/skins/default/xui/pl/floater_places.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2265721ad9a176818e7d47856dd3329325c79665
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_places.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_places" title="MIEJSCA">
+ <panel name="main_panel" label="Miejsca" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml
old mode 100755
new mode 100644
index e3dce849331c1fc11a822c3657148034c3e1aa12..47c40d231530ee98a78ea0c122681a80a14aedd5
--- a/indra/newview/skins/default/xui/pl/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml
@@ -1,62 +1,49 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Post-Process Floater" title="USTAWIENIA PRZETWARZANIA KOŃCOWEGO">
<tab_container name="Post-Process Tabs">
- <panel label="Kolor filtra" name="wmiColorFilterPanel">
- <check_box label="Udostępnij" name="wmiColorFilterToggle" />
+ <panel label="Filtr koloru" name="wmiColorFilterPanel">
+ <check_box label="WÅ‚Ä…cz" name="wmiColorFilterToggle" />
<text name="wmiColorFilterBrightnessText">
Jasność
</text>
- <slider label="" name="wmiColorFilterBrightness" />
<text name="wmiColorFilterSaturationText">
Nasycenie
</text>
- <slider label="" name="wmiColorFilterSaturation" />
<text name="wmiColorFilterContrastText">
Kontrast
</text>
- <slider label="" name="wmiColorFilterContrast" />
<text name="wmiColorFilterBaseText">
Kontrast koloru podstawowego
</text>
- <slider label="R" name="wmiColorFilterBaseR" />
- <slider label="G" name="wmiColorFilterBaseG" />
- <slider label="B" name="wmiColorFilterBaseB" />
- <slider label="I" name="wmiColorFilterBaseI" />
</panel>
- <panel label="Wizja nocna" name="wmiNightVisionPanel">
- <check_box label="Udostępnij" name="wmiNightVisionToggle" />
+ <panel label="Noktowizja" name="wmiNightVisionPanel">
+ <check_box label="WÅ‚Ä…cz" name="wmiNightVisionToggle" />
<text name="wmiNightVisionBrightMultText">
Wielokrotne wzmocnienie światła
</text>
- <slider label="" name="wmiNightVisionBrightMult" />
<text name="wmiNightVisionNoiseSizeText">
Rozmiar szumu
</text>
- <slider label="" name="wmiNightVisionNoiseSize" />
<text name="wmiNightVisionNoiseStrengthText">
Moc szumu
</text>
- <slider label="" name="wmiNightVisionNoiseStrength" />
</panel>
- <panel label="Bloom" name="wmiBloomPanel">
- <check_box label="Udostępnij" name="wmiBloomToggle" />
+ <panel label="Poświata" name="wmiBloomPanel">
+ <check_box label="WÅ‚Ä…cz" name="wmiBloomToggle" />
<text name="wmiBloomExtractText">
Ekstracja luminacji
</text>
- <slider label="" name="wmiBloomExtract" />
<text name="wmiBloomSizeText">
- Rozmiar rozmazania obrazu
+ Rozmiar poświaty
</text>
- <slider label="" name="wmiBloomSize" />
<text name="wmiBloomStrengthText">
- Moc rozmazania obrazu
+ Moc poświaty
</text>
- <slider label="" name="wmiBloomStrength" />
</panel>
<panel label="Dodatki" name="Extras">
- <button label="ZaładujEfekt" label_selected="ZaładujEfekt" name="PPLoadEffect" />
- <button label="ZapiszEfekt" label_selected="ZapiszEfekt" name="PPSaveEffect" />
- <line_editor label="Nazwa Efektu" name="PPEffectNameEditor" />
+ <button label="Wczytaj efekt" label_selected="Wczytaj efekt" name="PPLoadEffect" />
+ <button label="Zapisz efekt" label_selected="Zapisz efekt" name="PPSaveEffect" />
+ <line_editor label="Nazwa efektu" name="PPEffectNameEditor" />
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml
deleted file mode 100755
index fe796c6fa00c15d4a1fdc202e193c1f4112761de..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_postcard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="WYŚLIJ POCZTÓWKĘ (EMAIL)">
- <text name="to_label">
- Email odbiorcy:
- </text>
- <text name="from_label">
- Twój email:
- </text>
- <text name="name_label">
- Twoje dane:
- </text>
- <text name="subject_label">
- Temat:
- </text>
- <line_editor label="Wpisz treść tematu tutaj" name="subject_form"/>
- <text name="msg_label">
- Treść:
- </text>
- <text_editor name="msg_form">
- Wpisz treść swojej wiadomości tutaj
- </text_editor>
- <text name="fine_print">
- Jeżeli odbiorca tej pocztówki dołączy do [SECOND_LIFE], otrzymasz bonus.
- </text>
- <button label="Anuluj" name="cancel_btn"/>
- <button label="Wyślij" name="send_btn"/>
- <string name="default_subject">
- Pocztówka z [SECOND_LIFE].
- </string>
- <string name="default_message">
- Sprawdź i przekonaj się sam!
- </string>
- <string name="upload_message">
- Wysyłanie...
- </string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
old mode 100755
new mode 100644
index 930a5c76b005e8882ecad6eb2986c11fda402176..9dceb636cfe409ebaf1211600be0a62ff671ded7
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Preferences" title="USTAWIENIA">
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
<tab_container name="pref core">
- <panel label="Ogólne" name="general"/>
- <panel label="Grafika" name="display"/>
- <panel label="Dźwięk & Media" name="audio"/>
- <panel label="Czat" name="chat"/>
- <panel label="Ruch & Widok" name="move"/>
- <panel label="Powiadomienia" name="msgs"/>
- <panel label="Kolory" name="colors"/>
- <panel label="Prywatność" name="im"/>
- <panel label="Ustawienie" name="input"/>
- <panel label="Zaawansowane" name="advanced1"/>
+ <panel label="Ogólne" name="general" />
+ <panel label="Grafika" name="display" />
+ <panel label="Dźwięk i media" name="audio" />
+ <panel label="Czat" name="chat" />
+ <panel label="Ruch i widok" name="move" />
+ <panel label="Powiadomienia" name="msgs" />
+ <panel label="Kolory" name="colors" />
+ <panel label="Prywatność" name="im" />
+ <panel label="Åšrodowisko" name="input" />
+ <panel label="Zaawansowane" name="advanced1" />
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f348fdef50d0071b307480f5713cb87cfc2785f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Proxy Settings Floater" title="Ustawienia serwera pośredniczącego proxy">
+ <check_box label="Używaj proxy HTTP dla stron internetowych" name="web_proxy_enabled" />
+ <text name="http_proxy_label">
+ Proxy HTTP:
+ </text>
+ <line_editor name="web_proxy_editor" tool_tip="Nazwa DNS lub adres IP serwera proxy HTTP, którego chcesz używać." />
+ <spinner label="Numer portu:" name="web_proxy_port" tool_tip="Numer portu, który ma być używany przez proxy HTTP." />
+ <check_box label="Używaj proxy SOCKS 5 dla ruchu UDP" name="socks_proxy_enabled" />
+ <text name="socks5_proxy_label">
+ Proxy SOCKS 5:
+ </text>
+ <line_editor name="socks_proxy_editor" tool_tip="Nazwa DNS lub adres IP serwera proxy SOCKS 5, którego chcesz używać." />
+ <spinner label="Numer portu:" name="socks_proxy_port" tool_tip="Numer portu, który ma być używany przez proxy SOCKS 5." />
+ <text name="socks_auth_label">
+ Autoryzacja SOCKS:
+ </text>
+ <radio_group name="socks5_auth_type">
+ <radio_item label="Brak autoryzacji" name="Socks5NoAuth" tool_tip="Proxy Socks5 nie wymaga autoryzacji." />
+ <radio_item label="Użytkownik/hasło" name="Socks5UserPass" tool_tip="Proxy Socks5 wymaga autoryzacji typu użytkownik/hasło." />
+ </radio_group>
+ <text name="socks5_username_label">
+ Użytkownik:
+ </text>
+ <text name="socks5_password_label">
+ Hasło:
+ </text>
+ <line_editor name="socks5_username" tool_tip="Użytkownik używany do autoryzacji z Twoim serwerem SOCKS 5" />
+ <line_editor name="socks5_password" tool_tip="Hasło używane do autoryzacji z Twoim serwerem SOCKS 5" />
+ <text name="other_proxy_label">
+ Inny ruch proxy HTTP:
+ </text>
+ <radio_group name="other_http_proxy_type">
+ <radio_item label="Nie ślij przez proxy" name="OtherNoProxy" tool_tip="Ruch HTTP niepowiązany ze stronami internetowymi NIE będzie przesyłany przez żadne proxy." />
+ <radio_item label="Użyj proxy HTTP" name="OtherHTTPProxy" tool_tip="Ruch HTTP niepowiązany ze stronami internetowymi będzie przesyłany przez proxy dla stron internetowych skonfigurowane powyżej." />
+ <radio_item label="Użyj proxy SOCKS 5" name="OtherSocksProxy" tool_tip="Ruch HTTP niepowiązany ze stronami internetowymi będzie przesyłany przez proxy Socks 5." />
+ </radio_group>
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
old mode 100755
new mode 100644
index d276b1f63aeb6f1c78b960be11657661ab84399f..aa8384727e9d8e1a113712ca0f1ae45f14369865
--- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="preview_anim">
<floater.string name="Title">
Animacja: [NAME]
@@ -6,6 +6,6 @@
<text name="desc txt">
Opis:
</text>
- <button label="Uruchom in-world" label_selected="Stop" name="Anim play btn" tool_tip="Uruchom animacjÄ™ by widzieli jÄ… pozostali Rezydenci" width="131"/>
- <button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom animację widoczną tylko przez Ciebie" width="120"/>
+ <button label="Uruchom publicznie" label_selected="Zatrzymaj" name="Inworld" tool_tip="Uruchom animacjÄ™ tak, aby widzieli jÄ… pozostali Rezydenci" />
+ <button label="Uruchom prywatnie" label_selected="Zatrzymaj" name="Locally" tool_tip="Uruchom animację tak, aby była ona widoczna tylko dla Ciebie" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
old mode 100755
new mode 100644
index 817122566692449aaf893a50a1aebcbda58b4bf4..fd9b2ff8f855dc37f443c381b5e6b3d9f0c7c508
--- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="gesture_preview">
<floater.string name="step_anim">
- Animacja
+ Animacja:
</floater.string>
<floater.string name="step_sound">
Dźwięk:
@@ -10,13 +10,10 @@
Czat:
</floater.string>
<floater.string name="step_wait">
- Wstrzymaj:
- </floater.string>
- <floater.string name="stop_txt">
- Stop
+ Czekaj:
</floater.string>
<floater.string name="preview_txt">
- Pokaż
+ PodglÄ…d
</floater.string>
<floater.string name="none_text">
-- Brak --
@@ -28,46 +25,42 @@
Opis:
</text>
<text name="trigger_label">
- WÅ‚Ä…czanie:
+ WÅ‚Ä…cznik:
</text>
- <text name="replace_text" tool_tip="Zmień włączającą frazę na inną. Na przykład zmiana 'witam' na 'cześć' zmieni czat 'Chciałem powiedzieć witam' na 'Chciałem powiedzieć cześć' i pokaże animację!">
+ <text name="replace_text" tool_tip="Zmień włączającą frazę na inną. Na przykład zmiana 'witam' na 'cześć' zmieni czat 'Chciałem powiedzieć witam' na 'Chciałem powiedzieć cześć' i pokaże animację/gest!">
Zamień na:
</text>
- <line_editor name="replace_editor" tool_tip="Zmień włączającą frazę na inną. Na przykład zmiana 'witam' na 'cześć' zmieni czat 'Chciałem powiedzieć witam' na 'Chciałem powiedzieć cześć' i pokaże animację!"/>
+ <line_editor name="replace_editor" tool_tip="Zmień włączającą frazę na inną. Na przykład zmiana 'witam' na 'cześć' zmieni czat 'Chciałem powiedzieć witam' na 'Chciałem powiedzieć cześć' i pokaże animację/gest!" />
<text name="key_label">
Skrót:
</text>
- <combo_box label="Brak" name="modifier_combo"/>
- <combo_box label="Brak" name="key_combo"/>
+ <combo_box label="Brak" name="modifier_combo" />
+ <combo_box label="Brak" name="key_combo" />
<text name="library_label">
Zbiór:
</text>
<scroll_list name="library_list">
- <scroll_list.rows name="action_animation" value="Animacja"/>
- <scroll_list.rows name="action_sound" value="Dźwięk"/>
- <scroll_list.rows name="action_chat" value="Czat"/>
- <scroll_list.rows name="action_wait" value="Wstrzymaj"/>
+ <scroll_list.rows name="action_animation" value="Animacja" />
+ <scroll_list.rows name="action_sound" value="Dźwięk" />
+ <scroll_list.rows name="action_chat" value="Czat" />
+ <scroll_list.rows name="action_wait" value="Czekaj" />
</scroll_list>
- <button label="Dodaj >>" name="add_btn"/>
+ <button label="Dodaj >>" name="add_btn" />
<text name="steps_label">
Etapy:
</text>
- <button label="W górę" name="up_btn"/>
- <button label="W dół" name="down_btn"/>
- <button label="Usuń" name="delete_btn"/>
+ <button label="W górę" name="up_btn" />
+ <button label="W dół" name="down_btn" />
+ <button label="Usuń" name="delete_btn" />
<text name="options_text">
(opcje)
</text>
- <radio_group name="animation_trigger_type">
- <radio_item label="Start" name="start"/>
- <radio_item label="Stop" name="stop"/>
- </radio_group>
- <check_box label="do końca animacji" name="wait_anim_check"/>
- <check_box label="czas w sekundach:" name="wait_time_check"/>
+ <check_box label="do końca animacji" name="wait_anim_check" />
+ <check_box label="czas w sekundach:" name="wait_time_check" />
<text name="help_label">
- Wszystkie etapy nastąpią razem, chyba, że dodasz pauzy.
+ Wszystkie etapy nastąpią razem chyba, że dodasz pauzy.
</text>
- <check_box label="Aktywna" name="active_check" tool_tip="Aktywne gesturki można włączać używając przypisanej frazy w czacie albo używając przypisanego klawisza skrótowego. W przypaku konfliktu przypisań gesty zazwyczaj nie będą działać."/>
- <button label="Pokaż" name="preview_btn"/>
- <button label="Zapisz" name="save_btn"/>
+ <check_box label="Aktywny" name="active_check" tool_tip="Aktywne gesty można włączać używając przypisanej frazy w czacie albo używając przypisanego klawisza skrótowego. W przypaku konfliktu przypisań gesty zazwyczaj nie będą działać." />
+ <button label="PodglÄ…d" name="preview_btn" />
+ <button label="Zapisz" name="save_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
old mode 100755
new mode 100644
index b3275cb7b5917838dac07071da92db5fda5f5d78..8e0134e6c04980073c019e25447ed7908c37c567
--- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="NOTA:">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview notecard" title="NOTKA:">
<floater.string name="no_object">
Nie można znaleźć obiektu zawierającego tą notkę.
</floater.string>
<floater.string name="not_allowed">
- Nie masz pozwolenia na zobaczenie tej notki.
+ Nie masz uprawnień aby zobaczyć tą notkę.
</floater.string>
<floater.string name="Title">
Notka: [NAME]
@@ -15,6 +15,6 @@
<text_editor name="Notecard Editor">
Åadowanie...
</text_editor>
- <button label="Zapisz" label_selected="Zapisz" name="Save"/>
- <button label="Usuń" label_selected="Usuń" name="Delete"/>
+ <button label="Zapisz" label_selected="Zapisz" name="Save" />
+ <button label="Usuń" label_selected="Usuń" name="Delete" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
old mode 100755
new mode 100644
index 3825fe742e4b31df1f6843fb47b3c17d2128079d..40cf4600d44ccda929738a5ce19c6796630e833b
--- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="preview_sound">
<floater.string name="Title">
Dźwięk: [NAME]
@@ -6,6 +6,6 @@
<text name="desc txt">
Opis:
</text>
- <button label="Odtwarzaj" label_selected="Odtwarzaj" left_delta="-136" name="Sound play btn" tool_tip="Dźwięk będzie słyszalny przez wszystkich." width="130"/>
- <button label="Odtwarzaj lokalnie" label_selected="Odtwarzaj lokalnie" name="Sound audition btn" tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie."/>
+ <button label="Odtwórz publicznie" label_selected="Zatrzymaj" name="Sound play btn" tool_tip="Dźwięk będzie słyszalny dla wszystkich." />
+ <button label="Odtwórz prywatnie" label_selected="Zatrzymaj" name="Sound audition btn" tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie." />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
old mode 100755
new mode 100644
index e58acee139571d996116d2f2596d4ebccfc99de6..8cdeccd723d76fa1508fa4a4a8a1e1d538ec5025
--- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="preview_texture">
<floater.string name="Title">
Tekstura: [NAME]
@@ -9,39 +9,10 @@
<text name="desc txt">
Opis:
</text>
- <text name="dimensions">
- [WIDTH]px x [HEIGHT]px
- </text>
<text name="aspect_ratio">
- Zobacz proporcje
+ PodglÄ…d proporcji
</text>
- <combo_box name="combo_aspect_ratio" tool_tip="Wyświetl w domyślnych proporcjach">
- <combo_item name="Unconstrained">
- Swobodny
- </combo_item>
- <combo_item name="1:1" tool_tip="Insygnia Grupy lub realny Profil">
- 1:1
- </combo_item>
- <combo_item name="4:3" tool_tip="[SECOND_LIFE] profil">
- 4:3
- </combo_item>
- <combo_item name="10:7" tool_tip="Reklamy i atrakcje, landmarki">
- 10:7
- </combo_item>
- <combo_item name="3:2" tool_tip="O Posiadłości">
- 3:2
- </combo_item>
- <combo_item name="16:10">
- 16:10
- </combo_item>
- <combo_item name="16:9" tool_tip="LubiÄ™">
- 16:9
- </combo_item>
- <combo_item name="2:1">
- 2:1
- </combo_item>
- </combo_box>
- <button label="OK" name="Keep"/>
- <button label="Wyrzuć" name="Discard"/>
- <button label="Zapisz jako" name="save_tex_btn"/>
+ <combo_box name="combo_aspect_ratio" tool_tip="Wyświetl w stałych proporcjach" />
+ <button label="Wyrzuć" name="Discard" />
+ <button label="Zapisz jako" name="save_tex_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pl/floater_price_for_listing.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b54a7ea921109484b7f88113f1066a262338ea6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_price_for_listing.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="price_for_listing" title="PUBLIKUJ REKLAMĘ">
+ <text name="explanation_text">
+ Twoja reklama będzie wyświetlana przez okres jednego tygodnia od daty jej publikacji.
+
+Pozycja Twojej reklamy na liście zależy od tego, jak dużo za nią zapłacisz.
+
+Lepiej opłacone reklamy pojawiają się na szczycie listy i wyżej w wynikach wyszukiwania.
+ </text>
+ <text name="price_text">
+ Ustal cenÄ™:
+ </text>
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
old mode 100755
new mode 100644
index cfdac165cd4fde6f6150fdf7cdedf71d653327ac..1cc9722e7c3b5284f73985f7703b6dade484c1fb
--- a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="publish_classified" title="Publikowanie Reklam">
<text name="explanation_text">
- Twoja reklama zostanie wyświetlana przez okres jednego tygodnia od daty jej publikacji.
-
-Pamiętaj, opłaty za reklamy nie podlegają prawu zwrotu.
+ Twoja reklama będzie wyświetlana przez okres jednego tygodnia od daty jej publikacji.
+
+Pamiętaj, że opłaty nie podlegają prawu zwrotu.
</text>
- <spinner label="Cena: L$" name="price_for_listing" tool_tip="Cena za umieszczenie reklamy w wyszukiwarce." value="50"/>
- <text name="l$_text" value="L$"/>
- <text name="more_info_text">
- Więcej info (link do pomocy)
- </text>
- <button label="Publikuj" name="publish_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
+ <spinner label="Cena: L$" name="price_for_listing" tool_tip="Cena za umieszczenie reklamy w wyszukiwarce." />
+ <button label="Publikuj" name="publish_btn" />
+ <button label="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
old mode 100755
new mode 100644
index ce1f3c0ac73491c2c0834fcb833f91c605c15dea..498fc23976b2bb5b201607c64ef92ce11fa29369
--- a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="region_debug_console" title="Debugowanie regionu"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="region_debug_console" title="Debugowanie regionu" />
diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml
old mode 100755
new mode 100644
index a1f7785f488eaed112b47a5c6a5d35f03e277278..4613df2007e0711b7774f923e28029b63f744f4f
--- a/indra/newview/skins/default/xui/pl/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="REGION/MAJÄ„TEK"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="REGION/DZIAÅKA" />
diff --git a/indra/newview/skins/default/xui/pl/floater_region_restarting.xml b/indra/newview/skins/default/xui/pl/floater_region_restarting.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4157d4b424cbc4cf8cbb4a339f11dc599bffd254
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_region_restarting.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="region_restarting" title="RESTART REGIONU">
+ <string name="RegionName">
+ Region, w którym teraz jesteś ([NAME]) zostanie za chwilę zrestartowany.
+
+Jeśli w nim zostaniesz, to symulator Cię wyloguje.
+ </string>
+ <string name="RestartSeconds">
+ Sekund do restartu
+[SECONDS]
+ </string>
+ <panel name="layout_panel_1">
+ <text name="region_name">
+ Region, w którym teraz jesteś (-The longest region name-) zostanie za chwilę zrestartowany.
+
+Jeśli w nim zostaniesz, to symulator Cię wyloguje.
+ </text>
+ <text name="restart_seconds">
+ Sekund do restartu
+32767
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
old mode 100755
new mode 100644
index a5b96601b88bb029937c3d5bc0ad8ff39319a0ac..49767319e79265f43aab5e4947ac32d3d3f5d7d2
--- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
@@ -1,107 +1,61 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_report_abuse" title="RAPORT O NADUŻYCIU">
<floater.string name="Screenshot">
Zdjęcie ekranu
</floater.string>
- <check_box label="Załącz zdjęcie do raportu" name="screen_check"/>
+ <check_box label="Załącz zdjęcie" name="screen_check" />
<text name="reporter_title">
- Reporter:
- </text>
- <text name="reporter_field">
- Loremipsum Dolorsitamut Longnamez
- </text>
- <text name="sim_title">
- Region:
- </text>
- <text name="sim_field">
- Nazwa Regionu
+ Zgłasza:
</text>
<text name="pos_title">
Pozycja:
</text>
- <text name="pos_field">
- {128.1, 128.1, 15.4}
- </text>
<text name="select_object_label">
- Wybierz ten przycisk a następnie obiekt, który zgłaszasz do raportu:
+ Kliknij na przycisk, a następnie na obiekt:
</text>
- <button label="" label_selected="" name="pick_btn" tool_tip="Wybór obiektu - wybierz obiekt, którego dotyczy raport"/>
+ <button name="pick_btn" tool_tip="Wybór obiektu - wybierz obiekt, którego dotyczy raport" />
<text name="object_name_label">
- Nazwa obiektu:
- </text>
- <text name="object_name">
- Consetetur Sadipscing
+ Obiekt:
</text>
<text name="owner_name_label">
Właściciel:
</text>
- <text name="owner_name">
- Hendrerit Vulputate Kamawashi Longname
- </text>
<combo_box name="category_combo" tool_tip="Wybór kategorii - wybierz kategorię, której dotyczy raport">
- <combo_box.item label="Wybierz KategoriÄ™:" name="Select_category"/>
- <combo_box.item label="Wiek > Udawanie nieletniej osoby" name="Age__Age_play"/>
- <combo_box.item label="Wiek > Dorosły Rezydent w Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
- <combo_box.item label="Wiek > Nieletni Rezydent poza Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
- <combo_box.item label="Napaść > strefa militarna / niebezpieczny obszar" name="Assault__Combat_sandbox___unsafe_area"/>
- <combo_box.item label="Napaść > nezpieczny obszar" name="Assault__Safe_area"/>
- <combo_box.item label="Napaść > obszar do testowania broni" name="Assault__Weapons_testing_sandbox"/>
- <combo_box.item label="Handel > niedostarczenie produktu lub usługi" name="Commerce__Failure_to_deliver_product_or_service"/>
- <combo_box.item label="Naruszenie prywatności > dane osobiste" name="Disclosure__Real_world_information"/>
- <combo_box.item label="Ujawnienie > monitorowanie czatu" name="Disclosure__Remotely_monitoring chat"/>
- <combo_box.item label="Ujawnienie > dane z Second Life / Czatu / IM" name="Disclosure__Second_Life_information_chat_IMs"/>
- <combo_box.item label="Zakłócanie spokoju > nieuczciwe używanie zasobów Regionu" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
- <combo_box.item label="Zakłócanie spokoju > przesadnie skryptowane obiekty" name="Disturbing_the_peace__Excessive_scripted_objects"/>
- <combo_box.item label="Zakłócanie spokoju > śmiecenie obiektami" name="Disturbing_the_peace__Object_littering"/>
- <combo_box.item label="Zakłócanie spokoju > ciągły spam" name="Disturbing_the_peace__Repetitive_spam"/>
- <combo_box.item label="Zakłócanie spokoju > nieporządany spam reklamowy" name="Disturbing_the_peace__Unwanted_advert_spam"/>
- <combo_box.item label="Oszustwo > L$" name="Fraud__L$"/>
- <combo_box.item label="Oszustwo > Posiadłości" name="Fraud__Land"/>
- <combo_box.item label="Oszustwo > piramidy albo listy łańcuchowe" name="Fraud__Pyramid_scheme_or_chain_letter"/>
- <combo_box.item label="Oszustwo > US$" name="Fraud__US$"/>
- <combo_box.item label="Prześladowanie > farmy reklamowe / wizualny spam" name="Harassment__Advert_farms___visual_spam"/>
- <combo_box.item label="Prześladowanie > zniesławianie jedostek lub grup" name="Harassment__Defaming_individuals_or_groups"/>
- <combo_box.item label="Prześladowanie > Ograniczanie ruchu" name="Harassment__Impeding_movement"/>
- <combo_box.item label="Prześladowanie > Molestowanie seksualne" name="Harassment__Sexual_harassment"/>
- <combo_box.item label="Prześladowanie > Namawianie/Zachęcanie innych do łamania warunków umowy (ToS)" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
- <combo_box.item label="Prześladowanie > Znieważanie Słowne" name="Harassment__Verbal_abuse"/>
- <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść lub postępowanie" name="Indecency__Broadly_offensive_content_or_conduct"/>
- <combo_box.item label="Nieprzyzwoitość > Niestosowne imię awatara" name="Indecency__Inappropriate_avatar_name"/>
- <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść i postępowanie w Regionie 'General'" name="Indecency__Mature_content_in_PG_region"/>
- <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść i postępowanie w Regionie 'Moderate'" name="Indecency__Inappropriate_content_in_Mature_region"/>
- <combo_box.item label="Naruszenie własności intelektualnej > usunięcie treści" name="Intellectual_property_infringement_Content_Removal"/>
- <combo_box.item label="Naruszenie własności intelektualnej > CopyBot albo nadużycie przywilejów" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
- <combo_box.item label="Nietolerancja" name="Intolerance"/>
- <combo_box.item label="Posiadłości > nadużywanie piaskownicy" name="Land__Abuse_of_sandbox_resources"/>
- <combo_box.item label="Posiadłości > naruszenie > obiekty/tekstury" name="Land__Encroachment__Objects_textures"/>
- <combo_box.item label="Posiadłości > naruszenie > cząsteczki" name="Land__Encroachment__Particles"/>
- <combo_box.item label="Posiadłości > naruszenie > drzewa/rośliny" name="Land__Encroachment__Trees_plants"/>
- <combo_box.item label="Zakłady/Hazard" name="Wagering_gambling"/>
- <combo_box.item label="Inne" name="Other"/>
+ <combo_box.item label="Wybierz kategoriÄ™" name="Select_category" />
+ <combo_box.item label="Wiek > Udawanie nieletniej osoby" name="Age__Age_play" />
+ <combo_box.item label="Napaść > Bezpieczny obszar" name="Assault__Safe_area" />
+ <combo_box.item label="Prywatność > Dane osobiste ze świata realnego" name="Disclosure__Real_world_information" />
+ <combo_box.item label="Zakłócanie spokoju > Przesadnie skryptowane obiekty" name="Disturbing_the_peace__Excessive_scripted_objects" />
+ <combo_box.item label="Zakłócanie spokoju > Śmiecenie obiektami" name="Disturbing_the_peace__Object_littering" />
+ <combo_box.item label="Zakłócanie spokoju > Ciągły spam" name="Disturbing_the_peace__Repetitive_spam" />
+ <combo_box.item label="Oszustwo > US$" name="Fraud__US$" />
+ <combo_box.item label="Prześladowanie > Namawianie/zachęcanie innych do łamania warunków umowy (ToS)" name="Harassment__Solicting_inciting_others_to_violate_ToS" />
+ <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść lub postępowanie" name="Indecency__Broadly_offensive_content_or_conduct" />
+ <combo_box.item label="Nieprzyzwoitość > Niestosowne imię awatara" name="Indecency__Inappropriate_avatar_name" />
+ <combo_box.item label="Nieprzyzwoitość > Treść lub postępowanie niestosowne do regionu" name="Indecency__Mature_content_in_PG_region" />
+ <combo_box.item label="Nietolerancja" name="Intolerance" />
+ <combo_box.item label="Działki > Wtargnięcie > Obiekty/tekstury" name="Land__Encroachment__Objects_textures" />
+ <combo_box.item label="Zakłady/Hazard" name="Wagering_gambling" />
</combo_box>
<text name="abuser_name_title">
- Dane osobowe:
+ ImiÄ™/nazwa sprawcy:
</text>
- <line_editor name="abuser_name_edit"/>
- <button label="Wybierz Rezydenta" label_selected="" name="select_abuser" tool_tip="Wybierz dane Rezydenta"/>
+ <button label="Wybierz" name="select_abuser" tool_tip="Wybierz imiÄ™ lub nazwÄ™ Rezydenta z listy" />
<text name="abuser_name_title2">
Miejsce nadużycia:
</text>
- <line_editor name="abuse_location_edit"/>
<text name="sum_title">
Podsumowanie:
</text>
- <line_editor name="summary_edit"/>
<text name="dscr_title">
- Szczegóły:
+ Detale:
</text>
<text name="bug_aviso">
- Podaj jak najwięcej możliwych szczegółów dotyczących nadużycia
+ Bądź tak dokładny/a jak to tylko możliwe
</text>
- <text_editor name="details_edit"/>
<text name="incomplete_title">
- * Pamiętaj: Niedokończone raporty nie będą rozpatrywane
+ * Niekompletne raporty nie będą rozpatrywane
</text>
- <button label="Wyślij" label_selected="Wyślij" name="send_btn"/>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+ <button label="Zgłoś nadużycie" label_selected="Zgłoś nadużycie" name="send_btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6fdc7e19f664509e36d092d2d18fd9c07db33566
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Scene Load Statistics" title="Statystyki obciążenia sceny">
+ <button label="Pauza" name="playpause" />
+ <scroll_container name="statistics_scroll">
+ <container_view name="statistics_view">
+ <stat_view name="basic" label="Podstawowe">
+ <stat_bar name="frame difference" label="Różnica pomiędzy klatkami" />
+ <stat_bar label="Przepustowość" name="bandwidth" />
+ <stat_bar label="Utracone pakiety" name="packet_loss" />
+ </stat_view>
+ <stat_view name="advanced" label="Zaawansowane">
+ <stat_view name="render" label="Rendering">
+ <stat_bar name="objs" label="Wszystkie obiekty" />
+ <stat_bar name="newobjs" label="Nowe obiekty" unit_label="/sek" />
+ <stat_bar name="object_cache_hits" label="Wspł. trafień obiektów do cache" />
+ </stat_view>
+ <stat_view name="texture" label="Tekstura">
+ <stat_bar name="texture_cache_hits" label="Wspł. trafień do cache" />
+ <stat_bar name="texture_cache_read_latency" label="Opóźnienie odczytu cache" />
+ <stat_bar name="numimagesstat" label="Suma" />
+ <stat_bar name="numrawimagesstat" label="Suma surowych" />
+ </stat_view>
+ <stat_view name="network" label="Sieć">
+ <stat_bar name="packetsinstat" label="Pakiety wchodzÄ…ce" unit_label="/sek" />
+ <stat_bar name="packetsoutstat" label="Pakiety wychodzÄ…ce" unit_label="/sek" />
+ <stat_bar name="objectdatareceived" label="Obiekty" />
+ <stat_bar name="texturedatareceived" label="Tekstury" />
+ <stat_bar name="assetudpdatareceived" label="Dane (assety)" />
+ <stat_bar name="layersdatareceived" label="Warstwy" />
+ <stat_bar name="messagedatain" label="Aktualna il. wchodzÄ…ca" />
+ <stat_bar name="messagedataout" label="Aktualna il. wychodzÄ…ca" />
+ <stat_bar name="vfspendingoperations" label="Operacje oczekujÄ…ce VFS" unit_label=" op." />
+ </stat_view>
+ </stat_view>
+ <stat_view name="sim" label="Symulator">
+ <stat_bar name="simobjects" label="Obiekty" />
+ <stat_bar name="simactiveobjects" label="Aktywne obiekty" />
+ <stat_bar name="simactivescripts" label="Aktywne skrypty" />
+ <stat_bar name="siminpps" label="Pakiety wchodzÄ…ce" unit_label="pkt/sek" />
+ <stat_bar name="simoutpps" label="Pakiety wychodzÄ…ce" unit_label="pkt/sek" />
+ <stat_bar name="simpendingdownloads" label="OczekujÄ…ce pobrania" />
+ <stat_bar name="simpendinguploads" label="Oczekujące załadowania" />
+ <stat_bar name="simtotalunackedbytes" label="Wszystkie niepotwierdzone bajty" />
+ <stat_view label="Czas (ms)" name="simperf">
+ <stat_bar label="Całkowity czas klatek" name="simframemsec" />
+ <stat_bar label="Czas sieci" name="simnetmsec" />
+ <stat_bar label="Czas fizyki" name="simsimphysicsmsec" />
+ <stat_bar label="Czas symulatora" name="simsimothermsec" />
+ <stat_bar label="Czas agenta" name="simagentmsec" />
+ <stat_bar label="Czas obrazu" name="simimagesmsec" />
+ <stat_bar label="Czas skryptu" name="simscriptmsec" />
+ <stat_bar name="simsparemsec" label="Czas wolny" />
+ <stat_view name="timedetails" label="Szczegóły czasu">
+ <stat_bar name="simsimphysicsstepmsec" label=" Skok fizyki" />
+ <stat_bar name="simsimphysicsshapeupdatemsec" label=" Akt. kształtów fizyki" />
+ <stat_bar name="simsimphysicsothermsec" label=" Inna fizyka" />
+ <stat_bar name="simsleepmsec" label=" Czas pauzy" />
+ <stat_bar name="simpumpiomsec" label=" Skok IO" />
+ </stat_view>
+ </stat_view>
+ </stat_view>
+ </container_view>
+ </scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
old mode 100755
new mode 100644
index 714a600262850c5f1c6d92da465fff02034abbe9..ae3c5e6aa140fdd871a365d2668ad2fd9c78d89b
--- a/indra/newview/skins/default/xui/pl/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
@@ -1,6 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Ostrzeżenie/Błąd Skryptu">
- <tab_container name="Preview Tabs">
- <floater label="Skrypt" name="all_scripts" title="[ALL SCRIPTS]" />
- </tab_container>
-</multi_floater>
+<multi_floater name="script debug floater" title="Ostrzeżenie/błąd skryptu" />
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
old mode 100755
new mode 100644
index e70a30fa24af183134e2d78048bbf57a39cbc917..077dfac4e3b4c6bbbf09f4cc1accafdc6bceebf6
--- a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script" short_title="[WSZYSTKIE SKRYPTY]" title="[WSZYSTKIE SKRYPTY]" />
diff --git a/indra/newview/skins/default/xui/pl/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/pl/floater_script_ed_prefs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa92659f945df1bc14b06582240cb45e7b8908fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_script_ed_prefs.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_script_colors" title="KOLORY SKRYPTÓW">
+ <text name="color_pickers_label">
+ Wybierz żądane kolory:
+ </text>
+ <text name="text_label">
+ Tekst
+ </text>
+ <text name="cursor_label">
+ Kursor
+ </text>
+ <text name="background_label">
+ TÅ‚o
+ </text>
+ <text name="datatype_label">
+ Typy danych
+ </text>
+ <text name="event_label">
+ Zdarzenia
+ </text>
+ <text name="string_literal_label">
+ ÅaÅ„cuchy
+ </text>
+ <text name="constant_label">
+ Stałe
+ </text>
+ <text name="flow_control_label">
+ Sterowanie
+ </text>
+ <text name="function_label">
+ Funkcje
+ </text>
+ <text name="comment_label">
+ Komentarze
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_limits.xml b/indra/newview/skins/default/xui/pl/floater_script_limits.xml
old mode 100755
new mode 100644
index dd13d641a080129a37b634c3eac8499603e30019..6a0231e73763207c18e7e4652c109eb482d04f91
--- a/indra/newview/skins/default/xui/pl/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_limits.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="SKRYPT"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="scriptlimits" title="INFORMACJE O SKRYPCIE" />
diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
old mode 100755
new mode 100644
index eb6a1df77ba8b14687fbe6e2174c94871056d8b6..66473ad9ddcaead9ca3a93a23ecd66ff99c0e199
--- a/indra/newview/skins/default/xui/pl/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="SKRYPT: SKRYPT OBROTU">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="SKRYPT: SKRYPT ROTACYJNY">
<floater.string name="Title">
- Skrypt: [NAME]
+ SKRYPT: [NAME]
</floater.string>
<text name="desc txt">
Opis:
diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
old mode 100755
new mode 100644
index bdfdba569e5c1d6b4ea32e05fd8333e24b62ec0f..3b6efca02a473f82dd7d8b828b438320468ed40f
--- a/indra/newview/skins/default/xui/pl/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="ZRESETUJ PRACĘ W TOKU">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="queue" title="POSTĘP RESETOWANIA">
<floater.string name="Starting">
- Rozpoczęcie [START] [COUNT] elementów.
+ [START] w [COUNT] obiektach.
</floater.string>
<floater.string name="Done">
- Wykonane.
+ Gotowe.
</floater.string>
<floater.string name="Resetting">
- Trwa resetowanie
+ Resetowanie
</floater.string>
<floater.string name="Running">
- Skrypt działa
+ WÅ‚Ä…czanie
</floater.string>
<floater.string name="NotRunning">
- Skrypt nie działa
+ Wyłączanie
</floater.string>
- <button label="Zamknij" label_selected="Zamknij" name="close"/>
+ <button label="Zamknij" label_selected="Zamknij" name="close" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml
old mode 100755
new mode 100644
index 901d61a1377923340882121d782780707de05bb4..1e0381de2bed05a31face6fc33d10cd39f6d2813
--- a/indra/newview/skins/default/xui/pl/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="SZUKAJ SKRYPTU">
- <check_box label="CapsLoock nieaktywny" name="case_text"/>
- <button label="Szukaj" label_selected="Szukaj" name="search_btn"/>
- <button label="Zamień" label_selected="Zamień" name="replace_btn"/>
- <button label="Zamień wszystko" label_selected="Zamień wszystko" name="replace_all_btn"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script search" title="SZUKAJ W SKRYPCIE">
+ <check_box label="Wlk. nieważna" name="case_text" />
+ <button label="Szukaj" label_selected="Szukaj" name="search_btn" />
+ <button label="Zamień" label_selected="Zamień" name="replace_btn" />
+ <button label="Zamień wsz." label_selected="Zamień wsz." name="replace_all_btn" />
<text name="txt">
Szukaj
</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_search.xml b/indra/newview/skins/default/xui/pl/floater_search.xml
deleted file mode 100755
index a0198670e4f9f9ff0e20ad09a495e5280dba6597..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="SZUKAJ">
- <floater.string name="loading_text">
- Åadowanie...
- </floater.string>
- <floater.string name="done_text">
- Wykonano
- </floater.string>
- <layout_stack name="stack1">
- <layout_panel name="browser_layout">
- <text name="refresh_search">
- Ustaw wyszukiwanie na odzwierciedlanie poziomu boskiego
- </text>
- </layout_panel>
- </layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
old mode 100755
new mode 100644
index 190ad61352102145151fc83b208c18dab1ad02f5..5826f2d6373dc9bef457532d536701b53707b7b8
--- a/indra/newview/skins/default/xui/pl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title="">
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
<text name="Save item as:">
- Naciśnij klawisz aby ustawić przełącznik Mówić.
+ Naciśnij przycisk, aby ustawić przełącznik Głosu.
</text>
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
old mode 100755
new mode 100644
index 2201c4b0adf659428917ad7451b1fea6034e7534..9c5906259087e6ac3b5a362072b9397ab8c180ab
--- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
@@ -1,65 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sell land" title="SPRZEDAJ POSIADÅOŚĆ">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="sell land" title="SPRZEDAJ DZIAÅKĘ">
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
<text name="info_parcel_label">
- Posiadłość:
- </text>
- <text name="info_parcel">
- NAZWA POSIADÅOÅšCI
+ Działka:
</text>
<text name="info_size_label">
Rozmiar:
</text>
- <text name="info_size">
- [AREA] m²
- </text>
<text name="info_action">
- Aby sprzedać tą posiadłość:
+ Aby sprzedać tą działkę:
</text>
<text name="price_label">
1. Ustal cenÄ™:
</text>
<text name="price_text">
- Wybierz właściwą cenę za tą posiadłość.
- </text>
- <text name="price_ld">
- L$
+ Wybierz cenę za działkę.
</text>
- <line_editor name="price">
- 0
- </line_editor>
<text name="price_per_m">
- (L$[PER_METER] za m²)
+ ([PER_METER]L$ za m²)
</text>
<text name="sell_to_label">
- 2. Sprzedaj posiadłość:
+ 2. Sprzedaj działkę:
</text>
<text name="sell_to_text">
Wybierz sprzedaż dla kogokolwiek albo dla wybranego kupca.
</text>
<combo_box name="sell_to">
- <combo_box.item label="- Wybierz -" name="--selectone--"/>
- <combo_box.item label="Ktokolwiek" name="Anyone"/>
- <combo_box.item label="Wybrany Kupiec:" name="Specificuser:"/>
+ <combo_box.item label="- Wybierz -" name="--selectone--" />
+ <combo_box.item label="Ktokolwiek" name="Anyone" />
+ <combo_box.item label="Wybrany Kupiec:" name="Specificuser:" />
</combo_box>
- <button label="Wybierz" name="sell_to_select_agent"/>
- <text name="sell_objects_label" font="SansSerifSmall">
- 3. Obiekty sprzedawane razem z posiadłością?
+ <button label="Wybierz" name="sell_to_select_agent" />
+ <text name="sell_objects_label">
+ 3. Sprzedać obiekty razem z działką?
</text>
<text name="sell_objects_text">
- Przekazywalne obiekty właściciela posiadłości zmienią właściciela.
+ Przekazywalne obiekty właściciela działki zmienią właściciela.
</text>
<radio_group name="sell_objects">
- <radio_item label="Nie, zatrzymaj obiekty" name="no"/>
- <radio_item label="Tak, sprzedaj obiekty razem z posiadłością" name="yes"/>
+ <radio_item label="Nie, zatrzymaj obiekty" name="no" />
+ <radio_item label="Tak, sprzedaj razem z działką" name="yes" />
</radio_group>
- <button label="Pokaż Obiekty" name="show_objects"/>
+ <button label="Pokaż obiekty" name="show_objects" />
<text name="nag_message_label">
- PAMIĘTAJ: Sprzedaż jest nieodwracalna.
+ UWAGA: Sprzedaży nie można cofnąć.
</text>
- <button label="Wystaw ziemię na sprzedaż" name="sell_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
+ <button label="Wystaw ziemię na sprzedaż" name="sell_btn" />
+ <button label="Anuluj" name="cancel_btn" />
</panel>
</scroll_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
old mode 100755
new mode 100644
index 131f92d56f1010914a2239f20334f24015820aab..516ccbf4d5013ef2ace6928c80886b3e957ec1c5
--- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="settings_debug" title="USTAWIENIA DEBUGOWANIA">
<radio_group name="boolean_combo">
<radio_item label="PRAWDA" name="TRUE" />
- <radio_item label="NIEPRAWDA" name="FALSE" />
+ <radio_item label="FAÅSZ" name="FALSE" />
</radio_group>
- <color_swatch label="Kolor" name="val_color_swatch"/>
- <spinner label="x" name="val_spinner_1"/>
- <spinner label="x" name="val_spinner_2"/>
- <spinner label="x" name="val_spinner_3"/>
- <spinner label="x" name="val_spinner_4"/>
- <button label="Ustawienia domyślne" name="default_btn"/>
+ <color_swatch name="val_color_swatch" label="Kolor" />
+ <button label="Domyślnie" name="default_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
old mode 100755
new mode 100644
index be92ef917d7f7f40b16c49c4c23b943891869f56..540aa4686e123430a4bac118ffc78a8bd5635650
--- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
@@ -1,75 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="PODGLĄD ZDJĘCIA">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Snapshot" title="ZDJĘCIE">
<floater.string name="unknown">
nieznany
</floater.string>
- <radio_group label="Rodzaj zdjęcia" name="snapshot_type_radio">
- <radio_item label="Email" name="postcard"/>
- <radio_item label="Załaduj do Szafy (L$[AMOUNT])" name="texture"/>
- <radio_item label="Zapisz na dysku" name="local"/>
- </radio_group>
- <text name="file_size_label">
- [SIZE] KB
+ <string name="postcard_progress_str">
+ Wysyłanie maila
+ </string>
+ <string name="facebook_progress_str">
+ Wysyłanie na Facebooka
+ </string>
+ <string name="profile_progress_str">
+ Wysyłanie
+ </string>
+ <string name="inventory_progress_str">
+ Zapisywanie do Szafy
+ </string>
+ <string name="local_progress_str">
+ Zapisywanie na komputer
+ </string>
+ <string name="facebook_succeeded_str">
+ Obraz załadowany
+ </string>
+ <string name="profile_succeeded_str">
+ Obraz załadowany
+ </string>
+ <string name="postcard_succeeded_str">
+ Mail wysłany!
+ </string>
+ <string name="inventory_succeeded_str">
+ Zapisano do Szafy!
+ </string>
+ <string name="local_succeeded_str">
+ Zapisano na dysku!
+ </string>
+ <string name="facebook_failed_str">
+ Publikacja nie powiodła się.
+ </string>
+ <string name="profile_failed_str">
+ Publikacja nie powiodła się.
+ </string>
+ <string name="postcard_failed_str">
+ Wysyłanie maila nieudane.
+ </string>
+ <string name="inventory_failed_str">
+ Zapis do Szafy nieudany.
+ </string>
+ <string name="local_failed_str">
+ Zapis na dysku nieudany.
+ </string>
+ <button label="ODÅšWIEÅ»" name="new_snapshot_btn" />
+ <panel name="advanced_options_panel">
+ <text name="layer_type_label">
+ Uchwyć:
+ </text>
+ <combo_box label="Warstwy obrazu" name="layer_types">
+ <combo_box.item label="Kolory" name="Colors" />
+ <combo_box.item label="Głębia" name="Depth" />
+ </combo_box>
+ <check_box label="Interfejs" name="ui_check" />
+ <check_box label="Obiekty HUD" name="hud_check" />
+ <check_box label="Wstrzymaj (pełny ekran)" name="freeze_frame_check" />
+ <check_box label="Autoodświeżanie" name="auto_snapshot_check" />
+ <text name="filter_list_label">
+ Filtr:
+ </text>
+ <combo_box name="filters_combobox" tool_tip="Filtry obrazu">
+ <combo_box.item label="Brak filtra" name="NoFilter" />
+ </combo_box>
+ </panel>
+ <panel name="succeeded_panel">
+ <text name="succeeded_lbl">
+ Powodzenie
+ </text>
+ </panel>
+ <panel name="failed_panel">
+ <text name="failed_lbl">
+ Niepowodzenie
+ </text>
+ </panel>
+ <text name="working_lbl">
+ PracujÄ™
</text>
- <button label="Odśwież zdjęcie" name="new_snapshot_btn"/>
- <button label="Wyślij" name="send_btn"/>
- <button label="Załaduj (L$[AMOUNT])" name="upload_btn"/>
- <flyout_button label="Zapisz" name="save_btn" tool_tip="Zapisz zdjęcie w pliku">
- <flyout_button.item label="Zapisz" name="save_item"/>
- <flyout_button.item label="Zapisz jako..." name="saveas_item"/>
- </flyout_button>
- <button label="Więcej" name="more_btn" tool_tip="Zaawansowane"/>
- <button label="Mniej" name="less_btn" tool_tip="Zaawansowane"/>
- <button label="Anuluj" name="discard_btn"/>
- <text name="type_label2">
- Wymiar
+ <text name="refresh_lbl">
+ Zrób na nowo
</text>
- <text name="format_label">
- Format
+ <text name="image_res_text">
+ [WIDTH]px (szerokość) x [HEIGHT]px (wysokość)
</text>
- <combo_box label="Rozdzielczość" name="postcard_size_combo">
- <combo_box.item label="Obecne okno" name="CurrentWindow"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="Niestandardowy" name="Custom"/>
- </combo_box>
- <combo_box label="Rozdzielczość" name="texture_size_combo">
- <combo_box.item label="Obecne okno" name="CurrentWindow"/>
- <combo_box.item label="Mały (128x128)" name="Small(128x128)"/>
- <combo_box.item label="Åšredni (256x256)" name="Medium(256x256)"/>
- <combo_box.item label="Duży (512x512)" name="Large(512x512)"/>
- <combo_box.item label="Niestandardowy" name="Custom"/>
- </combo_box>
- <combo_box label="Rozdzielczość" name="local_size_combo">
- <combo_box.item label="Obecne okno" name="CurrentWindow"/>
- <combo_box.item label="320x240" name="320x240"/>
- <combo_box.item label="640x480" name="640x480"/>
- <combo_box.item label="800x600" name="800x600"/>
- <combo_box.item label="1024x768" name="1024x768"/>
- <combo_box.item label="1280x1024" name="1280x1024"/>
- <combo_box.item label="1600x1200" name="1600x1200"/>
- <combo_box.item label="Niestandardowy" name="Custom"/>
- </combo_box>
- <combo_box label="Format" name="local_format_combo">
- <combo_box.item label="PNG" name="PNG"/>
- <combo_box.item label="JPEG" name="JPEG"/>
- <combo_box.item label="BMP" name="BMP"/>
- </combo_box>
- <spinner label="Szer." name="snapshot_width"/>
- <spinner label="Wys." name="snapshot_height"/>
- <check_box label="Ograniczone proporcje" name="keep_aspect_check"/>
- <slider label="Jakość zdjęcia" name="image_quality_slider"/>
- <text name="layer_type_label">
- Warstwy obrazu:
- </text>
- <combo_box label="Warstwy obrazu" name="layer_types">
- <combo_box.item label="Kolory" name="Colors"/>
- <combo_box.item label="Głębokość" name="Depth"/>
- </combo_box>
- <check_box label="Pokaż interfejs na zdjęciu" name="ui_check"/>
- <check_box label="Pokaż obiekty Hud na zdjęciu" name="hud_check"/>
- <check_box label="Pozostaw otwarty po zapisaniu" name="keep_open_check"/>
- <check_box label="Widok pełnego okna" name="freeze_frame_check"/>
- <check_box label="Automatyczne odswieżanie" name="auto_snapshot_check"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_devices.xml b/indra/newview/skins/default/xui/pl/floater_sound_devices.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93a27f68a71540c80a539efe96cf6336df76817a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_sound_devices" title="URZĄDZENIA DŹWIĘKOWE">
+ <text name="voice_label">
+ Czat głos.
+ </text>
+ <check_box name="enable_voice" label="WÅ‚Ä…czone" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
old mode 100755
new mode 100644
index ac041dff6ad0c4842fe2f77265f9a72df1532ad7..6f8d0bab2c7544b95b98e5f3ea49db33f84ade5f
--- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Sound Preview" title="DŹWIĘK.WAV">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Sound Preview">
<text name="name_label">
- Opis:
+ Nazwa:
</text>
<text name="description_label">
Opis:
</text>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
- <button label="Załaduj ([AMOUNT]L$)" label_selected="Załaduj ([AMOUNT]L$)" name="ok_btn"/>
+ <button label="Załaduj ([AMOUNT]L$)" name="ok_btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_spellcheck.xml b/indra/newview/skins/default/xui/pl/floater_spellcheck.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4668382a14fa0633ba145252ebc0ec8d50881ae1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="spellcheck_floater" title="Ustawienia sprawdzania pisowni">
+ <check_box label="WÅ‚Ä…cz sprawdzanie pisowni" name="spellcheck_enable" />
+ <text name="spellcheck_main">
+ Główny słownik:
+ </text>
+ <text label="Logi:" name="spellcheck_additional">
+ SÅ‚owniki dodatkowe:
+ </text>
+ <text name="spellcheck_available">
+ Dostępne
+ </text>
+ <text name="spellcheck_active">
+ Aktywne
+ </text>
+ <button label="Usuń" name="spellcheck_remove_btn" />
+ <button label="Importuj" name="spellcheck_import_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pl/floater_spellcheck_import.xml
new file mode 100644
index 0000000000000000000000000000000000000000..99aee0dfe258858dfacca96979614dd7e1211d23
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_spellcheck_import.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="spellcheck_import" title="Import SÅ‚ownika">
+ <text name="import_dict">
+ SÅ‚ownik:
+ </text>
+ <button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="dictionary_path_browse" />
+ <text name="import_name">
+ Nazwa:
+ </text>
+ <text name="import_lang">
+ Język:
+ </text>
+ <button name="ok_btn" label="Importuj" />
+ <button name="cancel_btn" label="Anuluj" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
old mode 100755
new mode 100644
index 886a30e5d9dff88fc1d8f1378fd0ff39501c38e5..5dd7d19babb515a83ae7e1e2430e96e776bad8f7
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
@@ -1,69 +1,106 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Statistics" title="STATYSTYKI">
<scroll_container name="statistics_scroll">
<container_view name="statistics_view">
<stat_view label="Podstawowe" name="basic">
- <stat_bar label="Ilość obrazów/sek (FPS)" name="fps"/>
- <stat_bar label="Przepustowość" name="bandwidth"/>
- <stat_bar label="Stracone pakiety" name="packet_loss"/>
- <stat_bar label="Ping sim" name="ping"/>
+ <stat_bar label="Klatki/sek (FPS)" name="fps" />
+ <stat_bar label="Otrzymane dane UDP" name="bandwidth" />
+ <stat_bar label="Utracone pakiety" name="packet_loss" />
+ <stat_bar label="Ping symulatora" name="ping" />
</stat_view>
<stat_view label="Zaawansowane" name="advanced">
- <stat_view label="Renderuj" name="render">
- <stat_bar label="KTris Drawn" name="ktrisframe"/>
- <stat_bar label="KTris Drawn" name="ktrissec"/>
- <stat_bar label="Wszystkie obiekty" name="objs"/>
- <stat_bar label="Nowe obiekty" name="newobjs"/>
+ <stat_view label="Rendering" name="render">
+ <stat_bar label="KTris na klatkÄ™" name="ktrisframe" />
+ <stat_bar label="KTris na sekundÄ™" name="ktrissec" />
+ <stat_bar label="Wszystkie obiekty" name="totalobjs" />
+ <stat_bar label="Obiekty w cache" name="cachedobjs" />
+ <stat_bar label="Nowe obiekty" name="newobjs" />
+ <stat_bar name="object_cache_hits" label="Wspł. trafień obiektów do cache" />
+ <stat_bar name="occlusion_queries" label="Ilość wywołań okluzji" />
+ <stat_bar name="occluded" label="Obiekty z okluzjÄ…" />
+ <stat_bar name="unoccluded" label="Obiekty bez okluzji" />
</stat_view>
<stat_view label="Tekstura" name="texture">
- <stat_bar label="Suma" name="numimagesstat"/>
- <stat_bar label="Suma Raw" name="numrawimagesstat"/>
- <stat_bar label="GL Mem" name="gltexmemstat"/>
- <stat_bar label="Sformatowane Mem" name="formattedmemstat"/>
- <stat_bar label="Raw Mem" name="rawmemstat"/>
- <stat_bar label="Bound Mem" name="glboundmemstat"/>
+ <stat_bar name="texture_cache_hits" label="Wspł. trafień do cache" />
+ <stat_bar name="texture_cache_read_latency" label="Opóźnienie odczytu cache" />
+ <stat_bar label="Suma" name="numimagesstat" />
+ <stat_bar label="Suma surowych" name="numrawimagesstat" />
+ <stat_bar label="Pamięć GL" name="gltexmemstat" />
+ <stat_bar label="Pamięć sformatowana" name="formattedmemstat" />
+ <stat_bar label="Pamięć surowa" name="rawmemstat" />
+ <stat_bar label="Pamięć przypisana" name="glboundmemstat" />
+ </stat_view>
+ <stat_view name="memory" label="Użycie pamięci">
+ <stat_bar name="LLView" label="Interfejs" />
+ <stat_bar name="LLFontFreetype" label="Czcionki" />
+ <stat_bar name="LLInventoryObject" label="Szafa" />
+ <stat_bar name="LLViewerObject" label="Obiekty przeglÄ…darki" />
+ <stat_bar name="LLViewerOctreeGroup" label="Dane grupy drzewa ósemkowego" />
+ <stat_bar name="LLViewerOctreeEntry" label="Dane drzewa ósemkowego" />
+ <stat_bar name="LLVOCacheEntry" label="Pamięć podr. obiektów przegl." />
+ <stat_bar name="LLDrawable" label="Obiekty rysowane" />
+ <stat_bar name="LLFace" label="Dane powierzchni" />
+ <stat_bar name="LLDrawInfo" label="Informacje rysowania" />
+ <stat_bar name="LLTexture" label="Dane tekstur" />
+ <stat_bar name="LLImage" label="Dane obrazów" />
+ <stat_bar name="LLImageGL" label="Dane obrazu GL" />
+ <stat_bar name="LLVertexBuffer" label="Bufory wierzchołków" />
</stat_view>
<stat_view label="Sieć" name="network">
- <stat_bar label="Pakiety wewnętrzne" name="packetsinstat"/>
- <stat_bar label="Pakiety zewnętrzne" name="packetsoutstat"/>
- <stat_bar label="Obiekty" name="objectkbitstat"/>
- <stat_bar label="Tesktura" name="texturekbitstat"/>
- <stat_bar label="Asset" name="assetkbitstat"/>
- <stat_bar label="Podkład" name="layerskbitstat"/>
- <stat_bar label="Aktualna ilość wewnętrzna" name="actualinkbitstat"/>
- <stat_bar label="Aktualna ilość zewnętrzna" name="actualoutkbitstat"/>
- <stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
+ <stat_bar label="Pakiety wchodzÄ…ce" name="packetsinstat" />
+ <stat_bar label="Pakiety wychodzÄ…ce" name="packetsoutstat" />
+ <stat_bar label="Obiekty" name="objectdatareceived" />
+ <stat_bar label="Tekstury" name="texturedatareceived" />
+ <stat_bar label="Dane (assety)" name="assetudpdatareceived" />
+ <stat_bar label="Warstwy" name="layersdatareceived" />
+ <stat_bar label="Aktualna il. wchodzÄ…ca" name="messagedatain" />
+ <stat_bar label="Aktualna il. wychodzÄ…ca" name="messagedataout" />
+ <stat_bar label="Operacje oczekujÄ…ce VFS" name="vfspendingoperations" />
</stat_view>
</stat_view>
<stat_view label="Symulator" name="sim">
- <stat_bar label="Czas rozszerzenia" name="simtimedilation"/>
- <stat_bar label="Ilość obrazów/Sec na symulatorze (Sim FPS)" name="simfps"/>
- <stat_bar label="Fizyka obrazów/Sec" name="simphysicsfps"/>
+ <stat_bar label="Dylatacja czasu" name="simtimedilation" />
+ <stat_bar label="Klatki/sek (FPS)" name="simfps" />
+ <stat_bar label="Klatki fizyki/sek" name="simphysicsfps" />
<stat_view label="Szczegóły fizyki" name="physicsdetail">
- <stat_bar label="Pinned objects" name="physicspinnedtasks"/>
- <stat_bar label="Niskie LOD obiektów" name="physicslodtasks"/>
- <stat_bar label="Alokacja pamięci" name="physicsmemoryallocated"/>
- <stat_bar label="Aktualizacja agentów/Sek" name="simagentups"/>
- <stat_bar label="Główni agenci" name="simmainagents"/>
- <stat_bar label="Child agents" name="simchildagents"/>
- <stat_bar label="Obiekty" name="simobjects"/>
- <stat_bar label="Aktywne obiekty" name="simactiveobjects"/>
- <stat_bar label="Aktywne skrypty" name="simactivescripts"/>
- <stat_bar label="Wydarzenie skryptowe" name="simscripteps"/>
- <stat_bar label="Pakiety wewnętrzne" name="siminpps"/>
- <stat_bar label="Pakiety zewnętrzne" name="simoutpps"/>
- <stat_bar label="Oczekiwane na pobranie" name="simpendingdownloads"/>
- <stat_bar label="Oczekiwane na załadowanie" name="simpendinguploads"/>
- <stat_bar label="Wszystkie niepotwierdzone bity" name="simtotalunackedbytes"/>
+ <stat_bar label="Obiekty przypięte" name="physicspinnedtasks" />
+ <stat_bar label="Obiekty o niskim LOD" name="physicslodtasks" />
+ <stat_bar label="Alokacja pamięci" name="physicsmemoryallocated" />
+ </stat_view>
+ <stat_bar label="Aktualizacja agentów/sek" name="simagentups" />
+ <stat_bar label="Główni agenci" name="simmainagents" />
+ <stat_bar label="Agenci - potomki" name="simchildagents" />
+ <stat_bar label="Obiekty" name="simobjects" />
+ <stat_bar label="Aktywne obiekty" name="simactiveobjects" />
+ <stat_bar label="Aktywne skrypty" name="simactivescripts" />
+ <stat_bar label="Skrypty uruchomione" name="simpctscriptsrun" />
+ <stat_bar label="Zdarzenia skryptowe" name="simscripteps" />
+ <stat_view name="simpathfinding" label="Odnajdywanie ścieżek">
+ <stat_bar label=" Czasokrok dla AI" name="simsimaistepmsec" />
+ <stat_bar label=" Pominięte kroki sylwetek" name="simsimskippedsilhouettesteps" unit_label="/sek" />
+ <stat_bar label=" Postaci zaktualizowanych" name="simsimpctsteppedcharacters" />
</stat_view>
+ <stat_bar label="Pakiety wchodzÄ…ce" unit_label="pkt/sek" name="siminpps" />
+ <stat_bar label="Pakiety wychodzÄ…ce" unit_label="pkt/sek" name="simoutpps" />
+ <stat_bar label="OczekujÄ…ce pobrania" name="simpendingdownloads" />
+ <stat_bar label="Oczekujące załadowania" name="simpendinguploads" />
+ <stat_bar label="Wszystkie niepotwierdzone bajty" name="simtotalunackedbytes" />
<stat_view label="Czas (ms)" name="simperf">
- <stat_bar label="Całkowity czas obrazu" name="simframemsec"/>
- <stat_bar label="Czas sieciowy" name="simnetmsec"/>
- <stat_bar label="Czas fizyki" name="simsimphysicsmsec"/>
- <stat_bar label="Czas symulatora" name="simsimothermsec"/>
- <stat_bar label="Czas agenta" name="simagentmsec"/>
- <stat_bar label="Czas obrazu" name="simimagesmsec"/>
- <stat_bar label="Czas skryptu" name="simscriptmsec"/>
+ <stat_bar label="Całkowity czas klatek" name="simframemsec" />
+ <stat_bar label="Czas sieci" name="simnetmsec" />
+ <stat_bar label="Czas fizyki" name="simsimphysicsmsec" />
+ <stat_bar label="Czas symulatora" name="simsimothermsec" />
+ <stat_bar label="Czas agenta" name="simagentmsec" />
+ <stat_bar label="Czas obrazu" name="simimagesmsec" />
+ <stat_bar label="Czas skryptu" name="simscriptmsec" />
+ <stat_bar name="simsparemsec" label="Czas wolny" />
+ <stat_view name="timedetails" label="Szczegóły czasu">
+ <stat_bar name="simsimphysicsstepmsec" label=" Skok fizyki" />
+ <stat_bar name="simsimphysicsshapeupdatemsec" label=" Akt. kształtów fizyki" />
+ <stat_bar name="simsimphysicsothermsec" label=" Inna fizyka" />
+ <stat_bar name="simsleepmsec" label=" Czas pauzy" />
+ <stat_bar name="simpumpiomsec" label=" Skok IO" />
+ </stat_view>
</stat_view>
</stat_view>
</container_view>
diff --git a/indra/newview/skins/default/xui/pl/floater_sys_well.xml b/indra/newview/skins/default/xui/pl/floater_sys_well.xml
old mode 100755
new mode 100644
index e6c73af4f3674fe6ea759971046fb49f820ec3c8..765682d9b6732534683fb72efe83b457ccd74dfe
--- a/indra/newview/skins/default/xui/pl/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sys_well.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sys_well_window" title="ZAWIADOMIENIA">
+<floater name="sys_well_window" title="POWIADOMIENIA">
<string name="title_im_well_window">
ROZMOWY
</string>
<string name="title_notification_well_window">
- ZAWIADOMIENIA
+ POWIADOMIENIA
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
old mode 100755
new mode 100644
index 32cc08810df9100afb291824a9439092458d56c0..7d3039958ba971173e8cd136f1f325e91fc5418c
--- a/indra/newview/skins/default/xui/pl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater height="300" min_height="300" name="telehub" title="TELPORTER">
- <text name="status_text_connected" width="250">
- Teleporter połączony z obiektem [OBJECT]
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="telehub" title="TELPORTER / TELEHUB">
+ <text name="status_text_connected">
+ Teleport połączony z obiektem [OBJECT]
</text>
- <text name="status_text_not_connected" width="250">
- Brak połączenia z teleporterem
+ <text name="status_text_not_connected">
+ Brak połączenia z teleportem
</text>
<text name="help_text_connected">
By usunąć wybierz Rozłącz.
</text>
<text name="help_text_not_connected">
- Wybierz obiekt i kliknij Połącz z teleporterem
+ Wybierz obiekt i kliknij Połącz z teleportem
</text>
- <button label="Połącz z teleporterem" name="connect_btn" width="132"/>
- <button label="Rozłącz" left="152" name="disconnect_btn" width="88"/>
- <text name="spawn_points_text" width="250">
- Punkty składowe (pozycje - nie obiekty!):
+ <button label="Połącz z teleportem" name="connect_btn" />
+ <button label="Rozłącz" name="disconnect_btn" />
+ <text name="spawn_points_text">
+ Punkty przybywania (pozycje, nie obiekty):
</text>
- <button label="Dodaj punkt" name="add_spawn_point_btn"/>
- <button label="Usuń punkt" name="remove_spawn_point_btn"/>
+ <button label="Dodaj punkt" name="add_spawn_point_btn" />
+ <button label="Usuń punkt" name="remove_spawn_point_btn" />
<text name="spawn_point_help">
- Wybierz obiekt i wybierz "Dodaj" by sprecyzować pozycję.
-Możesz przesunąć lub usunąć obiekt.
+ Wybierz obiekt i wybierz "Dodaj" by określić pozycję.
+Możesz po tym przesuwać lub usunąć obiekt.
Pozycje są relatywne do części centralnej teleportera.
Wybierz obiekt z listy by zobaczyć jego pozycję w świecie.
</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
old mode 100755
new mode 100644
index 52c0cb8a93ab2b758dfe20af31f27435038c0a4f..8ac158b4623608d494a731de0fc9d1166a6d0947
--- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
@@ -1,24 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="ULUBIONE: TEKSTURA">
- <string name="choose_picture">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="texture picker" title="WYBÓR: TEKSTURA">
+ <floater.string name="choose_picture">
Kliknij by wybrać obraz
- </string>
+ </floater.string>
+ <floater.string name="pick title">
+ Wybór:
+ </floater.string>
<text name="Multiple">
Wiele tekstur
</text>
+ <radio_group name="mode_selection">
+ <radio_item label="Szafa" name="inventory" />
+ <radio_item label="Lokalna" name="local" />
+ </radio_group>
<text name="unknown">
- Rozmiar: [DIMENSIONS]
+ Rozm.: [DIMENSIONS]
</text>
- <button label="Domyślna" label_selected="Domyślna" name="Default"/>
- <button label="Żadna" label_selected="Żadna" name="None"/>
- <button label="Pusta" label_selected="Pusta" name="Blank"/>
- <check_box label="Pokaż foldery" name="show_folders_check"/>
- <search_editor label="Filtruj tektury" name="inventory search editor"/>
- <check_box label="Zastosuj teraz" name="apply_immediate_check"/>
- <button label="" label_selected="" name="Pipette"/>
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
- <button label="OK" label_selected="OK" name="Select"/>
- <string name="pick title">
- Wybór:
- </string>
+ <button label="Domyślna" label_selected="Domyślna" name="Default" />
+ <button label="Pusta" label_selected="Pusta" name="Blank" />
+ <button label="Przezrocz." label_selected="Przezrocz." name="None" />
+ <text name="preview_disabled" value="Podgląd wyłączony" />
+ <filter_editor label="Filtruj tekstury" name="inventory search editor" />
+ <check_box label="Pokaż foldery" name="show_folders_check" />
+ <button label="Dodaj" label_selected="Dodaj" name="l_add_btn" />
+ <button label="Usuń" label_selected="Usuń" name="l_rem_btn" />
+ <button label="Załaduj" label_selected="Załaduj" name="l_upl_btn" />
+ <scroll_list name="l_name_list">
+ <column name="unit_name" label="Nazwa" />
+ </scroll_list>
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+ <check_box label="PodglÄ…d" name="apply_immediate_check" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc0687f333462793434abaf897579861d06284e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_texture_fetch_debugger.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="TexFetchDebugger" title="Debuger Å‚adowania tekstur">
+ <text name="total_num_fetched_label">
+ 1, Pobranych tekstur: [NUM]
+ </text>
+ <text name="total_num_fetching_requests_label">
+ 2, Próśb o pobranie: [NUM]
+ </text>
+ <text name="total_num_cache_hits_label">
+ 3, Trafień w cache: [NUM]
+ </text>
+ <text name="total_num_visible_tex_label">
+ 4, Widocznych tekstur: [NUM]
+ </text>
+ <text name="total_num_visible_tex_fetch_req_label">
+ 5, Próśb o pobranie widocznych tekstur: [NUM]
+ </text>
+ <text name="total_fetched_data_label">
+ 6, Pobrane: [SIZE1]KB, zdekodowane: [SIZE2]KB, [PIXEL]MPikseli
+ </text>
+ <text name="total_fetched_vis_data_label">
+ 7, Widoczne: [SIZE1]KB, zdekodowane: [SIZE2]KB
+ </text>
+ <text name="total_fetched_rendered_data_label">
+ 8, Zrenderowane: [SIZE1]KB, zdekodowane: [SIZE2]KB, [PIXEL]MPikseli
+ </text>
+ <text name="total_time_cache_read_label">
+ 9, Odczyty cache: [TIME] sekund
+ </text>
+ <text name="total_time_cache_write_label">
+ 10, Zapisy cache: [TIME] sekund
+ </text>
+ <text name="total_time_decode_label">
+ 11, Zdekodowania: [TIME] sekund
+ </text>
+ <text name="total_time_gl_label">
+ 12, Tworzenie tekstur GL: [TIME] sekund
+ </text>
+ <text name="total_time_http_label">
+ 13, Pobieranie przez HTTP: [TIME] sekund
+ </text>
+ <text name="total_time_fetch_label">
+ 14, Pobieranie w sumie: [TIME] sekund
+ </text>
+ <text name="total_time_refetch_vis_cache_label">
+ 15, Ponowne pobier. widocznych z cache, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
+ </text>
+ <text name="total_time_refetch_all_cache_label">
+ 16, Ponowne pobier. wszystkich z cache, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
+ </text>
+ <text name="total_time_refetch_vis_http_label">
+ 17, Ponowne pobier. widocznych z HTTP, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
+ </text>
+ <text name="total_time_refetch_all_http_label">
+ 18, Ponowne pobier. wszystkich z HTTP, czas: [TIME] sekund, pobrano: [SIZE]KB, [PIXEL]MPikseli
+ </text>
+ <spinner label="19, Wspł. Teksel/Piksel:" name="texel_pixel_ratio" />
+ <text name="texture_source_label">
+ 20, Źródło tekstur:
+ </text>
+ <radio_group name="texture_source">
+ <radio_item label="Tylko HTTP" name="1" />
+ </radio_group>
+ <button label="Zamknij" name="close_btn" />
+ <button label="Odcz. cache" name="cacheread_btn" />
+ <button label="Zapis cache" name="cachewrite_btn" />
+ <button label="Dekoduj" name="decode_btn" />
+ <button label="Tekstura GL" name="gl_btn" />
+ <button label="Odśw. przez cache" name="refetchviscache_btn" />
+ <button label="Odśw. całe cache" name="refetchallcache_btn" />
+ <button label="Odśw. przez HTTP" name="refetchvishttp_btn" />
+ <button label="Odśw. całe HTTP" name="refetchallhttp_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
old mode 100755
new mode 100644
index 69d5c23f9c8dc82385cfc9b572485574b56680cb..5e2ed4a3510b46a42b5e662bf0b06ef00ef1628e
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -1,113 +1,112 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" short_title="BUDUJ" title="">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="toolbox floater" short_title="NARZĘDZIA BUDOWANIA">
+ <floater.string name="grid_screen_text">
+ Widok
+ </floater.string>
+ <floater.string name="grid_local_text">
+ Lokalna
+ </floater.string>
+ <floater.string name="grid_world_text">
+ Åšwiat
+ </floater.string>
+ <floater.string name="grid_reference_text">
+ Względna
+ </floater.string>
+ <floater.string name="grid_attachment_text">
+ Dodatek
+ </floater.string>
<floater.string name="status_rotate">
- Przeciągaj kolorowe pierścienie żeby obracać obiekt
+ Przeciągaj barwne pierścienie, by obracać obiekt
</floater.string>
<floater.string name="status_scale">
- Kliknij i przeciągaj żeby rozciągnąć wybraną stronę
+ Kliknij i przeciągaj, żeby rozciągnąć stronę
</floater.string>
<floater.string name="status_move">
- Wybierz opcjÄ™:
+ PrzeciÄ…ganie przesuwa, z shiftem kopiuje
</floater.string>
<floater.string name="status_modifyland">
- Kliknij i przytrzymaj żeby modyfikować teren
+ Kliknij i przytrzymaj, żeby modyfikować teren
</floater.string>
<floater.string name="status_camera">
- Kliknij i przeciągnij żeby zmienić widok
+ Kliknij i przeciągaj, żeby zmienić widok
</floater.string>
<floater.string name="status_grab">
Przeciągnij by przesunąć, wybierz Ctrl by podnieść, wybierz Ctrl-Shift by obrócić
</floater.string>
<floater.string name="status_place">
- Kliknij in-world by zacząć budować
+ Kliknij gdzieś w świecie, aby zacząć budowanie
</floater.string>
<floater.string name="status_selectland">
- Edytowanie terenu:
- </floater.string>
- <floater.string name="grid_screen_text">
- Widok
- </floater.string>
- <floater.string name="grid_local_text">
- Lokalna
- </floater.string>
- <floater.string name="grid_world_text">
- Åšwiat
+ Kliknij i przeciągnij, aby zaznaczyć teren
</floater.string>
- <floater.string name="grid_reference_text">
- Względa
+ <floater.string name="status_selectcount">
+ [OBJ_COUNT] zaznaczonych obiektów, wpływ na strefę: [LAND_IMPACT]
</floater.string>
- <floater.string name="grid_attachment_text">
- Załączniki
+ <floater.string name="status_remaining_capacity">
+ Pojemność pozostała: [LAND_CAPACITY].
</floater.string>
- <button label="" label_selected="" name="button focus" tool_tip="Zbliżenie"/>
- <button label="" label_selected="" name="button move" tool_tip="Przesunięcie"/>
- <button label="" label_selected="" name="button edit" tool_tip="Edycja"/>
- <button label="" label_selected="" name="button create" tool_tip="Stwórz"/>
- <button label="" label_selected="" name="button land" tool_tip="Teren"/>
+ <button name="button focus" tool_tip="Centrowanie" />
+ <button name="button move" tool_tip="Przesuwanie" />
+ <button name="button edit" tool_tip="Edytowanie" />
+ <button name="button create" tool_tip="Tworzenie" />
+ <button name="button land" tool_tip="Teren" />
<text name="text status">
- Przeciągnij żeby przenieść, shift-przeciągnij żeby skopiować
+ PrzeciÄ…ganie przesuwa, z shiftem kopiuje
</text>
<radio_group name="focus_radio_group">
- <radio_item label="Zbliżenie" name="radio zoom"/>
- <radio_item label="Obracanie (Ctrl)" name="radio orbit"/>
- <radio_item label="Przesunięcie (Ctrl+Shift)" name="radio pan"/>
+ <radio_item label="Zbliżanie" name="radio zoom" />
+ <radio_item label="Obracanie (Ctrl)" name="radio orbit" />
+ <radio_item label="Przesuwanie (Ctrl+Shift)" name="radio pan" />
</radio_group>
<radio_group name="move_radio_group">
- <radio_item label="Przesuń" name="radio move"/>
- <radio_item label="PodnieÅ› (Ctrl)" name="radio lift"/>
- <radio_item label="Obracanie (Ctrl+Shift)" name="radio spin"/>
+ <radio_item label="Przesuwanie" name="radio move" />
+ <radio_item label="Podnoszenie (Ctrl)" name="radio lift" />
+ <radio_item label="Obracanie (Ctrl+Shift)" name="radio spin" />
</radio_group>
<radio_group name="edit_radio_group">
- <radio_item label="Przesuń" name="radio position"/>
- <radio_item label="Obróć (Ctrl)" name="radio rotate"/>
- <radio_item label="RozciÄ…gnij (Ctrl+Shift)" name="radio stretch"/>
- <radio_item label="Wybierz teksturÄ™" name="radio select face"/>
+ <radio_item label="Przesuwanie" name="radio position" />
+ <radio_item label="Obracanie (Ctrl)" name="radio rotate" />
+ <radio_item label="RozciÄ…gaj (Ctrl+Shift)" name="radio stretch" />
+ <radio_item label="Zaznaczanie stron" name="radio select face" />
</radio_group>
- <check_box label="Edytuj połączone części" name="checkbox edit linked parts"/>
- <button label="Linkuj" name="link_btn"/>
- <button label="Rozlinkuj" name="unlink_btn"/>
- <text name="RenderingCost" tool_tip="Pokazuje koszt renderowania tego obiektu">
- þ: [COUNT]
- </text>
- <check_box label="" name="checkbox uniform"/>
- <text label="RozciÄ…gnij 2 strony" name="checkbox uniform label">
- RozciÄ…gnij 2 strony
- </text>
- <check_box initial_value="true" label="RozciÄ…gnij teksturÄ™" name="checkbox stretch textures"/>
- <check_box initial_value="true" label="Użyj siatki" name="checkbox snap to grid"/>
+ <check_box label="Edytuj podrzędne" name="checkbox edit linked parts" />
+ <button label="Scalaj" name="link_btn" />
+ <button label="Rozłącz" name="unlink_btn" />
+ <check_box label="Rozc. w 2 strony" name="checkbox uniform" />
+ <check_box label="RozciÄ…gaj tekstury" name="checkbox stretch textures" />
+ <check_box label="Siatk." name="checkbox snap to grid" />
<combo_box name="combobox grid mode" tool_tip="Wybierz rodzaj linijki siatki dla pozycjonowania obiektu">
- <combo_box.item label="Åšwiat" name="World"/>
- <combo_box.item label="Lokalna" name="Local"/>
- <combo_box.item label="Względna" name="Reference"/>
- </combo_box>
- <button label="Opcje..." label_selected="Opcje..." name="Options..." tool_tip="Więcej opcji siatki"/>
- <button label="" label_selected="" name="ToolCube" tool_tip="Sześcian"/>
- <button label="" label_selected="" name="ToolPrism" tool_tip="Graniastosłup"/>
- <button label="" label_selected="" name="ToolPyramid" tool_tip="Ostrosłup"/>
- <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Czworościan"/>
- <button label="" label_selected="" name="ToolCylinder" tool_tip="Walec"/>
- <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Pólwalec"/>
- <button label="" label_selected="" name="ToolCone" tool_tip="Stożek"/>
- <button label="" label_selected="" name="ToolHemiCone" tool_tip="Półstożek"/>
- <button label="" label_selected="" name="ToolSphere" tool_tip="Kula"/>
- <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Półkula"/>
- <button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/>
- <button label="" label_selected="" name="ToolTube" tool_tip="Rura"/>
- <button label="" label_selected="" name="ToolRing" tool_tip="Pierścień"/>
- <button label="" label_selected="" name="ToolTree" tool_tip="Drzewo"/>
- <button label="" label_selected="" name="ToolGrass" tool_tip="Trawa"/>
- <check_box label="Trzymaj zaznaczone" name="checkbox sticky"/>
- <check_box label="Kopiuj zaznaczone" name="checkbox copy selection"/>
- <check_box initial_value="true" label="Åšrodek" name="checkbox copy centers"/>
- <check_box label="Obróć" name="checkbox copy rotates"/>
+ <combo_box.item label="Siatka: Åšwiat" name="World" />
+ <combo_box.item label="Siatka: Lokalna" name="Local" />
+ <combo_box.item label="Siatka: Względna" name="Reference" />
+ </combo_box>
+ <button name="Options..." tool_tip="Więcej opcji siatki" />
+ <button name="ToolCube" tool_tip="Sześcian" />
+ <button name="ToolPrism" tool_tip="Graniastosłup" />
+ <button name="ToolPyramid" tool_tip="Ostrosłup" />
+ <button name="ToolTetrahedron" tool_tip="Czworościan" />
+ <button name="ToolCylinder" tool_tip="Walec" />
+ <button name="ToolHemiCylinder" tool_tip="Półwalec" />
+ <button name="ToolCone" tool_tip="Stożek" />
+ <button name="ToolHemiCone" tool_tip="Półstożek" />
+ <button name="ToolSphere" tool_tip="Kula" />
+ <button name="ToolHemiSphere" tool_tip="Półkula" />
+ <button name="ToolTube" tool_tip="Rura" />
+ <button name="ToolRing" tool_tip="Pierścień" />
+ <button name="ToolTree" tool_tip="Drzewo" />
+ <button name="ToolGrass" tool_tip="Trawa" />
+ <check_box label="Trzymaj aktywne" name="checkbox sticky" />
+ <check_box label="Kopiuj zaznaczone" name="checkbox copy selection" />
+ <check_box label="Centruj kopiÄ™" name="checkbox copy centers" />
+ <check_box label="Obróć kopię" name="checkbox copy rotates" />
<radio_group name="land_radio_group">
- <radio_item label="Zaznaczanie" name="radio select land"/>
- <radio_item label="Prostowanie" name="radio flatten"/>
- <radio_item label="Podnoszenie" name="radio raise"/>
- <radio_item label="Obniżanie" name="radio lower"/>
- <radio_item label="Wygładzanie" name="radio smooth"/>
- <radio_item label="Fałdowanie" name="radio noise"/>
- <radio_item label="Cofnij modyfikacjÄ™" name="radio revert"/>
+ <radio_item label="Zaznaczanie" name="radio select land" />
+ <radio_item label="Spłaszczanie" name="radio flatten" />
+ <radio_item label="Podnoszenie" name="radio raise" />
+ <radio_item label="Obniżanie" name="radio lower" />
+ <radio_item label="Wygładzanie" name="radio smooth" />
+ <radio_item label="Fałdowanie" name="radio noise" />
+ <radio_item label="Cofanie zmian" name="radio revert" />
</radio_group>
<text name="Bulldozer:">
Burzenie:
@@ -118,13 +117,12 @@
<text name="Strength:">
Siła
</text>
- <slider_bar initial_value="0.00" name="slider force"/>
- <button label="Zastosuj" label_selected="Zastosuj" name="button apply to selection" tool_tip="Modyfikuj zaznaczony teren"/>
- <text name="obj_count">
- Obiekty: [COUNT]
+ <button label="Zastosuj" label_selected="Zastosuj" name="button apply to selection" tool_tip="Modyfikuj zaznaczony teren" />
+ <text name="selection_empty">
+ Zaznacz coÅ›!
</text>
- <text name="prim_count">
- Primy: [COUNT]
+ <text name="remaining_capacity">
+ [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights Więcej]
</text>
<tab_container name="Object Info Tabs">
<panel label="Ogólne" name="General">
@@ -146,8 +144,14 @@
<panel.string name="text modify info 4">
Nie możesz modyfikować tych obiektów
</panel.string>
+ <panel.string name="text modify info 5">
+ Nie można modyfikować tego obiektu przez granicę regionu
+ </panel.string>
+ <panel.string name="text modify info 6">
+ Nie można modyfikować tych obiektów przez granicę regionu
+ </panel.string>
<panel.string name="text modify warning">
- Musisz zaznaczyć cały obiekt by ustawić prawa.
+ Musisz zaznaczyć cały obiekt by ustawić prawa
</panel.string>
<panel.string name="Cost Default">
Cena: L$
@@ -167,11 +171,9 @@
<text name="Name:">
Nazwa:
</text>
- <line_editor name="Object Name"/>
<text name="Description:">
Opis:
</text>
- <line_editor name="Object Description"/>
<text name="Creator:">
Twórca:
</text>
@@ -181,146 +183,107 @@
<text name="Group:">
Grupa:
</text>
- <name_box initial_value="Åadowanie..." name="Group Name Proxy"/>
- <button label="Ustaw..." label_selected="Ustaw..." name="button set group" tool_tip="Wybierz grupę, która uzyska dostęp do praw obiektu"/>
- <check_box label="Udostępnij" name="checkbox share with group" tool_tip="Pozwól członkom grupy na dzielenie praw do modyfikacji tego obiektu. Musisz przypisać obiekt aby uaktywnić ograniczenia dla ról."/>
- <button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Przypisanie oddaje prawa następnemu właścicielowi. Obiekty posiadane przez grupę mogą zostać przypisane przez oficera grupy."/>
+ <name_box initial_value="Wczytywanie..." name="Group Name Proxy" />
+ <button name="button set group" tool_tip="Wybierz grupę, z którą chcesz się podzielić dostępem do praw tego obiektu" />
+ <check_box label="Udostępnij" name="checkbox share with group" tool_tip="Pozwól członkom grupy na dzielenie praw do modyfikacji tego obiektu. Musisz przypisać obiekt, aby uaktywnić ograniczenia dla ról." />
+ <button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Przypisanie oddaje prawa następnemu właścicielowi. Obiekty posiadane przez grupę mogą zostać przypisane przez oficera grupy." />
<text name="label click action">
- Kliknij:
+ Akcja po kliku:
</text>
<combo_box name="clickaction">
- <combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/>
- <combo_box.item label="Usiądź na obiekcie" name="Sitonobject"/>
- <combo_box.item label="Kup obiekt" name="Buyobject"/>
- <combo_box.item label="Zapłać obiektowi" name="Payobject"/>
- <combo_box.item label="Otwórz" name="Open"/>
- <combo_box.item label="Przybliż" name="Zoom"/>
+ <combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)" />
+ <combo_box.item label="Usiądź na obiekcie" name="Sitonobject" />
+ <combo_box.item label="Kup obiekt" name="Buyobject" />
+ <combo_box.item label="Zapłać obiektowi" name="Payobject" />
+ <combo_box.item label="Otwórz" name="Open" />
+ <combo_box.item label="Przybliż" name="Zoom" />
</combo_box>
- <check_box label="Na sprzedaż:" name="checkbox for sale"/>
+ <check_box label="Na sprzedaż:" name="checkbox for sale" />
<combo_box name="sale type">
- <combo_box.item label="Kopia" name="Copy"/>
- <combo_box.item label="Zawartość" name="Contents"/>
- <combo_box.item label="Orginał" name="Original"/>
+ <combo_box.item name="Copy" label="Kopia" />
+ <combo_box.item name="Contents" label="Zawartość" />
+ <combo_box.item name="Original" label="Oryginał" />
</combo_box>
- <spinner label="Cena: L$" name="Edit Cost"/>
- <check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij wyświetlanie się tego przedmiotu w wynikach wyszukiwania"/>
+ <check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij wyświetlanie się tego przedmiotu w wynikach wyszukiwania" />
<panel name="perms_build">
<text name="perm_modify">
Możesz modyfikować ten obiekt
</text>
<text name="Anyone can:">
- Każdy:
+ Każdy może:
</text>
- <check_box label="Przesuń" name="checkbox allow everyone move"/>
- <check_box label="Kopiuj" name="checkbox allow everyone copy"/>
+ <check_box label="Przesuwać" name="checkbox allow everyone move" />
+ <check_box label="Kopiować" name="checkbox allow everyone copy" />
<text name="Next owner can:">
- Następny właściciel:
+ Następny właściciel może:
</text>
- <check_box label="Zmienia" name="checkbox next owner can modify"/>
- <check_box label="Kopiuje" name="checkbox next owner can copy"/>
- <check_box label="Oddaje/Sprzedaje" name="checkbox next owner can transfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
+ <check_box label="Zmieniać" name="checkbox next owner can modify" />
+ <check_box label="Kopiować" name="checkbox next owner can copy" />
+ <check_box label="Transferować" name="checkbox next owner can transfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt" />
+ </panel>
+ <panel name="pathfinding_attrs_panel">
+ <text name="pathfinding_attributes_label">
+ Atrybuty odnajd. ścieżek:
</text>
</panel>
</panel>
<panel label="Obiekt" name="Object">
- <check_box label="Zablokowany" name="checkbox locked" tool_tip="Chroni obiekty przed ich przesunięciem lub usunięciem. Pomocne także w czasie budowania by uniknąc niepotrzebnych edycji."/>
- <check_box label="Fizyczny" name="Physical Checkbox Ctrl" tool_tip="Umożliwia obcność sił grawitacyjnych i oddziaływania pomiędzy obiektami."/>
- <check_box label="Tymczasowy" name="Temporary Checkbox Ctrl" tool_tip="Umożliwia usunięcie obiektu po 1 minucie od jego stworzenia."/>
- <check_box label="Fantom" name="Phantom Checkbox Ctrl" tool_tip="Umożliwia zanik kolizji pomiędzy obiektami a awatarami."/>
+ <check_box label="Zablokowany" name="checkbox locked" tool_tip="Chroni obiekt przed przesunięciem lub usunięciem. Bardzo pomocne w czasie budowania, aby uniknąć niezamierzonych edycji." />
+ <check_box label="Fizyczny" name="Physical Checkbox Ctrl" tool_tip="Pozwala na popychanie obiektu i oddziaływanie na niego grawitacji." />
+ <check_box label="Tymczasowy" name="Temporary Checkbox Ctrl" tool_tip="Umożliwia usunięcie obiektu po 1 minucie od jego stworzenia." />
+ <check_box label="Widmowy" name="Phantom Checkbox Ctrl" tool_tip="Obiekt nie koliduje z awatarami i innymi obiektami, przenikajÄ… one przez niego." />
<text name="label position">
Pozycja (metry)
</text>
- <spinner label="X" name="Pos X"/>
- <spinner label="Y" name="Pos Y"/>
- <spinner label="Z" name="Pos Z"/>
<text name="label size">
Rozmiar (metry)
</text>
- <spinner label="X" name="Scale X"/>
- <spinner label="Y" name="Scale Y"/>
- <spinner label="Z" name="Scale Z"/>
<text name="label rotation">
Obrót (stopnie)
</text>
- <spinner label="X" name="Rot X"/>
- <spinner label="Y" name="Rot Y"/>
- <spinner label="Z" name="Rot Z"/>
<combo_box name="comboBaseType">
- <combo_box.item label="Klocek" name="Box"/>
- <combo_box.item label="Walec" name="Cylinder"/>
- <combo_box.item label="Graniastosłup" name="Prism"/>
- <combo_box.item label="Kula" name="Sphere"/>
- <combo_box.item label="Torus" name="Torus"/>
- <combo_box.item label="Rura" name="Tube"/>
- <combo_box.item label="Pierścień" name="Ring"/>
- <combo_box.item label="Skulpty" name="Sculpted"/>
- </combo_box>
- <combo_box name="material">
- <combo_box.item label="Kamień" name="Stone"/>
- <combo_box.item label="Metal" name="Metal"/>
- <combo_box.item label="Szkło" name="Glass"/>
- <combo_box.item label="Drewno" name="Wood"/>
- <combo_box.item label="Ciało" name="Flesh"/>
- <combo_box.item label="Plastik" name="Plastic"/>
- <combo_box.item label="Guma" name="Rubber"/>
+ <combo_box.item label="Klocek" name="Box" />
+ <combo_box.item label="Walec" name="Cylinder" />
+ <combo_box.item label="Graniastosłup" name="Prism" />
+ <combo_box.item label="Kula" name="Sphere" />
+ <combo_box.item label="Rura" name="Tube" />
+ <combo_box.item label="Pierścień" name="Ring" />
+ <combo_box.item label="Skulpt" name="Sculpted" />
</combo_box>
<text name="text cut">
Wykrój (początek/koniec)
</text>
- <spinner label="P" name="cut begin"/>
- <spinner label="K" name="cut end"/>
+ <spinner label="P" name="cut begin" />
+ <spinner label="K" name="cut end" />
<text name="text hollow">
Wydrążenie
</text>
<text name="text skew">
- Ukos/Skos
+ Pochylenie
</text>
- <spinner name="Scale 1"/>
- <spinner name="Skew"/>
<text name="Hollow Shape">
Kształt wydrążenia
</text>
<combo_box name="hole">
- <combo_box.item label="Domyślny" name="Default"/>
- <combo_box.item label="Koło" name="Circle"/>
- <combo_box.item label="Kwadrat" name="Square"/>
- <combo_box.item label="Trójkąt" name="Triangle"/>
+ <combo_box.item label="Domyślny" name="Default" />
+ <combo_box.item label="Okrągły" name="Circle" />
+ <combo_box.item label="Kwadratowy" name="Square" />
+ <combo_box.item label="Trójkątny" name="Triangle" />
</combo_box>
- <text left_delta="-5" name="text twist" width="160">
- Skręcenie (początek/koniec)
+ <text name="text twist">
+ Skręć (początek/koniec)
</text>
- <spinner label="P" name="Twist Begin"/>
- <spinner label="K" name="Twist End"/>
+ <spinner label="P" name="Twist Begin" />
+ <spinner label="K" name="Twist End" />
<text name="scale_taper">
Zwężenie
</text>
<text name="scale_hole">
- Rozmiar wgłębienia
+ Rozmiar otworu
</text>
- <spinner label="X" name="Taper Scale X"/>
- <spinner label="Y" name="Taper Scale Y"/>
<text name="text topshear">
- Przesunięcie górne
+ Ścięcie górne
</text>
- <spinner label="X" name="Shear X"/>
- <spinner label="Y" name="Shear Y"/>
<text name="advanced_cut">
Wykrojenie przekroju (poczÄ…tek/koniec)
</text>
@@ -328,167 +291,109 @@
Przesunięcie promienia (początek/koniec)
</text>
<text name="advanced_slice">
- Przetnij(poczÄ…tek/koniec)
+ Przetnij (poczÄ…tek/koniec)
</text>
- <spinner label="P" name="Path Limit Begin"/>
- <spinner label="K" name="Path Limit End"/>
+ <spinner label="P" name="Path Limit Begin" />
+ <spinner label="K" name="Path Limit End" />
<text name="text taper2">
- Zwężenie
+ Sylwetka zwężenia
</text>
- <spinner label="X" name="Taper X"/>
- <spinner label="Y" name="Taper Y"/>
<text name="text radius delta">
Promień
</text>
<text name="text revolutions">
Obroty
</text>
- <spinner name="Radius Offset"/>
- <spinner name="Revolutions"/>
- <texture_picker label="Tekstura skulptowa" name="sculpt texture control" tool_tip="Click to choose a picture"/>
- <check_box label="Odbicie" name="sculpt mirror control" tool_tip="Odwraca skulpt wzdłuż osi X."/>
- <check_box label="Åšrodek na zewnÄ…trz" name="sculpt invert control" tool_tip="Odwraca normalne skulptu."/>
+ <texture_picker label="Tekstura skulptu" name="sculpt texture control" tool_tip="Kliknij, aby wybrać obrazek" />
+ <check_box label="Odbicie" name="sculpt mirror control" tool_tip="Odwraca skulpt wzdłuż osi X" />
+ <check_box label="Środek na zewnątrz" name="sculpt invert control" tool_tip="Wywraca skulpt na drugą stronę poprzez zmianę jego wartości standardowych" />
<text name="label sculpt type">
- Typ ścięgna
+ Typ zszywania
</text>
<combo_box name="sculpt type control">
- <combo_box.item label="(żadne)" name="None"/>
- <combo_box.item label="Kula" name="Sphere"/>
- <combo_box.item label="Torus" name="Torus"/>
- <combo_box.item label="PÅ‚aszczyzna" name="Plane"/>
- <combo_box.item label="Walec" name="Cylinder"/>
- </combo_box>
+ <combo_box.item label="Kula" name="Sphere" />
+ <combo_box.item label="Płaszczyzna / Żadne" name="Plane" />
+ <combo_box.item label="Walec" name="Cylinder" />
+ </combo_box>
</panel>
- <panel label="Atrybuty" name="Features">
+ <panel label="Cechy" name="Features">
+ <panel.string name="None">
+ Żaden
+ </panel.string>
+ <panel.string name="Prim">
+ Prima
+ </panel.string>
+ <panel.string name="Convex Hull">
+ Powłoka wypukła
+ </panel.string>
<text name="select_single">
- Wybierz tylko jeden element by edytować jego cechę.
+ Wybierz pojedynczy obiekt, aby edytować cechy.
</text>
<text name="edit_object">
Edytuj cechy obiektu:
</text>
- <check_box label="Elastyczność" name="Flexible1D Checkbox Ctrl" tool_tip="Elastyczność wzdłuż osi Z (tylko po stronie klienta)"/>
- <spinner label="Gładkość" name="FlexNumSections"/>
- <spinner label="Ciężar" name="FlexGravity"/>
- <spinner label="Drżenie" name="FlexFriction"/>
- <spinner label="Wiatr" name="FlexWind"/>
- <spinner label="Napięcie" name="FlexTension"/>
- <spinner label="Siła X" name="FlexForceX"/>
- <spinner label="Siła Y" name="FlexForceY"/>
- <spinner label="Siła Z" name="FlexForceZ"/>
- <check_box label="Światło" name="Light Checkbox Ctrl" tool_tip="Umożliwia emitajcę światła"/>
- <color_swatch label="" name="colorswatch" tool_tip="Kliknij aby wybrać kolor"/>
- <texture_picker label="" name="light texture control" tool_tip="Kliknij aby wybrać obraz (efekt występuje tylko z aktywowanym opóźnionym renderowaniem)"/>
- <spinner label="Siła" name="Light Intensity"/>
- <spinner label="FOV" name="Light FOV"/>
- <spinner label="Promień" name="Light Radius"/>
- <spinner label="Przybliżenie" name="Light Focus"/>
- <spinner label="Spadek" name="Light Falloff"/>
- <spinner label="Otoczenie/Nastrój" name="Light Ambiance"/>
- </panel>
- <panel label="Tekstura" name="Texture">
- <panel.string name="string repeats per meter">
- Powtórzenia / m
- </panel.string>
- <panel.string name="string repeats per face">
- Powtórzenia
- </panel.string>
- <texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij by wybrać obraz"/>
- <color_swatch label="Kolor" name="colorswatch" tool_tip="Kliknij aby wybrać kolor"/>
- <text left="170" name="color trans" width="99">
- Przezroczystość %
- </text>
- <spinner left="170" name="ColorTrans"/>
- <text left="170" name="glow label">
- Blask
- </text>
- <spinner left="170" name="glow"/>
- <check_box label="Jaskrawość" left="170" name="checkbox fullbright"/>
- <text name="tex gen">
- Mapowanie
- </text>
- <combo_box name="combobox texgen">
- <combo_box.item label="Domyślne" name="Default"/>
- <combo_box.item label="Planarne" name="Planar"/>
- </combo_box>
- <text name="label shininess">
- Połysk
- </text>
- <combo_box name="combobox shininess">
- <combo_box.item label="Żadny" name="None"/>
- <combo_box.item label="Niski" name="Low"/>
- <combo_box.item label="Åšredni" name="Medium"/>
- <combo_box.item label="Wysoki" name="High"/>
- </combo_box>
- <text name="label bumpiness">
- Powierzchnia
- </text>
- <combo_box name="combobox bumpiness">
- <combo_box.item label="Żadna" name="None"/>
- <combo_box.item label="Najjaśniejsza" name="Brightness"/>
- <combo_box.item label="Najciemniejsza" name="Darkness"/>
- <combo_box.item label="Drewniano-ziarnista" name="woodgrain"/>
- <combo_box.item label="Kory drzewa" name="bark"/>
- <combo_box.item label="Cegieł" name="bricks"/>
- <combo_box.item label="Planszy szachowej" name="checker"/>
- <combo_box.item label="Betonu" name="concrete"/>
- <combo_box.item label="PÅ‚ytki/Kafelki" name="crustytile"/>
- <combo_box.item label="Kamienia" name="cutstone"/>
- <combo_box.item label="Dysku CD" name="discs"/>
- <combo_box.item label="Żwiru" name="gravel"/>
- <combo_box.item label="Skamieliny" name="petridish"/>
- <combo_box.item label="Brzegu" name="siding"/>
- <combo_box.item label="PÅ‚ytki kamiennej" name="stonetile"/>
- <combo_box.item label="Stucco" name="stucco"/>
- <combo_box.item label="Suction" name="suction"/>
- <combo_box.item label="Fali" name="weave"/>
+ <check_box label="Elastyczność" name="Flexible1D Checkbox Ctrl" tool_tip="Elastyczność wzdłuż osi Z (tylko po stronie klienta)" />
+ <spinner label="Gładkość" name="FlexNumSections" />
+ <spinner label="Ciężar" name="FlexGravity" />
+ <spinner label="Tarcie" name="FlexFriction" />
+ <spinner label="Wiatr" name="FlexWind" />
+ <spinner label="Napięcie" name="FlexTension" />
+ <spinner label="Siła X" name="FlexForceX" />
+ <spinner label="Siła Y" name="FlexForceY" />
+ <spinner label="Siła Z" name="FlexForceZ" />
+ <check_box label="Światło" name="Light Checkbox Ctrl" tool_tip="Sprawia, że obiekt emituje światło" />
+ <color_swatch name="colorswatch" tool_tip="Kliknij, aby wybrać kolor" />
+ <texture_picker name="light texture control" tool_tip="Kliknij, aby wybrać obraz (efekt występuje tylko z aktywowanym opóźnionym renderowaniem)" />
+ <spinner label="Natężenie" name="Light Intensity" />
+ <spinner label="Pole widz." name="Light FOV" />
+ <spinner label="Zasięg" name="Light Radius" />
+ <spinner label="Skupienie" name="Light Focus" />
+ <spinner label="Obniż. siły" name="Light Falloff" />
+ <spinner label="Nastrój" name="Light Ambiance" />
+ <text name="label physicsshapetype">
+ Typ kształtu fizycznego:
+ </text>
+ <combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Wybierz typ kształtu fizycznego" />
+ <combo_box name="material">
+ <combo_box.item label="Kamień" name="Stone" />
+ <combo_box.item label="Szkło" name="Glass" />
+ <combo_box.item label="Drewno" name="Wood" />
+ <combo_box.item label="Ciało" name="Flesh" />
+ <combo_box.item label="Plastik" name="Plastic" />
+ <combo_box.item label="Guma" name="Rubber" />
</combo_box>
- <spinner label="Poziomo (U)" name="TexScaleU"/>
- <check_box label="Odwróć" name="checkbox flip s"/>
- <spinner label="Pionowo (V)" name="TexScaleV"/>
- <check_box label="Odwróć" name="checkbox flip t"/>
- <spinner label="Powtórzenia˚" name="TexRot"/>
- <button label="Zastosuj" label_selected="Zastosuj" name="button apply"/>
- <text name="tex offset">
- Wyrównanie tekstury
- </text>
- <spinner label="Poziome (U)" name="TexOffsetU"/>
- <spinner label="Pionowe (V)" name="TexOffsetV"/>
- <panel name="Add_Media">
- <text name="media_tex">
- Media
- </text>
- <button name="add_media" tool_tip="Dodaj media"/>
- <button name="delete_media" tool_tip="Usuń tą teksturę mediów"/>
- <button name="edit_media" tool_tip="Edytuj media"/>
- <button label="Dodaj" label_selected="Dopasuj teksturę mediów" name="button align" tool_tip="Dodaj teksturę mediów (musi się najpierw załadować)"/>
- </panel>
+ <spinner label="Grawitacja" name="Physics Gravity" />
+ <spinner label="Tarcie" name="Physics Friction" />
+ <spinner label="Gęstość w 100 kg/m^3" name="Physics Density" />
+ <spinner label="Odbijanie" name="Physics Restitution" />
</panel>
- <panel label="Treść" name="Contents">
- <button label="Nowy skrypt" label_selected="Nowy skrypt" name="button new script"/>
- <button label="Prawa" name="button permissions"/>
+ <panel label="Tekstura" name="Texture" />
+ <panel label="Zawart." name="Contents">
+ <button label="Nowy skrypt" label_selected="Nowy skrypt" name="button new script" />
+ <button label="Prawa" name="button permissions" />
</panel>
</tab_container>
<panel name="land info panel">
<text name="label_parcel_info">
- Informacje o posiadłości
+ Informacje o działce
</text>
<text name="label_area_price">
- Cena: L$[PRICE] za [AREA] m²
+ Cena: [PRICE]L$ za [AREA] m²
</text>
<text name="label_area">
Obszar: [AREA] m²
</text>
- <button label="O Posiadłości" label_selected="O Posiadłości" name="button about land"/>
- <check_box label="Pokaż właścicieli" name="checkbox show owners" tool_tip="Pokoloruj posiadłości zgodnie z przynależnością do właściciela: Zielony = Twoja posiadłość Morski = posiadłość Twojej grupy Czerwony = posiadłości innych Żółty = Na sprzedaż Fioletowy = Na aukcję Szary = Publiczna"/>
+ <button label="O działce" label_selected="O działce" name="button about land" />
+ <check_box label="Pokaż właścicieli" name="checkbox show owners" tool_tip="Pokoloruj działki zgodnie z przynależnością do właściciela: Zielony = Twoja działka Morski = działka Twojej grupy Czerwony = działki innych Żółty = Na sprzedaż Purpurowy = Na aukcję Szary = Publiczna" />
<text name="label_parcel_modify">
- Modyfikuj posiadłość
+ Modyfikuj działkę
</text>
- <button label="Podziel" label_selected="Podziel" name="button subdivide land"/>
- <button label="ZÅ‚Ä…cz" label_selected="ZÅ‚Ä…cz" name="button join land"/>
+ <button label="Podziel" label_selected="Podziel" name="button subdivide land" />
+ <button label="ZÅ‚Ä…cz" label_selected="ZÅ‚Ä…cz" name="button join land" />
<text name="label_parcel_trans">
- Transakcje na posiadłości
+ Transakcje na działce
</text>
- <button label="Kup posiadłość" label_selected="Kup posiadłość" name="button buy land"/>
- <button label="Porzuć posiadłość" label_selected="Porzuć posiadłość" name="button abandon land"/>
+ <button label="Kup działkę" label_selected="Kup działkę" name="button buy land" />
+ <button label="Porzuć działkę" label_selected="Porzuć działkę" name="button abandon land" />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
old mode 100755
new mode 100644
index 2b06ae9f782ec7ae600abec27109c88f0e98d6a8..cdd56edec4a0a354d6209d3f7b06c3672c0f3347
--- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="Główne Obiekty">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="top_objects" title="Szczytowe obiekty">
<floater.string name="top_scripts_title">
Główne skrypty
</floater.string>
<floater.string name="top_scripts_text">
- [COUNT] skryptów działa w czasie [TIME] ms
+ [COUNT] skryptów zabiera w sumie [TIME] ms
</floater.string>
<floater.string name="scripts_score_label">
Czas
</floater.string>
- <floater.string name="scripts_mono_time_label">
- Czas Mono
- </floater.string>
<floater.string name="top_colliders_title">
Główne kolizje
</floater.string>
@@ -22,35 +19,45 @@
Wynik
</floater.string>
<floater.string name="none_descriptor">
- Nieodnalezione
+ Nieodnalezione.
+ </floater.string>
+ <floater.string name="URLs">
+ URLe
+ </floater.string>
+ <floater.string name="memory">
+ Pamięć (KB)
</floater.string>
<text name="title_text">
Åadowanie...
</text>
<scroll_list name="objects_list">
- <scroll_list.columns label="Wynik" name="score"/>
- <scroll_list.columns label="Nazwa" name="name"/>
- <scroll_list.columns label="Właściciel" name="owner"/>
- <scroll_list.columns label="Miejsce" name="location"/>
- <scroll_list.columns label="Czas" name="time"/>
- <scroll_list.columns label="Czas Mono" name="mono_time"/>
- <scroll_list.columns label="URL" name="URLs"/>
+ <scroll_list.columns label="Wynik" name="score" />
+ <scroll_list.columns label="Nazwa" name="name" />
+ <scroll_list.columns label="Właściciel" name="owner" />
+ <scroll_list.columns label="Miejsce" name="location" />
+ <scroll_list.columns label="Działka" name="parcel" />
+ <scroll_list.columns label="Czas" name="time" />
+ <scroll_list.columns label="URLe" name="URLs" />
+ <scroll_list.columns label="Pamięć (KB)" name="memory" />
</scroll_list>
<text name="id_text">
ID obiektu:
</text>
- <button label="Pokaż emitery" name="show_beacon_btn"/>
+ <button label="Pokaż emiter" name="show_beacon_btn" />
<text name="obj_name_text">
Nazwa obiektu:
</text>
- <button label="Filtr" name="filter_object_btn"/>
+ <button label="Filtruj" name="filter_object_btn" />
<text name="owner_name_text">
Właściciel:
</text>
- <button label="Filter" name="filter_owner_btn"/>
- <button label="Odśwież" name="refresh_btn"/>
- <button label="Zwróć wybrane" name="return_selected_btn"/>
- <button label="Zwróć wszystko" name="return_all_btn"/>
- <button label="Dezaktywuj wybrane" name="disable_selected_btn"/>
- <button label="Dezaktywuj wszystko" name="disable_all_btn"/>
+ <button label="Filtruj" name="filter_owner_btn" />
+ <text name="parcel_name_text">
+ Działka:
+ </text>
+ <button label="Filtruj" name="filter_parcel_btn" />
+ <button label="Zwróć wybrane" name="return_selected_btn" />
+ <button label="Zwróć wszystko" name="return_all_btn" />
+ <button label="Dezakt. wybrane" name="disable_selected_btn" />
+ <button label="Dezakt. wszystko" name="disable_all_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml
old mode 100755
new mode 100644
index 8cdf267f4b7ac375212151875751b813191292d6..c3bc528d17b3a744c4eccf78dba12146be9f680c
--- a/indra/newview/skins/default/xui/pl/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tos.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title="">
- <floater.string name="real_url">
- http://secondlife.com/app/tos/
- </floater.string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
<floater.string name="loading_url">
- data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Åadowanie %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3EWarunki%20Serwisu%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
+ data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Wczytywanie: %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3EWarunki%20korzystania%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
</floater.string>
- <button label="Kontynuuj" label_selected="Kontynuuj" name="Continue"/>
- <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
- <check_box label="Zgadzam się na Warunki Serwisu (Terms of Service) i Politykę Prywatności (Privacy Policy)" name="agree_chk"/>
+ <button label="Kontynuuj" label_selected="Kontynuuj" name="Continue" />
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+ <check_box label="Zgadzam się na Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy)" name="agree_chk" />
<text name="tos_heading">
- Proszę dokładnie przeczytać następujące Warunki Serwisu (Terms of Service) i Politykę Prywatności (Privacy Policy). Musisz zaakceptować umowę żeby kontynuować logowanie do [SECOND_LIFE].
+ Proszę dokładnie przeczytać Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy). Musisz je zaakceptować, aby kontynuować logowanie.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_toybox.xml b/indra/newview/skins/default/xui/pl/floater_toybox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fcfc18e2adf708aaea792f0e46ee092e4353b6c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_toybox.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Toybox" title="PRZYCISKI NA PASKACH">
+ <text name="toybox label 1">
+ Możesz dodać lub usunąć przycisk z paska poprzez przeciąganie.
+ </text>
+ <text name="toybox label 2">
+ Przyciski będą wyglądać jak te poniżej lub jak ikonki, zależnie od ustawienia paska.
+ </text>
+ <button label="Wyczyść paski" label_selected="Wyczyść paski" name="btn_clear_all" />
+ <button label="Przywróć domyślne" label_selected="Przywróć domyślne" name="btn_restore_defaults" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_translation_settings.xml b/indra/newview/skins/default/xui/pl/floater_translation_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b628491c95d2bf415cbb24d26697e9de8c7a29b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_translation_settings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_translation_settings" title="USTAWIENIA TÅUMACZENIA CZATU">
+ <string name="bing_api_key_not_verified">
+ Nie można zweryfikować Bing appID. Spróbuj ponownie.
+ </string>
+ <string name="google_api_key_not_verified">
+ Nie można zweryfikować klucza Google API. Spróbuj ponownie.
+ </string>
+ <string name="bing_api_key_verified">
+ Bing appID zweryfikowany.
+ </string>
+ <string name="google_api_key_verified">
+ Klucz Google API zweryfikowany.
+ </string>
+ <check_box label="Włącz maszynowe tłumaczenie czatu" name="translate_chat_checkbox" />
+ <text name="translate_language_label">
+ TÅ‚umacz czat na:
+ </text>
+ <combo_box name="translate_language_combo">
+ <combo_box.item label="Język systemu" name="System Default Language" />
+ <combo_box.item label="English (Angielski)" name="English" />
+ <combo_box.item label="Dansk (Duński)" name="Danish" />
+ <combo_box.item label="Deutsch (Niemiecki)" name="German" />
+ <combo_box.item label="Español (Hiszpański)" name="Spanish" />
+ <combo_box.item label="Français (Francuski)" name="French" />
+ <combo_box.item label="Italiano (WÅ‚oski)" name="Italian" />
+ <combo_box.item label="Magyar (Węgierski)" name="Hungarian" />
+ <combo_box.item label="Nederlands (Holenderski)" name="Dutch" />
+ <combo_box.item label="Polski" name="Polish" />
+ <combo_box.item label="Português (Portugalski)" name="Portugese" />
+ <combo_box.item label="РуÑÑкий (Rosyjski)" name="Russian" />
+ <combo_box.item label="Türkçe (Turecki)" name="Turkish" />
+ <combo_box.item label="УкраїнÑька (UkraiÅ„ski)" name="Ukrainian" />
+ <combo_box.item label="ä¸æ–‡ (æ£é«”) (ChiÅ„ski)" name="Chinese" />
+ <combo_box.item label="日本語 (Japoński)" name="Japanese" />
+ <combo_box.item label="í•œêµì–´ (KoreaÅ„ski)" name="Korean" />
+ </combo_box>
+ <text name="tip">
+ Usługa tłumacząca:
+ </text>
+ <line_editor default_text="Wpisz Bing AppID i kliknij na "Weryfikuj"" name="bing_api_key" />
+ <button label="Weryfikuj" name="verify_bing_api_key_btn" />
+ <line_editor default_text="Wpisz klucz Google API i kliknij na "Weryfikuj"" name="google_api_key" />
+ <button label="Verify" name="verify_google_api_key_btn" />
+ <text name="google_links_text">
+ [http://code.google.com/apis/language/translate/v2/pricing.html Koszty] | [https://code.google.com/apis/console Statystyki]
+ </text>
+ <button label="Gotowe" name="ok_btn" />
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_twitter.xml b/indra/newview/skins/default/xui/pl/floater_twitter.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e228041abaa80def96a0ccf039245d221463266
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_twitter.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_twitter">
+ <tab_container name="tabs">
+ <panel label="UTWÓRZ" name="panel_twitter_photo" />
+ <panel label="KONTO" name="panel_twitter_account" />
+ </tab_container>
+ <text name="connection_error_text">
+ BÅ‚Ä…d
+ </text>
+ <text name="connection_loading_text">
+ Åadowanie...
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
old mode 100755
new mode 100644
index fc170d8d1b4d4fc5105cc266e5e4288ee21fd64d..02e31fa9d8d18bcc98642371660cecb5552cfc7d
--- a/indra/newview/skins/default/xui/pl/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_entry" title="">
+<floater name="url_entry">
<text name="media_label">
URL Mediów:
</text>
- <button label="OK" name="ok_btn" />
<button label="Anuluj" name="cancel_btn" />
<button label="Wyczyść" name="clear_btn" />
<text name="loading_label">
- Åadowanie...
+ ÅadujÄ™...
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pl/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c842489af62edadce36f5db663ba21aaf01852e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_voice_volume" title="GÅOÅšNOŚĆ CZATU GÅOSOWEGO">
+ <slider label="Głośność" name="chat_voice_volume" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml
deleted file mode 100755
index 2155d56f271cbf9328e2e0cfeb3dc834af18ccf9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="Przełączniki Głosu">
- <string name="title_nearby">
- ROZMOWY GÅOSOWE W POBLIÅ»U
- </string>
- <string name="title_group">
- Rozmowa głosowa z grupą [GROUP]
- </string>
- <string name="title_adhoc">
- Konferencja
- </string>
- <string name="title_peer_2_peer">
- Rozmowa głosowa z [NAME]
- </string>
- <string name="no_one_near">
- Nikt w pobliżu nie ma aktywnych rozmów głosowych
- </string>
- <layout_stack name="my_call_stack">
- <layout_panel name="my_panel">
- <text name="user_text" value="Mój awatar:"/>
- </layout_panel>
- <layout_panel name="leave_call_panel">
- <layout_stack name="voice_effect_and_leave_call_stack">
- <layout_panel name="leave_call_btn_panel">
- <button label="Zakończ rozmowę" name="leave_call_btn"/>
- </layout_panel>
- </layout_stack>
- </layout_panel>
- </layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
old mode 100755
new mode 100644
index e2d1fb77e96f372033459bb6d87d94e677287332..b02266caa9775c86671f0c4ce54b8ada22ed4b42
--- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Miejsca" name="voice_effects" title="VOICE MORPHING">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="voice_effects" title="PODGLÄ„D PRZEKSZTAÅCANIA GÅOSU" label="Miejsca">
<string name="no_voice_effect">
- (Bez Voice Morphing)
+ (Bez Przekształcania)
</string>
<string name="active_voice_effect">
(Aktywny)
@@ -12,19 +12,87 @@
<string name="new_voice_effect">
(Nowy!)
</string>
+ <string name="effect_Beast">
+ Bestia
+ </string>
+ <string name="effect_Buzz">
+ Brzęczenie
+ </string>
+ <string name="effect_Creepy">
+ Przerażający
+ </string>
+ <string name="effect_Cyber">
+ Cybernetyczny
+ </string>
+ <string name="effect_Female Elf">
+ Kobiecy Elf
+ </string>
+ <string name="effect_Flirty">
+ Flirt
+ </string>
+ <string name="effect_Foxy">
+ Ponętny
+ </string>
+ <string name="effect_Helium">
+ Hel
+ </string>
+ <string name="effect_Husky Whisper">
+ Szept Husky
+ </string>
+ <string name="effect_Macho">
+ Maczo
+ </string>
+ <string name="effect_Micro">
+ Mikrus
+ </string>
+ <string name="effect_Mini">
+ Miniaturowy
+ </string>
+ <string name="effect_Nano">
+ Malutki
+ </string>
+ <string name="effect_Nightmare">
+ Koszmar
+ </string>
+ <string name="effect_Rumble">
+ Burczenie
+ </string>
+ <string name="effect_Sexy">
+ Seksowny
+ </string>
+ <string name="effect_Shorty">
+ Krótki
+ </string>
+ <string name="effect_Smaller">
+ Mniejszy
+ </string>
+ <string name="effect_Sneaky">
+ Podstępny
+ </string>
+ <string name="effect_Stallion">
+ Ogier
+ </string>
+ <string name="effect_Sultry">
+ GorÄ…co
+ </string>
+ <string name="effect_Thunder">
+ Grzmot
+ </string>
+ <string name="effect_Vixen">
+ Lisica
+ </string>
<text name="preview_text">
- PrzeglÄ…daj
+ PodglÄ…d
</text>
<text name="status_text">
- Nagraj próbkę, następnie kliknij na głos aby usłyszeć jego brzmienie.
+ Nagraj próbkę, a następnie kliknij na głos aby usłyszeć jego brzmienie.
</text>
- <button label="Nagraj" name="record_btn" tool_tip="Nagraj próbkę swojego głosu."/>
- <button label="Zatrzymaj" name="record_stop_btn"/>
+ <button label="Nagraj" name="record_btn" tool_tip="Nagraj próbkę swojego głosu." />
<text name="voice_morphing_link">
[[URL] Subskrybuj teraz]
</text>
- <scroll_list name="voice_effect_list" tool_tip="Nagraj próbke swojego głosu, następnie kliknij aby odsłuchać.">
- <scroll_list.columns label="Nazwa głosu" name="name"/>
- <scroll_list.columns label="Termin zakończenia subskrypcji" name="expires"/>
+ <scroll_list name="voice_effect_list" tool_tip="Nagraj próbkę swojego głosu, a następnie kliknij na efekt aby odsłuchać podgląd.">
+ <scroll_list.columns label="Nazwa głosu" name="name" />
+ <scroll_list.columns label="Wygasa" name="expires" />
</scroll_list>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_volume.xml b/indra/newview/skins/default/xui/pl/floater_voice_volume.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11bc04cc15da00ba9890cd440c87cd932fd670a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_voice_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_voice_volume" title="GÅOÅšNOŚĆ GÅOSU">
+ <slider name="volume_slider" tool_tip="Głośność głosu" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_web_content.xml b/indra/newview/skins/default/xui/pl/floater_web_content.xml
old mode 100755
new mode 100644
index 4cc8d0b27b3272ea0f66db049595663230655432..6ee5a0d7cb9c6eb2a13e33aba8ed42bcf15d5ea7
--- a/indra/newview/skins/default/xui/pl/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/pl/floater_web_content.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_web_content" title="">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_web_content">
<layout_stack name="stack1">
<layout_panel name="nav_controls">
- <button name="back" tool_tip="Do tyłu"/>
- <button name="forward" tool_tip="Do przodu"/>
- <button name="stop" tool_tip="Zatrzymaj"/>
- <button name="reload" tool_tip="Odśwież stronę"/>
- <combo_box name="address" tool_tip="Wprowadź URL tutaj"/>
- <icon name="media_secure_lock_flag" tool_tip="Funkcja bezpiecznego przeglÄ…dania (Secured Browsing)"/>
- <button name="popexternal" tool_tip="Otwórz bieżący URL w zewnętrznej przeglądarce"/>
+ <button tool_tip="Wstecz" name="back" />
+ <button tool_tip="Do przodu" name="forward" />
+ <button tool_tip="Zatrzymaj" name="stop" />
+ <button tool_tip="Odśwież stronę" name="reload" />
+ <combo_box name="address" tool_tip="Tutaj wpisz URL" />
+ <icon name="media_secure_lock_flag" tool_tip="Bezpieczne przeglÄ…danie (Secured Browsing)" />
+ <button tool_tip="Otwórz obecny URL w Twojej zewnętrznej przeglądarce internetowej" name="popexternal" />
</layout_panel>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
old mode 100755
new mode 100644
index 4081b8a37e86eadaa012f2280b309793c4a811c6..3e64af25a20adbebcd0cb51a7053795ef914a01a
--- a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="whitelist_entry" title="BIAÅA LISTA">
<text name="media_label">
- Wprowadź URL lub wzorzec URL dla dodania do listy dozwolonych domen
+ Wprowadź URL / wzorzec dla dodania do listy dozwolonych domen
</text>
- <line_editor name="whitelist_entry" tool_tip="Wprowadź URL lub wzorzec URL do Białej Listy"/>
- <button label="OK" name="ok_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
+ <line_editor name="whitelist_entry" tool_tip="Wprowadź URL lub wzorzec URL na Białą Listę" />
+ <button label="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_window_size.xml b/indra/newview/skins/default/xui/pl/floater_window_size.xml
old mode 100755
new mode 100644
index 2a6c257e54d81034ba6fffaaa1bfbcc65c1ed876..6b01b8213715335f49315b136ad886452f0f64cb
--- a/indra/newview/skins/default/xui/pl/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/pl/floater_window_size.xml
@@ -1,17 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="window_size" title="WYMIARY OKNA">
- <string name="resolution_format">
- [RES_X] x [RES_Y]
- </string>
<text name="windowsize_text">
Ustaw rozmiar okna:
</text>
<combo_box name="window_size_combo" tool_tip="szerokość x wysokość">
- <combo_box.item label="1000 x 700 (domyślnie)" name="item0"/>
- <combo_box.item label="1024 x 768" name="item1"/>
- <combo_box.item label="1280 x 720 (720p)" name="item2"/>
- <combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+ <combo_box.item label="1000 x 700 (domyślnie)" name="item1" />
</combo_box>
- <button label="Ustaw" name="set_btn"/>
- <button label="Anuluj" name="cancel_btn"/>
+ <button label="Ustaw" name="set_btn" />
+ <button label="Anuluj" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
old mode 100755
new mode 100644
index 4f533373658e2291033a2126f22f11b08abfb793..b7e827598b8fac74eab402eb9c5bccbbf73d4872
--- a/indra/newview/skins/default/xui/pl/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="worldmap" title="MAPA ÅšWIATA">
<panel name="layout_panel_1">
<text name="events_label">
@@ -6,42 +6,29 @@
</text>
</panel>
<panel name="layout_panel_2">
- <button name="Show My Location" tool_tip="Wyśrodkuj mapę w miejscu, gdzie znajduje się mój awatar"/>
+ <button name="Show My Location" tool_tip="Wyśrodkuj mapę w miejscu, gdzie znajduje się mój awatar" />
<text name="me_label">
Ja
</text>
<text name="person_label">
- Osoba
- </text>
- <text name="infohub_label">
- Infohub
+ Rezydent
</text>
<text name="land_sale_label">
- Sprzedaż posiadłości
+ Sprzedaż ziemi
</text>
<text name="auction_label">
- Aukcja posiadłości
+ Aukcja ziemi
</text>
<text name="by_owner_label">
przez właściciela
</text>
- <button name="Go Home" tool_tip="Teleportuj do mojego Miejsca Startowego"/>
+ <button name="Go Home" tool_tip="Teleportuj do mojego Miejsca Startowego" />
<text name="Home_label">
- Miejsce Startu
+ Do Startu
</text>
<text name="events_label">
Wydarzenia:
</text>
- <text name="pg_label">
- General
- </text>
- <check_box initial_value="true" name="events_mature_chk"/>
- <text name="events_mature_label">
- Moderate
- </text>
- <text name="events_adult_label">
- Adult
- </text>
</panel>
<panel name="layout_panel_3">
<text name="find_on_map_label">
@@ -50,24 +37,24 @@
</panel>
<panel name="layout_panel_4">
<combo_box label="Dostępni znajomi" name="friend combo" tool_tip="Pokaż znajomych na mapie">
- <combo_box.item label="Moi dostępni znajomi" name="item1"/>
+ <combo_box.item label="Moi dostępni znajomi" name="item1" />
</combo_box>
<combo_box label="Zapisane miejsca" name="landmark combo" tool_tip="Pokaż zapisane miejsce na mapie">
- <combo_box.item label="Zapisane miejsca" name="item1"/>
+ <combo_box.item label="Zapisane miejsca" name="item1" />
</combo_box>
- <search_editor label="Regiony według nazwy" name="location" tool_tip="Wpisz nazwę regionu"/>
- <button label="Znajdź" name="DoSearch" tool_tip="Szukaj regionu"/>
- <button name="Clear" tool_tip="Wyczyść zapamiętane linie oraz zresetuj mapę"/>
+ <search_editor label="Regiony według nazwy" name="location" tool_tip="Wpisz nazwę regionu" />
+ <button label="Znajdź" name="DoSearch" tool_tip="Szukaj regionu" />
+ <button name="Clear" tool_tip="Wyczyść zapamiętane linie i zresetuj mapę" />
<text name="events_label">
Lokalizacja:
</text>
- <button label="Teleportuj" name="Teleport" tool_tip="Teleportuj do wybranego miejsca"/>
- <button label="Kopiuj SLurl" name="copy_slurl" tool_tip="Kopie obecnego miejsca jako SLurl mogą zostać użyte na stronie internetowej."/>
- <button label="Pokaż wybrane" name="Show Destination" tool_tip="Wyśrodkuj mapę w wybranym miejscu"/>
+ <button label="Teleportuj" name="Teleport" tool_tip="Teleportuj do wybranego miejsca" />
+ <button label="Kopiuj SLurl" name="copy_slurl" tool_tip="Kopiuje obecną lokalizację jako SLurl, aby można było ją użyć na stronie internetowej." />
+ <button label="Pokaż wybrane" name="Show Destination" tool_tip="Wyśrodkuj mapę w wybranym miejscu" />
</panel>
<panel name="layout_panel_5">
<text name="zoom_label">
- Przybliż
+ Powiększ
</text>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
old mode 100755
new mode 100644
index 5e982c0185f9d0f1959bc9de4460c4eb48850623..ffd9e819f00c2b73938f4e05d9326f4dfc41c354
--- a/indra/newview/skins/default/xui/pl/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
@@ -1,24 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
- Not can_close / no title to avoid window chrome
- Single instance - only have one at a time, recycle it each spawn
--->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect_avatar">
- <string name="Subtitle">
- [AGE]
- </string>
- <string name="Details">
- [SL_PROFILE]
- </string>
- <text name="user_details">
- To jest mój opis w Second Life.
- </text>
- <slider name="volume_slider" tool_tip="Poziom głośności" value="0.5"/>
- <button label="Dodaj znajomość" name="add_friend_btn"/>
- <button label="IM" name="im_btn"/>
- <button label="Profil" name="view_profile_btn"/>
- <panel name="moderator_panel">
- <button label="Wyłącz komunikację głosową" name="disable_voice"/>
- <button label="Włącz komunikację głosową" name="enable_voice"/>
- </panel>
+ <slider name="volume_slider" tool_tip="Poziom głośności" />
+ <text name="avatar_profile_link" value="[[LINK] Pokaż pełny profil]" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml
old mode 100755
new mode 100644
index 63c79acc8c13c548644e23db37e9cda9825bd5c2..52174485533e8a5c35f5cf87f0fdc4c541859359
--- a/indra/newview/skins/default/xui/pl/inspect_group.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_group.xml
@@ -1,8 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
- Not can_close / no title to avoid window chrome
- Single instance - only have one at a time, recycle it each spawn
--->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect_group">
<string name="PrivateGroup">
Grupa prywatna
@@ -11,12 +7,12 @@
Wstęp wolny
</string>
<string name="CostToJoin">
- L$[AMOUNT] by dołączyć
+ [AMOUNT]L$ by dołączyć
</string>
<string name="YouAreMember">
- Jesteś członkiem
+ JesteÅ› w grupie
</string>
- <button label="Dołącz" name="join_btn"/>
- <button label="Opuść" name="leave_btn"/>
- <button label="Zobacz profil" name="view_profile_btn"/>
+ <button label="Dołącz" name="join_btn" />
+ <button label="Opuść" name="leave_btn" />
+ <button label="Zobacz profil" name="view_profile_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml
old mode 100755
new mode 100644
index 23d8ce77004e97fef09fab70c456268948dc71a1..9dc1cee2cf28af994bf4f4745a078f325af5577c
--- a/indra/newview/skins/default/xui/pl/inspect_object.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_object.xml
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
- Not can_close / no title to avoid window chrome
- Single instance - only have one at a time, recycle it each spawn
--->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect_object">
<string name="Creator">
- Przez [CREATOR]
+ Twórca [CREATOR]
</string>
<string name="CreatorAndOwner">
Twórca [CREATOR]
Właściciel [OWNER]
</string>
<string name="Price">
- L$[AMOUNT]
+ [AMOUNT]L$
</string>
<string name="PriceFree">
Darmowe!
@@ -23,19 +19,12 @@ Właściciel [OWNER]
<string name="Sit">
Usiądź tutaj
</string>
- <text name="object_name" value="Test Object Name That Is actually two lines and Really Long"/>
- <text name="price_text">
- L$30,000
- </text>
- <text name="object_description">
- This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really?
- </text>
- <button label="Kup" name="buy_btn"/>
- <button label="Zapłać" name="pay_btn"/>
- <button label="Weź kopię" name="take_free_copy_btn"/>
- <button label="Dotknij" name="touch_btn"/>
- <button label="Usiądź tutaj" name="sit_btn"/>
- <button label="Otwórz" name="open_btn"/>
- <icon name="secure_browsing" tool_tip="Zabezpiecz przeglÄ…danie"/>
- <button label="Więcej" name="more_info_btn"/>
+ <icon name="secure_browsing" tool_tip="Bezpieczne przeglÄ…danie (Secured Browsing)" />
+ <button label="Kup" name="buy_btn" />
+ <button label="Zapłać" name="pay_btn" />
+ <button label="Weź kopię" name="take_free_copy_btn" />
+ <button label="Dotknij" name="touch_btn" />
+ <button label="Usiądź tutaj" name="sit_btn" />
+ <button label="Otwórz" name="open_btn" />
+ <button label="Więcej" name="more_info_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
old mode 100755
new mode 100644
index 0d570940c1ae43db8f45d713d2c1f636a3331e6c..52ea5b777fc431bd75aa7f402eed7c76d9bdaf50
--- a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
- Not can_close / no title to avoid window chrome
- Single instance - only have one at a time, recycle it each spawn
--->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect_remote_object">
<text name="object_owner_label">
Właściciel:
</text>
- <button label="Mapa" name="map_btn"/>
- <button label="Zablokuj" name="block_btn"/>
- <button label="Zamknij" name="close_btn"/>
+ <text name="object_slurl_label">
+ Lokalizacja:
+ </text>
+ <button label="Mapa" name="map_btn" />
+ <button label="Zablokuj" name="block_btn" />
+ <button label="Zamknij" name="close_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml
old mode 100755
new mode 100644
index 93051d1317867b24495d021012980b6d450cd4a3..0057ca530c8aa9cc54abd3b48be13867e16e630d
--- a/indra/newview/skins/default/xui/pl/language_settings.xml
+++ b/indra/newview/skins/default/xui/pl/language_settings.xml
@@ -1,51 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- This file contains strings that used to be hardcoded in the source.-->
<strings>
-
- <!-- Locale Information -->
<string name="MicrosoftLocale">polish</string>
<string name="MacLocale">pl_PL.UTF-8</string>
<string name="DarwinLocale">pl_PL.UTF-8</string>
<string name="LinuxLocale">pl_PL.UTF-8</string>
-
- <!--
- datetimeToCodes["wkday"] = "%a"; // Thu
- datetimeToCodes["weekday"] = "%A"; // Thursday
- datetimeToCodes["year4"] = "%Y"; // 2009
- datetimeToCodes["year"] = "%Y"; // 2009
- datetimeToCodes["year2"] = "%y"; // 09
- datetimeToCodes["mth"] = "%b"; // Aug
- datetimeToCodes["month"] = "%B"; // August
- datetimeToCodes["mthnum"] = "%m"; // 08
- datetimeToCodes["day"] = "%d"; // 31
- datetimeToCodes["sday"] = "%-d"; // 9
- datetimeToCodes["hour24"] = "%H"; // 14
- datetimeToCodes["hour"] = "%H"; // 14
- datetimeToCodes["hour12"] = "%I"; // 02
- datetimeToCodes["min"] = "%M"; // 59
- datetimeToCodes["ampm"] = "%p"; // AM
- datetimeToCodes["second"] = "%S"; // 59
- datetimeToCodes["timezone"] = "%Z"; // PST
- -->
-
<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="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>
- <string name="LTimeMonth">mth,datetime,local</string>
- <string name="LTimeDay">day,datetime,local</string>
+ <string name="LTimeMonth">mth,datetime,local</string>
+ <string name="LTimeDay">day,datetime,local</string>
<string name="LTimeSec">second,datetime,local</string>
<string name="LTimeHour">hour,datetime,local</string>
- <string name="LTimeMin">min,datetime,local</string>
- <string name="LTimeYear">year,datetime,local</string>
-
+ <string name="LTimeMin">min,datetime,local</string>
+ <string name="LTimeYear">year,datetime,local</string>
<string name="UTCTimeWeek">weekday,datetime,utc</string>
<string name="UTCTimeDay">day,datetime,utc</string>
<string name="UTCTimeMth">mth,datetime,utc</string>
@@ -53,5 +31,5 @@
<string name="UTCTimeHr">hour,datetime,utc</string>
<string name="UTCTimeMin">min,datetime,utc</string>
<string name="UTCTimeSec">second,datetime,utc</string>
- <string name="UTCTimeTimezone">timezone,datetime,utc</string>
+ <string name="UTCTimeTimezone">timezone,datetime,utc</string>
</strings>
diff --git a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
index 7c572b4fc93e4081d4ea1d3d4a7fbd4bf4a50421..30befd6cb5709459c7719f6f13e5d1f7deb6dc33
--- a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Add Wearable Gear Menu">
- <menu_item_check label="Porządkuj według daty" name="sort_by_most_recent"/>
- <menu_item_check label="Porządkuj według nazwy" name="sort_by_name"/>
- <menu_item_check label="Porządkuj według typu" name="sort_by_type"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Add Wearable Gear Menu">
+ <menu_item_check label="Porządkuj według daty" name="sort_by_most_recent" />
+ <menu_item_check label="Porządkuj według nazwy" name="sort_by_name" />
+ <menu_item_check label="Porządkuj według typu" name="sort_by_type" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
old mode 100755
new mode 100644
index aacdad97e3e932105f1cc6f0e5d18064d2d37fdd..3bbe52ae17dda0b53afbacd81e7a14de29828924
--- a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
@@ -1,17 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_avatar_other.xml -->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Avatar Pie">
- <menu_item_call label="Zobacz profil" name="Profile..."/>
- <menu_item_call label="Dodaj znajomość" name="Add Friend"/>
- <menu_item_call label="IM" name="Send IM..."/>
- <menu_item_call label="Zadzwoń" name="Call"/>
- <menu_item_call label="ZaproÅ› do grupy" name="Invite..."/>
- <menu_item_call label="Zablokuj" name="Avatar Mute"/>
- <menu_item_call label="Raport" name="abuse"/>
- <menu_item_call label="Unieruchom" name="Freeze..."/>
- <menu_item_call label="Wyrzuć" name="Eject..."/>
- <menu_item_call label="Debugowanie tekstur" name="Debug..."/>
- <menu_item_call label="Przybliż" name="Zoom In"/>
- <menu_item_call label="Zapłać" name="Pay..."/>
- <menu_item_call label="Sprawdź" name="Object Inspect"/>
+ <menu_item_call label="Zobacz profil" name="Profile..." />
+ <menu_item_call label="Nowy znajomy" name="Add Friend" />
+ <menu_item_call label="Wiadomość IM" name="Send IM..." />
+ <menu_item_call label="Zadzwoń" name="Call" />
+ <menu_item_call label="ZaproÅ› do grupy" name="Invite..." />
+ <menu_item_call label="Zablokuj" name="Avatar Mute" />
+ <menu_item_call label="Zgłoś" name="abuse" />
+ <menu_item_call label="Unieruchom" name="Freeze..." />
+ <menu_item_call label="Wyrzuć" name="Eject..." />
+ <menu_item_call label="Pokaż tekstury" name="Debug..." />
+ <menu_item_call label="Zrzuć XML" name="Dump XML" />
+ <menu_item_call label="Przybliż" name="Zoom In" />
+ <menu_item_call label="Zapłać" name="Pay..." />
+ <menu_item_call label="Profil obiektu" name="Object Inspect" />
+ <menu_item_check name="Renderuj normalnie" label="Normal Rendering" />
+ <menu_item_check name="Zawsze upraszczaj" label="Always use impostor" />
+ <menu_item_check name="Nigdy nie upraszczaj" label="Never use impostor" />
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
old mode 100755
new mode 100644
index ecfc341d735e555f1133ad1041c9ab11cd0a2b8e..23a6d82e9dd5dcbae5ab277f545ed6450bb0a2e5
--- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Attachment Pie">
- <menu_item_call label="Dotknij" name="Attachment Object Touch"/>
- <menu_item_call label="Edytuj" name="Edit..."/>
- <menu_item_call label="Odłącz" name="Detach"/>
- <menu_item_call label="Usiądź tutaj" name="Sit Down Here"/>
- <menu_item_call label="Wstań" name="Stand Up"/>
- <menu_item_call label="Mój wygląd" name="Change Outfit"/>
- <menu_item_call label="Edytuj mój strój" name="Edit Outfit"/>
- <menu_item_call label="Edytuj mój kształt" name="Edit My Shape"/>
+ <menu_item_call label="Dotknij" name="Attachment Object Touch" />
+ <menu_item_call label="Edytuj" name="Edit..." />
+ <menu_item_call label="Odłącz" name="Detach" />
+ <menu_item_call label="Usiądź tutaj" name="Sit Down Here" />
+ <menu_item_call label="Wstań" name="Stand Up" />
+ <menu_item_call label="Mój wygląd" name="Change Outfit" />
+ <menu_item_call label="Edytuj mój strój" name="Edit Outfit" />
+ <menu_item_call label="Edytuj mój kształt" name="Edit My Shape" />
<menu_item_call label="Uniesienie" name="Hover Height"/>
- <menu_item_call label="Moi znajomi" name="Friends..."/>
- <menu_item_call label="Moje grupy" name="Groups..."/>
- <menu_item_call label="Mój profil" name="Profile..."/>
- <menu_item_call label="Debugowanie tekstur" name="Debug..."/>
- <menu_item_call label="Opuść" name="Drop"/>
+ <menu_item_call label="Moi znajomi" name="Friends..." />
+ <menu_item_call label="Moje grupy" name="Groups..." />
+ <menu_item_call label="Mój profil" name="Profile..." />
+ <menu_item_call label="Pokaż tekstury" name="Debug..." />
+ <menu_item_call label="Zrzuć XML" name="Dump XML" />
+ <menu_item_call label="Upuść" name="Drop" />
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
old mode 100755
new mode 100644
index e8d2b14231fd1e8ad90f2fc34fe5daabf042cd14..923af8440b45a9397ae9334581b54f416e635584
--- a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
@@ -1,7 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Avatar Icon Menu">
- <menu_item_call label="Profil" name="Show Profile"/>
- <menu_item_call label="Czat/IM..." name="Send IM"/>
- <menu_item_call label="Dodaj znajomość..." name="Add Friend"/>
- <menu_item_call label="Usuń..." name="Remove Friend"/>
+ <menu_item_call label="Profil" name="Show Profile" />
+ <menu_item_call label="Czat/IM" name="Send IM" />
+ <menu_item_call label="Proponuj teleport" name="Offer Teleport" />
+ <menu_item_call label="PoproÅ› o teleport" name="Request Teleport" />
+ <menu_item_call label="Rozmowa głosowa" name="Voice Call" />
+ <menu_item_call label="Historia czatu..." name="Chat History" />
+ <menu_item_call label="Dodaj znajomego" name="Add Friend" />
+ <menu_item_call label="Usuń znajomego" name="Remove Friend" />
+ <menu_item_call label="ZaproÅ› do grupy..." name="Invite Group" />
+ <menu_item_call label="Przybliż" name="Zoom In" />
+ <menu_item_call label="Mapa" name="Map" />
+ <menu_item_call label="Udostępnij" name="Share" />
+ <menu_item_call label="Zapłać" name="Pay" />
+ <menu_item_check label="Blokuj głos" name="Block Unblock" />
+ <menu_item_check label="Blokuj tekst" name="Mute Text" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
old mode 100755
new mode 100644
index dcf7921badc165902f342d4df3944ae8f3419129..3f357248909dc2ef1f462875ddbde58af5fc4877
--- a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: See also menu_attachment_other.xml -->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Avatar Pie">
- <menu_item_call label="Zobacz profil" name="Profile..."/>
- <menu_item_call label="Dodaj znajomość" name="Add Friend"/>
- <menu_item_call label="IM" name="Send IM..."/>
- <menu_item_call label="Zadzwoń" name="Call"/>
- <menu_item_call label="ZaproÅ› do grupy" name="Invite..."/>
- <menu_item_call label="Zablokuj" name="Avatar Mute"/>
- <menu_item_call label="Raport" name="abuse"/>
- <menu_item_call label="Unieruchom" name="Freeze..."/>
- <menu_item_call label="Wyrzuć" name="Eject..."/>
- <menu_item_call label="Debugowanie tekstur" name="Debug..."/>
- <menu_item_call label="Przybliż" name="Zoom In"/>
- <menu_item_call label="Zapłać" name="Pay..."/>
+ <menu_item_call label="Zobacz profil" name="Profile..." />
+ <menu_item_call label="Nowy znajomy" name="Add Friend" />
+ <menu_item_call label="Wiadomość IM" name="Send IM..." />
+ <menu_item_call label="Zadzwoń" name="Call" />
+ <menu_item_call label="ZaproÅ› do grupy" name="Invite..." />
+ <menu_item_call label="Zablokuj" name="Avatar Mute" />
+ <menu_item_call label="Zgłoś" name="abuse" />
+ <menu_item_call label="Unieruchom" name="Freeze..." />
+ <menu_item_call label="Wyrzuć" name="Eject..." />
+ <menu_item_call label="Pokaż tekstury" name="Debug..." />
+ <menu_item_call label="Zrzuć XML" name="Dump XML" />
+ <menu_item_call label="Przybliż" name="Zoom In" />
+ <menu_item_call label="Zapłać" name="Pay..." />
+ <menu_item_check name="Normal" label="Renderuj normalnie" />
+ <menu_item_check name="Always use impostor" label="Zawsze upraszczaj" />
+ <menu_item_check name="Never use impostor" label="Nigdy nie upraszczaj" />
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
old mode 100755
new mode 100644
index dafad57d982d4511a36fb888f7afd8affd8f04b7..f744b5019c90b75972d89b0f3e5525e38035b4bc
--- a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
@@ -1,33 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Self Pie">
- <menu_item_call label="Usiądź tu" name="Sit Down Here"/>
- <menu_item_call label="Wstań" name="Stand Up"/>
+ <menu_item_call label="Usiądź tu" name="Sit Down Here" />
+ <menu_item_call label="Wstań" name="Stand Up" />
<context_menu label="Zdejmij" name="Take Off >">
<context_menu label="Ubrania" name="Clothes >">
- <menu_item_call label="KoszulÄ™" name="Shirt"/>
- <menu_item_call label="Spodnie" name="Pants"/>
- <menu_item_call label="Spódnicę" name="Skirt"/>
- <menu_item_call label="Buty" name="Shoes"/>
- <menu_item_call label="Skarpetki" name="Socks"/>
- <menu_item_call label="KurtkÄ™" name="Jacket"/>
- <menu_item_call label="Rękawiczki" name="Gloves"/>
- <menu_item_call label="Podkoszulek" name="Self Undershirt"/>
- <menu_item_call label="BieliznÄ™" name="Self Underpants"/>
- <menu_item_call label="Tatuaż" name="Self Tattoo"/>
- <menu_item_call label="Fizyka" name="Self Physics"/>
- <menu_item_call label="Ubranie alpha" name="Self Alpha"/>
- <menu_item_call label="Wszystko" name="All Clothes"/>
+ <menu_item_call label="KoszulÄ™" name="Shirt" />
+ <menu_item_call label="Spodnie" name="Pants" />
+ <menu_item_call label="Spódnicę" name="Skirt" />
+ <menu_item_call label="Buty" name="Shoes" />
+ <menu_item_call label="Skarpetki" name="Socks" />
+ <menu_item_call label="KurtkÄ™" name="Jacket" />
+ <menu_item_call label="Rękawiczki" name="Gloves" />
+ <menu_item_call label="Podkoszulek" name="Self Undershirt" />
+ <menu_item_call label="BieliznÄ™" name="Self Underpants" />
+ <menu_item_call label="Tatuaż" name="Self Tattoo" />
+ <menu_item_call label="FizykÄ™" name="Self Physics" />
+ <menu_item_call label="WarstwÄ™ alpha" name="Self Alpha" />
+ <menu_item_call label="Wszystko" name="All Clothes" />
</context_menu>
- <context_menu label="HUD" name="Object Detach HUD"/>
- <context_menu label="Odłącz" name="Object Detach"/>
- <menu_item_call label="Odłącz wszystko" name="Detach All"/>
+ <context_menu label="Odłącz" name="Object Detach" />
+ <menu_item_call label="Odłącz wszystko" name="Detach All" />
</context_menu>
- <menu_item_call label="Mój wygląd" name="Chenge Outfit"/>
- <menu_item_call label="Edytuj mój strój" name="Edit Outfit"/>
- <menu_item_call label="Edytuj mój kształt" name="Edit My Shape"/>
+ <menu_item_call label="Mój wygląd" name="Chenge Outfit" />
+ <menu_item_call label="Edytuj strój" name="Edit Outfit" />
+ <menu_item_call label="Edytuj kształt" name="Edit My Shape" />
<menu_item_call label="Uniesienie" name="Hover Height"/>
- <menu_item_call label="Moi znajomi" name="Friends..."/>
- <menu_item_call label="Moje grupy" name="Groups..."/>
- <menu_item_call label="Mój profil" name="Profile..."/>
- <menu_item_call label="Debugowanie tekstur" name="Debug..."/>
+ <menu_item_call label="Znajomi" name="Friends..." />
+ <menu_item_call label="Grupy" name="Groups..." />
+ <menu_item_call label="Profil" name="Profile..." />
+ <menu_item_call label="Pokaż tekstury" name="Debug..." />
+ <menu_item_call label="Zrzuć XML" name="Dump XML" />
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml
deleted file mode 100755
index 1ec5883cfe2130a4f20e625445392053d5cb0ffc..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
- <menu_item_check label="Rozpocznij rozmowę głosową" name="EnableVoiceChat"/>
- <menu_item_check label="Przycisk gesturki" name="ShowGestureButton"/>
- <menu_item_check label="Przycisk ruchu" name="ShowMoveButton"/>
- <menu_item_check label="Przycisk widoku" name="ShowCameraButton"/>
- <menu_item_check label="Przycisk zdjęć" name="ShowSnapshotButton"/>
- <menu_item_check label="Buduj" name="ShowBuildButton"/>
- <menu_item_check label="Szukaj" name="ShowSearchButton"/>
- <menu_item_check label="Mapa" name="ShowWorldMapButton"/>
- <menu_item_check label="Mini-Mapa" name="ShowMiniMapButton"/>
- <menu_item_call label="Wytnij" name="NearbyChatBar_Cut"/>
- <menu_item_call label="Kopiuj" name="NearbyChatBar_Copy"/>
- <menu_item_call label="Wklej" name="NearbyChatBar_Paste"/>
- <menu_item_call label="Usuń" name="NearbyChatBar_Delete"/>
- <menu_item_call label="Zaznacz wszystko" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
old mode 100755
new mode 100644
index 4e5407601b455003e7873bc683569d53624ef755..add2d59998fe703a1d4504b7a8bc3d37d91967ab
--- a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="COF Attachment">
- <menu_item_call label="Odłącz" name="detach"/>
+ <menu_item_call label="Odłącz" name="detach" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
old mode 100755
new mode 100644
index ee60d3feb657db0a28da74b50ae820a130fd83ee..df8a167d79f158730aaf7b64c8a813f4d0a1b3d3
--- a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="COF Body">
- <menu_item_call label="ZastÄ…p" name="replace"/>
- <menu_item_call label="Edytuj" name="edit"/>
+ <menu_item_call label="ZastÄ…p" name="replace" />
+ <menu_item_call label="Edytuj" name="edit" />
+ <menu_item_call label="Utwórz nową" name="create_new" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
old mode 100755
new mode 100644
index ad4390013787524fe0ca0a5c638f5022367ad111..6c3475663f641e7db83d278326a6537984713488
--- a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="COF Clothing">
- <menu_item_call label="Zdejmij" name="take_off"/>
- <menu_item_call label="Edytuj" name="edit"/>
- <menu_item_call label="ZastÄ…p" name="replace"/>
+ <menu_item_call label="Zdejmij" name="take_off" />
+ <menu_item_call label="Edytuj" name="edit" />
+ <menu_item_call label="ZastÄ…p" name="replace" />
+ <menu_item_call label="Utwórz nowe" name="create_new" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
old mode 100755
new mode 100644
index 9fba39be1ac3a325ee7246563876f3fe5fa14dde..24e7ae5f8ca09b93d9dd19bd2aebd9bed9e76211
--- a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
- <menu label="Nowe ubranie" name="COF.Gear.New_Clothes"/>
- <menu label="Nowe części ciała" name="COF.Geear.New_Body_Parts"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Gear COF">
+ <menu label="Nowe ubrania" name="COF.Gear.New_Clothes" />
+ <menu label="Nowe części ciała" name="COF.Gear.New_Body_Parts" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_conversation.xml b/indra/newview/skins/default/xui/pl/menu_conversation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..833ac5d54300fb2c5ebbc1a6a54da501ad7290cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_conversation.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_conversation_participant">
+ <menu_item_call label="Zakończ rozmowę" name="close_conversation" />
+ <menu_item_call label="Rozpocznij rozmowę głosową" name="open_voice_conversation" />
+ <menu_item_call label="Odłącz od głosu" name="disconnect_from_voice" />
+ <menu_item_call label="Zamknij zaznaczone" name="close_selected_conversations" />
+ <menu_item_call label="Pokaż profil" name="view_profile" />
+ <menu_item_call label="Wiadomość IM" name="im" />
+ <menu_item_call label="Proponuj teleport" name="offer_teleport" />
+ <menu_item_call label="PoproÅ› o teleport" name="request_teleport" />
+ <menu_item_call label="Rozmowa głosowa" name="voice_call" />
+ <menu_item_call label="Logi czatu..." name="chat_history" />
+ <menu_item_call label="Dodaj do znajomych" name="add_friend" />
+ <menu_item_call label="Usuń znajomego" name="remove_friend" />
+ <menu_item_call label="Usuń znajomych" name="remove_friends" />
+ <menu_item_call label="ZaproÅ› do grupy..." name="invite_to_group" />
+ <menu_item_call label="Przybliż" name="zoom_in" />
+ <menu_item_call label="Mapa" name="map" />
+ <menu_item_call label="Udostępnij" name="share" />
+ <menu_item_call label="Zapłać" name="pay" />
+ <menu_item_check label="Wycisz głos" name="block_unblock" />
+ <menu_item_check label="Wycisz czat" name="MuteText" />
+ <menu_item_call label="Profil grupy" name="group_profile" />
+ <menu_item_call label="Aktywuj grupÄ™" name="activate_group" />
+ <menu_item_call label="Opuść grupę" name="leave_group" />
+ <context_menu label="Opcje moderatora" name="Moderator Options">
+ <menu_item_check label="Zezwól na czat tekstowy" name="AllowTextChat" />
+ <menu_item_call label="Wycisz tego rozmówcę" name="ModerateVoiceMuteSelected" />
+ <menu_item_call label="Odblokuj tego rozmówcę" name="ModerateVoiceUnMuteSelected" />
+ <menu_item_call label="Wycisz wszystkich" name="ModerateVoiceMute" />
+ <menu_item_call label="Odblokuj wszystkich" name="ModerateVoiceUnmute" />
+ </context_menu>
+ <menu_item_call label="Zbanuj" name="BanMember" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pl/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4f0adfbb959625508d2a7ce894b7c9718c197413
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_conversation_log_gear.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Conversation Context Menu">
+ <menu_item_call label="Wiadomość IM..." name="IM" />
+ <menu_item_call label="Rozmowa głosowa..." name="Call" />
+ <menu_item_call label="Otwórz logi czatu..." name="Chat history" />
+ <menu_item_call label="Pokaż profil" name="View Profile" />
+ <menu_item_call label="Proponuj teleport" name="teleport" />
+ <menu_item_call label="PoproÅ› o teleport" name="request_teleport" />
+ <menu_item_call label="Dodaj do znajomych" name="add_friend" />
+ <menu_item_call label="Usuń znajomego" name="remove_friend" />
+ <menu_item_call label="ZaproÅ› do grupy..." name="Invite" />
+ <menu_item_call label="Mapa" name="Map" />
+ <menu_item_call label="Udostępnij" name="Share" />
+ <menu_item_call label="Zapłać" name="Pay" />
+ <menu_item_check label="Blokuj/Odblokuj" name="Block/Unblock" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pl/menu_conversation_log_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9dca0aa0525d457a0719179773276706b9f639e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_conversation_view">
+ <menu_item_check label="Sortuj według imion" name="sort_by_name" />
+ <menu_item_check label="Sortuj według daty" name="sort_by_date" />
+ <menu_item_check label="Umieść znajomych na górze" name="sort_by_friends" />
+ <menu_item_call label="Pokaż logi czatu lokalnego..." name="view_nearby_chat_history" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_edit.xml b/indra/newview/skins/default/xui/pl/menu_edit.xml
old mode 100755
new mode 100644
index 578e270fed0f15465e3a5f41ad4830473a74c3b9..37d7b6ce4a03257c48eeea43c238580ec7ddcae6
--- a/indra/newview/skins/default/xui/pl/menu_edit.xml
+++ b/indra/newview/skins/default/xui/pl/menu_edit.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu label="Edycja" name="Edit">
- <menu_item_call label="Cofnij" name="Undo"/>
- <menu_item_call label="Powtórz" name="Redo"/>
- <menu_item_call label="Wytnij" name="Cut"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
- <menu_item_call label="Wklej" name="Paste"/>
- <menu_item_call label="Usuń" name="Delete"/>
- <menu_item_call label="Powiel" name="Duplicate"/>
- <menu_item_call label="Zaznacz wszystko" name="Select All"/>
- <menu_item_call label="Odznacz" name="Deselect"/>
+ <menu_item_call label="Cofnij" name="Undo" />
+ <menu_item_call label="Powtórz" name="Redo" />
+ <menu_item_call label="Wytnij" name="Cut" />
+ <menu_item_call label="Kopiuj" name="Copy" />
+ <menu_item_call label="Wklej" name="Paste" />
+ <menu_item_call label="Usuń" name="Delete" />
+ <menu_item_call label="Usuń" name="Duplicate" />
+ <menu_item_call label="Zaznacz wszystko" name="Select All" />
+ <menu_item_call label="Odznacz" name="Deselect" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_favorites.xml b/indra/newview/skins/default/xui/pl/menu_favorites.xml
old mode 100755
new mode 100644
index 7310ff5c2765b984bc26c51453dcf41089c6aab5..231f2b3906e16bc903c97ac5fa593c537965e715
--- a/indra/newview/skins/default/xui/pl/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/pl/menu_favorites.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Popup">
- <menu_item_call label="Teleportuj" name="Teleport To Landmark"/>
- <menu_item_call label="Zobacz/Edytuj Ulubione miejsce" name="Landmark Open"/>
- <menu_item_call label="Kopiuj SLurl" name="Copy slurl"/>
- <menu_item_call label="Pokaż na mapie" name="Show On Map"/>
- <menu_item_call label="Kopiuj" name="Landmark Copy"/>
- <menu_item_call label="Wklej" name="Landmark Paste"/>
- <menu_item_call label="Usuń" name="Delete"/>
+ <menu_item_call label="Teleportuj" name="Teleport To Landmark" />
+ <menu_item_call label="Zobacz/Edytuj Landmark" name="Landmark Open" />
+ <menu_item_call label="Kopiuj SLurl" name="Copy slurl" />
+ <menu_item_call label="Pokaż na mapie" name="Show On Map" />
+ <menu_item_call label="Kopiuj" name="Landmark Copy" />
+ <menu_item_call label="Wklej" name="Landmark Paste" />
+ <menu_item_call label="Usuń" name="Delete" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
old mode 100755
new mode 100644
index a72dec22fc1dc2612c097b528a2af56ba3ce7b3d..a51b3e9677968fbebbd8240f431f6a968d70dfcc
--- a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_gesture_gear">
- <menu_item_call label="Dodaj/Usuń z Ulubionych" name="activate"/>
- <menu_item_call label="Kopiuj" name="copy_gesture"/>
- <menu_item_call label="Wklej" name="paste"/>
- <menu_item_call label="Kopiuj UUID" name="copy_uuid"/>
- <menu_item_call label="Zapisz do obecnego zestawu ubrania" name="save_to_outfit"/>
- <menu_item_call label="Edytuj" name="edit_gesture"/>
- <menu_item_call label="Sprawdź" name="inspect"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_gesture_gear">
+ <menu_item_call label="Aktywuj/dezaktywuj wybrany gest" name="activate" />
+ <menu_item_call label="Kopiuj" name="copy_gesture" />
+ <menu_item_call label="Wklej" name="paste" />
+ <menu_item_call label="Kopiuj UUID" name="copy_uuid" />
+ <menu_item_call label="Zapisz do obecnego stroju" name="save_to_outfit" />
+ <menu_item_call label="Edytuj" name="edit_gesture" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_group_plus.xml b/indra/newview/skins/default/xui/pl/menu_group_plus.xml
old mode 100755
new mode 100644
index 83be4d38c515a9713f1b1aec807432df20ae8c46..9e53de3e5888578a1331621d9d289c9445cb561a
--- a/indra/newview/skins/default/xui/pl/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/pl/menu_group_plus.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
- <menu_item_call label="Dołącz do grupy..." name="item_join"/>
- <menu_item_call label="Nowa grupa..." name="item_new"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_call name="item_join" label="Dołącz do grupy..." />
+ <menu_item_call name="item_new" label="Nowa grupa..." />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
old mode 100755
new mode 100644
index 19d9510cd3f05c26ac4174f8308ea7febacf338c..fc815051dc57d7cf7db70b71b9de57bbdb4cbd48
--- a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="hide_navbar_menu">
- <menu_item_check label="Pokaż pasek Nawigacji" name="ShowNavbarNavigationPanel"/>
- <menu_item_check label="Pokaż pasek Ulubionych" name="ShowNavbarFavoritesPanel"/>
- <menu_item_check label="Pokaż pasek mini-lokalizacji" name="ShowMiniLocationPanel"/>
+ <menu_item_check label="Pokaż pasek nawigacji i ulubionych" name="ShowNavbarNavigationPanel" />
+ <menu_item_check label="Pokaż pasek mini-lokalizacji" name="ShowMiniLocationPanel" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_im_conversation.xml b/indra/newview/skins/default/xui/pl/menu_im_conversation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..023e2cb09ed8f490a35e8846c8f5a0f7b3e26ad2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Conversation Gear Menu">
+ <menu_item_call label="Pokaż profil" name="View Profile" />
+ <menu_item_call label="Dodaj do znajomych" name="Add Friend" />
+ <menu_item_call label="Usuń znajomego" name="remove_friend" />
+ <menu_item_call label="Proponuj teleport" name="offer_teleport" />
+ <menu_item_call label="ZaproÅ› do grupy..." name="invite_to_group" />
+ <menu_item_call label="Logi czatu..." name="chat_history" />
+ <menu_item_call label="Przybliż" name="zoom_in" />
+ <menu_item_call label="Mapa" name="map" />
+ <menu_item_call label="Udostępnij" name="Share" />
+ <menu_item_call label="Zapłać" name="Pay" />
+ <menu_item_check label="Wycisz głos" name="Block/Unblock" />
+ <menu_item_check label="Wycisz czat" name="MuteText" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pl/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..274cfbab9526df9c5c3255ae85598108ed729dce
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_modes">
+ <menu_item_check label="Widok kompaktowy" name="compact_view" />
+ <menu_item_check label="Widok rozszerzony" name="expanded_view" />
+ <menu_item_check name="IMShowTime" label="Pokazuj czas" />
+ <menu_item_check name="IMShowNamesForP2PConv" label="Pokazuj imiona w rozmowach z jednÄ… osobÄ…" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
index 4ead44878a3f23d27dda5e640c3fe4ae454a19aa..482900835b474b23c4a8c4f44fb120fd361e64b2
--- a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="IMChiclet AdHoc Menu">
- <menu_item_call label="Zakończ rozmowę" name="End Session"/>
+ <menu_item_call label="Zakończ rozmowę" name="End Session" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
old mode 100755
new mode 100644
index 2b9a362123b23e779dd2701d2e98c53920b18a20..f89bee946689c3107597b824e1790003edc60ab3
--- a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="IMChiclet Group Menu">
- <menu_item_call label="O grupie" name="Show Profile"/>
- <menu_item_call label="Pokaż sesję" name="Chat"/>
- <menu_item_call label="Zakończ rozmowę" name="End Session"/>
+ <menu_item_call label="O grupie" name="Show Profile" />
+ <menu_item_call label="Pokaż sesję" name="Chat" />
+ <menu_item_call label="Zakończ sesję" name="End Session" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
index 8924d6db3e1b1fa6b7156902b1122ccc265cffb4..3e4298dd4860d5df37462fc06d22fcb61bbafc24
--- a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="IMChiclet P2P Menu">
- <menu_item_call label="Zobacz profil" name="Show Profile"/>
- <menu_item_call label="Dodaj znajomość" name="Add Friend"/>
- <menu_item_call label="Pokaż sesję" name="Send IM"/>
- <menu_item_call label="Zakończ rozmowę" name="End Session"/>
+ <menu_item_call label="Zobacz profil" name="Show Profile" />
+ <menu_item_call label="Dodaj znajomego" name="Add Friend" />
+ <menu_item_call label="Pokaż sesję" name="Send IM" />
+ <menu_item_call label="Zakończ sesję" name="End Session" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
deleted file mode 100755
index 59560f236c279fa3c4acfa2bfba197fecb1bb690..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
- <menu_item_call label="Zobacz profil" name="view_profile"/>
- <menu_item_call label="Dodaj znajomość" name="add_friend"/>
- <menu_item_call label="IM" name="im"/>
- <menu_item_call label="Zadzwoń" name="call"/>
- <menu_item_call label="Teleportuj" name="teleport"/>
- <menu_item_call label="ZaproÅ› do grupy" name="invite_to_group"/>
- <menu_item_call label="Zablokuj" name="block"/>
- <menu_item_call label="Odblokuj" name="unblock"/>
- <menu_item_call label="Raport" name="report"/>
- <menu_item_call label="Unieruchom" name="freeze"/>
- <menu_item_call label="Wyrzuć" name="eject"/>
- <menu_item_call label="Kopnij" name="kick"/>
- <menu_item_call label="CSR" name="csr"/>
- <menu_item_call label="Debugowanie tekstur" name="debug"/>
- <menu_item_call label="Znajdź na mapie" name="find_on_map"/>
- <menu_item_call label="Przybliż" name="zoom_in"/>
- <menu_item_call label="Zapłać" name="pay"/>
- <menu_item_call label="Udostępnij" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
index c12bd490ff98485bcd41eae09577487f10c63798..f4294891601405bf82c1a51abecf6b67f14d3c5f
--- a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
- <menu_item_call label="Dotknij" name="touch"/>
- <menu_item_call label="Usiądź" name="sit"/>
- <menu_item_call label="Zapłać" name="pay"/>
- <menu_item_call label="Kup" name="buy"/>
- <menu_item_call label="Weź" name="take"/>
- <menu_item_call label="Weź kopię" name="take_copy"/>
- <menu_item_call label="Otwórz" name="open"/>
- <menu_item_call label="Edytuj" name="edit"/>
- <menu_item_call label="Ubierz" name="wear"/>
- <menu_item_call label="Dodaj" name="add"/>
- <menu_item_call label="Raport" name="report"/>
- <menu_item_call label="Zablokuj" name="block"/>
- <menu_item_call label="Przybliż" name="zoom_in"/>
- <menu_item_call label="Usuń" name="remove"/>
- <menu_item_call label="Więcej informacji" name="more_info"/>
-</menu>
+<toggleable_menu name="Gear Menu">
+ <menu_item_call label="Dotknij" name="touch" />
+ <menu_item_call label="Usiądź" name="sit" />
+ <menu_item_call label="Zapłać" name="pay" />
+ <menu_item_call label="Kup" name="buy" />
+ <menu_item_call label="Weź" name="take" />
+ <menu_item_call label="Weź kopię" name="take_copy" />
+ <menu_item_call label="Otwórz" name="open" />
+ <menu_item_call label="Edytuj" name="edit" />
+ <menu_item_call label="Ubierz" name="wear" />
+ <menu_item_call label="Dodaj" name="add" />
+ <menu_item_call label="Zgłoś" name="report" />
+ <menu_item_call label="Zablokuj" name="block" />
+ <menu_item_call label="Odblokuj" name="unblock" />
+ <menu_item_call label="Przybliż" name="zoom_in" />
+ <menu_item_call label="Usuń" name="remove" />
+ <menu_item_call label="Więcej informacji" name="more_info" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
deleted file mode 100755
index c4ef9761d9d73eaac285a9d9b8dd6053157e1a1d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear Menu">
- <menu_item_call label="Usiądź tutaj" name="Sit Down Here"/>
- <menu_item_call label="Wstań" name="Stand Up"/>
- <context_menu label="Zdejmij" name="Take Off >">
- <context_menu label="Ubranie" name="Clothes >">
- <menu_item_call label="Bluzka" name="Shirt"/>
- <menu_item_call label="Spodnie" name="Pants"/>
- <menu_item_call label="Spódnica" name="Skirt"/>
- <menu_item_call label="Buty" name="Shoes"/>
- <menu_item_call label="Skarpetki" name="Socks"/>
- <menu_item_call label="Kurtka" name="Jacket"/>
- <menu_item_call label="Rękawiczki" name="Gloves"/>
- <menu_item_call label="Podkoszulek" name="Self Undershirt"/>
- <menu_item_call label="Bielizna" name="Self Underpants"/>
- <menu_item_call label="Tatuaż" name="Self Tattoo"/>
- <menu_item_call label="Alpha" name="Self Alpha"/>
- <menu_item_call label="Ubranie" name="All Clothes"/>
- </context_menu>
- <context_menu label="HUD" name="Object Detach HUD"/>
- <context_menu label="Odłącz" name="Object Detach"/>
- <menu_item_call label="Odłącz wszystko" name="Detach All"/>
- </context_menu>
- <menu_item_call label="Zmień strój" name="Chenge Outfit"/>
- <menu_item_call label="Edytuj mój strój" name="Edit Outfit"/>
- <menu_item_call label="Edytuj mój kształt" name="Edit My Shape"/>
- <menu_item_call label="Znajomi" name="Friends..."/>
- <menu_item_call label="Moje grupy" name="Groups..."/>
- <menu_item_call label="Mój profil" name="Profile..."/>
- <menu_item_call label="Debugowanie tekstur" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
index 5ef0f2f7a48925dd5026047ff49a51be7aff7cbf..c0f52040a5fae3435d61320e4e9df1b13e4c1d48
--- a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="InvOfferChiclet Menu">
- <menu_item_call label="Zamknij" name="Close"/>
+ <menu_item_call label="Zamknij" name="Close" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
old mode 100755
new mode 100644
index a0c2b2c6c151b578cdea4856bd235457d723a3fc..0edb680b163f0ecd4f2c71d1cdf8b2ba5daa0e3c
--- a/indra/newview/skins/default/xui/pl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
@@ -1,96 +1,94 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Popup">
- <menu_item_call label="Utwórz nowy przedmiot" name="Marketplace Create Listing"/>
- <menu_item_call label="Przypisz" name="Marketplace Associate Listing"/>
- <menu_item_call label="Pobierz ponownie (odśwież)" name="Marketplace Get Listing"/>
- <menu_item_call label="Zweryfikuj" name="Marketplace Check Listing"/>
- <menu_item_call label="Edytuj przedmiot" name="Marketplace Edit Listing"/>
- <menu_item_call label="Listuj" name="Marketplace List"/>
- <menu_item_call label="Usuń z listy" name="Marketplace Unlist"/>
- <menu_item_call label="Aktywuj" name="Marketplace Activate"/>
- <menu_item_call label="Dezaktywuj" name="Marketplace Deactivate"/>
- <menu_item_call label="Udostępnij" name="Share"/>
- <menu_item_call label="Kupuj" name="Task Buy"/>
- <menu_item_call label="Otwórz" name="Task Open"/>
- <menu_item_call label="Odtwarzaj" name="Task Play"/>
- <menu_item_call label="Właściwości" name="Task Properties"/>
- <menu_item_call label="Zmień nazwę" name="Task Rename"/>
- <menu_item_call label="Usuń" name="Task Remove"/>
- <menu_item_call label="Opróżnij Kosz" name="Empty Trash"/>
- <menu_item_call label="Opróżnij Folder Zgubione i odnalezione" name="Empty Lost And Found"/>
- <menu_item_call label="Nowy folder" name="New Folder"/>
- <menu_item_call label="Nowy skrypt" name="New Script"/>
- <menu_item_call label="Nowa nota" name="New Note"/>
- <menu_item_call label="Nowa gesturka" name="New Gesture"/>
- <menu label="Nowe Ubranie" name="New Clothes">
- <menu_item_call label="Nowa koszula" name="New Shirt"/>
- <menu_item_call label="Nowe spodnie" name="New Pants"/>
- <menu_item_call label="Nowe buty" name="New Shoes"/>
- <menu_item_call label="Nowe skarpety" name="New Socks"/>
- <menu_item_call label="Nowa kurtka" name="New Jacket"/>
- <menu_item_call label="Nowa spódnica" name="New Skirt"/>
- <menu_item_call label="Nowe rękawiczki" name="New Gloves"/>
- <menu_item_call label="Nowy podkoszulek" name="New Undershirt"/>
- <menu_item_call label="Nowa bielizna" name="New Underpants"/>
- <menu_item_call label="Nowa maska alpha" name="New Alpha Mask"/>
- <menu_item_call label="Nowy tatuaż" name="New Tattoo"/>
- <menu_item_call label="Nowa fizyka" name="New Physics"/>
+ <menu_item_call label="Udostępnij" name="Share" />
+ <menu_item_call label="Kupuj" name="Task Buy" />
+ <menu_item_call label="Otwórz" name="Task Open" />
+ <menu_item_call label="Odtwarzaj" name="Task Play" />
+ <menu_item_call label="Właściwości" name="Task Properties" />
+ <menu_item_call label="Zmień nazwę" name="Task Rename" />
+ <menu_item_call label="Usuń" name="Task Remove" />
+ <menu_item_call label="Opróżnij Kosz" name="Empty Trash" />
+ <menu_item_call label="Opróżnij Zagubione i odnalezione" name="Empty Lost And Found" />
+ <menu_item_call label="Nowy folder" name="New Folder" />
+ <menu_item_call label="Nowy skrypt" name="New Script" />
+ <menu_item_call label="Nowa nota" name="New Note" />
+ <menu_item_call label="Nowy gest" name="New Gesture" />
+ <menu label="Nowe ubranie" name="New Clothes">
+ <menu_item_call label="Nowa koszula" name="New Shirt" />
+ <menu_item_call label="Nowe spodnie" name="New Pants" />
+ <menu_item_call label="Nowe buty" name="New Shoes" />
+ <menu_item_call label="Nowe skarpety" name="New Socks" />
+ <menu_item_call label="Nowa kurtka" name="New Jacket" />
+ <menu_item_call label="Nowa spódnica" name="New Skirt" />
+ <menu_item_call label="Nowe rękawiczki" name="New Gloves" />
+ <menu_item_call label="Nowy podkoszulek" name="New Undershirt" />
+ <menu_item_call label="Nowa bielizna" name="New Underpants" />
+ <menu_item_call label="Nowa maska alpha" name="New Alpha Mask" />
+ <menu_item_call label="Nowy tatuaż" name="New Tattoo" />
+ <menu_item_call label="Nowa fizyka" name="New Physics" />
</menu>
- <menu label="Nowa Część Ciała" name="New Body Parts">
- <menu_item_call label="Nowy kształt" name="New Shape"/>
- <menu_item_call label="Nowa skórka" name="New Skin"/>
- <menu_item_call label="Nowe włosy" name="New Hair"/>
- <menu_item_call label="Nowe oczy" name="New Eyes"/>
+ <menu label="Nowa część ciała" name="New Body Parts">
+ <menu_item_call label="Nowy kształt" name="New Shape" />
+ <menu_item_call label="Nowa skórka" name="New Skin" />
+ <menu_item_call label="Nowe włosy" name="New Hair" />
+ <menu_item_call label="Nowe oczy" name="New Eyes" />
</menu>
- <menu label="Zmień Czcionkę" name="Change Type">
- <menu_item_call label="Domyślna" name="Default"/>
- <menu_item_call label="Rękawiczki" name="Gloves"/>
- <menu_item_call label="Kurtka" name="Jacket"/>
- <menu_item_call label="Spodnie" name="Pants"/>
- <menu_item_call label="Kształt" name="Shape"/>
- <menu_item_call label="Buty" name="Shoes"/>
- <menu_item_call label="Koszula" name="Shirt"/>
- <menu_item_call label="Spódnica" name="Skirt"/>
- <menu_item_call label="Bielizna" name="Underpants"/>
- <menu_item_call label="Podkoszulek" name="Undershirt"/>
+ <menu label="Zmień typ" name="Change Type">
+ <menu_item_call label="Domyślny" name="Default" />
+ <menu_item_call label="Rękawiczki" name="Gloves" />
+ <menu_item_call label="Kurtka" name="Jacket" />
+ <menu_item_call label="Spodnie" name="Pants" />
+ <menu_item_call label="Kształt" name="Shape" />
+ <menu_item_call label="Buty" name="Shoes" />
+ <menu_item_call label="Koszula" name="Shirt" />
+ <menu_item_call label="Spódnica" name="Skirt" />
+ <menu_item_call label="Bielizna" name="Underpants" />
+ <menu_item_call label="Podkoszulek" name="Undershirt" />
</menu>
- <menu_item_call label="Teleportuj" name="Landmark Open"/>
- <menu_item_call label="Otwórz" name="Animation Open"/>
- <menu_item_call label="Otwórz" name="Sound Open"/>
- <menu_item_call label="Zmień strój" name="Replace Outfit"/>
- <menu_item_call label="Dodaj do stroju" name="Add To Outfit"/>
- <menu_item_call label="Usuń obiekt" name="Purge Item"/>
- <menu_item_call label="Przywróć obiekt" name="Restore Item"/>
- <menu_item_call label="Otwórz" name="Open"/>
- <menu_item_call label="Otwórz oryginalne" name="Open Original"/>
- <menu_item_call label="Właściwości" name="Properties"/>
- <menu_item_call label="Zmień nazwę" name="Rename"/>
- <menu_item_call label="Kopiuj dane UUID" name="Copy Asset UUID"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
- <menu_item_call label="Wklej" name="Paste"/>
- <menu_item_call label="Wklej jako link" name="Paste As Link"/>
- <menu_item_call label="Usuń" name="Remove Link"/>
- <menu_item_call label="Usuń" name="Delete"/>
- <menu_item_call label="Skasuj folder systemu" name="Delete System Folder"/>
- <menu_item_call label="Rozpocznij konferencjÄ™ czatowÄ…" name="Conference Chat Folder"/>
- <menu_item_call label="Odtwarzaj" name="Sound Play"/>
- <menu_item_call label="O Miejscu" name="About Landmark"/>
- <menu_item_call label="Używaj in-world" name="Animation Play"/>
- <menu_item_call label="Odtwarzaj lokalnie" name="Animation Audition"/>
- <menu_item_call label="Wyślij IM" name="Send Instant Message"/>
- <menu_item_call label="Teleportuj..." name="Offer Teleport..."/>
- <menu_item_call label="Rozpocznij konferencjÄ™ czatowÄ…" name="Conference Chat"/>
- <menu_item_call label="Aktywuj" name="Activate"/>
- <menu_item_call label="Deaktywuj" name="Deactivate"/>
- <menu_item_call label="Zapisz jako" name="Save As"/>
- <menu_item_call label="Odłącz od siebie" name="Detach From Yourself"/>
- <menu_item_call label="Załóż" name="Wearable And Object Wear"/>
- <menu label="Dołącz do" name="Attach To"/>
- <menu label="Dołącz do załączników HUD" name="Attach To HUD"/>
- <menu_item_call label="Edytuj" name="Wearable Edit"/>
- <menu_item_call label="Dodaj" name="Wearable Add"/>
- <menu_item_call label="Zdejmij" name="Take Off"/>
- <menu_item_call label="Kopiuj do przedmiotów Marketplace" name="Marketplace Copy"/>
- <menu_item_call label="Przenieś do przedmiotów Marketplace" name="Marketplace Move"/>
- <menu_item_call label="--brak opcji--" name="--no options--"/>
+ <menu_item_call label="Teleportuj" name="Landmark Open" />
+ <menu_item_call label="Odtwórz" name="Animation Open" />
+ <menu_item_call label="Odtwórz" name="Sound Open" />
+ <menu_item_call label="Zastąp strój" name="Replace Outfit" />
+ <menu_item_call label="Dodaj do stroju" name="Add To Outfit" />
+ <menu_item_call label="Usuń ze stroju" name="Remove From Outfit" />
+ <menu_item_call label="Znajdź oryginał" name="Find Original" />
+ <menu_item_call label="Usuń obiekt" name="Purge Item" />
+ <menu_item_call label="Przywróć obiekt" name="Restore Item" />
+ <menu_item_call label="Otwórz" name="Open" />
+ <menu_item_call label="Otwórz oryginał" name="Open Original" />
+ <menu_item_call label="Właściwości" name="Properties" />
+ <menu_item_call label="Zmień nazwę" name="Rename" />
+ <menu_item_call label="Kopiuj identyfikator UUID" name="Copy Asset UUID" />
+ <menu_item_call label="Wytnij" name="Cut" />
+ <menu_item_call label="Kopiuj" name="Copy" />
+ <menu_item_call label="Wklej" name="Paste" />
+ <menu_item_call label="Wklej jako link" name="Paste As Link" />
+ <menu_item_call label="Usuń ten link" name="Remove Link" />
+ <menu_item_call label="Usuń" name="Delete" />
+ <menu_item_call label="Usuń folder systemowy" name="Delete System Folder" />
+ <menu_item_call label="Rozpocznij konferencjÄ™ czatowÄ…" name="Conference Chat Folder" />
+ <menu_item_call label="Odtwarzaj" name="Sound Play" />
+ <menu_item_call label="Kopiuj SLurl" name="url_copy" />
+ <menu_item_call label="O miejscu" name="About Landmark" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Odtwórz publicznie" name="Animation Play" />
+ <menu_item_call label="Odtwórz prywatnie" name="Animation Audition" />
+ <menu_item_call label="Wyślij wiadomość IM" name="Send Instant Message" />
+ <menu_item_call label="Proponuj teleport..." name="Offer Teleport..." />
+ <menu_item_call label="PoproÅ› o teleport..." name="Request Teleport..." />
+ <menu_item_call label="Rozpocznij konferencjÄ™ czatowÄ…" name="Conference Chat" />
+ <menu_item_call label="Aktywuj" name="Activate" />
+ <menu_item_call label="Deaktywuj" name="Deactivate" />
+ <menu_item_call label="Zapisz jako" name="Save As" />
+ <menu_item_call label="Odłącz od siebie" name="Detach From Yourself" />
+ <menu_item_call label="Przywróć na ostatnią pozycję" name="Restore to Last Position" />
+ <menu_item_call label="Załóż" name="Wearable And Object Wear" />
+ <menu label="Dołącz do" name="Attach To" />
+ <menu label="Dołącz do HUD-a" name="Attach To HUD" />
+ <menu_item_call label="Edytuj" name="Wearable Edit" />
+ <menu_item_call label="Dodaj/dołącz" name="Wearable Add" />
+ <menu_item_call label="Zdejmij" name="Take Off" />
+ <menu_item_call label="Kopiuj do Skrzynki Kupca" name="Merchant Copy" />
+ <menu_item_call label="Wyślij na Marketplace" name="Marketplace Send" />
+ <menu_item_call label="--brak opcji--" name="--no options--" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
old mode 100755
new mode 100644
index 04f9b94f7ca46f1d9cbf506d4ae2759d895c47c6..5b5c1351e8a06fd313bbc66143c5d6cc99c0c7d3
--- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_inventory_add">
<menu label="Załaduj" name="upload">
- <menu_item_call label="obraz (L$[COST])..." name="Upload Image"/>
- <menu_item_call label="dźwięk (L$[COST])..." name="Upload Sound"/>
- <menu_item_call label="animacjÄ™ (L$[COST])..." name="Upload Animation"/>
- <menu_item_call label="zbiór plików (L$[COST] za jeden plik)..." name="Bulk Upload"/>
- <menu_item_call label="Ustaw domyślne pozwolenia ładowania" name="perm prefs"/>
+ <menu_item_call label="TeksturÄ™ (L$[COST])..." name="Upload Image" />
+ <menu_item_call label="Dźwięk (L$[COST])..." name="Upload Sound" />
+ <menu_item_call label="AnimacjÄ™ (L$[COST])..." name="Upload Animation" />
+ <menu_item_call label="Model meszowy..." name="Upload Model" />
+ <menu_item_call label="Zbiór wielu plików ([COST]L$ za plik)..." name="Bulk Upload" />
</menu>
- <menu_item_call label="Nowy folder" name="New Folder"/>
- <menu_item_call label="Nowy skrypt" name="New Script"/>
- <menu_item_call label="Nowa nota" name="New Note"/>
- <menu_item_call label="Nowa gesturka" name="New Gesture"/>
- <menu label="Nowe Ubranie" name="New Clothes">
- <menu_item_call label="Nowa koszula" name="New Shirt"/>
- <menu_item_call label="Nowe spodnie" name="New Pants"/>
- <menu_item_call label="Nowe buty" name="New Shoes"/>
- <menu_item_call label="Nowe skarpetki" name="New Socks"/>
- <menu_item_call label="Nowa kurtka" name="New Jacket"/>
- <menu_item_call label="Nowa spódnica" name="New Skirt"/>
- <menu_item_call label="Nowe rękawiczki" name="New Gloves"/>
- <menu_item_call label="Nowy podkoszulek" name="New Undershirt"/>
- <menu_item_call label="Nowa bielizna" name="New Underpants"/>
- <menu_item_call label="Nowa maska alpha" name="New Alpha"/>
- <menu_item_call label="Nowy tatuaż" name="New Tattoo"/>
- <menu_item_call label="Nowa fizyka" name="New Physics"/>
+ <menu_item_call label="Nowy folder" name="New Folder" />
+ <menu_item_call label="Nowy skrypt" name="New Script" />
+ <menu_item_call label="Nowa nota" name="New Note" />
+ <menu_item_call label="Nowy gest" name="New Gesture" />
+ <menu label="Nowe ubranie" name="New Clothes">
+ <menu_item_call label="Nowa koszula" name="New Shirt" />
+ <menu_item_call label="Nowe spodnie" name="New Pants" />
+ <menu_item_call label="Nowe buty" name="New Shoes" />
+ <menu_item_call label="Nowe skarpety" name="New Socks" />
+ <menu_item_call label="Nowa kurtka" name="New Jacket" />
+ <menu_item_call label="Nowa spódnica" name="New Skirt" />
+ <menu_item_call label="Nowe rękawiczki" name="New Gloves" />
+ <menu_item_call label="Nowy podkoszulek" name="New Undershirt" />
+ <menu_item_call label="Nowa bielizna" name="New Underpants" />
+ <menu_item_call label="Nowa warstwa alpha" name="New Alpha" />
+ <menu_item_call label="Nowy tatuaż" name="New Tattoo" />
+ <menu_item_call label="Nowa fizyka" name="New Physics" />
</menu>
- <menu label="Nowa Część Ciała" name="New Body Parts">
- <menu_item_call label="Nowy kształt" name="New Shape"/>
- <menu_item_call label="Nowa skórka" name="New Skin"/>
- <menu_item_call label="Nowe włosy" name="New Hair"/>
- <menu_item_call label="Nowe oczy" name="New Eyes"/>
+ <menu label="Nowa część ciała" name="New Body Parts">
+ <menu_item_call label="Nowy kształt" name="New Shape" />
+ <menu_item_call label="Nowa skórka" name="New Skin" />
+ <menu_item_call label="Nowe włosy" name="New Hair" />
+ <menu_item_call label="Nowe oczy" name="New Eyes" />
</menu>
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
index 591c3a81d5f3d563c2c5b05179151130f4632efe..a0b5545f18ec06b870b98c67e2b7397cfc667e0e
--- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="menu_gear_default">
- <menu_item_call label="Nowe okno Szafy" name="new_window"/>
- <menu_item_check label="Porządkuj według nazwy" name="sort_by_name"/>
- <menu_item_check label="Porządkuj według daty" name="sort_by_recent"/>
- <menu_item_check label="Sortuj foldery zawsze według nazwy" name="sort_folders_by_name"/>
- <menu_item_check label="Posortuj foldery systemowe od góry" name="sort_system_folders_to_top"/>
- <menu_item_call label="Pokaż filtry" name="show_filters"/>
- <menu_item_call label="Zresetuj filtry" name="reset_filters"/>
- <menu_item_call label="Zamknij wszystkie foldery" name="close_folders"/>
- <menu_item_call label="Opróżnij Zagubione i odnalezione" name="empty_lostnfound"/>
- <menu_item_call label="Zapisz teksturÄ™ jako" name="Save Texture As"/>
- <menu_item_call label="Udostępnij" name="Share"/>
- <menu_item_call label="Znajdź oryginał" name="Find Original"/>
- <menu_item_call label="Znajdź wszystkie linki" name="Find All Links"/>
- <menu_item_call label="Opróżnij Kosz" name="empty_trash"/>
+ <menu_item_call label="Nowe okno Szafy" name="new_window" />
+ <menu_item_check label="Porządkuj według nazw" name="sort_by_name" />
+ <menu_item_check label="Porządkuj według dat" name="sort_by_recent" />
+ <menu_item_check label="Sortuj foldery zawsze wg. nazwy" name="sort_folders_by_name" />
+ <menu_item_check label="Sortuj foldery systemowe od góry" name="sort_system_folders_to_top" />
+ <menu_item_call label="Pokaż filtry..." name="show_filters" />
+ <menu_item_call label="Zresetuj filtry" name="reset_filters" />
+ <menu_item_call label="Zamknij wszystkie foldery" name="close_folders" />
+ <menu_item_call label="Opróżnij Zagubione i odnalezione" name="empty_lostnfound" />
+ <menu_item_call label="Zapisz teksturÄ™ jako" name="Save Texture As" />
+ <menu_item_call label="Udostępnij" name="Share" />
+ <menu_item_call label="Znajdź oryginał" name="Find Original" />
+ <menu_item_call label="Znajdź wszystkie linki" name="Find All Links" />
+ <menu_item_call label="Opróżnij Kosz" name="empty_trash" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_land.xml b/indra/newview/skins/default/xui/pl/menu_land.xml
old mode 100755
new mode 100644
index cbfecaee56855bd8427660cbad9a8869f54a3ea2..25e2de889688f9c4e195e25b17ba7df2c9e44739
--- a/indra/newview/skins/default/xui/pl/menu_land.xml
+++ b/indra/newview/skins/default/xui/pl/menu_land.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Land Pie">
- <menu_item_call label="O Posiadłości" name="Place Information..."/>
- <menu_item_call label="Usiądź tutaj" name="Sit Here"/>
- <menu_item_call label="Kup posiadłość" name="Land Buy"/>
- <menu_item_call label="Kup przepustkÄ™" name="Land Buy Pass"/>
- <menu_item_call label="Buduj" name="Create"/>
- <menu_item_call label="Edytuj teren" name="Edit Terrain"/>
+ <menu_item_call label="O działce" name="Place Information..." />
+ <menu_item_call label="Podejdź tutaj" name="Go Here" />
+ <menu_item_call label="Usiądź tutaj" name="Sit Here" />
+ <menu_item_call label="Kup działkę" name="Land Buy" />
+ <menu_item_call label="Kup przepustkÄ™" name="Land Buy Pass" />
+ <menu_item_call label="Buduj" name="Create" />
+ <menu_item_call label="Edytuj teren" name="Edit Terrain" />
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_landmark.xml b/indra/newview/skins/default/xui/pl/menu_landmark.xml
old mode 100755
new mode 100644
index aa5808390c4d7a3a6c1ba7e475b6b383782da4d0..5f08d345083a777f1361353fdf4d5485e75ec60c
--- a/indra/newview/skins/default/xui/pl/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/pl/menu_landmark.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="landmark_overflow_menu">
- <menu_item_call label="Kopiuj SLurl" name="copy"/>
- <menu_item_call label="Usuń" name="delete"/>
- <menu_item_call label="Utwórz" name="pick"/>
- <menu_item_call label="Dodaj do paska Ulubionych" name="add_to_favbar"/>
+ <menu_item_call label="Kopiuj SLurl" name="copy" />
+ <menu_item_call label="Usuń" name="delete" />
+ <menu_item_call label="Utwórz" name="pick" />
+ <menu_item_call label="Dodaj do paska Ulubionych" name="add_to_favbar" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
old mode 100755
new mode 100644
index e50b69464119b2f3b2b020f5af4b6422adbdfbdf..069f6fc08f120ce481bda22b7e2a049595cc1a6c
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -1,24 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu_bar name="Login Menu">
<menu label="Ja" name="File">
- <menu_item_call label="Ustawienia" name="Preferences..."/>
- <menu_item_call label="Wyłącz [APP_NAME]" name="Quit"/>
+ <menu_item_call label="Preferencje..." name="Preferences..." />
+ <menu_item_call label="Wyłącz [APP_NAME]" name="Quit" />
</menu>
<menu label="Pomoc" name="Help">
- <menu_item_call label="[SECOND_LIFE]: Pomoc" name="Second Life Help"/>
- <menu_item_call label="O [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Samouczek..." name="How To" />
+ <menu_item_call label="Szybki start" name="Quickstart" />
+ <menu_item_call label="Baza wiedzy" name="Knowledge Base" />
+ <menu_item_call label="Wiki informacyjna" name="Wiki" />
+ <menu_item_call label="Forum społecznościowe" name="Community Forums" />
+ <menu_item_call label="Portal wsparcia" name="Support portal" />
+ <menu_item_call label="Newsy [SECOND_LIFE]" name="Second Life News" />
+ <menu_item_call label="Blogi [SECOND_LIFE]" name="Second Life Blogs" />
+ <menu_item_call label="Zgłoś błędy" name="Report Bug" />
+ <menu_item_call label="Informacje o [APP_NAME]" name="About Second Life" />
</menu>
- <menu_item_check label="Pokaż ustawienia debugowania" name="Show Debug Menu"/>
- <menu label="Debug" name="Debug">
- <menu_item_call label="Ustawienia debugowania" name="Debug Settings"/>
- <menu_item_call label="Ustawienia UI/kolor" name="UI/Color Settings"/>
- <menu label="UI Testy" name="UI Tests"/>
- <menu_item_call label="Ustaw rozmiar interfejsu..." name="Set Window Size..."/>
- <menu_item_call label="Wyświetl TOS" name="TOS"/>
- <menu_item_call label="Wyświetl wiadomość krytyczną" name="Critical"/>
- <menu_item_call label="Test przeglądarki mediów" name="Web Browser Test"/>
- <menu_item_call label="Test zawartości strony" name="Web Content Floater Test"/>
- <menu_item_check label="Pokaż siatkę" name="Show Grid Picker"/>
- <menu_item_call label="Pokaż konsolę Zawiadomień" name="Show Notifications Console"/>
+ <menu_item_check label="Pokaż menu debugowania" name="Show Debug Menu" />
+ <menu label="Debugowanie" name="Debug">
+ <menu_item_call label="Pokaż ustawienia debugowania" name="Debug Settings" />
+ <menu_item_call label="Ustawienia kolorów/interfejsu" name="UI/Color Settings" />
+ <menu_item_call label="Narzędzie podglądu XUI" name="UI Preview Tool" />
+ <menu label="Testy interfejsu" name="UI Tests" />
+ <menu_item_call label="Ustaw rozmiar okna..." name="Set Window Size..." />
+ <menu_item_call label="Pokaż warunki użytkowania" name="TOS" />
+ <menu_item_call label="Pokaż wiadomość krytyczną" name="Critical" />
+ <menu_item_call label="Test debugowania okienka sieciowego" name="Web Content Floater Debug Test" />
+ <menu label="Ustaw poziom logowania" name="Set Logging Level">
+ <menu_item_check name="Debug" label="Debugowanie" />
+ <menu_item_check name="Info" label="Informacje" />
+ <menu_item_check name="Warning" label="Ostrzeżenia" />
+ <menu_item_check name="Error" label="Błędy" />
+ <menu_item_check name="None" label="Brak" />
+ </menu>
+ <menu_item_check label="Pokaż wybór siatki" name="Show Grid Picker" />
+ <menu_item_call label="Pokaż konsolę powiadomień" name="Show Notifications Console" />
</menu>
</menu_bar>
diff --git a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
old mode 100755
new mode 100644
index 60dc3673a949593a3651e30864a1e96a4a9daad2..5fb89a9816f9ba69277713c01f54c7a39a78c3b4
--- a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="media ctrl context menu">
- <menu_item_call label="Wytnij" name="Cut"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
- <menu_item_call label="Wklej" name="Paste"/>
+ <menu_item_call label="Wytnij" name="Cut" />
+ <menu_item_call label="Kopiuj" name="Copy" />
+ <menu_item_call label="Wklej" name="Paste" />
+ <menu_item_call label="Otwórz Web Inspector" name="open_webinspector" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
old mode 100755
new mode 100644
index 8f869654165d268d4c23e4ed73383f0473b47979..5f5a6f9e19894708650db96e4d854de521815331
--- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Popup">
- <menu_item_call label="Zoom blisko" name="Zoom Close"/>
- <menu_item_call label="Zoom średnio" name="Zoom Medium"/>
- <menu_item_call label="Zoom daleko" name="Zoom Far"/>
- <menu_item_call label="Zoom domyślny" name="Zoom Default"/>
- <menu_item_check label="Obróć mapę" name="Rotate Map"/>
- <menu_item_check label="Autocentrowanie" name="Auto Center"/>
- <menu_item_call label="Zatrzymaj" name="Stop Tracking"/>
- <menu_item_call label="Mapa Åšwiata" name="World Map"/>
+ <menu_item_call label="Powiększenie: Duże" name="Zoom Close" />
+ <menu_item_call label="Powiększenie: Średnie" name="Zoom Medium" />
+ <menu_item_call label="Powiększenie: Małe" name="Zoom Far" />
+ <menu_item_call label="Powiększenie: Domyślne" name="Zoom Default" />
+ <menu_item_check label="Obracaj mapÄ™" name="Rotate Map" />
+ <menu_item_check label="Autocentrowanie" name="Auto Center" />
+ <menu_item_call label="Przestań śledzić" name="Stop Tracking" />
+ <menu_item_call label="Mapa świata" name="World Map" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000000000000000000000000000000000..37097df2aaa1300e060431fad3888fec0411c7ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="model_menu_gear_default">
+ <menu_item_check label="Pokaż krawędzie" name="show_edges" />
+ <menu_item_check label="Pokaż fizykę" name="show_physics" />
+ <menu_item_check label="Pokaż tekstury" name="show_textures" />
+ <menu_item_check label="Pokaż ciężar skórki" name="show_skin_weight" />
+ <menu_item_check label="Pokaż punkty łączenia" name="show_joint_positions" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_mute_particle.xml b/indra/newview/skins/default/xui/pl/menu_mute_particle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..98ac5c3a6d8f58d47e070fb543b2388e9e373169
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_mute_particle.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml
old mode 100755
new mode 100644
index 1d434670eeea01435f615e6c5f3c2b819cdca8a4..ebca8e7d155741a6e5ce67b0113dfe5a46611c38
--- a/indra/newview/skins/default/xui/pl/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_navbar.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Navbar Menu">
- <menu_item_check label="Pokaż współrzędne" name="Show Coordinates"/>
- <menu_item_check label="Pokaż właściwości posiadłości" name="Show Parcel Properties"/>
- <menu_item_call label="Landmark" name="Landmark"/>
- <menu_item_call label="Wytnij" name="Cut"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
- <menu_item_call label="Wklej" name="Paste"/>
- <menu_item_call label="Usuń" name="Delete"/>
- <menu_item_call label="Zaznacz wszystko" name="Select All"/>
+ <menu_item_check label="Pokaż współrzędne" name="Show Coordinates" />
+ <menu_item_check label="Pokaż właściwości działki" name="Show Parcel Properties" />
+ <menu_item_call label="Wytnij" name="Cut" />
+ <menu_item_call label="Kopiuj" name="Copy" />
+ <menu_item_call label="Wklej" name="Paste" />
+ <menu_item_call label="Usuń" name="Delete" />
+ <menu_item_call label="Zaznacz wszystko" name="Select All" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
old mode 100755
new mode 100644
index fe5bc6ba6f39a545357459212609220118016daf..d83d2a6f76391e564c9ad666d5d1693b654d72a1
--- a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="NearBy Chat Menu">
- <menu_item_call label="Pokaż osoby w pobliżu..." name="nearby_people"/>
- <menu_item_check label="Pokaż zablokowany tekst" name="muted_text"/>
- <menu_item_check label="Wyświetlaj ikonki znajomych" name="show_buddy_icons"/>
- <menu_item_check label="Wyświetlaj imiona" name="show_names"/>
- <menu_item_check label="Wyświetlaj ikonki i imiona" name="show_icons_and_names"/>
- <menu_item_call label="Rozmiar czcionki" name="font_size"/>
+ <menu_item_call label="Pokaż osoby w pobliżu..." name="nearby_people" />
+ <menu_item_check label="Pokaż zablokowany tekst" name="muted_text" />
+ <menu_item_check label="Wyświetlaj ikonki znajomych" name="show_buddy_icons" />
+ <menu_item_check label="Wyświetlaj imiona" name="show_names" />
+ <menu_item_check label="Wyświetlaj ikonki i imiona" name="show_icons_and_names" />
+ <menu_item_call label="Rozmiar czcionki" name="font_size" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
old mode 100755
new mode 100644
index bd3d42f9b1facfeef347dcd3aeaaf36cbac0423e..9460104a43956066bac44068a02aab68e31c648e
--- a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Notification Well Button Context Menu">
- <menu_item_call label="Zamknij" name="Close All"/>
+ <menu_item_call label="Zamknij wszystko" name="Close All" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
old mode 100755
new mode 100644
index 3da6c5c8905b6b43975dfe532900bd11b7e4355a..dd2a4edf589566645b81c8a689e3f1498e159ef1
--- a/indra/newview/skins/default/xui/pl/menu_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object.xml
@@ -1,29 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Object Pie">
<menu_item_call label="Dotknij" name="Object Touch">
<menu_item_call.on_enable name="EnableTouch" parameter="Dotknij"/>
</menu_item_call>
- <menu_item_call label="Edytuj" name="Edit..."/>
- <menu_item_call label="Buduj" name="Build"/>
- <menu_item_call label="Otwórz" name="Open"/>
- <menu_item_call label="Usiądź tutaj" name="Object Sit"/>
- <menu_item_call label="Wstań" name="Object Stand Up"/>
- <menu_item_call label="Sprawdź" name="Object Inspect"/>
- <menu_item_call label="Przybliż" name="Zoom In"/>
- <context_menu label="Załóż na" name="Put On">
- <menu_item_call label="Załóż" name="Wear"/>
- <menu_item_call label="Dodaj" name="Add"/>
- <context_menu label="Dołącz" name="Object Attach"/>
- <context_menu label="Dołącz HUD" name="Object Attach HUD"/>
+ <menu_item_call label="Edytuj" name="Edit..." />
+ <menu_item_call label="Buduj" name="Build" />
+ <menu_item_call label="Otwórz" name="Open" />
+ <menu_item_call label="Usiądź tutaj" name="Object Sit" />
+ <menu_item_call label="Wstań" name="Object Stand Up" />
+ <menu_item_call label="Profil obiektu" name="Object Inspect" />
+ <menu_item_call label="Przybliż" name="Zoom In" />
+ <menu_item_call label="Ścieżki: w zbiorach części" name="show_in_linksets" />
+ <menu_item_call label="Ścieżki: w postaciach" name="show_in_characters" />
+ <context_menu label="Ubierz" name="Put On">
+ <menu_item_call label="Załóż" name="Wear" />
+ <menu_item_call label="Dodaj" name="Add" />
+ <context_menu label="Dołącz" name="Object Attach" />
+ <context_menu label="Dołącz HUD" name="Object Attach HUD" />
</context_menu>
- <context_menu label="ZarzÄ…dzaj" name="Remove">
- <menu_item_call label="Raport" name="Report Abuse..."/>
- <menu_item_call label="Zablokuj" name="Object Mute"/>
- <menu_item_call label="Zwróć" name="Return..."/>
+ <context_menu label="Irytacja?" name="Remove">
+ <menu_item_call label="Zgłoś nadużycie" name="Report Abuse..." />
+ <menu_item_call label="Zablokuj/wycisz" name="Object Mute" />
+ <menu_item_call label="Odblokuj" name="Object Unmute" />
+ <menu_item_call label="Zwróć" name="Return..." />
</context_menu>
- <menu_item_call label="Weź" name="Pie Object Take"/>
- <menu_item_call label="Weź kopię" name="Take Copy"/>
- <menu_item_call label="Zapłać" name="Pay..."/>
- <menu_item_call label="Kup" name="Buy..."/>
- <menu_item_call label="Skasuj" name="Delete"/>
+ <menu_item_call label="Weź" name="Pie Object Take" />
+ <menu_item_call label="Weź kopię" name="Take Copy" />
+ <menu_item_call label="Zapłać" name="Pay..." />
+ <menu_item_call label="Kup" name="Buy..." />
+ <menu_item_call label="Skasuj" name="Delete" />
+ <menu_item_call label="Blokuj właściciela cząsteczek" name="Mute Particle" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_object_icon.xml b/indra/newview/skins/default/xui/pl/menu_object_icon.xml
old mode 100755
new mode 100644
index b499bca2dbfbd32c18c98b859dd4315d6348ba1f..44caaf155e0f2278faf52c1f83bf319ed234369f
--- a/indra/newview/skins/default/xui/pl/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object_icon.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Object Icon Menu">
- <menu_item_call label="Sprawdź..." name="Object Profile"/>
- <menu_item_call label="Zablokuj..." name="Block"/>
+ <menu_item_call label="Profil obiektu..." name="Object Profile" />
+ <menu_item_call label="Zablokuj..." name="Block" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Teleportuj do pozycji obiektu" name="teleport_to_object" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
old mode 100755
new mode 100644
index c093557e861f0f7d1db2c6c3ed03396aadcefafd..6a603487569d66f4b2ad6122d4c0b9a1ca9a3f77
--- a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="Gear Outfit">
- <menu_item_call label="Załóż - Zastąp obecny strój" name="wear"/>
- <menu_item_call label="Załóż - Dodaj do bieżącego stroju" name="wear_add"/>
- <menu_item_call label="Zdejmij - Usuń z obecnego stroju" name="take_off"/>
+ <menu_item_call label="Załóż - Zastąp obecny strój" name="wear" />
+ <menu_item_call label="Załóż - Dodaj do bieżącego stroju" name="wear_add" />
+ <menu_item_call label="Zdejmij - Usuń z obecnego stroju" name="take_off" />
<menu label="Nowe ubranie" name="New Clothes">
- <menu_item_call label="Nowa koszula" name="New Shirt"/>
- <menu_item_call label="Nowe spodnie" name="New Pants"/>
- <menu_item_call label="Nowe buty" name="New Shoes"/>
- <menu_item_call label="Nowe skarpetki" name="New Socks"/>
- <menu_item_call label="Nowa kurtka" name="New Jacket"/>
- <menu_item_call label="Nowa spódnica" name="New Skirt"/>
- <menu_item_call label="Nowe rękawiczki" name="New Gloves"/>
- <menu_item_call label="Nowa podkoszulka" name="New Undershirt"/>
- <menu_item_call label="Nowa bielizna" name="New Underpants"/>
- <menu_item_call label="Nowa maska alpha" name="New Alpha"/>
- <menu_item_call label="Nowa fizyka" name="New Physics"/>
- <menu_item_call label="Nowy tatuaż" name="New Tattoo"/>
+ <menu_item_call label="Nowa koszula" name="New Shirt" />
+ <menu_item_call label="Nowe spodnie" name="New Pants" />
+ <menu_item_call label="Nowe buty" name="New Shoes" />
+ <menu_item_call label="Nowe skarpetki" name="New Socks" />
+ <menu_item_call label="Nowa kurtka" name="New Jacket" />
+ <menu_item_call label="Nowa spódnica" name="New Skirt" />
+ <menu_item_call label="Nowe rękawiczki" name="New Gloves" />
+ <menu_item_call label="Nowy podkoszulek" name="New Undershirt" />
+ <menu_item_call label="Nowa bielizna" name="New Underpants" />
+ <menu_item_call label="Nowa warstwa alpha" name="New Alpha" />
+ <menu_item_call label="Nowa fizyka" name="New Physics" />
+ <menu_item_call label="Nowy tatuaż" name="New Tattoo" />
</menu>
<menu label="Nowe części ciała" name="New Body Parts">
- <menu_item_call label="Nowy kształt" name="New Shape"/>
- <menu_item_call label="Nowa skórka" name="New Skin"/>
- <menu_item_call label="Nowe włosy" name="New Hair"/>
- <menu_item_call label="Nowe oczy" name="New Eyes"/>
+ <menu_item_call label="Nowy kształt" name="New Shape" />
+ <menu_item_call label="Nowa skórka" name="New Skin" />
+ <menu_item_call label="Nowe włosy" name="New Hair" />
+ <menu_item_call label="Nowe oczy" name="New Eyes" />
</menu>
- <menu_item_call label="Zmień nazwę stroju" name="rename"/>
- <menu_item_call label="Usuń strój" name="delete_outfit"/>
+ <menu_item_call label="Rozwiń wszystkie foldery" name="expand" />
+ <menu_item_call label="Zwiń wszystkie foldery" name="collapse" />
+ <menu_item_call label="Zmień nazwę stroju" name="rename" />
+ <menu_item_call label="Usuń strój" name="delete_outfit" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
old mode 100755
new mode 100644
index 998e25f38ee12d50260a79628df0732c6a0178d9..e7a02f5fa2bd53923d7699f82c0710987189fc4e
--- a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Outfit">
- <menu_item_call label="Załóż - Zastąp obecny strój" name="wear_replace"/>
- <menu_item_call label="Załóż - Dodaj do obecnego stroju" name="wear_add"/>
- <menu_item_call label="Zdejmij - Usuń z obecnego stroju" name="take_off"/>
- <menu_item_call label="Edytuj strój" name="edit"/>
- <menu_item_call label="Zmień nazwę stroju" name="rename"/>
- <menu_item_call label="Usuń strój" name="delete"/>
+ <menu_item_call label="Załóż - Zastąp obecny strój" name="wear_replace" />
+ <menu_item_call label="Załóż - Dodaj do obecnego stroju" name="wear_add" />
+ <menu_item_call label="Zdejmij - Usuń z obecnego stroju" name="take_off" />
+ <menu_item_call label="Edytuj strój" name="edit" />
+ <menu_item_call label="Zmień nazwę stroju" name="rename" />
+ <menu_item_call label="Usuń strój" name="delete" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
old mode 100755
new mode 100644
index 9e591027887e7654c2e7c3ea37c6aad2c10f3256..cc9e9b731131f2e0956641b5f45f8ac580044b2b
--- a/indra/newview/skins/default/xui/pl/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Participant List Context Menu">
- <menu_item_check label="Sortuj według imienia" name="SortByName"/>
- <menu_item_check label="Sortuj według ostatniego mówcy" name="SortByRecentSpeakers"/>
- <menu_item_call label="Zobacz profil" name="View Profile"/>
- <menu_item_call label="Dodaj znajomość" name="Add Friend"/>
- <menu_item_call label="IM" name="IM"/>
- <menu_item_call label="Zadzwoń" name="Call"/>
- <menu_item_call label="Udostępnij" name="Share"/>
- <menu_item_call label="Zapłać" name="Pay"/>
- <menu_item_check label="PrzeglÄ…daj ikonki" name="View Icons"/>
- <menu_item_check label="Zablokuj głos" name="Block/Unblock"/>
- <menu_item_check label="Zablokuj tekst" name="MuteText"/>
+ <menu_item_check label="Sortuj według imienia" name="SortByName" />
+ <menu_item_check label="Sortuj według ostatniego mówcy" name="SortByRecentSpeakers" />
+ <menu_item_call label="Zobacz profil" name="View Profile" />
+ <menu_item_call label="Nowy znajomy" name="Add Friend" />
+ <menu_item_call label="Wiadomość IM" name="IM" />
+ <menu_item_call label="Zadzwoń" name="Call" />
+ <menu_item_call label="Udostępnij" name="Share" />
+ <menu_item_call label="Zapłać" name="Pay" />
+ <menu_item_check label="Pokazuj ikonki" name="View Icons" />
+ <menu_item_check label="Zablokuj głos" name="Block/Unblock" />
+ <menu_item_check label="Zablokuj tekst" name="MuteText" />
<context_menu label="Opcje Moderatora" name="Moderator Options">
- <menu_item_check label="Czat/IM dozwolony" name="AllowTextChat"/>
- <menu_item_call label="Wycisz tego uczestnika" name="ModerateVoiceMuteSelected"/>
- <menu_item_call label="Odblokuj wyciszenie tego uczestnika" name="ModerateVoiceUnMuteSelected"/>
- <menu_item_call label="Wycisz wszystkich" name="ModerateVoiceMute"/>
- <menu_item_call label="Cofnij wyciszenie wszystkim" name="ModerateVoiceUnmute"/>
+ <menu_item_check label="Czat tekstowy dozwolony" name="AllowTextChat" />
+ <menu_item_call label="Wycisz tego uczestnika" name="ModerateVoiceMuteSelected" />
+ <menu_item_call label="Cofnij wyciszenie tego uczestnika" name="ModerateVoiceUnMuteSelected" />
+ <menu_item_call label="Wycisz wszystkich" name="ModerateVoiceMute" />
+ <menu_item_call label="Cofnij wyciszenie wszystkich" name="ModerateVoiceUnmute" />
</context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_participant_view.xml b/indra/newview/skins/default/xui/pl/menu_participant_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5520ce75b158192da0332e3b056bff36cf5fc758
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="participant_manu_view">
+ <menu_item_check label="Sortuj rozmowy według typu" name="sort_sessions_by_type" />
+ <menu_item_check label="Sortuj rozmowy według imion" name="sort_sessions_by_name" />
+ <menu_item_check label="Sortuj rozmowy według ostatniej aktywności" name="sort_sessions_by_recent" />
+ <menu_item_check label="Sortuj rozmówców według imion" name="sort_participants_by_name" />
+ <menu_item_check label="Sortuj rozmówców według ostatniej aktywności" name="sort_participants_by_recent" />
+ <menu_item_call label="Ustawienia czatu..." name="chat_preferences" />
+ <menu_item_call label="Ustawienia prywatności..." name="privacy_preferences" />
+ <menu_item_check label="Dziennik rozmów..." name="Conversation" />
+ <menu_item_check name="Translate_chat" label="TÅ‚umacz czat lokalny" />
+ <menu_item_check name="Translation_settings" label="Ustawienia tłumaczenia..." />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pl/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ece4a51db9b42ac862eff6326a1018d8c1fd5457
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_blocked_gear">
+ <menu_item_call label="Odblokuj" name="unblock" />
+ <menu_item_call label="Profil..." name="profile" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pl/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..38acdd1152c1c65f50c8c4c92465b407c7f29f87
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_blocked_plus">
+ <menu_item_call label="Blokuj Rezydenta według imienia..." name="block_resident_by_name" />
+ <menu_item_call label="Blokuj obiekt według nazwy..." name="block_object_by_name" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pl/menu_people_blocked_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89f31d88aafac235392ad1700a262f8ec64a082c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_blocked_view">
+ <menu_item_check label="Sortuj według nazw" name="sort_by_name" />
+ <menu_item_check label="Sortuj według typu" name="sort_by_type" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8a60e83ae895c712f262b60a0add757f773473ab
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="Sortuj według imion" name="sort_name" />
+ <menu_item_check label="Sortuj według statusu" name="sort_status" />
+ <menu_item_check name="view_icons" label="Pokazuj ikonki" />
+ <menu_item_check name="view_permissions" label="Pokazuj zezwolenia" />
+ <menu_item_check name="view_conversation" label="Pokaż dziennik rozmów..." />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
deleted file mode 100755
index b62b85d30a4f8659e8afa4e6b8d1a5955f36c466..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
- <menu_item_check label="Porządkuj według nazwy" name="sort_name"/>
- <menu_item_check label="Porządkuj według statusu" name="sort_status"/>
- <menu_item_check label="Wyświetlaj ikonki" name="view_icons"/>
- <menu_item_check label="Zobacz udzielone prawa" name="view_permissions"/>
- <menu_item_call label="Pokaż zablokowanych Rezydentów & obiekty" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups.xml b/indra/newview/skins/default/xui/pl/menu_people_groups.xml
old mode 100755
new mode 100644
index ace5ebf888464b9c1aab41dd8797c22feaeb7301..5a4292af569fc39352986573dc3137c0b05a1592
--- a/indra/newview/skins/default/xui/pl/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_groups.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
- <menu_item_call label="Zobacz info" name="View Info"/>
- <menu_item_call label="Czat" name="Chat"/>
- <menu_item_call label="Rozmowa" name="Call"/>
- <menu_item_call label="Aktywuj" name="Activate"/>
- <menu_item_call label="Opuść" name="Leave"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_call label="Aktywuj" name="Activate" />
+ <menu_item_call label="Zobacz info" name="View Info" />
+ <menu_item_call label="Czat" name="Chat" />
+ <menu_item_call label="Rozmowa głosowa" name="Call" />
+ <menu_item_call label="Opuść" name="Leave" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..986d32f50a88e2ebe73408cabf80177cc569e9e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="Pokaż ikony grup" name="Display Group Icons" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
deleted file mode 100755
index c70ea2315f4fd8f108729ef45d76f6a71da7ad10..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
- <menu_item_check label="Wyświetlaj ikonki grupy" name="Display Group Icons"/>
- <menu_item_call label="Opuść zaznaczone grupy" name="Leave Selected Group"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
old mode 100755
new mode 100644
index a8cc6b4a60445eb63555393586764390c809574b..a57c7205661097ae392b8499253dc6532032dc1b
--- a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Avatar Context Menu">
- <menu_item_call label="Zobacz profil" name="View Profile"/>
- <menu_item_call label="Dodaj znajomość" name="Add Friend"/>
- <menu_item_call label="Usuń z listy znajomych" name="Remove Friend"/>
- <menu_item_call label="IM" name="IM"/>
- <menu_item_call label="Zadzwoń" name="Call"/>
- <menu_item_call label="Mapa" name="Map"/>
- <menu_item_call label="Udostępnij" name="Share"/>
- <menu_item_call label="Zapłać" name="Pay"/>
- <menu_item_check label="Zablokuj/Odblokuj" name="Block/Unblock"/>
- <menu_item_call label="Teleportuj" name="teleport"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu name="Nearby People Context Menu">
+ <menu_item_call label="Zobacz profil" name="view_profile" />
+ <menu_item_call label="Wiadomość IM" name="im" />
+ <menu_item_call label="Proponuj teleport" name="offer_teleport" />
+ <menu_item_call label="PoproÅ› o teleport" name="request_teleport" />
+ <menu_item_call label="Rozmowa głosowa" name="voice_call" />
+ <menu_item_call label="Pokaż logi czatu..." name="chat_history" />
+ <menu_item_call label="Dodaj do znajomych" name="add_friend" />
+ <menu_item_call label="Usuń ze znajomych" name="remove_friend" />
+ <menu_item_call label="ZaproÅ› do grupy..." name="invite_to_group" />
+ <menu_item_call label="Przybliż kamerę" name="zoom_in" />
+ <menu_item_call label="Pokaż na mapie" name="map" />
+ <menu_item_call label="Udostępnij przedmiot" name="share" />
+ <menu_item_call label="Zapłać" name="pay" />
+ <menu_item_check label="Zablokuj/Odblokuj" name="block_unblock" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
index dcfc48fb606418674cb003f172e16e5247d5964c..84e1b86cbc7a7ebbd5a7340372eb11599d41e7b8
--- a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Multi-Selected People Context Menu">
- <menu_item_call label="Dodaj znajomych" name="Add Friends"/>
- <menu_item_call label="Usuń znajomych" name="Remove Friend"/>
- <menu_item_call label="IM" name="IM"/>
- <menu_item_call label="Zadzwoń" name="Call"/>
- <menu_item_call label="Udostępnij" name="Share"/>
- <menu_item_call label="Zapłać" name="Pay"/>
- <menu_item_call label="Teleportuj" name="teleport"/>
+ <menu_item_call label="Dodaj do znajomych" name="add_friends" />
+ <menu_item_call label="Usuń ze znajomych" name="remove_friends" />
+ <menu_item_call label="Wiadomość IM" name="im" />
+ <menu_item_call label="Zadzwoń" name="call" />
+ <menu_item_call label="Udostępnij" name="share" />
+ <menu_item_call label="Zapłać" name="pay" />
+ <menu_item_call label="Proponuj teleport" name="offer_teleport" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..21adabd62edc3d18e5be9e3b8483f3fa425e7c2f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="Sortuj według ostatnich rozmówców" name="sort_by_recent_speakers" />
+ <menu_item_check label="Sortuj według imion" name="sort_name" />
+ <menu_item_check label="Sortuj według odległości" name="sort_distance" />
+ <menu_item_check name="view_icons" label="Pokazuj ikonki" />
+ <menu_item_check name="view_map" label="Pokazuj mapÄ™" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
deleted file mode 100755
index 8ec3820f84e888c5bc13ee47df866d53d55997b2..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
- <menu_item_check label="Porządkuj według ostatnich rozmówców" name="sort_by_recent_speakers"/>
- <menu_item_check label="Porządkuj według nazwy" name="sort_name"/>
- <menu_item_check label="Porządkuj według odległości" name="sort_distance"/>
- <menu_item_check label="Wyświetlaj ikonki" name="view_icons"/>
- <menu_item_call label="Pokaż zablokowanych Rezydentów & obiekty" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f764f0969ad734a282ae747f322123ed086c292
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_group_plus">
+ <menu_item_check label="Sortuj według daty" name="sort_most" />
+ <menu_item_check label="Sortuj według imion" name="sort_name" />
+ <menu_item_check name="view_icons" label="Pokazuj ikonki" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
deleted file mode 100755
index b474a556bdad38e6f19fa4c2892a3ef251507b53..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
- <menu_item_check label="Porządkuj według daty" name="sort_most"/>
- <menu_item_check label="Porządkuj według nazwy" name="sort_name"/>
- <menu_item_check label="Wyświetlaj ikonki" name="view_icons"/>
- <menu_item_call label="Pokaż zablokowanych Rezydentów & obiekty" name="show_blocked_list"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_picks.xml b/indra/newview/skins/default/xui/pl/menu_picks.xml
old mode 100755
new mode 100644
index 6f6e4b7fa80df9a2d9801c5aea2f2d3a9e4b2974..aa41d7ef99e906d4c32debe7bed8225877163490
--- a/indra/newview/skins/default/xui/pl/menu_picks.xml
+++ b/indra/newview/skins/default/xui/pl/menu_picks.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Picks">
- <menu_item_call label="Info" name="pick_info"/>
- <menu_item_call label="Edytuj" name="pick_edit"/>
- <menu_item_call label="Teleportuj" name="pick_teleport"/>
- <menu_item_call label="Mapa" name="pick_map"/>
- <menu_item_call label="Usuń" name="pick_delete"/>
+ <menu_item_call label="Edytuj" name="pick_edit" />
+ <menu_item_call label="Teleportuj" name="pick_teleport" />
+ <menu_item_call label="Mapa" name="pick_map" />
+ <menu_item_call label="Usuń" name="pick_delete" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
old mode 100755
new mode 100644
index e9c00f51a978c7ff28b5a47c8e373a9761fc05b3..9067d921388a1e0b44825e91eced801d4401ad73
--- a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="picks_plus_menu">
- <menu_item_call label="Stwórz" name="create_pick"/>
- <menu_item_call label="Nowa reklama" name="create_classified"/>
+ <menu_item_call name="create_pick" label="Nowe Miejsce" />
+ <menu_item_call name="create_classified" label="Nowa reklama" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_place.xml b/indra/newview/skins/default/xui/pl/menu_place.xml
old mode 100755
new mode 100644
index c3b72d6abbddafed423f8ada857be161387c422c..5d515c307e5c6aa08432603a2dc3fd5ab6b85010
--- a/indra/newview/skins/default/xui/pl/menu_place.xml
+++ b/indra/newview/skins/default/xui/pl/menu_place.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="place_overflow_menu">
- <menu_item_call label="Zapisz landmark" name="landmark"/>
- <menu_item_call label="Utwórz" name="pick"/>
- <menu_item_call label="Kup przepustkÄ™" name="pass"/>
- <menu_item_call label="Edytuj" name="edit"/>
+ <menu_item_call label="Utwórz Landmark" name="landmark" />
+ <menu_item_call label="Utwórz Miejsce" name="pick" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
old mode 100755
new mode 100644
index 3d0c1c87fb199763200ed65e5e3e7a00f9ead0bc..ff19f32ba835beb032405d6e9199dc39eec17080
--- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_folder_gear">
- <menu_item_call label="Dodaj folder" name="add_folder"/>
- <menu_item_call label="Dodaj do landmarków" name="add_landmark"/>
+ <menu_item_call label="Dodaj folder" name="add_folder" />
+ <menu_item_call label="Dodaj do Landmarków" name="add_landmark" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
old mode 100755
new mode 100644
index d1f283b7aa3c4672f6405d7aae7969493e624170..ad739d6dfbe115e7afb03db002c4d9d0779b9ee4
--- a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="menu_folder_gear">
- <menu_item_call label="Dodaj do landmarków" name="add_landmark"/>
- <menu_item_call label="Dodaj folder" name="add_folder"/>
- <menu_item_call label="Przywróć obiekt" name="restore_item"/>
- <menu_item_call label="Wytnij" name="cut"/>
- <menu_item_call label="Kopiuj" name="copy_folder"/>
- <menu_item_call label="Wklej" name="paste"/>
- <menu_item_call label="Zmień nazwę" name="rename"/>
- <menu_item_call label="Usuń" name="delete"/>
- <menu_item_call label="Rozwiń" name="expand"/>
- <menu_item_call label="Schowaj" name="collapse"/>
- <menu_item_call label="Rozwiń wszystkie foldery" name="expand_all"/>
- <menu_item_call label="Schowaj wszystkie foldery" name="collapse_all"/>
- <menu_item_check label="Sortuj według daty" name="sort_by_date"/>
+ <menu_item_call label="Dodaj do landmarków" name="add_landmark" />
+ <menu_item_call label="Dodaj folder" name="add_folder" />
+ <menu_item_call label="Przywróć obiekt" name="restore_item" />
+ <menu_item_call label="Wytnij" name="cut" />
+ <menu_item_call label="Kopiuj" name="copy_folder" />
+ <menu_item_call label="Wklej" name="paste" />
+ <menu_item_call label="Zmień nazwę" name="rename" />
+ <menu_item_call label="Usuń" name="delete" />
+ <menu_item_call label="Rozwiń" name="expand" />
+ <menu_item_call label="Zwiń" name="collapse" />
+ <menu_item_call label="Rozwiń wszystkie foldery" name="expand_all" />
+ <menu_item_call label="Zwiń wszystkie foldery" name="collapse_all" />
+ <menu_item_check label="Sortuj według daty" name="sort_by_date" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
index 0139d3a98799049e5571c87b1c0d6c00f7e19592..3bae9332f93e2f802ff821e8b0da4b2acc45cc3b
--- a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="menu_ladmark_gear">
- <menu_item_call label="Teleportuj" name="teleport"/>
- <menu_item_call label="Więcej informacji" name="more_info"/>
- <menu_item_call label="Pokaż na mapie" name="show_on_map"/>
- <menu_item_call label="Dodaj do landmarków" name="add_landmark"/>
- <menu_item_call label="Dodaj folder" name="add_folder"/>
- <menu_item_call label="Przywróć obiekt" name="restore_item"/>
- <menu_item_call label="Wytnij" name="cut"/>
- <menu_item_call label="Kopiuj landmark" name="copy_landmark"/>
- <menu_item_call label="Kopiuj SLurl" name="copy_slurl"/>
- <menu_item_call label="Wklej" name="paste"/>
- <menu_item_call label="Zmień nazwę" name="rename"/>
- <menu_item_call label="Usuń" name="delete"/>
- <menu_item_call label="Rozwiń wszystkie foldery" name="expand_all"/>
- <menu_item_call label="Schowaj wszystkie foldery" name="collapse_all"/>
- <menu_item_check label="Sortuj według daty" name="sort_by_date"/>
- <menu_item_call label="Stwórz Ulubione" name="create_pick"/>
+ <menu_item_call label="Teleportuj" name="teleport" />
+ <menu_item_call label="Więcej informacji" name="more_info" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Dodaj do landmarków" name="add_landmark" />
+ <menu_item_call label="Dodaj folder" name="add_folder" />
+ <menu_item_call label="Przywróć obiekt" name="restore_item" />
+ <menu_item_call label="Wytnij" name="cut" />
+ <menu_item_call label="Kopiuj landmark" name="copy_landmark" />
+ <menu_item_call label="Kopiuj SLurl" name="copy_slurl" />
+ <menu_item_call label="Wklej" name="paste" />
+ <menu_item_call label="Zmień nazwę" name="rename" />
+ <menu_item_call label="Usuń" name="delete" />
+ <menu_item_call label="Rozwiń wszystkie foldery" name="expand_all" />
+ <menu_item_call label="Zwiń wszystkie foldery" name="collapse_all" />
+ <menu_item_check label="Sortuj według daty" name="sort_by_date" />
+ <menu_item_call label="Stwórz Miejsce" name="create_pick" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
old mode 100755
new mode 100644
index ef836c8ecfe3f59c0244a46a60f2a1f492fc49ce..3cb0ba5b7c75f5fed48ae52a37735e9008e93985
--- a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="profile_overflow_menu">
- <menu_item_call label="Mapa" name="show_on_map"/>
- <menu_item_call label="Zapłać" name="pay"/>
- <menu_item_call label="Udostępnij" name="share"/>
- <menu_item_call label="Zablokuj" name="block"/>
- <menu_item_call label="Odblokuj" name="unblock"/>
- <menu_item_call label="Wyrzuć" name="kick"/>
- <menu_item_call label="Unieruchom" name="freeze"/>
- <menu_item_call label="Uruchom" name="unfreeze"/>
- <menu_item_call label="CSR" name="csr"/>
+ <menu_item_call label="Mapa" name="show_on_map" />
+ <menu_item_call label="Zapłać" name="pay" />
+ <menu_item_call label="Udostępnij" name="share" />
+ <menu_item_call label="Blokuj" name="block" />
+ <menu_item_call label="Odblokuj" name="unblock" />
+ <menu_item_call label="Wyrzuć" name="kick" />
+ <menu_item_call label="Unieruchom" name="freeze" />
+ <menu_item_call label="Zezwól na ruch" name="unfreeze" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
old mode 100755
new mode 100644
index 4bc65eca38fa4421e0d8749acd634a4a46f266bd..d3d14926bb8c6a96f801dbb2374c0bee97855957
--- a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu name="save_outfit_menu">
- <menu_item_call label="Zapisz" name="save_outfit"/>
- <menu_item_call label="Zapisz jako" name="save_as_new_outfit"/>
+ <menu_item_call name="save_outfit" label="Zapisz" />
+ <menu_item_call name="save_as_new_outfit" label="Zapisz jako" />
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
old mode 100755
new mode 100644
index 256500a402a883b6d77a85914ff5525cc9b0dd10..72b97876b855edcf3500aea48e19418bb15b0bee
--- a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="ScriptChiclet Menu">
- <menu_item_call label="Zamknij" name="Close"/>
+ <menu_item_call label="Zamknij" name="Close" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml
old mode 100755
new mode 100644
index 862f538aa7730b3641bff874bd406d46551e01ea..9030325e85c04a551f82bcf31b06b894734c8b39
--- a/indra/newview/skins/default/xui/pl/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/pl/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="Popup">
- <menu_item_call label="O miejscu" name="about_url"/>
- <menu_item_call label="Teleportuj do miejsca" name="teleport_to_url"/>
- <menu_item_call label="Mapa" name="show_on_map"/>
+ <menu_item_call label="O miejscu" name="about_url" />
+ <menu_item_call label="Teleportuj do miejsca" name="teleport_to_url" />
+ <menu_item_call label="Mapa" name="show_on_map" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
index 0e58592d46a66a044465a2a1229051e5df44feef..32968d6e6e0ccb1bf102deb84bd3eb06b5d1815b
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Teleport History Gear Context Menu">
- <menu_item_call label="Rozwiń wszystkie foldery" name="Expand all folders"/>
- <menu_item_call label="Schowaj wszystkie foldery" name="Collapse all folders"/>
- <menu_item_call label="Wyczyść historię teleportacji" name="Clear Teleport History"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Teleport History Gear Context Menu">
+ <menu_item_call label="Rozwiń wszystkie foldery" name="Expand all folders" />
+ <menu_item_call label="Zwiń wszystkie foldery" name="Collapse all folders" />
+ <menu_item_call label="Wyczyść historię teleportacji" name="Clear Teleport History" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
old mode 100755
new mode 100644
index cd36c116b065f7a49c2538de5de7baf257912058..7d8519324f40ec2457738db055a2bdce9736ebc3
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Teleport History Item Context Menu">
- <menu_item_call label="Teleportuj" name="Teleport"/>
- <menu_item_call label="Więcej szczegółów" name="More Information"/>
- <menu_item_call label="Kopiuj do schowka" name="CopyToClipboard"/>
+ <menu_item_call label="Teleportuj" name="Teleport" />
+ <menu_item_call label="Więcej szczegółów" name="More Information" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="CopyToClipboard" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
index b12df08d6ae55b1bab1334bc81eb704e2e2164ee..9fdb96881be9d031d7fa84a968e7d694700320de
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Teleport History Item Context Menu">
- <menu_item_call label="Otwórz" name="TabOpen"/>
- <menu_item_call label="Zamknij" name="TabClose"/>
+ <menu_item_call label="Otwórz" name="TabOpen" />
+ <menu_item_call label="Zamknij" name="TabClose" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_text_editor.xml b/indra/newview/skins/default/xui/pl/menu_text_editor.xml
old mode 100755
new mode 100644
index 812f87bc1a3183957ac62940e842beab7003539d..58e14f1ef13b292d821edd13e50ed1ee08771f19
--- a/indra/newview/skins/default/xui/pl/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/pl/menu_text_editor.xml
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Text editor context menu">
- <menu_item_call label="Wytnij" name="Cut"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
- <menu_item_call label="Wklej" name="Paste"/>
- <menu_item_call label="Usuń" name="Delete"/>
- <menu_item_call label="Zaznacz wszystko" name="Select All"/>
+ <menu_item_call label="(nieznane)" name="Suggestion 1" />
+ <menu_item_call label="(nieznane)" name="Suggestion 2" />
+ <menu_item_call label="(nieznane)" name="Suggestion 3" />
+ <menu_item_call label="(nieznane)" name="Suggestion 4" />
+ <menu_item_call label="(nieznane)" name="Suggestion 5" />
+ <menu_item_call label="Dodaj do słownika" name="Add to Dictionary" />
+ <menu_item_call label="Dodaj do ignorowanych" name="Add to Ignore" />
+ <menu_item_call label="Wytnij" name="Cut" />
+ <menu_item_call label="Kopiuj" name="Copy" />
+ <menu_item_call label="Wklej" name="Paste" />
+ <menu_item_call label="Usuń" name="Delete" />
+ <menu_item_call label="Zaznacz wszystko" name="Select All" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_toolbars.xml b/indra/newview/skins/default/xui/pl/menu_toolbars.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3606e8a542df94c03454842a19c6c033b39e4135
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_toolbars.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu name="Toolbars Popup">
+ <menu_item_call label="Usuń ten przycisk" name="Remove button" />
+ <menu_item_call label="Przyciski na pasku..." name="Choose Buttons" />
+ <menu_item_check label="Ikony i etykiety" name="icons_with_text" />
+ <menu_item_check label="Tylko ikony" name="icons_only" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
old mode 100755
new mode 100644
index 53536c8f1cfe96b08de665eea9dca7a6d9bbab81..dd5589aee8142800ab5e51d18bbc13707deab842
--- a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_topinfobar">
- <menu_item_check label="Pokaż współprzędne" name="Show Coordinates"/>
- <menu_item_check label="Pokaż O Posiadłości" name="Show Parcel Properties"/>
- <menu_item_call label="Landmark" name="Landmark"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
+ <menu_item_check label="Pokaż współrzędne" name="Show Coordinates" />
+ <menu_item_check label="Pokaż detale działki" name="Show Parcel Properties" />
+ <menu_item_call label="Kopiuj" name="Copy" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
old mode 100755
new mode 100644
index db729be725febdf25e91584d4788d05a523cb160..0f26194ef336970d9b2f526227b9d8722dead3bd
--- a/indra/newview/skins/default/xui/pl/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Url Popup">
- <menu_item_call label="Pokaż profil Rezydenta" name="show_agent"/>
- <menu_item_call label="Kopiuj nazwÄ™ do schowka" name="url_copy_label"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Pokaż profil" name="show_agent" />
+ <menu_item_call label="Wyślij wiadomość IM..." name="send_im" />
+ <menu_item_call label="Dodaj do znajomych..." name="add_friend" />
+ <menu_item_call label="Usuń ze znajomych..." name="remove_friend" />
+ <menu_item_call label="Kopiuj nazwÄ™ do schowka" name="url_copy_label" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_group.xml b/indra/newview/skins/default/xui/pl/menu_url_group.xml
old mode 100755
new mode 100644
index f340b3296aac7f193d7046cf0e4139110965292d..61ddd37bd51b3fa647e4551f6dc608f5cdddb1d4
--- a/indra/newview/skins/default/xui/pl/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_group.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Pokaż szczegóły o grupie" name="show_group"/>
- <menu_item_call label="Kopiuj grupÄ™ do schowka" name="url_copy_label"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Pokaż szczegóły o grupie" name="show_group" />
+ <menu_item_call label="Kopiuj grupÄ™ do schowka" name="url_copy_label" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_http.xml b/indra/newview/skins/default/xui/pl/menu_url_http.xml
old mode 100755
new mode 100644
index e73f7b674562e71b81864fba4fa3decd812fb360..7dc09616ec117b6686f1783c322940f77e93e5b4
--- a/indra/newview/skins/default/xui/pl/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_http.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Otwórz przeglądarkę internetową" name="url_open"/>
- <menu_item_call label="Otwórz w wewnętrzenej przeglądarce" name="url_open_internal"/>
- <menu_item_call label="Otwórz w zewnętrznej przeglądarce" name="url_open_external"/>
- <menu_item_call label="Kopiuj URL do schowka" name="url_copy"/>
+ <menu_item_call label="Otwórz przeglądarkę internetową" name="url_open" />
+ <menu_item_call label="Otwórz w wewnętrznej przeglądarce" name="url_open_internal" />
+ <menu_item_call label="Otwórz w zewnętrznej przeglądarce" name="url_open_external" />
+ <menu_item_call label="Kopiuj URL do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
old mode 100755
new mode 100644
index e36fa0dd2baddb63cb7a09f121dac47e099be005..a4be2f0b447bce4bb042dafebd8ecb62878d71a1
--- a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Pokaż obiekt w szafie" name="show_item"/>
- <menu_item_call label="Kopiuj nazwÄ™ do schowka" name="url_copy_label"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Pokaż obiekt w szafie" name="show_item" />
+ <menu_item_call label="Kopiuj nazwÄ™ do schowka" name="url_copy_label" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_map.xml b/indra/newview/skins/default/xui/pl/menu_url_map.xml
old mode 100755
new mode 100644
index 179ab1f6768213a1629ae7b3ce85cabc542f30d9..dcf16fc20d194e1dc3f4bd8980f349fd853e4266
--- a/indra/newview/skins/default/xui/pl/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_map.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Pokaż na mapie" name="show_on_map"/>
- <menu_item_call label="Teleportuj do miejsca" name="teleport_to_location"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Teleportuj do miejsca" name="teleport_to_location" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
old mode 100755
new mode 100644
index 7576208a9ef1e706579dbcc90ff65d866cd73c2a..53b4cb2bacad13d256702b441baedc935e3dde95
--- a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Pokaż szczegóły o obiekcie" name="show_object"/>
- <menu_item_call label="Pokaż na mapie" name="show_on_map"/>
- <menu_item_call label="Teleportuj to miejsca obiektu" name="teleport_to_object"/>
- <menu_item_call label="Kopiuj nazwÄ™ obiektu do schowka" name="url_copy_label"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Profil obiektu..." name="show_object" />
+ <menu_item_call label="Zablokuj..." name="block_object" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Teleportuj do miejsca obiektu" name="teleport_to_object" />
+ <menu_item_call label="Kopiuj nazwÄ™ obiektu do schowka" name="url_copy_label" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
old mode 100755
new mode 100644
index 1b8dd6213723ea427d82b95527066d918c3a21c8..46d982f09de7b81bf9f1f128fa8be4e9dd93d068
--- a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Pokaż szczegóły o miejscu" name="show_parcel"/>
- <menu_item_call label="Pokaż na mapie" name="show_on_map"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Pokaż szczegóły o miejscu" name="show_parcel" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
old mode 100755
new mode 100644
index eb83245c48c5cc44616619b08371486ec3d9812b..fe29215303f9bd13adad1a54a5e56ee1e3aa5a96
--- a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Uruchom tÄ™ komendÄ™" name="run_slapp"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Uruchom tÄ™ komendÄ™" name="run_slapp" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
old mode 100755
new mode 100644
index 4d4a5b4c4d90b11c0895763bf83aafe22f57eefa..db10e42f33609396ca9ee7ef0748d0790bebfdb0
--- a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Pokaż szczegóły o miejscu" name="show_place"/>
- <menu_item_call label="Pokaż na mapie" name="show_on_map"/>
- <menu_item_call label="Teleportuj do miejsca" name="teleport_to_location"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Pokaż szczegóły o miejscu" name="show_place" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Teleportuj do miejsca" name="teleport_to_location" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
old mode 100755
new mode 100644
index e2255469300600f63e6d03878778526e85c1aa28..585ff6573618a3dd7b62bd977284d26e4be94050
--- a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Url Popup">
- <menu_item_call label="Teleportuj do tego miejsca" name="teleport"/>
- <menu_item_call label="Pokaż na mapie" name="show_on_map"/>
- <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+ <menu_item_call label="Teleportuj do tego miejsca" name="teleport" />
+ <menu_item_call label="Pokaż na mapie" name="show_on_map" />
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
old mode 100755
new mode 100644
index 6fd498eea8f0545e86b1eab59c6935c966686dd4..e6ad1faee654dd928f00d4150dd7d1c51444c704
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -1,306 +1,504 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu_bar name="Main Menu">
<menu label="Ja" name="Me">
- <menu_item_call label="Mój Profil" name="Profile"/>
- <menu_item_call label="Mój wygląd" name="ChangeOutfit"/>
- <menu_item_check label="Moja Szafa" name="Inventory"/>
- <menu label="Ruch" name="Movement">
- <menu_item_call label="Usiądź" name="Sit Down Here"/>
- <menu_item_check label="Zacznij latać" name="Fly"/>
- <menu_item_check label="Zawsze biegnij" name="Always Run"/>
- <menu_item_call label="Zatrzymaj animacje" name="Stop Animating My Avatar"/>
- </menu>
- <menu label="Mój Status" name="Status"/>
- <menu_item_call label="Kup L$" name="Buy and Sell L$"/>
- <menu_item_call label="Moje rzeczy na Marketplace" name="MarketplaceListings"/>
- <menu_item_call label="Dashboard" name="Manage My Account"/>
- <menu_item_call label="Ustawienia" name="Preferences"/>
- <menu_item_call label="Wyłącz [APP_NAME]" name="Quit"/>
+ <menu_item_call label="Profil..." name="Profile" />
+ <menu_item_call label="WyglÄ…d..." name="ChangeOutfit" />
+ <menu_item_call label="Wybierz awatara..." name="Avatar Picker" />
+ <menu_item_check label="Szafa..." name="Inventory" />
+ <menu_item_call label="Nowe okno Szafy" name="NewInventoryWindow" />
+ <menu_item_call label="Landmarki..." name="Places" />
+ <menu_item_call label="Miejsca..." name="Picks" />
+ <menu_item_call label="Ustawienia kamery..." name="Camera Controls" />
+ <menu label="Ustawienia ruchu" name="Movement">
+ <menu_item_call label="Usiądź" name="Sit Down Here" />
+ <menu_item_check label="Zacznij latać" name="Fly" />
+ <menu_item_call label="Przestań latać" name="Stop flying" />
+ <menu_item_check label="Zawsze biegnij" name="Always Run" />
+ <menu_item_call label="Przestań mnie animować" name="Stop Animating My Avatar" />
+ <menu_item_call label="Chodzenie / Bieganie / Latanie..." name="Walk / run / fly" />
+ </menu>
+ <menu name="Status">
+ <menu_item_check name="Away" label="Z dala od klawiatury (śpij)" />
+ <menu_item_check name="Do Not Disturb" label="Zajęty lub Niedostępny" />
+ </menu>
+ <menu_item_call label="Kup L$..." name="Buy and Sell L$" />
+ <menu_item_call label="Skrzynka nadawcza kupca..." name="MerchantOutbox" />
+ <menu_item_call label="ZarzÄ…dzaj kontem..." name="Manage My Account" />
+ <menu_item_call label="Ustawienia..." name="Preferences" />
+ <menu_item_call label="Przyciski na paskach..." name="Toolbars" />
+ <menu_item_call label="Ukryj interfejs" name="Hide UI" />
+ <menu_item_check label="Pokaż dodatki HUD" name="Show HUD Attachments" />
+ <menu_item_call label="Wyłącz [APP_NAME]" name="Quit" />
</menu>
<menu label="Komunikacja" name="Communicate">
- <menu_item_check label="Czat lokalny" name="Nearby Chat"/>
- <menu_item_check label="Znajomi" name="My Friends"/>
- <menu_item_check label="Grupy" name="My Groups"/>
- <menu_item_check label="Osoby w pobliżu" name="Active Speakers"/>
+ <menu_item_check label="Rozmowy..." name="Conversations" />
+ <menu_item_check label="Czat lokalny..." name="Nearby Chat" />
+ <menu_item_check label="Mowa" name="Speak" />
+ <menu_item_check name="Conversation Log..." label="Dziennik rozmów..." />
+ <menu label="Przekształcanie głosu" name="VoiceMorphing">
+ <menu_item_check label="Bez przekształcania" name="NoVoiceMorphing" />
+ <menu_item_check label="PodglÄ…d..." name="Preview" />
+ <menu_item_call label="Subskrybuj..." name="Subscribe" />
+ </menu>
+ <menu_item_check label="Gesty..." name="Gestures" />
+ <menu_item_check label="Znajomi" name="My Friends" />
+ <menu_item_check label="Grupy" name="My Groups" />
+ <menu_item_check label="Osoby w pobliżu" name="Active Speakers" />
+ <menu_item_check label="Lista zablokowanych" name="Block List" />
+ <menu_item_check name="Do Not Disturb" label="Zajęty lub Niedostępny" />
</menu>
<menu label="Åšwiat" name="World">
- <menu_item_call label="Zapamiętaj to miejsce (LM)" name="Create Landmark Here"/>
- <menu_item_check label="Mapa Åšwiata" name="World Map"/>
- <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
- <menu_item_check label="Szukaj" name="Search"/>
- <menu_item_call label="Teleportuj do Miejsca Startu" name="Teleport Home"/>
- <menu_item_call label="Ustaw Miejsce Startu" name="Set Home to Here"/>
- <menu_item_call label="Zrób zdjęcie" name="Take Snapshot"/>
- <menu_item_call label="Profil miejsca" name="Place Profile"/>
- <menu_item_call label="O posiadłości" name="About Land"/>
+ <menu_item_call label="Zapamiętaj to miejsce (LM)" name="Create Landmark Here" />
+ <menu_item_call label="Cele podróży..." name="Destinations" />
+ <menu_item_check label="Mapa Åšwiata" name="World Map" />
+ <menu_item_check label="Minimapa" name="Mini-Map" />
+ <menu_item_check label="Wyszukiwarka" name="Search" />
+ <menu_item_call label="Teleportuj do Miejsca Startu" name="Teleport Home" />
+ <menu_item_call label="Ustaw Miejsce Startu tu, gdzie stojÄ™" name="Set Home to Here" />
+ <menu_item_call label="Zrób zdjęcie" name="Take Snapshot" />
+ <menu_item_call label="Profil miejsca" name="Place Profile" />
+ <menu_item_call label="O działce" name="About Land" />
<menu_item_call label="Region/MajÄ…tek" name="RegionEstate"/>
- <menu_item_call label="Moje posiadłości" name="My Land"/>
- <menu_item_call label="Kup posiadłość" name="Buy Land"/>
- <menu label="Pokaż" name="LandShow">
- <menu_item_check label="Linie bana" name="Ban Lines"/>
- <menu_item_check label="Emitery" name="beacons"/>
- <menu_item_check label="Granice posiadłości" name="Property Lines"/>
- <menu_item_check label="Właściciele posiadłości" name="Land Owners"/>
- <menu_item_check label="Współrzędne" name="Coordinates"/>
- <menu_item_check label="Właściwości posiadłości" name="Parcel Properties"/>
- <menu_item_check label="Menu Zaawansowane" name="Show Advanced Menu"/>
+ <menu_item_call label="Moje działki..." name="My Land" />
+ <menu_item_call label="Kup działkę" name="Buy Land" />
+ <menu label="Pokaż więcej" name="LandShow">
+ <menu_item_check label="Linie zakazu" name="Ban Lines" />
+ <menu_item_check label="Emitery" name="beacons" shortcut="" />
+ <menu_item_check label="Granice działek" name="Property Lines" />
+ <menu_item_check label="Właściciele działek" name="Land Owners" />
+ <menu_item_check label="Współrzędne" name="Coordinates" />
+ <menu_item_check label="Zezwolenia działek" name="Parcel Properties" />
+ <menu_item_check label="Menu Zaawansowane" name="Show Advanced Menu" />
</menu>
+ <menu_item_check label="Pokaż pasek nawigacyjny" name="ShowNavbarNavigationPanel" />
+ <menu_item_check label="Pokaż pasek ulubionych" name="ShowNavbarFavoritesPanel" />
<menu label="Słońce" name="Sun">
- <menu_item_check label="Wschód Słońca" name="Sunrise"/>
- <menu_item_check label="Południe" name="Noon"/>
- <menu_item_check label="Zachód Słońca" name="Sunset"/>
- <menu_item_check label="Północ" name="Midnight"/>
+ <menu_item_check label="Wschód Słońca" name="Sunrise" />
+ <menu_item_check label="Południe" name="Noon" />
+ <menu_item_check label="Zachód Słońca" name="Sunset" />
+ <menu_item_check label="Północ" name="Midnight" />
+ <menu_item_check label="Używaj czasu Regionu" name="Use Region Settings" />
+ </menu>
+ <menu label="Edytor środowiska" name="Environment Editor">
+ <menu_item_call label="Ustawienia środowiska..." name="Environment Settings" />
+ <menu name="Water Presets" label="Ustawienia wody">
+ <menu_item_call label="Nowe Ustawienie..." name="new_water_preset" />
+ <menu_item_call label="Edytuj Ustawienie..." name="edit_water_preset" />
+ <menu_item_call label="Usuń Ustawienie..." name="delete_water_preset" />
+ </menu>
+ <menu name="Sky Presets" label="Ustawienia nieba">
+ <menu_item_call label="Nowe Ustawienie..." name="new_sky_preset" />
+ <menu_item_call label="Edytuj Ustawienie..." name="edit_sky_preset" />
+ <menu_item_call label="Usuń Ustawienie..." name="delete_sky_preset" />
+ </menu>
+ <menu name="Day Presets" label="Ustawienia pory dnia">
+ <menu_item_call label="Nowe Ustawienie..." name="new_day_preset" />
+ <menu_item_call label="Edytuj Ustawienie..." name="edit_day_preset" />
+ <menu_item_call label="Usuń Ustawienie..." name="delete_day_preset" />
+ </menu>
</menu>
</menu>
<menu label="Buduj" name="BuildTools">
- <menu_item_check label="Buduj" name="Show Build Tools"/>
+ <menu_item_check label="Pokaż narzędzia budowania" name="Show Build Tools" />
<menu label="Wybierz narzędzie budowania" name="Select Tool">
- <menu_item_call label="Narzędzie ogniskowej" name="Focus"/>
- <menu_item_call label="Narzędzie ruchu" name="Move"/>
- <menu_item_call label="Narzędzie edycji" name="Edit"/>
- <menu_item_call label="Stwórz narzędzie" name="Create"/>
- <menu_item_call label="Narzędzie posiadłości" name="Land"/>
- </menu>
- <menu_item_call label="Linkuj" name="Link"/>
- <menu_item_call label="Rozlinkuj" name="Unlink"/>
- <menu_item_check label="Edytuj zlinkowane obiekty" name="Edit Linked Parts"/>
- <menu label="Wybierz zlinkowane części" name="Select Linked Parts">
- <menu_item_call label="Wybierz następną część" name="Select Next Part"/>
- <menu_item_call label="Zaznacz poprzednią część" name="Select Previous Part"/>
- <menu_item_call label="Uwzględnij następną część" name="Include Next Part"/>
- <menu_item_call label="Uwzględnij poprzednią część" name="Include Previous Part"/>
- </menu>
- <menu_item_call label="Ogniskowa selekcji" name="Focus on Selection"/>
- <menu_item_call label="Przybliż do selekcji" name="Zoom to Selection"/>
+ <menu_item_call label="Narzędzie centrowania" name="Focus" />
+ <menu_item_call label="Narzędzie ruchu" name="Move" />
+ <menu_item_call label="Narzędzie edycji" name="Edit" />
+ <menu_item_call label="Narzędzie tworzenia" name="Create" />
+ <menu_item_call label="Narzędzie terenu" name="Land" />
+ </menu>
+ <menu_item_call label="Scal" name="Link" />
+ <menu_item_call label="Rozłącz" name="Unlink" />
+ <menu_item_check label="Edytuj połączone części" name="Edit Linked Parts" />
+ <menu label="Wybierz połączone części" name="Select Linked Parts">
+ <menu_item_call label="Wybierz następną część" name="Select Next Part" />
+ <menu_item_call label="Zaznacz poprzednią część" name="Select Previous Part" />
+ <menu_item_call label="Uwzględnij następną część" name="Include Next Part" />
+ <menu_item_call label="Uwzględnij poprzednią część" name="Include Previous Part" />
+ </menu>
+ <menu_item_call label="Zbiory części (linków)..." name="pathfinding_linkset_menu_item" />
+ <menu_item_call label="Wycentruj na selekcji" name="Focus on Selection" />
+ <menu_item_call label="Przybliż do selekcji" name="Zoom to Selection" />
<menu label="Obiekt" name="Object">
- <menu_item_call label="Kup" name="Menu Object Buy"/>
- <menu_item_call label="Weź" name="Menu Object Take"/>
- <menu_item_call label="Weź kopię" name="Take Copy"/>
- <menu_item_call label="Zapisz do treści obiektu" name="Save Object Back to Object Contents"/>
- <menu_item_call label="Zwróć obiekt" name="Return Object back to Owner"/>
+ <menu_item_call label="Kup" name="Menu Object Buy" />
+ <menu_item_call label="Weź" name="Menu Object Take" />
+ <menu_item_call label="Weź kopię" name="Take Copy" />
+ <menu_item_call label="Zapisz do zawartości obiektu" name="Save Object Back to Object Contents" />
+ <menu_item_call label="Zwróć obiekt" name="Return Object back to Owner" />
</menu>
<menu label="Skrypty" name="Scripts">
- <menu_item_call label="Zrekompiluj skrypt w selekcji (Mono)" name="Mono"/>
- <menu_item_call label="Zrekompiluj skrypty" name="LSL"/>
- <menu_item_call label="Reset skryptów" name="Reset Scripts"/>
- <menu_item_call label="Ustaw uruchamienie skryptów" name="Set Scripts to Running"/>
- <menu_item_call label="Wstrzymaj działanie skryptów w selekcji" name="Set Scripts to Not Running"/>
+ <menu_item_call label="Zrekompiluj skrypty (Mono)" name="Mono" />
+ <menu_item_call label="Zrekompiluj skrypty (LSL)" name="LSL" />
+ <menu_item_call label="Reset skryptów" name="Reset Scripts" />
+ <menu_item_call label="Przestaw skrypty na stan WÅ‚Ä…czony" name="Set Scripts to Running" />
+ <menu_item_call label="Przestaw skrypty na stan Wyłączony" name="Set Scripts to Not Running" />
+ </menu>
+ <menu label="Odnajdywanie ścieżek" name="Pathfinding">
+ <menu_item_call label="Zbiory części (linków)..." name="pathfinding_linksets_menu_item" />
+ <menu_item_call label="Postacie..." name="pathfinding_characters_menu_item" />
+ <menu_item_call label="Pokaż / testuj..." name="pathfinding_console_menu_item" />
+ <menu_item_call label="Odśwież region" name="pathfinding_rebake_navmesh_item" />
</menu>
<menu label="Opcje" name="Options">
- <menu_item_check label="Pokaż zaawansowane pozwolenia" name="DebugPermissions"/>
- <menu_item_check label="Wybierz tylko moje obiekty" name="Select Only My Objects"/>
- <menu_item_check label="Wybierz tylko obiekty przesuwalne" name="Select Only Movable Objects"/>
- <menu_item_check label="Wybierz przez otoczenie" name="Select By Surrounding"/>
- <menu_item_check label="Pokaż wytyczne selekcji" name="Show Selection Outlines"/>
- <menu_item_check label="Zobacz ukrytÄ… selekcjÄ™" name="Show Hidden Selection"/>
- <menu_item_check label="Pokaż promień emitera dla selekcji" name="Show Light Radius for Selection"/>
- <menu_item_check label="Pokaż emiter selekcji" name="Show Selection Beam"/>
- <menu_item_check label="Uruchom siatkÄ™" name="Snap to Grid"/>
- <menu_item_call label="PrzeciÄ…gnij obiekt do siatki" name="Snap Object XY to Grid"/>
- <menu_item_call label="Wybierz zaznaczenie siatki" name="Use Selection for Grid"/>
- <menu_item_call label="Opcje siatki" name="Grid Options"/>
+ <menu_item_check label="Pokaż zaawansowane uprawnienia" name="DebugPermissions" />
+ <menu_item_check label="Wybierz tylko moje obiekty" name="Select Only My Objects" />
+ <menu_item_check label="Wybierz tylko obiekty przesuwalne" name="Select Only Movable Objects" />
+ <menu_item_check label="Wybierz przez otoczenie" name="Select By Surrounding" />
+ <menu_item_check label="Pokaż kontury selekcji" name="Show Selection Outlines" />
+ <menu_item_check label="Zobacz ukrytÄ… selekcjÄ™" name="Show Hidden Selection" />
+ <menu_item_check label="Pokaż promień światła dla selekcji" name="Show Light Radius for Selection" />
+ <menu_item_check label="Pokaż promień selekcji" name="Show Selection Beam" />
+ <menu_item_check label="PrzyciÄ…gaj do siatki" name="Snap to Grid" />
+ <menu_item_call label="PrzeciÄ…gnij obiekt XY do siatki" name="Snap Object XY to Grid" />
+ <menu_item_call label="Wybierz zaznaczenie siatki" name="Use Selection for Grid" />
+ <menu_item_call label="Opcje siatki..." name="Grid Options" />
+ <menu_item_call label="Ustaw domyślne uprawnienia ładowania..." name="Set default permissions" />
</menu>
<menu label="Załaduj" name="Upload">
- <menu_item_call label="teksturÄ™ (L$[COST])..." name="Upload Image"/>
- <menu_item_call label="dźwięk (L$[COST])..." name="Upload Sound"/>
- <menu_item_call label="animacjÄ™ (L$[COST])..." name="Upload Animation"/>
- <menu_item_call label="zbiór plików (L$[COST] za jeden plik)..." name="Bulk Upload"/>
+ <menu_item_call label="TeksturÄ™ ([COST]L$)..." name="Upload Image" />
+ <menu_item_call label="Dźwięk ([COST]L$)..." name="Upload Sound" />
+ <menu_item_call label="AnimacjÄ™ ([COST]L$)..." name="Upload Animation" />
+ <menu_item_call label="Model meszowy..." name="Upload Model" />
+ <menu_item_call label="Zbiór wielu plików ([COST]L$ per file)..." name="Bulk Upload" />
</menu>
- <menu_item_call label="Cofnij" name="Undo"/>
- <menu_item_call label="Ponów" name="Redo"/>
+ <menu_item_call label="Cofnij" name="Undo" />
+ <menu_item_call label="Ponów" name="Redo" />
</menu>
<menu label="Pomoc" name="Help">
- <menu_item_call label="Złóż Raport o Nadużyciu" name="Report Abuse"/>
- <menu_item_call label="Zgłoś błędy klienta" name="Report Bug"/>
- <menu_item_call label="Zderzenia, popchnięcia i uderzenia" name="Bumps, Pushes &amp; Hits"/>
- <menu_item_call label="O [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Podstawowe zagadnienia..." name="How To" />
+ <menu_item_call label="Szybki start" name="Quickstart" />
+ <menu_item_call label="Samouczek" name="Tutorial" />
+ <menu_item_call label="Baza wiedzy" name="Knowledge Base" />
+ <menu_item_call label="Wiki informacyjna" name="Wiki" />
+ <menu_item_call label="Forum społecznościowe" name="Community Forums" />
+ <menu_item_call label="Portal wsparcia" name="Support portal" />
+ <menu_item_call label="Newsy [SECOND_LIFE]" name="Second Life News" />
+ <menu_item_call label="Blogi [SECOND_LIFE]" name="Second Life Blogs" />
+ <menu_item_call label="Zgłoś nadużycie" name="Report Abuse" />
+ <menu_item_call label="Zgłoś błędy klienta" name="Report Bug" />
+ <menu_item_call label="Zderzenia, popchnięcia i uderzenia" name="Bumps, Pushes &amp; Hits" />
+ <menu_item_call label="Informacje o [APP_NAME]" name="About Second Life" />
</menu>
<menu label="Zaawansowane" name="Advanced">
- <menu_item_call label="Odswież wyświetlanie tekstur" name="Rebake Texture"/>
- <menu_item_call label="Domyślne ustawienia rozmiaru interfejsu" name="Set UI Size to Default"/>
- <menu_item_call label="Ustaw rozmiar interfejsu..." name="Set Window Size..."/>
- <menu_item_check label="Ogranicz dystans selekcji" name="Limit Select Distance"/>
- <menu_item_check label="Wyłącz ograniczenia zasięgu kamery" name="Disable Camera Distance"/>
- <menu_item_check label="Wysoka rozdzielczość zdjęć" name="HighResSnapshot"/>
- <menu_item_check label="Zapisuj zdjęcia na dysk twardy bez efektu dźwiękowego" name="QuietSnapshotsToDisk"/>
- <menu label="Narzędzia" name="Performance Tools">
- <menu_item_call label="Pomiar lagów" name="Lag Meter"/>
- <menu_item_check label="Statystyki" name="Statistics Bar"/>
- <menu_item_check label="Pokaż wartość renderowania awatara" name="Avatar Rendering Cost"/>
- </menu>
- <menu label="Podkreślanie i widoczność" name="Highlighting and Visibility">
- <menu_item_check label="Efekt emiterów" name="Cheesy Beacon"/>
- <menu_item_check label="Ukryj czÄ…steczki" name="Hide Particles"/>
- <menu_item_check label="Ukryj zaznaczone" name="Hide Selected"/>
- <menu_item_check label="Pokaż przeźroczyste obiekty" name="Highlight Transparent"/>
- <menu_item_check label="Pokaż celownik myszki" name="ShowCrosshairs"/>
+ <menu_item_call label="Odśwież tekstury (rebake)" name="Rebake Texture" />
+ <menu_item_call label="Domyślne ustawienia rozmiaru interfejsu" name="Set UI Size to Default" />
+ <menu_item_call label="Ustaw rozmiar okna..." name="Set Window Size..." />
+ <menu_item_check label="Ogranicz dystans selekcji" name="Limit Select Distance" />
+ <menu_item_check label="Wyłącz ograniczenia zasięgu kamery" name="Disable Camera Distance" />
+ <menu_item_check label="Zdjęcie wysokiej jakości" name="HighResSnapshot" />
+ <menu_item_check label="Wykonuj zdjęcia bez efektu dźwiękowego i animacji" name="QuietSnapshotsToDisk" />
+ <menu label="Narzędzia wydajności" name="Performance Tools">
+ <menu_item_call label="Miernik lagów" name="Lag Meter" />
+ <menu_item_check label="Statystyki ogólne" name="Statistics Bar" />
+ <menu_item_call label="Statystyki obciążenia sceny" name="Scene Load Statistics" />
+ <menu_item_check label="Pokaż wartość renderowania awatara" name="Avatar Rendering Cost" />
+ </menu>
+ <menu label="Podświetlanie i widoczność" name="Highlighting and Visibility">
+ <menu_item_check label="Efekt emiterów" name="Cheesy Beacon" />
+ <menu_item_check label="Ukryj czÄ…steczki" name="Hide Particles" />
+ <menu_item_check label="Ukryj zaznaczone" name="Hide Selected" />
+ <menu_item_check label="Pokaż przezroczyste obiekty" name="Highlight Transparent" />
+ <menu_item_check label="Pokaż celownik myszki" name="ShowCrosshairs" />
+ <menu label="Chmurki pomocy" name="Hover Tips">
+ <menu_item_check label="Pokazuj chmurki pomocy" name="Show Tips" />
+ <menu_item_check label="Pokazuj chmurki ponad terenem" name="Land Tips" />
+ <menu_item_check label="Pokazuj chmurki dla wszystkich obiektów" name="Tips On All Objects" />
+ </menu>
</menu>
<menu label="Rodzaje renderowania" name="Rendering Types">
- <menu_item_check label="Podstawowe" name="Rendering Type Simple"/>
- <menu_item_check label="Maska alpha" name="Rendering Type Alpha"/>
- <menu_item_check label="Drzewo" name="Rendering Type Tree"/>
- <menu_item_check label="Awatary" name="Rendering Type Character"/>
- <menu_item_check label="PÅ‚aszczyzna powierzchni" name="Rendering Type Surface Patch"/>
- <menu_item_check label="Niebo" name="Rendering Type Sky"/>
- <menu_item_check label="Woda" name="Rendering Type Water"/>
- <menu_item_check label="Ziemia" name="Rendering Type Ground"/>
- <menu_item_check label="Głośność" name="Rendering Type Volume"/>
- <menu_item_check label="Trawa" name="Rendering Type Grass"/>
- <menu_item_check label="Chmury" name="Rendering Type Clouds"/>
- <menu_item_check label="CzÄ…steczki" name="Rendering Type Particles"/>
- <menu_item_check label="Zderzenie" name="Rendering Type Bump"/>
+ <menu_item_check label="Podstawowe" name="Rendering Type Simple" />
+ <menu_item_check label="Maska alpha" name="Rendering Type Alpha" />
+ <menu_item_check label="Drzewa" name="Rendering Type Tree" />
+ <menu_item_check label="Awatary" name="Rendering Type Character" />
+ <menu_item_check label="PÅ‚aszczyzna powierzchni" name="Rendering Type Surface Patch" />
+ <menu_item_check label="Niebo" name="Rendering Type Sky" />
+ <menu_item_check label="Woda" name="Rendering Type Water" />
+ <menu_item_check label="Ziemia" name="Rendering Type Ground" />
+ <menu_item_check label="Objętość" name="Rendering Type Volume" />
+ <menu_item_check label="Trawa" name="Rendering Type Grass" />
+ <menu_item_check label="Chmury" name="Rendering Type Clouds" />
+ <menu_item_check label="CzÄ…steczki" name="Rendering Type Particles" />
+ <menu_item_check label="Mapping wypukłości i połysk" name="Rendering Type Bump" />
</menu>
<menu label="Opcje renderowania" name="Rendering Features">
- <menu_item_check label="UI" name="ToggleUI"/>
- <menu_item_check label="Zaznaczone" name="Selected"/>
- <menu_item_check label="Podświetlenie" name="Highlighted"/>
- <menu_item_check label="Tekstury dynamiczne" name="Dynamic Textures"/>
- <menu_item_check label="Cień stopy" name="Foot Shadows"/>
- <menu_item_check label="Mgła" name="Fog"/>
- <menu_item_check label="Obiekty elastyczne" name="Flexible Objects"/>
- </menu>
- <menu_item_check label="Użyj plugin Read Thread" name="Use Plugin Read Thread"/>
- <menu_item_call label="Wyczyść bufor danych grupy" name="ClearGroupCache"/>
- <menu_item_check label="Wygładzanie ruchu myszki" name="Mouse Smoothing"/>
+ <menu_item_check label="Interfejs użytkownika" name="ToggleUI" />
+ <menu_item_check label="Zaznaczone" name="Selected" />
+ <menu_item_check label="Podświetlenie" name="Highlighted" />
+ <menu_item_check label="Tekstury dynamiczne" name="Dynamic Textures" />
+ <menu_item_check label="Cień stopy" name="Foot Shadows" />
+ <menu_item_check label="Mgła" name="Fog" />
+ <menu_item_check label="Obiekty elastyczne" name="Flexible Objects" />
+ </menu>
+ <menu_item_check label="Osobny wątek do odbierania poleceń z zewnętrznych wtyczek" name="Use Plugin Read Thread" />
+ <menu_item_call label="Wyczyść bufor danych grup" name="ClearGroupCache" />
+ <menu_item_check label="Wygładzanie ruchu myszki" name="Mouse Smoothing" />
+ <menu_item_call label="Cofnij dodatkom zezwolenia kontroli przycisków" name="Release Keys" />
<menu label="Skróty" name="Shortcuts">
- <menu_item_check label="Pokaż menu Zaawansowane - skrót" name="Show Advanced Menu - legacy shortcut"/>
- <menu_item_call label="Zamknij okno" name="Close Window"/>
- <menu_item_call label="Zamknij wszystkie okna" name="Close All Windows"/>
- <menu_item_call label="Zapisz zdjęcie na dysk twardy" name="Snapshot to Disk"/>
- <menu_item_call label="Widok panoramiczny" name="Mouselook"/>
- <menu_item_check label="Wolna kamera" name="Joystick Flycam"/>
- <menu_item_call label="Reset widoku" name="Reset View"/>
- <menu_item_call label="Zobacz ostatniego rozmówcę" name="Look at Last Chatter"/>
- <menu_item_call label="Przybliż" name="Zoom In"/>
- <menu_item_call label="Domyślne przybliżenie" name="Zoom Default"/>
- <menu_item_call label="Oddal" name="Zoom Out"/>
- </menu>
- <menu_item_call label="Pokaż ustawienia debugowania" name="Debug Settings"/>
- <menu_item_check label="Pokaż menu progresu" name="Debug Mode"/>
+ <menu_item_check label="Pokazuj menu Zaawansowane" name="Show Advanced Menu - legacy shortcut" />
+ <menu_item_call label="Zamknij okno" name="Close Window" />
+ <menu_item_call label="Zamknij wszystkie okna" name="Close All Windows" />
+ <menu_item_call label="Zapisz zdjęcie na dysk twardy" name="Snapshot to Disk" />
+ <menu_item_call label="Widok pierwszoosobowy" name="Mouselook" />
+ <menu_item_check label="Wolna kamera" name="Joystick Flycam" />
+ <menu_item_call label="Reset widoku" name="Reset View" />
+ <menu_item_call label="Zobacz ostatniego rozmówcę" name="Look at Last Chatter" />
+ <menu_item_call label="Przybliż" name="Zoom In" />
+ <menu_item_call label="Domyślne przybliżenie" name="Zoom Default" />
+ <menu_item_call label="Oddal" name="Zoom Out" />
+ </menu>
+ <menu_item_call label="Pokaż ustawienia debugowania" name="Debug Settings" />
+ <menu_item_check label="Pokaż menu programisty" name="Debug Mode" />
</menu>
- <menu label="Rozwinięcie..." name="Develop">
- <menu label="Konsola" name="Consoles">
- <menu_item_check label="Konsola tekstur" name="Texture Console"/>
- <menu_item_check label="Debugowanie zdarzeń konsoli" name="Debug Console"/>
- <menu_item_call label="Konsola powiadomień" name="Notifications"/>
- <menu_item_check label="Konsola debugowania regionu" name="Region Debug Console"/>
- <menu_item_check label="Szybkie timery" name="Fast Timers"/>
- <menu_item_check label="Pamięć" name="Memory"/>
- <menu_item_call label="Info Regionu do debugowania konsoli" name="Region Info to Debug Console"/>
- <menu_item_check label="Kamera" name="Camera"/>
- <menu_item_check label="Wiatr" name="Wind"/>
- <menu_item_check label="Znak" name="Badge"/>
+ <menu label="Programista" name="Develop">
+ <menu label="Konsole" name="Consoles">
+ <menu_item_check label="Konsola tekstur" name="Texture Console" />
+ <menu_item_check label="Konsola debugowania" name="Debug Console" />
+ <menu_item_call label="Konsola powiadomień" name="Notifications" />
+ <menu_item_check label="Podgląd procesów" name="Fast Timers" />
+ <menu_item_check label="Konsola debugowania regionu" name="Region Debug Console" />
+ <menu_item_check label="Pamięć" name="Memory" />
+ <menu_item_check label="Statystyki sceny" name="Scene Statistics" />
+ <menu_item_check label="Monitor obciążenia sceny" name="Scene Loading Monitor" />
+ <menu_item_call label="Konsola debugowania dla Å‚adowania tekstur" name="Texture Fetch Debug Console" />
+ <menu_item_call label="Info o regionie do konsoli debugowania" name="Region Info to Debug Console" />
+ <menu_item_call label="Info o grupie do konsoli debugowania" name="Group Info to Debug Console" />
+ <menu_item_call label="Info o możliwościach do konsoli debugowania" name="Capabilities Info to Debug Console" />
+ <menu_item_check label="Kamera" name="Camera" />
+ <menu_item_check label="Wiatr" name="Wind" />
+ <menu_item_check label="Pole widzenia" name="FOV" />
+ <menu_item_check label="Hipcie" name="Badge" />
</menu>
<menu label="Pokaż informacje" name="Display Info">
- <menu_item_check label="Pokaż czas" name="Show Time"/>
- <menu_item_check label="Pokaż informacje o renderowaniu" name="Show Render Info"/>
- <menu_item_check label="Pokaż informację o teksturze" name="Show Texture Info"/>
- <menu_item_check label="Pokaż kolor pod kursorem" name="Show Color Under Cursor"/>
- <menu_item_check label="Pokaż pamięć" name="Show Memory"/>
- <menu_item_check label="Pokaż aktualizacje obiektów" name="Show Updates"/>
- </menu>
- <menu label="Reset błędu" name="Force Errors">
- <menu_item_call label="Aktywacja punktu załamania" name="Force Breakpoint"/>
- <menu_item_call label="Reset błędów LL" name="Force LLError And Crash"/>
- <menu_item_call label="Reset błędów pamięci" name="Force Bad Memory Access"/>
- <menu_item_call label="Reset pętli" name="Force Infinite Loop"/>
- <menu_item_call label="Reset sterowników" name="Force Driver Carsh"/>
- <menu_item_call label="WyjÄ…tek programu" name="Force Software Exception"/>
- <menu_item_call label="Uruchom rozłączenie" name="Force Disconnect Viewer"/>
- <menu_item_call label="Symulacja wycieku pamięci" name="Memory Leaking Simulation"/>
- </menu>
- <menu label="Test renderowania" name="Render Tests">
- <menu_item_check label="Kamera poza zasiegiem" name="Camera Offset"/>
- <menu_item_check label="Losowa ilość klatek" name="Randomize Framerate"/>
- <menu_item_check label="Test klatki obrazu" name="Frame Test"/>
- </menu>
- <menu label="Render Metadata" name="Render Metadata">
- <menu_item_check label="Aktualizuj typ" name="Update Type"/>
+ <menu_item_check label="Pokaż czas" name="Show Time" />
+ <menu_item_check label="Pokazuj koszt transakcji Å‚adowania pliku" name="Show Upload Cost" />
+ <menu_item_check label="Pokaż informacje o renderowaniu ogólnym" name="Show Render Info" />
+ <menu_item_check label="Pokaż informacje o renderowaniu awatarów" name="Show Avatar Render Info" />
+ <menu_item_check label="Pokaż informacje o teksturach" name="Show Texture Info" />
+ <menu_item_check label="Pokaż macierze" name="Show Matrices" />
+ <menu_item_check label="Pokaż kolor pod kursorem" name="Show Color Under Cursor" />
+ <menu_item_check label="Pokaż pamięć" name="Show Memory" />
+ <menu_item_check label="Pokaż informacje o pamięci prywatnej" name="Show Private Mem Info" />
+ <menu_item_check label="Pokaż aktualizacje obiektów" name="Show Updates" />
+ </menu>
+ <menu label="Wymuś błąd" name="Force Errors">
+ <menu_item_call label="Wymuś pułapkę w programie (breakpoint)" name="Force Breakpoint" />
+ <menu_item_call label="Wymuś błąd LLError i spowoduj awarię" name="Force LLError And Crash" />
+ <menu_item_call label="Wymuś błąd dostępu do pamięci" name="Force Bad Memory Access" />
+ <menu_item_call label="Wymuś nieskończoną pętlę" name="Force Infinite Loop" />
+ <menu_item_call label="WymuÅ› awariÄ™ sterownika" name="Force Driver Carsh" />
+ <menu_item_call label="WymuÅ› wyjÄ…tek programu" name="Force Software Exception" />
+ <menu_item_call label="Wymuś rozłączenie Przeglądarki" name="Force Disconnect Viewer" />
+ <menu_item_call label="Symulacja wycieku pamięci" name="Memory Leaking Simulation" />
+ </menu>
+ <menu label="Testy renderowania" name="Render Tests">
+ <menu_item_check label="Kamera poza zasiegiem" name="Camera Offset" />
+ <menu_item_check label="Losowa ilość klatek" name="Randomize Framerate" />
+ <menu_item_check label="Okresowe spowolnienie" name="Periodic Slow Frame" />
+ <menu_item_check label="Test klatek obrazu" name="Frame Test" />
+ <menu_item_call label="Profil klatek obrazu" name="Frame Profile" />
+ <menu_item_call label="Testowanie (benchmark)" name="Benchmark" />
+ </menu>
+ <menu label="Renderowanie metadanych" name="Render Metadata">
+ <menu_item_check label="Bryły brzegowe (Bounding Boxes)" name="Bounding Boxes" />
+ <menu_item_check label="Wektory normalne" name="Normals" />
+ <menu_item_check label="Drzewo okluzji" name="Octree" />
+ <menu_item_check label="Wzmocniona okluzja (Shadow Frusta)" name="Shadow Frusta" />
+ <menu_item_check label="Kształty fizyczne" name="Physics Shapes" />
+ <menu_item_check label="Okluzja" name="Occlusion" />
+ <menu_item_check label="Pakiety renderu" name="Render Batches" />
+ <menu_item_check label="Typy aktualizacji" name="Update Type" />
+ <menu_item_check label="Animacje tekstur" name="Texture Anim" />
+ <menu_item_check label="Priorytety tekstur" name="Texture Priority" />
+ <menu_item_check label="Obszary tekstur" name="Texture Area" />
+ <menu_item_check label="Obszary powierzchni" name="Face Area" />
+ <menu_item_check label="Poziomy detali" name="LOD Info" />
+ <menu_item_check label="Kolejka budowania" name="Build Queue" />
+ <menu_item_check label="Światła" name="Lights" />
+ <menu_item_check label="CzÄ…steczki" name="Particles" />
+ <menu_item_check label="Szkielet kolizji" name="Collision Skeleton" />
+ <menu_item_check label="Stawy" name="Joints" />
+ <menu_item_check label="Promienie" name="Raycast" />
+ <menu_item_check label="Wektory wiatru" name="Wind Vectors" />
+ <menu_item_check label="Złożoność renderowania" name="rendercomplexity" />
+ <menu_item_check label="Bajty dodatków" name="attachment bytes" />
+ <menu_item_check label="Skulpty" name="Sculpt" />
+ <menu label="Gęstość tekstur" name="Texture Density">
+ <menu_item_check label="Żadna" name="None" />
+ <menu_item_check label="Obecna" name="Current" />
+ <menu_item_check label="Pożądana" name="Desired" />
+ <menu_item_check label="Pełna" name="Full" />
+ </menu>
</menu>
<menu label="Renderowanie" name="Rendering">
- <menu_item_check label="Osie" name="Axes"/>
- <menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe"/>
- <menu_item_check label="Oświetlenie i cienie" name="Advanced Lighting Model"/>
- <menu_item_check label="Cienie Słońca/Księżyca/Projektory" name="Shadows from Sun/Moon/Projectors"/>
- <menu_item_check label="SSAO and wygładzanie cienia" name="SSAO and Shadow Smoothing"/>
- <menu_item_check label="Automatyczne maski alpha (deferred)" name="Automatic Alpha Masks (deferred)"/>
- <menu_item_check label="Automatyczne maski alpha (non-deferred)" name="Automatic Alpha Masks (non-deferred)"/>
- <menu_item_check label="Tekstury animacji" name="Animation Textures"/>
- <menu_item_check label="Wyłącz tekstury" name="Disable Textures"/>
- <menu_item_check label="Renderowania załączonego światła" name="Render Attached Lights"/>
- <menu_item_check label="Renderowanie załączonych cząsteczek" name="Render Attached Particles"/>
- <menu_item_check label="Wyświetlaj obiekty odblaskowe" name="Hover Glow Objects"/>
+ <menu_item_check label="Osie" name="Axes" />
+ <menu_item_check label="Podstawy stycznych" name="Tangent Basis" />
+ <menu_item_call label="Bazowe informacje wybranych tekstur" name="Selected Texture Info Basis" />
+ <menu_item_call label="Informacje o zaznaczonym materiale" name="Selected Material Info" />
+ <menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe" />
+ <menu_item_check label="Okluzja obiektu do obiektu" name="Object-Object Occlusion" />
+ <menu_item_check label="Zaawansowane oświetlenie" name="Advanced Lighting Model" />
+ <menu_item_check label=" Cienie Słońca, Księżyca i innych źródeł" name="Shadows from Sun/Moon/Projectors" />
+ <menu_item_check label=" SSAO i wygładzanie cieni" name="SSAO and Shadow Smoothing" />
+ <menu_item_check label="Debugowanie GL" name="Debug GL" />
+ <menu_item_check label="Debugowanie potoków" name="Debug Pipeline" />
+ <menu_item_check label="Automatyczne maski alpha (z opóźnianiem)" name="Automatic Alpha Masks (deferred)" />
+ <menu_item_check label="Automatyczne maski alpha (bez opóźniania)" name="Automatic Alpha Masks (non-deferred)" />
+ <menu_item_check label="Tekstury animacji" name="Animation Textures" />
+ <menu_item_check label="Wyłącz tekstury" name="Disable Textures" />
+ <menu_item_check label="Maksymalna rozdzielczość tekstur (niebezpieczne)" name="Rull 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="Wyświetlaj obiekty odblaskowe" name="Hover Glow Objects" />
+ <menu_item_call label="Wyczyść natychmiast pamięć podręczną" name="Cache Clear" />
</menu>
<menu label="Sieć" name="Network">
- <menu_item_check label="Zatrzymaj awatara" name="AgentPause"/>
- <menu_item_call label="Upuść pakiet pamięci" name="Drop a Packet"/>
+ <menu_item_check label="Zatrzymaj awatara" name="AgentPause" />
+ <menu_item_call label="Włącz logowanie wiadomości" name="Enable Message Log" />
+ <menu_item_call label="Wyłącz logowanie wiadomości" name="Disable Message Log" />
+ <menu_item_check label="Prędkość interpolacji obiektów" name="Velocity Interpolate Objects" />
+ <menu_item_check label="Pinguj pozycje interpolowanych obiektów" name="Ping Interpolate Object Positions" />
+ <menu_item_call label="Zagub pakiet" name="Drop a Packet" shortcut="" />
+ </menu>
+ <menu_item_call label="Zrzut oskryptowanej kamery" name="Dump Scripted Camera" />
+ <menu label="Nagrywanie" name="Recorder">
+ <menu_item_call label="Rozpocznij nagrywanie zdarzeń" name="Start event recording" />
+ <menu_item_call label="Zatrzymaj nagrywanie zdarzeń" name="Stop event recording" />
+ <menu_item_call label="Odtwarzanie nagranych zdarzeń" name="Playback event recording" />
+ <menu_item_call label="Rozpocznij odtwarzanie" name="Start Playback" />
+ <menu_item_call label="Zatrzymaj odtwarzanie" name="Stop Playback" />
+ <menu_item_check label="Odtwarzanie w pętli" name="Loop Playback" />
+ <menu_item_call label="Rozpocznij nagrywanie" name="Start Record" />
+ <menu_item_call label="Zatrzymaj nagrywanie" name="Stop Record" />
</menu>
<menu label="Åšwiat" name="DevelopWorld">
- <menu_item_check label="Domyślne ustawienia środowiska Regionu" name="Sim Sun Override"/>
- <menu_item_check label="Ustalona pogoda" name="Fixed Weather"/>
- <menu_item_call label="Zachowaj bufor pamięci obiektów regionu" name="Dump Region Object Cache"/>
- </menu>
- <menu label="UI" name="UI">
- <menu_item_call label="Test przeglądarki mediów" name="Web Browser Test"/>
- <menu_item_call label="Przeglądarka zawartości strony" name="Web Content Browser"/>
- <menu_item_call label="Drukuj zaznaczone informacje o obiekcie" name="Print Selected Object Info"/>
- <menu_item_check label="Debugowanie zdarzeń klikania" name="Debug Clicks"/>
- <menu_item_check label="Debugowanie zdarzeń myszy" name="Debug Mouse Events"/>
- </menu>
- <menu label="XUI" name="XUI">
- <menu_item_call label="Załaduj ustawienia koloru" name="Reload Color Settings"/>
- <menu_item_call label="Pokaż test czcionki" name="Show Font Test"/>
- <menu_item_check label="Pokaż nazwy XUI" name="Show XUI Names"/>
- <menu_item_call label="Wyślij wiadomość (IM) testową" name="Send Test IMs"/>
- <menu_item_call label="Wyczyść bufor pamięci nazw" name="Flush Names Caches"/>
+ <menu_item_check label="Domyślne ustawienia środowiska Regionu" name="Sim Sun Override" />
+ <menu_item_check label="Ustalona pogoda" name="Fixed Weather" />
+ <menu_item_call label="Zrzut buforu pamięci obiektów regionu" name="Dump Region Object Cache" />
+ </menu>
+ <menu label="Interfejs" name="UI">
+ <menu_item_check label="Nowy pasek dolny" name="New Bottom Bar" />
+ <menu_item_call label="Test przeglądarki mediów" name="Web Browser Test" />
+ <menu_item_call label="Przeglądarka treści internetowych" name="Web Content Browser" />
+ <menu_item_call label="Test połączenia z Facebookiem" name="FB Connect Test" />
+ <menu_item_call label="Zrzut SelectMgr" name="Dump SelectMgr" />
+ <menu_item_call label="Zrzut Szafy" name="Dump Inventory" />
+ <menu_item_call label="Zrzut liczników" name="Dump Timers" />
+ <menu_item_call label="Zrzut punktu skupienia" name="Dump Focus Holder" />
+ <menu_item_call label="Listuj informacje o zaznaczonym obiekcie" name="Print Selected Object Info" />
+ <menu_item_call label="Listuj informacje o Agencie" name="Print Agent Info" />
+ <menu_item_check label="Debuguj SelectMgr" name="Debug SelectMgr" />
+ <menu_item_check label="Debuguj kliknięcia" name="Debug Clicks" />
+ <menu_item_check label="Debuguj widoki" name="Debug Views" />
+ <menu_item_check label="Debuguj chmurki dla podpowiedzi nazw" name="Debug Name Tooltips" />
+ <menu_item_check label="Debuguj zdarzenia myszy" name="Debug Mouse Events" />
+ <menu_item_check label="Debuguj klawisze" name="Debug Keys" />
+ <menu_item_check label="Debuguj procesy okien" name="Debug WindowProc" />
+ </menu>
+ <menu label="XUI/XML" name="XUI">
+ <menu_item_call label="Przeładuj ustawienia koloru" name="Reload Color Settings" />
+ <menu_item_call label="Pokaż test czcionki" name="Show Font Test" />
+ <menu_item_check label="Pokaż nazwy XUI" name="Show XUI Names" />
+ <menu_item_call label="Wyślij wiadomość (IM) testową" name="Send Test IMs" />
+ <menu_item_call label="Wyczyść bufor pamięci nazw" name="Flush Names Caches" />
</menu>
<menu label="Awatar" name="Character">
- <menu label="Przesuń bakowaną teksturę" name="Grab Baked Texture">
- <menu_item_call label="Tęczówka oka" name="Grab Iris"/>
- <menu_item_call label="GÅ‚owa" name="Grab Head"/>
- <menu_item_call label="Górna część ciała" name="Grab Upper Body"/>
- <menu_item_call label="Dolna część ciała" name="Grab Lower Body"/>
- <menu_item_call label="Spódnica" name="Grab Skirt"/>
+ <menu label="Zrzuć prerenderowaną (bakowaną) teksturę" name="Grab Baked Texture">
+ <menu_item_call label="Tęczówka oka" name="Grab Iris" />
+ <menu_item_call label="GÅ‚owa" name="Grab Head" />
+ <menu_item_call label="Górna część ciała" name="Grab Upper Body" />
+ <menu_item_call label="Dolna część ciała" name="Grab Lower Body" />
+ <menu_item_call label="Spódnica" name="Grab Skirt" />
</menu>
<menu label="Testy postaci" name="Character Tests">
- <menu_item_call label="Przesuń geometrię postaci" name="Toggle Character Geometry"/>
- <menu_item_check label="Pozwól na zaznaczanie awatarów" name="Allow Select Avatar"/>
+ <menu_item_call label="WyglÄ…d do XML" name="Appearance To XML" />
+ <menu_item_call label="Zmień geometrię postaci" name="Toggle Character Geometry" />
+ <menu_item_call label="Testowy mężczyzna" name="Test Male" />
+ <menu_item_call label="Testowa kobieta" name="Test Female" />
+ <menu_item_check label="Pozwól na zaznaczanie awatarów" name="Allow Select Avatar" />
+ </menu>
+ <menu label="Szybkość animacji" name="Animation Speed">
+ <menu_item_call label="Wszystkie animacje 10% szybciej" name="All Animations 10 Faster" />
+ <menu_item_call label="Wszystkie animacje 10% wolniej" name="All Animations 10 Slower" />
+ <menu_item_call label="Resetuj szybkość wszystkich animacji" name="Reset All Animation Speed" />
+ <menu_item_check label="Animacje w zwolnionym tempie" name="Slow Motion Animations" />
</menu>
- <menu_item_call label="Powrót do domyślnych parametrów" name="Force Params to Default"/>
- <menu_item_check label="Info o animacji" name="Animation Info"/>
- <menu_item_check label="Wyłącz poziom detalu" name="Disable LOD"/>
- <menu_item_check label="Pokaż szczegóły kolizji" name="Show Collision Skeleton"/>
- <menu_item_check label="Wyświetl cel agenta" name="Display Agent Target"/>
- <menu_item_call label="Debugowanie tekstur awatara" name="Debug Avatar Textures"/>
- </menu>
- <menu_item_check label="Tekstury HTTP" name="HTTP Textures"/>
- <menu_item_check label="Aktywacja okna konsoli podczas następnego uruchomienia" name="Console Window"/>
- <menu_item_call label="Uzyskaj status administratora" name="Request Admin Options"/>
- <menu_item_call label="Opuść status administratora" name="Leave Admin Options"/>
- <menu_item_check label="Pokaż menu administratora" name="View Admin Options"/>
+ <menu_item_call label="Powrót do domyślnych parametrów" name="Force Params to Default" />
+ <menu_item_check label="Informacje o animacji" name="Animation Info" />
+ <menu_item_check label="Pokaż na co patrzą inni" name="Show Look At" />
+ <menu_item_check label="Pokaż na co wskazują inni" name="Show Point At" />
+ <menu_item_check label="Debuguj aktualizacje stawów" name="Debug Joint Updates" />
+ <menu_item_check label="Wyłącz poziomy detali (LOD)" name="Disable LOD" />
+ <menu_item_check label="Debuguj VIs postaci" name="Debug Character Vis" />
+ <menu_item_check label="Pokaż szkielet kolizji" name="Show Collision Skeleton" />
+ <menu_item_check label="Wyświetl cel Agenta" name="Display Agent Target" />
+ <menu_item_check label="Debugowanie rotacji" name="Debug Rotation" />
+ <menu_item_call label="Zrzut przyłączonych dodatków" name="Dump Attachments" />
+ <menu_item_call label="Debugowanie tekstur awatara" name="Debug Avatar Textures" shortcut="" />
+ <menu_item_call label="Zrzut lokalnych tekstur" name="Dump Local Textures" />
+ </menu>
+ <menu_item_check label="Tekstury przez HTTP" name="HTTP Textures" />
+ <menu_item_call label="Kompresuj obrazki" name="Compress Images" />
+ <menu_item_call label="Włącz wizualny detektor wycieków pamięci" name="Enable Visual Leak Detector" />
+ <menu_item_check label="Mały zrzut wyjścia debugowania" name="Output Debug Minidump" />
+ <menu_item_check label="Aktywacja okna konsoli podczas następnego uruchomienia" name="Console Window" />
+ <menu label="Ustaw poziom logowania" name="Set Logging Level">
+ <menu_item_check name="Debug" label="Debugowanie" />
+ <menu_item_check name="Info" label="Informacje" />
+ <menu_item_check name="Warning" label="Ostrzeżenia" />
+ <menu_item_check name="Error" label="Błędy" />
+ <menu_item_check name="None" label="Brak" />
+ </menu>
+ <menu_item_call label="Zażądaj statusu administratora" name="Request Admin Options" />
+ <menu_item_call label="Porzuć status administratora" name="Leave Admin Options" />
+ <menu_item_check label="Pokaż menu administratora" name="View Admin Options" />
</menu>
<menu label="Administrator" name="Admin">
- <menu label="Object" name="AdminObject">
- <menu_item_call label="Weź kopię" name="Admin Take Copy"/>
- <menu_item_call label="Reset właściciela" name="Force Owner To Me"/>
- <menu_item_call label="Reset przyzwolenia właściciela" name="Force Owner Permissive"/>
- <menu_item_call label="Usuń" name="Delete"/>
- <menu_item_call label="Zablokuj" name="Lock"/>
- </menu>
- <menu label="Posiadłość" name="Parcel">
- <menu_item_call label="Reset właściciela" name="Owner To Me"/>
- <menu_item_call label="Ustawienia treści Lindenów" name="Set to Linden Content"/>
- <menu_item_call label="Odzyskaj posiadłość publiczną" name="Claim Public Land"/>
- </menu>
- <menu label="Region" name="Region">
- <menu_item_call label="Zachowaj tymczasowo bazÄ™ asset" name="Dump Temp Asset Data"/>
- <menu_item_call label="Zachowaj ustawienie Regionu" name="Save Region State"/>
- </menu>
- <menu_item_call label="Boskie narzędzia" name="God Tools"/>
+ <menu label="Obiekt" name="AdminObject">
+ <menu_item_call label="Weź kopię" name="Admin Take Copy" />
+ <menu_item_call label="Wymuś ustawienie właściciela na mnie" name="Force Owner To Me" />
+ <menu_item_call label="Wymuś ustawienie właściciela na mnie, ale liberalnie" name="Force Owner Permissive" />
+ <menu_item_call label="Usuń" name="Delete" />
+ <menu_item_call label="Zablokuj" name="Lock" />
+ <menu_item_call label="Pobierz ID zasobów danych (assetów)" name="Get Assets IDs" />
+ </menu>
+ <menu label="Działka" name="Parcel">
+ <menu_item_call label="Wymuś ustawienie właściciela na mnie" name="Owner To Me" />
+ <menu_item_call label="Ustaw na własność Lindenów" name="Set to Linden Content" />
+ <menu_item_call label="Zażądaj działki publicznej" name="Claim Public Land" />
+ </menu>
+ <menu name="Region">
+ <menu_item_call label="Zrzuć tymczasowe informacje zasobów danych (assetów)" name="Dump Temp Asset Data" />
+ <menu_item_call label="Zachowaj ustawienie Regionu" name="Save Region State" />
+ </menu>
+ <menu_item_call label="Boskie narzędzia" name="God Tools" />
</menu>
- <menu label="Admin" name="Deprecated">
- <menu label="Take Off Clothing" name="Take Off Clothing">
- <menu_item_call label="Fizyka" name="Physics"/>
+ <menu name="Deprecated">
+ <menu label="Przyłącz obiekt" name="Attach Object" />
+ <menu label="Odłącz obiekt" name="Detach Object" />
+ <menu label="Zdejmij ubrania" name="Take Off Clothing">
+ <menu_item_call label="Koszula" name="Shirt" />
+ <menu_item_call label="Spodnie" name="Pants" />
+ <menu_item_call label="Buty" name="Shoes" />
+ <menu_item_call label="Skarpetki" name="Socks" />
+ <menu_item_call label="Kurtka" name="Jacket" />
+ <menu_item_call label="Rękawiczki" name="Gloves" />
+ <menu_item_call label="Podkoszulek" name="Menu Undershirt" />
+ <menu_item_call label="Bielizna" name="Menu Underpants" />
+ <menu_item_call label="Spódnica" name="Skirt" />
+ <menu_item_call label="Tatuaż" name="Tattoo" />
+ <menu_item_call label="Fizyka" name="Physics" />
+ <menu_item_call label="Wszystkie ubrania" name="All Clothes" />
+ </menu>
+ <menu label="Pomoc" name="DeprecatedHelp">
+ <menu_item_call label="Oficjalny blog Lindenów" name="Official Linden Blog" />
+ <menu_item_call label="Portal dla skrypterów" name="Scripting Portal" />
+ <menu label="Raportowanie błędów" name="Bug Reporting">
+ <menu_item_call label="Publiczny system śledzenia błędów" name="Public Issue Tracker" />
+ <menu_item_call label="Pomoc publicznego systemu śledzenia błędów" name="Publc Issue Tracker Help" />
+ <menu_item_call label="Raportowanie błędów 101" name="Bug Reporing 101" />
+ <menu_item_call label="Problemy z bezpieczeństwem" name="Security Issues" />
+ <menu_item_call label="Wiki kontroli jakości" name="QA Wiki" />
+ </menu>
</menu>
</menu>
</menu_bar>
diff --git a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
old mode 100755
new mode 100644
index bf85246be84d8adcb589b0f4be3c14d597d79357..260b86cb073373ffd9bc62e4ced1be5187a92816
--- a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Outfit Wearable Context Menu">
- <menu_item_call label="ZastÄ…p" name="wear_replace"/>
- <menu_item_call label="Załóż" name="wear_wear"/>
- <menu_item_call label="Dodaj" name="wear_add"/>
- <menu_item_call label="Zdejmij/Odłącz" name="take_off_or_detach"/>
- <menu_item_call label="Odłącz" name="detach"/>
- <context_menu label="Dołącz do" name="wearable_attach_to"/>
- <context_menu label="Dołącz do załączników HUD" name="wearable_attach_to_hud"/>
- <menu_item_call label="Zdejmij" name="take_off"/>
- <menu_item_call label="Edytuj" name="edit"/>
- <menu_item_call label="Profil obiektu" name="object_profile"/>
- <menu_item_call label="Pokaż oryginalny" name="show_original"/>
+ <menu_item_call label="ZastÄ…p" name="wear_replace" />
+ <menu_item_call label="Załóż" name="wear_wear" />
+ <menu_item_call label="Dodaj" name="wear_add" />
+ <menu_item_call label="Zdejmij/Odłącz" name="take_off_or_detach" />
+ <menu_item_call label="Odłącz" name="detach" />
+ <context_menu label="Dołącz do" name="wearable_attach_to" />
+ <context_menu label="Dołącz do HUDa" name="wearable_attach_to_hud" />
+ <menu_item_call label="Zdejmij" name="take_off" />
+ <menu_item_call label="Edytuj" name="edit" />
+ <menu_item_call label="Profil obiektu" name="object_profile" />
+ <menu_item_call label="Pokaż oryginał" name="show_original" />
+ <menu_item_call label="Utwórz nowe" name="create_new" />
+ <menu_item_call label="--brak opcji--" name="--no options--" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
old mode 100755
new mode 100644
index 47cafdbd999efb8a5b318a54e0a148b04e633a96..73138b2cf752f1241db0fb76e16535e04c40af40
--- a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
- <menu_item_call label="Edytuj strój" name="edit"/>
- <menu_item_call label="Zdejmij" name="takeoff"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Gear Wearing">
+ <menu_item_call label="Edytuj strój" name="edit" />
+ <menu_item_call label="Zdejmij" name="takeoff" />
+ <menu_item_call label="Kopiuj listę przedmiotów stroju do schowka" name="copy" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
old mode 100755
new mode 100644
index 753143704320159934e6c540e4739625c20dc5af..09c82da4273b33de0934b8b4b3a68e1507936585
--- a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu name="Wearing">
- <menu_item_call label="Zdejmij" name="take_off"/>
- <menu_item_call label="Odłącz" name="detach"/>
- <menu_item_call label="Edytuj strój" name="edit"/>
+ <menu_item_call label="Zdejmij" name="take_off" />
+ <menu_item_call label="Odłącz" name="detach" />
+ <menu_item_call label="Edytuj strój" name="edit" />
</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml
old mode 100755
new mode 100644
index cbf2afa91d3cda2818d2fd87bafda8f8e484aacb..8327c6d8c8596db12b0110837a83cd42830e2e70
--- a/indra/newview/skins/default/xui/pl/mime_types.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
+ <defaultlabel>
+ (Nieznane)
+ </defaultlabel>
<widgetset name="web">
<label name="web_label">
Zawartość przeglądarki internetowej
@@ -22,20 +25,12 @@
Zacznij odtwarzanie filmu
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- Brak zawartości
- </label>
- <tooltip name="none_tooltip">
- Brak mediów tutaj
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
Obraz
</label>
<tooltip name="image_tooltip">
- Brak obrazów w tym miejscu
+ To miejsce zawiera obrazy
</tooltip>
<playtip name="image_playtip">
Zobacz obrazy tego miejsca
@@ -43,15 +38,23 @@
</widgetset>
<widgetset name="audio">
<label name="audio_label">
- Audio
+ Dźwięk
</label>
<tooltip name="audio_tooltip">
- To miejsce odtwarza audio
+ To miejsce odtwarza dźwięki
</tooltip>
<playtip name="audio_playtip">
- Zacznij odtwarzanie audio
+ Zacznij odtwarzanie dźwięków
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Brak zawartości
+ </label>
+ <tooltip name="none_tooltip">
+ Brak mediów
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Strumieniowe w czasie rzeczywistym
@@ -59,22 +62,22 @@
</scheme>
<mimetype name="blank">
<label name="blank_label">
- - Żadne -
+ - Brak -
</label>
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- - Żadne -
+ - Brak -
</label>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
- Audio
+ Dźwięk
</label>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
- Video
+ Wideo
</label>
</mimetype>
<mimetype name="image/*">
@@ -84,17 +87,12 @@
</mimetype>
<mimetype name="video/vnd.secondlife.qt.legacy">
<label name="vnd.secondlife.qt.legacy_label">
- Movie (QuickTime)
- </label>
- </mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Javascript
+ Film (QuickTime)
</label>
</mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
- Ogg Audio/Video
+ Dźwięk/Film Ogg
</label>
</mimetype>
<mimetype name="application/pdf">
@@ -114,7 +112,7 @@
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
- Synchronized Multimedia Integration Language (SMIL)
+ Język Integracyjnej Synchronizacji Multimedialnej (SMIL)
</label>
</mimetype>
<mimetype name="application/xhtml+xml">
@@ -122,34 +120,24 @@
Strona internetowa (XHTML)
</label>
</mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
- Audio (MIDI)
+ Dźwięk (MIDI)
</label>
</mimetype>
<mimetype name="audio/mpeg">
<label name="audio/mpeg_label">
- Audio (MP3)
+ Dźwięk (MP3)
</label>
</mimetype>
<mimetype name="audio/x-aiff">
<label name="audio/x-aiff_label">
- Audio (AIFF)
+ Dźwięk (AIFF)
</label>
</mimetype>
<mimetype name="audio/x-wav">
<label name="audio/x-wav_label">
- Audio (WAV)
+ Dźwięk (WAV)
</label>
</mimetype>
<mimetype name="image/bmp">
@@ -164,12 +152,12 @@
</mimetype>
<mimetype name="image/jpeg">
<label name="image/jpeg_label">
- Image (JPEG)
+ Obraz (JPEG)
</label>
</mimetype>
<mimetype name="image/png">
<label name="image/png_label">
- Image (PNG)
+ Obraz (PNG)
</label>
</mimetype>
<mimetype name="image/svg+xml">
@@ -192,11 +180,6 @@
Tekst
</label>
</mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
<mimetype name="video/mpeg">
<label name="video/mpeg_label">
Film (MPEG)
diff --git a/indra/newview/skins/default/xui/pl/mime_types_linux.xml b/indra/newview/skins/default/xui/pl/mime_types_linux.xml
old mode 100755
new mode 100644
index a2b8168b518625dd8cf889a399b83260a6bc6091..37b67db79781e4842acf1be7202790b58ed36066
--- a/indra/newview/skins/default/xui/pl/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types_linux.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
+ <defaultlabel>
+ (Nieznane)
+ </defaultlabel>
<widgetset name="web">
<label name="web_label">
Zawartość przeglądarki internetowej
@@ -16,7 +19,7 @@
Film
</label>
<tooltip name="movie_tooltip">
- To miejsce wyświtela filmy
+ To miejsce wyświetla filmy
</tooltip>
<playtip name="movie_playtip">
Zacznij odtwarzanie filmu
@@ -35,38 +38,46 @@
</widgetset>
<widgetset name="audio">
<label name="audio_label">
- Audio
+ Dźwięk
</label>
<tooltip name="audio_tooltip">
- W tym miejscu odtwarzane jest audio
+ W tym miejscu odtwarzane są dźwięki
</tooltip>
<playtip name="audio_playtip">
- Zacznij odtwarzanie audio
+ Zacznij odtwarzanie dźwięków
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Brak zawartości
+ </label>
+ <tooltip name="none_tooltip">
+ Brak mediów
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
- Strumieniowe w czasie rzeczywistym
+ Strumień w czasie rzeczywistym
</label>
</scheme>
<mimetype name="blank">
<label name="blank_label">
- - Żadne -
+ - Brak -
</label>
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- - Żadne -
+ - Brak -
</label>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
- Audio
+ Dźwięk
</label>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
- Video
+ Wideo
</label>
</mimetype>
<mimetype name="image/*">
@@ -79,14 +90,9 @@
Film (QuickTime)
</label>
</mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Javascript
- </label>
- </mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
- Ogg Audio/Video
+ Dźwięk/Wideo Ogg
</label>
</mimetype>
<mimetype name="application/pdf">
@@ -106,7 +112,7 @@
</mimetype>
<mimetype name="application/smil">
<label name="application/smil_label">
- Synchronized Multimedia Integration Language (SMIL)
+ Język Integracyjnej Synchronizacji Multimedialnej (SMIL)
</label>
</mimetype>
<mimetype name="application/xhtml+xml">
@@ -114,29 +120,24 @@
Strona internetowa (XHTML)
</label>
</mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
- Audio (MIDI)
+ Dźwięk (MIDI)
</label>
</mimetype>
<mimetype name="audio/mpeg">
<label name="audio/mpeg_label">
- Audio (MP3)
+ Dźwięk (MP3)
</label>
</mimetype>
<mimetype name="audio/x-aiff">
<label name="audio/x-aiff_label">
- Audio (AIFF)
+ Dźwięk (AIFF)
</label>
</mimetype>
<mimetype name="audio/x-wav">
<label name="audio/x-wav_label">
- Audio (WAV)
+ Dźwięk (WAV)
</label>
</mimetype>
<mimetype name="image/bmp">
@@ -179,11 +180,6 @@
Tekst
</label>
</mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
<mimetype name="video/mpeg">
<label name="video/mpeg_label">
Film (MPEG)
diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
old mode 100755
new mode 100644
index 7213b26165af2a2ee76533359973892ee98da4ef..8b7f1558c4ecb2b89fe9ed5fa6a3c4e9d9c6378a
--- a/indra/newview/skins/default/xui/pl/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
+ <defaultlabel>
+ (Nieznane)
+ </defaultlabel>
<widgetset name="web">
<label name="web_label">
Zawartość przeglądarki internetowej
@@ -16,10 +19,10 @@
Film
</label>
<tooltip name="movie_tooltip">
- To miejsce posiada zawartość filmową
+ To miejsce wyświetla filmy
</tooltip>
<playtip name="movie_playtip">
- OglÄ…daj film
+ Zacznij odtwarzanie filmu
</playtip>
</widgetset>
<widgetset name="image">
@@ -27,46 +30,54 @@
Obraz
</label>
<tooltip name="image_tooltip">
- To miejsce posiada zwartość graficzną
+ W tym miejscu można zobaczyć obrazy
</tooltip>
<playtip name="image_playtip">
- Zobacz zdjęcie miejsca
+ Zobacz obrazy wyświetlane w tym miejscu
</playtip>
</widgetset>
<widgetset name="audio">
<label name="audio_label">
- Audio
+ Dźwięk
</label>
<tooltip name="audio_tooltip">
- To miejsce posiada zwartość audio
+ W tym miejscu odtwarzane są dźwięki
</tooltip>
<playtip name="audio_playtip">
- Rozpocznij odtwarzanie audio
+ Zacznij odtwarzanie dźwięków
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Brak zawartości
+ </label>
+ <tooltip name="none_tooltip">
+ Brak mediów
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
- Synchroniczne strumienie mediów
+ Real Time Streaming
</label>
</scheme>
<mimetype name="blank">
<label name="blank_label">
- - Żadne -
+ - Brak -
</label>
</mimetype>
<mimetype name="none/none">
<label name="none/none_label">
- - Żadne -
+ - Brak -
</label>
</mimetype>
<mimetype name="audio/*">
<label name="audio2_label">
- Audio
+ Dźwięk
</label>
</mimetype>
<mimetype name="video/*">
<label name="video2_label">
- Video
+ Wideo
</label>
</mimetype>
<mimetype name="image/*">
@@ -79,14 +90,9 @@
Film (QuickTime)
</label>
</mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Skrypt Java
- </label>
- </mimetype>
<mimetype name="application/ogg">
<label name="application/ogg_label">
- Ogg Audio/Video
+ Dźwięk/Wideo Ogg
</label>
</mimetype>
<mimetype name="application/pdf">
@@ -101,7 +107,7 @@
</mimetype>
<mimetype name="application/rtf">
<label name="application/rtf_label">
- Dokument RTF
+ Tekst (RTF)
</label>
</mimetype>
<mimetype name="application/smil">
@@ -114,29 +120,24 @@
Strona internetowa (XHTML)
</label>
</mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
- Audio (MIDI)
+ Dźwięk (MIDI)
</label>
</mimetype>
<mimetype name="audio/mpeg">
<label name="audio/mpeg_label">
- Audio (MP3)
+ Dźwięk (MP3)
</label>
</mimetype>
<mimetype name="audio/x-aiff">
<label name="audio/x-aiff_label">
- Audio (AIFF)
+ Dźwięk (AIFF)
</label>
</mimetype>
<mimetype name="audio/x-wav">
<label name="audio/x-wav_label">
- Audio (WAV)
+ Dźwięk (WAV)
</label>
</mimetype>
<mimetype name="image/bmp">
@@ -179,11 +180,6 @@
Tekst
</label>
</mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
<mimetype name="video/mpeg">
<label name="video/mpeg_label">
Film (MPEG)
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
old mode 100755
new mode 100644
index 25cc43a6e3868bd57bb439c14e760c6d2e1f563b..e92bdb8820d50b7e1fe8db81fbeb8a5c7e80c496
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -1,382 +1,297 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
<notifications>
<global name="skipnexttime">
- Nie pokazuj tej opcji następnym razem
+ Nie pokazuj tego następnym razem
</global>
<global name="alwayschoose">
- Pozwalaj na wybór tej opcji
+ Zawsze wybieraj tÄ… opcjÄ™
</global>
<global name="implicitclosebutton">
Zamknij
</global>
- <template name="okbutton">
- <form>
- <button name="OK_okbutton" text="$yestext"/>
- </form>
- </template>
- <template name="okignore">
- <form>
- <button name="OK_okignore" text="$yestext"/>
- </form>
- </template>
- <template name="okcancelbuttons">
- <form>
- <button name="OK_okcancelbuttons" text="$yestext"/>
- <button name="Cancel_okcancelbuttons" text="$notext"/>
- </form>
- </template>
- <template name="okcancelignore">
- <form>
- <button name="OK_okcancelignore" text="$yestext"/>
- <button name="Cancel_okcancelignore" text="$notext"/>
- </form>
- </template>
- <template name="okhelpbuttons">
- <form>
- <button name="OK_okhelpbuttons" text="$yestext"/>
- <button name="Help" text="$helptext"/>
- </form>
- </template>
- <template name="yesnocancelbuttons">
- <form>
- <button name="Yes" text="$yestext"/>
- <button name="No" text="$notext"/>
- <button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
- </form>
- </template>
- <notification functor="GenericAcknowledge" label="Nieznany rodzaj komunikatu" name="MissingAlert">
+ <notification name="MissingAlert" label="Nieznany rodzaj komunikatu">
Twoja wersja klienta [APP_NAME] nie może wyświetlić odebranej wiadomości. Upewnij się, że posiadasz najnowszą wersję klienta.
Szczegóły błędu: Błąd o nazwie '[_NAME]' nie został odnaleziony w pliku notifications.xml.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="FloaterNotFound">
Błąd: nie można znaleźć następujących elementów:
[CONTROLS]
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="TutorialNotFound">
Brak samouczka na ten temat
- <usetemplate name="okbutton" yestext="OK"/>
- </notification>
- <notification name="GenericAlert">
- [MESSAGE]
</notification>
<notification name="GenericAlertYesCancel">
[MESSAGE]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak"/>
- </notification>
- <notification name="GenericAlertOK">
- [MESSAGE]
- <usetemplate name="okbutton" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak" />
</notification>
<notification name="BadInstallation">
- Podczas aktualizacji [APP_NAME] wystąpił błąd. Proszę odwiedzić stronę [http://get.secondlife.com pobierz najnowsza wersję] aby ściągnąć ostatnią wersję klienta.
- <usetemplate name="okbutton" yestext="OK"/>
+ Podczas aktualizacji [APP_NAME] wystąpił błąd. Proszę [http://get.secondlife.com odwiedzić stronę] aby ściągnąć ostatnią wersję klienta.
</notification>
<notification name="LoginFailedNoNetwork">
Nie można połączyć z [SECOND_LIFE_GRID].
- '[DIAGNOSTIC]'
+'[DIAGNOSTIC]'
Upewnij się, że Twoje połączenie z internetem działa.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="MessageTemplateNotFound">
- Wzór komunikatu dla [PATH] nie został odnaleziony.
- <usetemplate name="okbutton" yestext="OK"/>
+ Szablon komunikatu dla [PATH] nie został odnaleziony.
</notification>
<notification name="WearableSave">
Zapisać zmiany dotyczące ubrania/części ciała?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie Zapisuj" yestext="Zapisz"/>
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz" />
</notification>
- <notification name="StockPasteFailed">
- Kopiowanie lub przeniesienie do folderu magazynowego nie powiodło się:
-
- '[ERROR_CODE]'
- <usetemplate name="okbutton" yestext="OK"/>
+ <notification name="ConfirmNoCopyToOutbox">
+ Nie masz uprawnień do kopiowania jednego lub więcej obiektów do Skrzynki Nadawczej Kupca. Możesz je przenieść lub pozostawić.
+ <usetemplate name="okcancelbuttons" notext="Nie przenoÅ›" yestext="PrzenieÅ›" />
</notification>
- <notification name="MerchantPasteFailed">
- Kopiowanie lub przenoszenie przedmiotów na Marketplace nie powiodło się:
-
-'[ERROR_CODE]'
- <usetemplate name="okbutton" yestext="OK"/>
+ <notification name="OutboxFolderCreated">
+ Nowy folder został stworzony dla każdego przedmiotu przeniesionego do głównego poziomu Skrzynki Nadawczej Kupca.
+ <usetemplate ignoretext="Nowy folder został stworzony w Skrzynce Nadawczej Kupca" name="okignore" />
</notification>
- <notification name="MerchantTransactionFailed">
- Transakcja z Marketplace nie powiodła się:
+ <notification name="OutboxImportComplete">
+ Powodzenie
- Powód: '[ERROR_REASON]'
- [ERROR_DESCRIPTION]
- <usetemplate name="okbutton" yestext="OK"/>
+Wszystkie foldery zostały pomyślnie wysłane na Marketplace.
+ <usetemplate ignoretext="Wszystkie foldery wysłano na Marketplace" name="okignore" />
</notification>
- <notification name="MerchantUnprocessableEntity">
- Wylistowanie tego produktu lub aktywowanie folderu z wersją nie było możliwe. Zazwyczaj jest to spowodowane brakującymi informacjami w formularzu z opisem przedmiotu, ale może to również wynikać z błędów w strukturze folderów. Zmień opis przedmiotu lub sprawdź foldery, aby znaleźć błędy.
- <usetemplate name="okbutton" yestext="OK"/>
- </notification>
- <notification name="MerchantListingFailed">
- Listowanie na Marketplace nie powiodło się:
+ <notification name="OutboxImportHadErrors">
+ Niektóre foldery nie zostały wysłane
- '[ERROR_CODE]'
- <usetemplate name="okbutton" yestext="OK"/>
- </notification>
- <notification name="MerchantFolderActivationFailed">
- Aktywacja tego folderu wersji nie powiodła się:
+Wystąpiły błędy w wysyłaniu pewnych folderów na Marketplace. Są one ciągle obecne w Skrzynce Nadawczej Kupca.
- '[ERROR_CODE]'
- <usetemplate name="okbutton" yestext="OK"/>
- </notification>
- <notification name="ConfirmMerchantActiveChange">
- Jeśli kontynuujesz, to zmieni się aktywna zawartość tego przedmiotu. Czy chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź przed zmodyfikowaniem aktywnego przedmiotu na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
- </notification>
- <notification name="ConfirmMerchantMoveInventory">
- Przedmioty przeciągnięte do okna listowania na Marketplace są przenoszone z ich oryginalnych lokalizacji, a nie kopiowane. Czy chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź, zanim prześlę na Marketplace przedmiot z mojej Szafy" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+Zobacz [[MARKETPLACE_IMPORTS_URL] log błędów] aby uzyskać więcej informacji.
</notification>
- <notification name="ConfirmListingCutOrDelete">
- Przeniesienie lub usunięcie folderu usunie również Twój przedmiot na Marketplace. Jeśli chcesz, aby przedmiot był ciągle widoczny na Marketplace musisz przesunąć lub usunąć zawartość folderu z wersją, którą chcesz zmodyfikować. Czy chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź, zanim usunę lub przeniosę przedmiot na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
- </notification>
- <notification name="ConfirmCopyToMarketplace">
- Nie masz praw do skopiowania jednego lub więcej obiektów na Marketplace. Możesz je przenieść lub pozostawić.
- <usetemplate canceltext="Anuluj" ignoretext="Potwierdź, zanim wyślę na Marketplace przedmioty bez praw kopiowania" name="yesnocancelbuttons" notext="Nie przenoś" yestext="Przenieś"/>
- </notification>
- <notification name="ConfirmMerchantUnlist">
- Jeśli kontynuujesz, to ten przedmiot zostanie usunięty z listy. Czy chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź, zanim usunę z listy przedmiot na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
- </notification>
- <notification name="ConfirmMerchantClearVersion">
- Jeśli kontynuujesz, to folder wersji tego przedmiotu zostanie zdeaktywowany. Czy chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź przed wyłączeniem folderu wersji dla przedmiotu na Marketplace" name="okcancelignore" notext="Anuluj" yestext="OK"/>
- </notification>
- <notification name="AlertMerchantListingNotUpdated">
- Ten przedmiot nie może zostać zaktualizowany.
-[[URL] Kliknij tutaj] aby zaktualizować go na Marketplace.
- <usetemplate name="okbutton" yestext="OK"/>
- </notification>
- <notification name="AlertMerchantListingCannotWear">
- Nie możesz założyć ubrań lub części ciała, które znajdują się w folderze listingów Marketplace.
- </notification>
- <notification name="AlertMerchantListingInvalidID">
- Nieprawidłowy ID przedmiotu.
- </notification>
- <notification name="AlertMerchantListingActivateRequired">
- Istnieje kilka, lub żadna, wersji folderu dla tego przedmiotu. Będziesz musiała/ wybrać i uaktywnić jedną oddzielnie później.
- <usetemplate ignoretext="Powiadamiaj o aktywacji folderu wersji, gdy tworzÄ™ przedmiot z kilkoma folderami wersji" name="okignore" yestext="OK"/>
- </notification>
- <notification name="AlertMerchantStockFolderSplit">
- Przedmioty z ograniczonymi zasobami magazynowymi różnych typów zostały rozdzielone do osobnych folderów, aby ogólna hierarchia katalogów umożliwiała ich listowanie.
- <usetemplate ignoretext="Powiadom, gdy folder magazynowy jest dzielony przed listowaniem" name="okignore" yestext="OK"/>
- </notification>
- <notification name="AlertMerchantStockFolderEmpty">
- Twój przedmiot został usunięty z listy, ponieważ nie ma go już w magazynie. Musisz dodać więcej jego jednostek do folderu magazynowego, aby można było go ponownie wyświetlać na liście.
- <usetemplate ignoretext="Powiadom, gdy przedmiot jest zdjęty z listy, bo folder zasobów magazynowych jest pusty" name="okignore" yestext="OK"/>
- </notification>
- <notification name="CompileQueueSaveText">
- W trakcie ładwania tekstu dla skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut.
+ <notification name="OutboxImportFailed">
+ Transfer nieudany, błąd '[ERROR_CODE]'
+
+Foldery nie zostały wysłane na Marketplace z powodu błędu sieci lub systemu. Spróbuj później.
</notification>
- <notification name="CompileQueueSaveBytecode">
- W trakcie ładowania skompilowanego skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut.
+ <notification name="OutboxInitFailed">
+ Inicjalizacja Marketplace nieudana, błąd '[ERROR_CODE]'
+
+Inicjalizacja Marketplace nieudana z powodu błędu sieci lub systemu. Spróbuj później.
</notification>
<notification name="WriteAnimationFail">
Problem w zapisywaniu danych animacji. Spróbuj ponownie za kilka minut.
</notification>
<notification name="UploadAuctionSnapshotFail">
- W trakcie ładwania obrazu aukcji pojawił się problem z następującego powodu: [REASON].
+ W trakcie ładowania obrazu aukcji pojawił się problem z następującego powodu: [REASON].
</notification>
<notification name="UnableToViewContentsMoreThanOne">
Nie można przeglądać zawartości więcej niż jednego obiektu naraz.
Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
</notification>
<notification name="SaveClothingBodyChanges">
- Zapisać wszystkie zmiany dotyczące ubrania/cześci ciała?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz"/>
+ Zapisać wszystkie zmiany dotyczące ubrania/części ciała?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz" />
</notification>
<notification name="FriendsAndGroupsOnly">
- Osoby spoza listy znajomych, których rozmowy głosowe i IM są ignorowane, nie wiedzą o tym.
- <usetemplate name="okbutton" yestext="OK"/>
+ Osoby spoza listy znajomych nie będą wiedzieć, że zdecydowałeś/aś się ignorować ich rozmowy głosowe i wiadomości IM.
</notification>
- <notification name="FavoritesOnLogin">
- Pamiętaj: kiedy wyłączysz tą opcję, każdy kto używa tego komputera, może zobaczyć Twoją listę ulubionych miejsc.
- <usetemplate name="okbutton" yestext="OK"/>
+ <notification name="FavoritesOnLogin">
+ Pamiętaj: kiedy włączysz tą opcję to każdy kto używa tego komputera będzie mógł zobaczyć Twoją listę ulubionych miejsc.
</notification>
<notification name="GrantModifyRights">
Udzielenie praw modyfikacji innemu Rezydentowi umożliwia modyfikację, usuwanie lub wzięcie JAKIEGOKOLWIEK z Twoich obiektów. Używaj tej opcji z rozwagą!
Czy chcesz udzielić prawa do modyfikacji [NAME]?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="GrantModifyRightsMultiple">
Udzielenie praw modyfikacji innym Rezydentom umożliwia im modyfikację, usuwanie lub wzięcie JAKIEGOKOLWIEK z Twoich obiektów. Używaj tej opcji z rozwagą!
Czy chcesz dać prawa modyfikacji wybranym osobom?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="RevokeModifyRights">
Czy chcesz odebrać prawa do modyfikacji [NAME]?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="RevokeModifyRightsMultiple">
Czy chcesz odebrać prawa modyfikacji wybranym Rezydentom?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="UnableToCreateGroup">
Założenie grupy nie jest możliwe.
[MESSAGE]
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="PanelGroupApply">
[NEEDS_APPLY_MESSAGE]
[WANT_APPLY_MESSAGE]
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Ignoruj zmiany" yestext="Zastosuj zmiany"/>
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Ignoruj zmiany" yestext="Zastosuj zmiany" />
</notification>
<notification name="MustSpecifyGroupNoticeSubject">
Aby wysłać ogłoszenie do grupy musisz nadać mu tytuł.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="AddGroupOwnerWarning">
- Dodajesz członków do funkcji [ROLE_NAME].
+ Dodajesz osoby do funkcji [ROLE_NAME].
Ta funkcja nie może być odebrana.
-Członkowie muszą sami zrezygnować z pełnienia tej funkcji.
+Osoby muszą same zrezygnować z pełnienia tej funkcji.
Chcesz kontynuować?
- <usetemplate ignoretext="Przed dodaniem nowego właściciela do grupy, proszę potwierdzić swoją decyzję." name="okcancelignore" notext="Nie" yestext="Tak"/>
+ <usetemplate ignoretext="Potwierdź przed dodaniem nowego właściciela grupy" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="AssignDangerousActionWarning">
- Dodajesz przywilej [ACTION_NAME] do fukcji [ROLE_NAME].
+ Dodajesz przywilej '[ACTION_NAME]' do funkcji '[ROLE_NAME]'.
*UWAGA*
-Członek w funkcji z tym przywilejem może przypisać siebie i innych członków nie będących właścicielami do funkcji dających więcej przywilejów niż posiadane obecnie potencjalnie dające możliwości zbliżone do możliwości właściciela.
-Udzielaj tego przywileju z rozwagÄ…."
+Osoba w funkcji z tym przywilejem może przypisać siebie i inne osoby, które nie są właścicielami do funkcji dających więcej przywilejów niż posiadane obecnie, potencjalnie dające możliwości zbliżone do możliwości właściciela.
+Udzielaj tego przywileju z rozwagÄ….
-Dodać ten przywilej do funkcji [ROLE_NAME]?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+Dodać ten przywilej do funkcji '[ROLE_NAME]'?
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="AssignDangerousAbilityWarning">
- Dodajesz przywilej [ACTION_NAME] do fukcji [ROLE_NAME]
+ Dodajesz przywilej '[ACTION_NAME]' do funkcji '[ROLE_NAME]'
*UWAGA*
-Członek w funkcji z tym przywilejem może przypisać sobie i innychm członkom nie będącym właścicielami wszystkie przywileje potencjalnie dające możliwości zbliżone do możliwości właściciela.
+Osoba w funkcji z tym przywilejem może przypisać sobie i innym osobom, które nie są właścicielami wszystkie przywileje potencjalnie dające możliwości zbliżone do możliwości właściciela.
Udzielaj tego przywileju z rozwagÄ….
-Dodać ten przywilej do funkcji [ROLE_NAME]?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+Dodać ten przywilej do funkcji '[ROLE_NAME]'?
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
+ </notification>
+ <notification name="AssignBanAbilityWarning">
+ Dodajesz przywilej '[ACTION_NAME]' do funkcji '[ROLE_NAME]'
+
+*UWAGA*
+Osoba w funkcji z tym przywilejem otrzyma również '[ACTION_NAME_2]' oraz '[ACTION_NAME_3]'
+ </notification>
+ <notification name="RemoveBanAbilityWarning">
+ Zabierasz przywilej '[ACTION_NAME]' z funkcji '[ROLE_NAME]'
+
+*UWAGA*
+Zabranie tej funkcji NIE usunie '[ACTION_NAME_2]' oraz '[ACTION_NAME_3]'.
+
+Jeśli nie chcesz, aby te przywileje były dłużej przypisane do tej roli, to wyłącz je natychmiast!
+ </notification>
+ <notification name="EjectGroupMemberWarning">
+ Zamierzasz wyrzucić [AVATAR_NAME] z grupy.
+ <usetemplate ignoretext="Potwierdź wyrzucenie osoby z grupy" name="okcancelignore" notext="Anuluj" yestext="Wyrzuć" />
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Zamierzasz wyrzucić [COUNT] osób z grupy.
+ <usetemplate ignoretext="Potwierdź wyrzucenie kilku osób z grupy" name="okcancelignore" notext="Anuluj" yestext="Wyrzuć" />
</notification>
<notification name="AttachmentDrop">
- Wybrałeś opcję opuszczenia swojego załącznika.
- Czy chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź przed zdjęciem załącznika." name="okcancelignore" notext="Nie" yestext="Tak"/>
+ Wybrałeś/aś opcję upuszczenia swojego dodatku.
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Potwierdź przed upuszczeniem dodatku" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="JoinGroupCanAfford">
Dołączenie do tej grupy kosztuje [COST]L$.
Chcesz kontynuować?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Dołącz"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Dołącz" />
</notification>
<notification name="JoinGroupNoCost">
Dołączasz do grupy [NAME].
Czy chcesz kontynuować?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Akceptuj"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Dołącz" />
</notification>
<notification name="JoinGroupCannotAfford">
- Członkostwo w tej grupie kosztuje [COST]L$
-Masz za mało L$ żeby zostać członkiem.
+ Członkostwo w tej grupie kosztuje [COST]L$.
+Masz za mało L$ żeby do niej dołączyć.
</notification>
<notification name="CreateGroupCost">
- Stworzenie tej grupy kosztuje 100L$.
-W grupie powinien być więcej niż jeden członek, albo zostanie na zawsze skasowana.
-Zaproś proszę członków w ciągu 48 godzin.
- <usetemplate canceltext="Anuluj" name="okcancelbuttons" notext="Anuluj" yestext="Stwórz grupę za 100L$"/>
+ Stworzenie tej grupy kosztuje [COST]L$.
+W grupie powinna być więcej niż jedna osoba, w przeciwnym razie zostanie ona na zawsze skasowana.
+ZaproÅ› kogoÅ› w ciÄ…gu 48 godzin.
+ <usetemplate canceltext="Anuluj" name="okcancelbuttons" notext="Anuluj" yestext="Stwórz grupę za 100L$" />
</notification>
<notification name="LandBuyPass">
- Za [COST]L$ możesz odwiedzić tą posiadłość ('[PARCEL_NAME]') na [TIME] godzin. Chcesz kupić przepustkę?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Za [COST]L$ możesz odwiedzić tą działkę ('[PARCEL_NAME]') na [TIME] godzin. Chcesz kupić przepustkę?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="SalePriceRestriction">
Cena sprzedaży musi być wyższa niż 0L$ jeżeli sprzedajesz komukolwiek.
Musisz wybrać kupca jeżeli chcesz sprzedać za 0L$.
</notification>
<notification name="ConfirmLandSaleChange">
- Posiadłość o powierzchni [LAND_SIZE] m zostaje wystawiona na sprzedaż.
-Cena wynosi [SALE_PRICE]L$ i sprzedaż będzie autoryzowana dla [NAME].
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Działka o powierzchni [LAND_SIZE] m² zostaje wystawiona na sprzedaż.
+Cena wynosi [SALE_PRICE]L$, a sprzedaż będzie autoryzowana dla [NAME].
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmLandSaleToAnyoneChange">
- UWAGA: Wybierając opcję "Sprzedaj Każdemu" udostępniasz swoją posiadłość do sprzedaży dla jakiegokolwiek Rezydenta [SECOND_LIFE] , nawet osób nieobecnych w tym regionie.
+ UWAGA: Wybierając opcję "Sprzedaj Każdemu" udostępniasz swoją działkę na sprzedaż dla jakiegokolwiek Rezydenta [SECOND_LIFE], nawet osób nieobecnych w tym regionie.
-Posiadłość o powierzchni [LAND_SIZE] m² zostaje wystawiona na sprzedaż.
-Cena wynosi [SALE_PRICE]L$ i sprzedaż będzie autoryzowana dla [NAME].
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Działka o powierzchni [LAND_SIZE] m² zostaje wystawiona na sprzedaż.
+Cena wynosi [SALE_PRICE]L$, a sprzedaż będzie autoryzowana dla [NAME].
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnObjectsDeededToGroup">
- Czy na pewno chcesz zwrócić wszystkie obiekty udostępnione grupie [NAME] na tej posiadłości do szafy ich poprzednich właścicieli?
+ Czy na pewno chcesz zwrócić wszystkie obiekty udostępnione grupie '[NAME]' na tej działce do szaf ich poprzednich właścicieli?
*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów
udostępnionych grupie, które nie mają praw transferu!
Obiekty: [N]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnObjectsOwnedByUser">
- Czy na pewno chcesz zwrócić wszystkie obiekty należące do Rezydenta [NAME] znajdujące się na tej posiadłości do szafy właściciela?
+ Czy na pewno chcesz zwrócić wszystkie obiekty należące do Rezydenta '[NAME]' znajdujące się na tej działce do szafy właściciela?
Obiekty: [N]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnObjectsOwnedBySelf">
- Czy na pewno chcesz zwrócić wszystkie Twoje obiekty znajdujące się na tej posiadłości do swojej szafy?
+ Czy na pewno chcesz zwrócić wszystkie Twoje obiekty znajdujące się na tej działce do swojej szafy?
Obiekty: [N]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnObjectsNotOwnedBySelf">
- Czy na pewno chcesz zwrócić wszystkie obiekty, których nie jesteś właścicielem znajdujące się na tej posiadłości do szaf właścicieli? Wszystkie obiekty udostępnione grupie z prawem transferu, zostaną zwrócone poprzednim właścicielom.
+ Czy na pewno chcesz zwrócić wszystkie obiekty, których NIE jesteś właścicielem znajdujące się na tej działce do szaf właścicieli?
+Wszystkie obiekty udostępnione grupie z prawem transferu zostaną zwrócone poprzednim właścicielom.
*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów udostępnionych grupie, które nie mają praw transferu!
Obiekty: [N]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnObjectsNotOwnedByUser">
- Czy na pewno chcesz zwrócić wszystkie obiekty, które nie należą do [NAME] znajdujące się na tej posiadłości do szaf właścicieli? Wszystkie obiekty udostępnione grupie z prawem transferu, zostaną zwrócone poprzednim właścicielom.
+ Czy na pewno chcesz zwrócić wszystkie obiekty, które NIE należą do [NAME], a znajdujące się na tej działce - do szaf właścicieli?
+Wszystkie obiekty udostępnione grupie z prawem transferu zostaną zwrócone poprzednim właścicielom.
*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów udostępnionych grupie, które nie mają praw transferu!
Obiekty: [N]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnAllTopObjects">
- Czy na pewno chcesz zwrócić wszystkie wymienione obiekty znajdujące się na tej posiadłości do szaf ich właścicieli?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Czy na pewno chcesz zwrócić wszystkie wymienione obiekty znajdujące się na tej działce do szaf ich właścicieli?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="DisableAllTopObjects">
- Czy na pewno chcesz deaktywować wszystkie obiekty w tym Regionie?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Czy na pewno chcesz dezaktywować wszystkie obiekty w tym regionie?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ReturnObjectsNotOwnedByGroup">
- Zwrócić obiekty z tej posiadłości, które nie są udosępnione grupie [NAME] do ich właścicieli?
+ Zwrócić obiekty z tej działki, które NIE są udostępnione grupie [NAME] do ich właścicieli?
Obiekty: [N]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="UnableToDisableOutsideScripts">
- Nie można deaktywować skryptów.
+ Nie można dezaktywować skryptów.
Ten region pozwala na uszkodzenia.
Skrypty muszą pozostać aktywne dla prawidłowego działania broni.
</notification>
<notification name="MultipleFacesSelected">
Obecnie zaznaczono wiele powierzchni.
-Jeśli działanie będzie kontynuowane, oddzielne media będą ustawione na wielu powierzchniach obiektu.
-W celu umieszczenia mediów tylko na jednej powierzchni skorzystaj z Wybierz powierzchnię i kliknij na wybranej powierzchni obiektu oraz kliknij Dodaj.
- <usetemplate ignoretext="Media zostanÄ… ustawione na wielu zaznaczonych powierzchniach" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+Jeśli kontynuujesz, to oddzielne instancje mediów będą ustawione na wielu powierzchniach obiektu.
+W celu umieszczenia mediów tylko na jednej powierzchni skorzystaj z narzędzia wyboru powierzchni i kliknij na ten wybranej oraz na Dodaj.
+ <usetemplate ignoretext="Media zostanÄ… ustawione na wielu zaznaczonych powierzchniach" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="MustBeInParcel">
- Musisz znajdować się wewnątrz posiadłości żeby wybrać punkt lądowania.
+ Musisz znajdować się wewnątrz działki, żeby wybrać punkt lądowania.
</notification>
<notification name="PromptRecipientEmail">
- Proszę wpisać adres emailowy odbiorcy.
+ Proszę wpisać prawidłowy adres e-mail odbiorcy.
</notification>
<notification name="PromptSelfEmail">
- Proszę wpisać swój adres emailowy.
+ Proszę wpisać swój adres e-mail.
</notification>
<notification name="PromptMissingSubjMsg">
- Wysłać widokówkę z domyślnym tematem i wiadomością?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Wysłać zdjęcie z domyślnym tematem lub wiadomością?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ErrorProcessingSnapshot">
Błąd w trakcie przetwarzania danych zdjęcia.
@@ -395,57 +310,61 @@ W celu umieszczenia mediów tylko na jednej powierzchni skorzystaj z Wybierz pow
</notification>
<notification name="CouldNotPutOnOutfit">
Założenie stroju nie powiodło się.
-Folder stroju nie zawiera żadnego ubrania, części ciała ani załączników.
+Folder stroju nie zawiera żadnego ubrania, części ciała ani dodatków.
</notification>
<notification name="CannotWearTrash">
Nie możesz założyć ubrania, które znajduje się w koszu.
</notification>
<notification name="MaxAttachmentsOnOutfit">
Nie można dołączyć obiektu.
-Limit [MAX_ATTACHMENTS] załączników został przekroczony. Proszę najpierw odłączyć inny obiekt.
+Limit [MAX_ATTACHMENTS] dodatków został przekroczony. Proszę najpierw odłączyć inny obiekt.
</notification>
<notification name="CannotWearInfoNotComplete">
- Nie możesz założyć tego artkułu ponieważ nie załadował się poprawnie. Spróbuj ponownie za kilka minut.
+ Nie możesz założyć tego przedmiotu, ponieważ jeszcze się nie załadował do końca. Spróbuj ponownie za kilka minut.
</notification>
<notification name="MustHaveAccountToLogIn">
- Oops! Brakuje czegoÅ›.
-Należy wprowadzić nazwę użytkownika.
+ Należy wprowadzić nazwę użytkownika.
Potrzebujesz konta aby się zalogować do [SECOND_LIFE]. Czy chcesz utworzyć je teraz?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Spróbuj ponownie" yestext="Nowe konto" />
</notification>
<notification name="InvalidCredentialFormat">
- Należy wprowadzić nazwę użytkownika lub imię oraz nazwisko Twojego awatara w pole nazwy użytkownika a następnie ponownie się zalogować.
+ Należy wprowadzić nazwę użytkownika lub imię oraz nazwisko Twojego awatara w pole nazwy użytkownika, a następnie ponownie się zalogować.
+ </notification>
+ <notification name="InvalidGrid">
+ '[GRID]' nie jest prawidłowym identyfikatorem siatki.
+ </notification>
+ <notification name="InvalidLocationSLURL">
+ Twój punkt startowy nie znajduje się na prawidłowej siatce.
</notification>
<notification name="DeleteClassified">
Usunąć reklamę '[NAME]'?
Pamiętaj! Nie ma rekompensaty za poniesione koszta.
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="DeleteMedia">
Wybrano usunięcie mediów związanych z tą powierzchnią.
Czy na pewno chcesz kontynuować?
- <usetemplate ignoretext="Potwierdź przed usunięciem mediów z obiektu" name="okcancelignore" notext="Nie" yestext="Tak"/>
+ <usetemplate ignoretext="Potwierdź przed usunięciem mediów z obiektu" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="ClassifiedSave">
Zapisać zmiany w reklamie [NAME]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie Zapisuj" yestext="Zapisz"/>
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz" />
</notification>
<notification name="ClassifiedInsufficientFunds">
Nie posiadasz wystarczających środków aby dodać reklamę.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeleteAvatarPick">
- Usuń zdjęcie <nolink>[PICK]</nolink>?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Usunąć miejsce <nolink>[PICK]</nolink>?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="DeleteOutfits">
Skasować wybrane stroje?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="PromptGoToEventsPage">
- Odwiedzić internetową stronę Imprez [SECOND_LIFE]?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Odwiedzić internetową stronę imprez [SECOND_LIFE]?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="SelectProposalToView">
Wybierz propozycję, którą chcesz zobaczyć.
@@ -453,6 +372,14 @@ Czy na pewno chcesz kontynuować?
<notification name="SelectHistoryItemToView">
Wybierz obiekt z historii, który chcesz zobaczyć.
</notification>
+ <notification name="ResetShowNextTimeDialogs">
+ Czy chcesz aktywować ponownie wszystkie te powiadomienia, przy których wcześniej zaznaczono 'nie pokazuj ponownie'?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
+ </notification>
+ <notification name="SkipShowNextTimeDialogs">
+ Czy chcesz dezaktywować wszystkie powiadomienia, jakie tylko można?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
+ </notification>
<notification name="CacheWillClear">
Bufor danych zostanie wyczyszczony po restarcie aplikacji [APP_NAME].
</notification>
@@ -464,40 +391,40 @@ Pamiętaj: Opcja ta wyczyszcza bufor danych.
Ustawienia portu zostajÄ… zaktualizowane po restarcie aplikacji [APP_NAME].
</notification>
<notification name="ChangeSkin">
- Nowa skórka zostanie wczytana po restarcie aplikacji [APP_NAME].
+ Nowa skórka pojawi się po restarcie aplikacji [APP_NAME].
</notification>
<notification name="ChangeLanguage">
Zmiana języka zadziała po restarcie [APP_NAME].
</notification>
<notification name="GoToAuctionPage">
- Odwiedzić stronę internetową [SECOND_LIFE] żeby zobaczyć szczgóły aukcji lub zrobić ofertę?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Odwiedzić stronę internetową [SECOND_LIFE] żeby zobaczyć szczegóły aukcji lub zgłosić ofertę?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="SaveChanges">
Zapisać zmiany?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz"/>
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie zapisuj" yestext="Zapisz" />
</notification>
<notification name="DeleteNotecard">
Usunąć notkę?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="GestureSaveFailedTooManySteps">
- Nie można zapisać gesturki.
-Ta gesturka ma zbyt wiele etapów.
+ Nie można zapisać gestu.
+Ten gest ma zbyt wiele etapów.
Usuń kilka etapów i zapisz jeszcze raz.
</notification>
<notification name="GestureSaveFailedTryAgain">
- Zapis gesturki nie powiódł się. Spróbuj jeszcze raz za kilka minut.
+ Zapis gestu nie powiódł się. Spróbuj jeszcze raz za kilka minut.
</notification>
<notification name="GestureSaveFailedObjectNotFound">
- Nie można zapisać gesturki ponieważ obiekt lub szafa powiązanego obiektu nie został znaleziony.
+ Nie można zapisać gestu, ponieważ obiekt lub zawartość powiązanego obiektu nie została znaleziona.
Obiekt może znajdować się zbyt daleko albo został usunięty.
</notification>
<notification name="GestureSaveFailedReason">
- Nie można zapisać gesturki z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później.
+ Nie można zapisać gestu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później.
</notification>
<notification name="SaveNotecardFailObjectNotFound">
- Nie można zapisać notki ponieważ obiekt lub szafa powiązanego obiektu nie został znaleziony.
+ Nie można zapisać notki, ponieważ obiekt lub zawartość powiązanego obiektu nie została znaleziona.
Obiekt może znajdować się zbyt daleko albo został usunięty.
</notification>
<notification name="SaveNotecardFailReason">
@@ -507,67 +434,78 @@ Obiekt może znajdować się zbyt daleko albo został usunięty.
Nie można cofnąć wszystkich zmian w Twojej wersji skryptu.
Czy chcesz załadować ostatnią wersję zapisaną na serwerze?
(*UWAGA* Ta operacja jest nieodwracalna.)
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
- </notification>
- <notification name="SaveScriptFailReason">
- Nie można zapisać skryptu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później.
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="SaveScriptFailObjectNotFound">
Nie można zapisać skryptu ponieważ obiekt w którym się zawiera nie został znaleziony.
Obiekt może znajdować się zbyt daleko albo został usunięty.
</notification>
- <notification name="SaveBytecodeFailReason">
- Nie można zapisać skompilowanego skryptu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz póżniej.
- </notification>
<notification name="StartRegionEmpty">
- Oops, Twoje miejsce startu nie zostało określone.
-Wpisz proszÄ™ nazwÄ™ regionu w lokalizacjÄ™ startu w polu Lokalizacja Startu lub wybierz Moja ostatnia lokalizacja albo Miejsce Startu.
- <usetemplate name="okbutton" yestext="OK"/>
+ Twoje miejsce startu nie zostało określone.
+Wpisz proszÄ™ nazwÄ™ regionu w lokalizacjÄ™ startu w polu Lokalizacja Startu lub wybierz 'Moja ostatnia lokalizacja' albo 'Miejsce Startu'.
</notification>
<notification name="CouldNotStartStopScript">
Nie można uruchomić lub zatrzymać skryptu ponieważ obiekt w którym się zawiera nie został znaleziony.
Obiekt może znajdować się zbyt daleko albo został usunięty.
</notification>
<notification name="CannotDownloadFile">
- Nie można załadować pliku
+ Nie można pobrać pliku
</notification>
<notification name="CannotWriteFile">
Nie można zapisać pliku [[FILE]]
</notification>
<notification name="UnsupportedHardware">
- Niestety Twój komputer nie spełnia minimalnych wymogów sprzętowych dla poprawnego działania [APP_NAME]. Możesz odczuwać bardzo niską wydajność operacyjną. Niestety portal pomocy, [SUPPORT_SITE] nie posiada informacji na temat poprawnej konfiguracji technicznej Twojego systemu.
+ Niestety Twój komputer nie spełnia minimalnych wymogów sprzętowych dla poprawnego działania [APP_NAME]. Możesz odczuwać bardzo niską wydajność operacyjną. Niestety, portal pomocy [SUPPORT_SITE] nie jest w stanie zapewnić wsparcia technicznego dla Twojego systemu.
+
+Odwiedzić [_URL], aby uzyskać więcej informacji?
+ <usetemplate ignoretext="Sprzęt w moim komputerze nie jest wspierany" name="okcancelignore" notext="Nie" yestext="Tak" />
+ </notification>
+ <notification name="IntelOldDriver">
+ Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
-Po więcej info, odwiedź stronę [_URL] .
- <url name="url" option="0">
- http://www.secondlife.com/corporate/sysreqs.php
- </url>
- <usetemplate ignoretext="Dysk twardy mojego komputera nie jest wspomagany" name="okcancelignore" notext="Nie" yestext="Tak"/>
+Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
+ <usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak" />
+ </notification>
+ <notification name="AMDOldDriver">
+ Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
+
+Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
+ <usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak" />
+ </notification>
+ <notification name="NVIDIAOldDriver">
+ Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
+
+Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
+ <usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="UnknownGPU">
Twój system jest wyposażony w kartę graficzną, która nie jest rozpoznana przez [APP_NAME].
-Zdarza się to często w przypadku nowego sprzętu, który nie był testowany z [APP_NAME]. Prawdopodobnie wystarczy dostosowanie ustawień grafiki aby działanie było poprawne.
-(Ja > Właściwości > Grafika).
+Zdarza się to często w przypadku nowego sprzętu, który nie był testowany z [APP_NAME]. Prawdopodobnie wystarczy dostosowanie ustawień grafiki aby działanie było poprawne.
+(Ja > Ustawienia > Grafika).
<form name="form">
- <ignore name="ignore" text="Karta graficzna nie została zidentyfikowana."/>
+ <ignore name="ignore" text="Karta graficzna nie została zidentyfikowana" />
</form>
</notification>
<notification name="DisplaySettingsNoShaders">
[APP_NAME] zawiesił się podczas inicjalizacji sterowników graficznych.
Jakość grafiki została zmniejszona - może to pomóc.
-Pewne funkcje graficzne zostały wyłączone. Zalecamy aktualizcje sterowników graficznych.
+Pewne funkcje graficzne zostały wyłączone. Zalecamy aktualizację sterowników graficznych.
Możesz podnieść jakość grafiki pod Ustawienia > Grafika.
</notification>
<notification name="RegionNoTerraforming">
- Region [REGION] nie pozwala na formowanie powierzchni ziemi.
+ Region [REGION] nie pozwala na zmianÄ™ powierzchni ziemi.
+ </notification>
+ <notification name="ParcelNoTerraforming">
+ Działka [PARCEL] nie pozwala Ci na zmianę powierzchni ziemi.
</notification>
<notification name="CannotCopyWarning">
Nie masz pozwolenia na kopiowanie następujących obiektów:
[ITEMS]
i stracisz je w momencie przekazania. Czy na pewno chcesz oddać te obiekty?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="CannotGiveItem">
- Podarowanie obiektu nie powiodło się.
+ Przekazanie obiektu nie powiodło się.
</notification>
<notification name="TransactionCancelled">
Transakcja anulowana
@@ -576,44 +514,53 @@ i stracisz je w momencie przekazania. Czy na pewno chcesz oddać te obiekty?
Jednorazowo możesz podarować maksymalnie 42 obiekty z szafy.
</notification>
<notification name="NoItems">
- Nie masz praw do transferu wybranych obiektów.
+ Nie masz praw transferu dla wybranych obiektów.
</notification>
<notification name="CannotCopyCountItems">
Nie masz praw do skopiowania [COUNT] wybranych obiektów. Obiekty znikną z Twojej szafy.
Na pewno chcesz oddać te obiekty?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="CannotGiveCategory">
- Nie masz praw do transferu wybranego foldera.
+ Nie masz praw transferu dla wybranego folderu.
</notification>
<notification name="FreezeAvatar">
Unieruchomić tego awatara?
-Awatar tymczasowo nie będzie mógł się poruszać, nie będzie mógł używać czatu (IM) i nie będzie w stanie odziaływać na świat.
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Odblokuj" yestext="Unieruchom"/>
+Awatar tymczasowo nie będzie mógł się poruszać, używać czatu (IM) lub oddziaływać na świat.
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Odblokuj" yestext="Unieruchom" />
</notification>
<notification name="FreezeAvatarFullname">
- Unieruchowmić [AVATAR_NAME]?
-Ta osoba tymczasowo nie będzie mógła się poruszać, nie będzie mógł używać czatu (IM) i nie będzie w stanie odziaływać na świat.
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Odblokuj" yestext="Unieruchom"/>
+ Unieruchomić [AVATAR_NAME]?
+Ta osoba tymczasowo nie będzie mogła się poruszać, używać czatu (IM) lub oddziaływać na świat.
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Odblokuj" yestext="Unieruchom" />
</notification>
<notification name="EjectAvatarFullname">
- Wyrzucić [AVATAR_NAME] z Twojej posiadłości?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wyrzuć i zabroń wstępu (ban)" yestext="Wyrzuć"/>
+ Wyrzucić [AVATAR_NAME] z Twojej działki?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wyrzuć i zabroń wstępu (ban)" yestext="Wyrzuć" />
+ </notification>
+ <notification name="EjectAvatarNoBan">
+ Wyrzucić tego awatara z Twojej działki?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć" />
+ </notification>
+ <notification name="EjectAvatarFullnameNoBan">
+ Wyrzucić [AVATAR_NAME] z Twojej działki?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć" />
</notification>
<notification name="EjectAvatarFromGroup">
- Wyrzuć [AVATAR_NAME] z grupy [GROUP_NAME]
+ Wyrzuciłeś/aś [AVATAR_NAME] z grupy [GROUP_NAME]
</notification>
<notification name="AcquireErrorTooManyObjects">
BÅÄ„D OTRZYMYWANIA: Zbyt wiele wybranych obiektów.
</notification>
<notification name="AcquireErrorObjectSpan">
- BÅÄ„D OTRZYMYWANIA: Obiekty przekraczajÄ… granicÄ™ regionów. Przemieść wszystkie otrzymywane obiekty do jednego regionu.
+ BÅÄ„D OTRZYMYWANIA: Obiekty przekraczajÄ… granicÄ™ regionów.
+Przemieść wszystkie otrzymywane obiekty do jednego regionu.
</notification>
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-Odwiedź stronę [_URL] po więcej informacji na temat zakupu L$?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Odwiedzić [_URL] po więcej informacji na temat zakupu L$?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="UnableToLinkObjects">
Nie można połączyć [COUNT] obiektów.
@@ -623,24 +570,26 @@ Maksymalnie można połączyć [MAX] obiektów.
Możesz łączyć tylko kompletne zbiory obiektów i musisz wybrać więcej niż jeden obiekt.
</notification>
<notification name="CannotLinkModify">
- Nie możesz połączyć obiektów ponieważ nie masz praw modyfikacji dla wszystkich obiektów.
+ Nie możesz połączyć obiektów, ponieważ nie masz praw modyfikacji dla wszystkich.
-Upewnij się, że żaden z obiktów nie jest zablokowany i że wszystkie obiekty należą do Ciebie.
+Upewnij się, że żaden z obiektów nie jest zablokowany i wszystkie należą do Ciebie.
+ </notification>
+ <notification name="CannotLinkPermanent">
+ Nie możesz łączyć obiektów przez granice regionów.
</notification>
<notification name="CannotLinkDifferentOwners">
- Nie możesz połączyć obiektów ponieważ należą one do różnych osób.
+ Nie możesz połączyć obiektów, ponieważ należą one do różnych osób.
-Upewnij sie, że wszystkie wybrane obiekty należą do Ciebie.
+Upewnij się, że wszystkie wybrane obiekty należą do Ciebie.
</notification>
<notification name="NoFileExtension">
- Niepoprawna końcówka nazwy pliku: '[FILE]'
+ Brak rozszerzenia dla pliku: '[FILE]'
-Upewnij się, że nazwa pliku ma poprawaną końcówkę.
+Upewnij się, że nazwa pliku ma poprawne rozszerzenie.
</notification>
<notification name="InvalidFileExtension">
- Niepoprawna końcówka nazwy pliku - [EXTENSION]
-Oczekiwana - [VALIDS]
- <usetemplate name="okbutton" yestext="OK"/>
+ Niepoprawne rozszerzenie pliku: [EXTENSION]
+Oczekiwane: [VALIDS]
</notification>
<notification name="CannotUploadSoundFile">
Nie można otworzyć załadowanego pliku dźwiękowego:
@@ -659,7 +608,7 @@ Oczekiwana - [VALIDS]
[FILE]
</notification>
<notification name="SoundFileInvalidSampleRate">
- Plik zawiera niewłaścią częstotliwość (musi być 44.1k):
+ Plik zawiera niewłaściwą częstotliwość (musi być 44.1k):
[FILE]
</notification>
<notification name="SoundFileInvalidWordSize">
@@ -677,9 +626,14 @@ Oczekiwana - [VALIDS]
<notification name="SoundFileInvalidTooLong">
Plik audio jest zbyt długi (10 sekund maksimum):
[FILE]
+ </notification>
+ <notification name="ProblemWithFile">
+ Problem z plikiem [FILE]:
+
+[ERROR]
</notification>
<notification name="CannotOpenTemporarySoundFile">
- Nie można otworzyć tymczasowego skompresowango pliku dźwiękowego w celu zapisu: [FILE]
+ Nie można otworzyć tymczasowego skompresowanego pliku dźwiękowego w celu zapisu: [FILE]
</notification>
<notification name="UnknownVorbisEncodeFailure">
Nieznany błąd kodowania Vorbis w: [FILE]
@@ -688,11 +642,11 @@ Oczekiwana - [VALIDS]
Kodowanie pliku: [FILE] nie powidło się.
</notification>
<notification name="CorruptedProtectedDataStore">
- Nie można wpisać Twojego imienia użytkownika ani hasła. To może się zdarzyć kiedy zmieniasz ustawienia sieci.
- <usetemplate name="okbutton" yestext="OK"/>
+ Nie można zdekodować pliku zawierającego nazwy użytkowników i haseł. Jeśli teraz je zapiszesz lub usuniesz, to wymażesz te, które były trzymane w nim wcześniej.
+To może się zdarzyć, kiedy zmieniasz ustawienia sieci. Zrestartowanie Przeglądarki z poprzednimi ustawieniami sieci może pomóc w odzyskaniu danych.
</notification>
<notification name="CorruptResourceFile">
- Skorumpowany plik zasobów: [FILE]
+ Uszkodzony plik zasobów: [FILE]
</notification>
<notification name="UnknownResourceFileVersion">
Nieznana wersja pliku zasobów Linden w pliku: [FILE]
@@ -701,21 +655,20 @@ Oczekiwana - [VALIDS]
Nie można utworzyć pliku wyjściowego: [FILE]
</notification>
<notification name="DoNotSupportBulkAnimationUpload">
- [APP_NAME] obecnie nie wspomaga ładowania grupowego plików animacji.
+ [APP_NAME] obecnie nie wspomaga ładowania grupowego plików animacji w formacie BVH.
</notification>
<notification name="CannotUploadReason">
Åadowanie pliku [FILE] nie powiodÅ‚o siÄ™ z powodu: [REASON]
-Spróbuj jeszcze raz póżniej.
+Spróbuj jeszcze raz później.
</notification>
<notification name="LandmarkCreated">
- Dodano "[LANDMARK_NAME]" do folderu [FOLDER_NAME].
+ Dodano "[LANDMARK_NAME]" do folderu [FOLDER_NAME].
</notification>
<notification name="LandmarkAlreadyExists">
Posiadasz już landmark dla tej lokalizacji.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="CannotCreateLandmarkNotOwner">
- Nie możesz zapamiętać tego miejsca (LM) ponieważ właściciel posiadłości nie pozwala na to.
+ Nie możesz zapamiętać tego miejsca (LM) ponieważ właściciel działki nie pozwala na to.
</notification>
<notification name="CannotRecompileSelectObjectsNoScripts">
'Rekompilacja' nie powiodła się.
@@ -754,28 +707,27 @@ Wybierz obiekty zawierajÄ…ce skrypty.
Brak górnego okna do zapisu.
</notification>
<notification name="SeachFilteredOnShortWords">
- Twoje zapytanie wyszukiwania zostło zmienione - zbyt krótkie słowa zostały usunięte.
+ Twoje zapytanie wyszukiwania zostało zmienione - zbyt krótkie słowa zostały usunięte.
Nowe zapytanie: [FINALQUERY]
</notification>
<notification name="SeachFilteredOnShortWordsEmpty">
- Użyte terminy wyszukiwania były zbyt krótkie - wyszukiwanie zostało anulowane.
+ Użyte słowa wyszukiwania były zbyt krótkie - wyszukiwanie zostało anulowane.
</notification>
<notification name="CouldNotTeleportReason">
Teleportacja nie powiodła się.
[REASON]
</notification>
<notification name="invalid_tport">
- Niestety, pojawił się błąd podczas próby teleportacji. Proponujemy wylogowanie się i spróbowanie teleportacji ponownie.
+ Niestety, pojawił się błąd podczas próby teleportacji. Proponujemy wylogowanie się i spróbowanie teleportacji ponownie.
Jeżeli nadal otrzymujesz tę wiadomość proponujemy odwiedzić stronę [SUPPORT_SITE].
</notification>
<notification name="invalid_region_handoff">
- Niestety, pojawił się błąd podczas próby przedostania się na drugi region. Proponujemy wylogowanie się i spróbowanie przedostania się na drugi region ponownie.
+ Niestety, pojawił się błąd podczas próby przedostania się na drugi region. Proponujemy wylogowanie się i spróbowanie przedostania się na drugi region ponownie.
Jeżeli nadal otrzymujesz tę wiadomość proponujemy odwiedzić stronę [SUPPORT_SITE].
</notification>
<notification name="blocked_tport">
- Przepraszamy, teleportacja jest chwilowo niedostępna. Spróbuj jeszcze raz.
-Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
+ Przepraszamy, teleportacja jest chwilowo niedostępna. Spróbuj jeszcze raz. Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
</notification>
<notification name="nolandmark_tport">
Przepraszamy, ale nie możemy znaleźć miejsca docelowego.
@@ -787,11 +739,10 @@ Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
Przepraszamy, ale nie masz dostępu do miejsca docelowego.
</notification>
<notification name="missing_attach_tport">
- Czekamy na Twoje akcesoria. Możesz poczekać kilka minut lub zrobić relog przed następną próbą teleportacji.
+ Czekamy na Twoje akcesoria. Możesz poczekać kilka sekund lub zrobić relog przed następną próbą teleportacji.
</notification>
<notification name="too_many_uploads_tport">
- Obecnie ten region ma problemy z ładowaniem obiektów w związku z czym teleportacja bardzo sie opóźnia.
-Spróbuj jeszcze raz za kilka minut albo teleportuj się do mniej zatłoczonego miejsca.
+ Obecnie ten region ma problemy z ładowaniem obiektów w związku z czym teleportacja bardzo się opóźnia. Spróbuj jeszcze raz za kilka minut albo teleportuj się do mniej zatłoczonego miejsca.
</notification>
<notification name="expired_tport">
Przepraszamy, ale nie udało się przeprowadzić teleportacji wystarczająco szybko. Spróbuj jeszcze raz za kilka minut.
@@ -800,173 +751,172 @@ Spróbuj jeszcze raz za kilka minut albo teleportuj się do mniej zatłoczonego
Przepraszamy, ale nie udało się przeprowadzić zmiany regionu wystarczająco szybko. Spróbuj jeszcze raz za kilka minut.
</notification>
<notification name="no_host">
- Nie możemy znaleść miejsca docelowego. To miejsce może być chwilowo nieosiągalne albo przestało istnieć.
-Spróbuj jeszcze raz za kilka minut.
+ Nie można znaleźć miejsca docelowego. To miejsce może być chwilowo nieosiągalne albo przestało istnieć. Spróbuj jeszcze raz za kilka minut.
</notification>
<notification name="no_inventory_host">
Szafa chwilowo nie działa.
</notification>
<notification name="CannotSetLandOwnerNothingSelected">
- Nie można wybrać właściciela posiadłości.
-Posiadłość nie została wybrana.
+ Nie można wybrać właściciela działki.
+Działka nie została wybrana.
</notification>
<notification name="CannotSetLandOwnerMultipleRegions">
- Nie można wybrać właściciela posiadłości ponieważ wybrany obszar przekracza granicę regionów. Wybierz mniejszy obszar i spróbuj jeszcze raz.
+ Nie można wybrać właściciela działki, ponieważ wybrany obszar przekracza granicę regionów. Wybierz mniejszy obszar i spróbuj jeszcze raz.
</notification>
<notification name="ForceOwnerAuctionWarning">
- Ta posiadłość jest wystawiona na aukcję. Wymuszenie własności anuluje aukcję i potencjalnie może zdenerwować zainteresowanych Rezydentów, jeżeli licytacja już się rozpoczęła.
+ Ta działka jest wystawiona na aukcję. Wymuszenie własności anuluje aukcję i potencjalnie może zdenerwować zainteresowanych Rezydentów, jeżeli licytacja już się rozpoczęła.
Wymusić własność?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="CannotContentifyNothingSelected">
Nie można sfinalizować:
-Posiadłość nie została wybrana.
+Działka nie została wybrana.
</notification>
<notification name="CannotContentifyNoRegion">
Nie można sfinalizować:
Region nie znaleziony.
</notification>
<notification name="CannotReleaseLandNothingSelected">
- Nie można porzucić posiadłości:
-Posiadłość nie została wybrana.
+ Nie można porzucić działki:
+Działka nie została wybrana.
</notification>
<notification name="CannotReleaseLandNoRegion">
- Nie można porzucić posiadłości:
+ Nie można porzucić działki:
Region nie znaleziony.
</notification>
<notification name="CannotBuyLandNothingSelected">
- Nie można kupić posiadłości:
-Posiadłość nie została wybrana.
+ Nie można kupić działki:
+Działka nie została wybrana.
</notification>
<notification name="CannotBuyLandNoRegion">
- Nie można kupić posiadłości:
-Region nie znaleziony.
+ Nie można kupić działki:
+Region nie został znaleziony.
</notification>
<notification name="CannotCloseFloaterBuyLand">
- Okno zakupu landu nie może zostać zamknięte dopóki aplikacja [APP_NAME] nie określi ceny dla tej transkacji.
+ Okno zakupu ziemi nie może zostać zamknięte dopóki aplikacja [APP_NAME] nie określi ceny dla tej transakcji.
</notification>
<notification name="CannotDeedLandNothingSelected">
- Nie można przekazać posiadłości:
-Posiadłość nie została wybrana.
+ Nie można przekazać działki:
+Działka nie została wybrana.
</notification>
<notification name="CannotDeedLandNoGroup">
- Nie można przekazać posiadłości:
+ Nie można przekazać działki:
Grupa nie została wybrana.
</notification>
<notification name="CannotDeedLandNoRegion">
- Brak możliwości przepisania posiadłości grupie:
-Region, gdzie posiadłość się znajduje nie został odnaleziony.
+ Brak możliwości przypisania działki grupie:
+Region, gdzie działka się znajduje nie został odnaleziony.
</notification>
<notification name="CannotDeedLandMultipleSelected">
- Nie można przekazać posiadłości:
-Wiele posiadłości jest wybranych.
+ Nie można przekazać działki:
+Wiele działek jest wybranych.
-Spróbuj wybrać pojedynczą posiadłość.
+Spróbuj wybrać pojedynczą działkę.
</notification>
<notification name="CannotDeedLandWaitingForServer">
- Nie można przekazać posiadłości:
+ Nie można przekazać działki:
Serwer aktualizuje dane własności.
-Spróbuj jeszcze raz póżniej.
+Spróbuj jeszcze raz później.
</notification>
<notification name="CannotDeedLandNoTransfer">
- Nie możesz przekazać posiadłości:
-Region [REGION] nie pozwala na transfer posiadłości.
+ Nie możesz przekazać działki:
+Region [REGION] nie pozwala na transfer działki.
</notification>
<notification name="CannotReleaseLandWatingForServer">
- Nie można porzucić posiadłości:
-Serwer aktualizuje dane posiadłości.
+ Nie można porzucić działki:
+Serwer aktualizuje dane działki.
-Spróbuj jeszcze raz póżniej.
+Spróbuj jeszcze raz później.
</notification>
<notification name="CannotReleaseLandSelected">
- Nie możesz porzucić posiadłości:
-Nie jesteś właścicielem wszystkich wybranych posiadłości.
+ Nie możesz porzucić działki:
+Nie jesteś właścicielem wszystkich wybranych działek.
-Wybierz pojedynczą posiadłość.
+Wybierz pojedynczą działkę.
</notification>
<notification name="CannotReleaseLandDontOwn">
- Nie możesz porzucić posiadłości:
-Nie masz praw do porzucenia tej posiadłości.
-
-Twoje posiadłości są podkreślone na zielono.
+ Nie możesz porzucić działki:
+Nie masz praw do porzucenia tej działki.
+Twoje działki są podświetlone na zielono.
</notification>
<notification name="CannotReleaseLandRegionNotFound">
- Brak możliwości porzucenia posiadłości:
-Region, gdzie posiadłość się znajduje nie został odnaleziony.
+ Brak możliwości porzucenia działki:
+Region, gdzie działka się znajduje nie został odnaleziony.
</notification>
<notification name="CannotReleaseLandNoTransfer">
- Nie możesz porzucić posiadłości:
-Region [REGION] nie pozwala na transfer posiadłości.
+ Nie możesz porzucić działki:
+Region [REGION] nie pozwala na transfer działki.
</notification>
<notification name="CannotReleaseLandPartialSelection">
- Nie można porzucić posiadłości:
-Musisz wybrać całą posiadłość by ją porzucić.
-Wybierz całą posiadłość albo najpierw ją podziel.
+ Nie można porzucić działki:
+Musisz wybrać całą działkę by ją porzucić.
+
+Wybierz całą działkę albo najpierw ją podziel.
</notification>
<notification name="ReleaseLandWarning">
- Porzucasz posiadłość o powierzchni [AREA] m².
-Porzucenie tej posiadłości usunie ją z Twoich własności.
-Nie otrzymasz za to żadnej opłaty.
+ Porzucasz działkę o powierzchni [AREA] m².
+Porzucenie tej działki usunie ją z Twoich własności, ale nie otrzymasz za to żadnych L$.
-Porzucić posiadłość?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Porzucić działkę?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="CannotDivideLandNothingSelected">
- Nie można podzielić posiadłości:
+ Nie można podzielić działki:
-Posiadłość nie została wybrana.
+Działka nie została wybrana.
</notification>
<notification name="CannotDivideLandPartialSelection">
- Nie można podzielić posiadłości:
+ Nie można podzielić działki:
-Posiadłość została wybrana w całości.
-Spróbuj wybrać część posiadłości.
+Działka została wybrana w całości.
+Spróbuj wybrać część działki.
</notification>
<notification name="LandDivideWarning">
- Podział tej posiadłości stworzy dwie posiadłości z których każda będzie mogła mieć indywidualne ustawienia.
+ Podział tej działki stworzy dwie działki, z których każda będzie mogła mieć indywidualne ustawienia.
Niektóre ustawienia zostaną zmienione na domyślne po tej operacji.
-Podzielić posiadłość?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Podzielić działkę?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="CannotDivideLandNoRegion">
- Brak możliwości podziału posiadłości:
-Region, gdzie posiadłość się znajduje nie został odnaleziony.
+ Brak możliwości podziału działki:
+Region, gdzie działka się znajduje nie został odnaleziony.
</notification>
<notification name="CannotJoinLandNoRegion">
- Brak możliwości złączenia posiadłości:
-Region, gdzie posiadłość się znajduje nie został odnaleziony.
+ Brak możliwości złączenia działek:
+Region, gdzie działka się znajduje nie został odnaleziony.
</notification>
<notification name="CannotJoinLandNothingSelected">
- Nie można połączyć posiadłości:
-Posiadłości nie zostały wybrane.
+ Nie można połączyć działek:
+Działki nie zostały wybrane.
</notification>
<notification name="CannotJoinLandEntireParcelSelected">
- Nie można połączyć posiadłości:
-Tylko jedna posiadłość została wybrana.
+ Nie można połączyć działek:
+Tylko jedna działka została wybrana.
-Wybierz obaszar usytuowany na obu posiadłościach.
+Wybierz obszar usytuowany na obu działkach.
</notification>
<notification name="CannotJoinLandSelection">
- Nie można połączyć posiadłości:
-Musisz wybrać więcej niż jedną posiadłość.
+ Nie można połączyć działek:
+Musisz wybrać więcej niż jedną działkę.
-Wybierz obaszar usytuowany na obu posiadłościach.
+Wybierz obszar usytuowany na obu działkach.
</notification>
<notification name="JoinLandWarning">
- Połączenie tego obszaru utworzy jedną większą posiadłość ze wszystkich posiadłości przecinających wybrany prostokąt. Nazwa i opcje posiadłości bedą musiały zostać skonfigurowane.
+ Połączenie tego obszaru utworzy jedną większą działkę ze wszystkich działek przecinających wybrany prostokąt.
+Nazwa i opcje działki będą musiały zostać skonfigurowane.
-Połączyć posiadłości?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Połączyć działki?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmNotecardSave">
Ta notka musi być zapisana żeby mogła być skopiowana lub zobaczona. Zapisać notkę?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmItemCopy">
Skopiować ten obiekt do Twojej szafy?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Skopiuj"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Skopiuj" />
</notification>
<notification name="ResolutionSwitchFail">
Zmiana rozdzielczości do [RESX] x [RESY] nie powidła się
@@ -975,7 +925,7 @@ Połączyć posiadłości?
BÅ‚Ä…d: niezdefiniowane trawy: [SPECIES]
</notification>
<notification name="ErrorUndefinedTrees">
- BÅ‚ad: niezdefiniowane drzewa: [SPECIES]
+ BÅ‚Ä…d: niezdefiniowane drzewa: [SPECIES]
</notification>
<notification name="CannotSaveWearableOutOfSpace">
Nie można zapisać '[NAME]' do pliku stroju. Musisz zwolnić trochę miejsca na Twoim komputerze i zapisać strój jeszcze raz.
@@ -986,33 +936,63 @@ Zazwyczaj jest to tymczasowy problem. Możesz kontynuować modyfikacje i zapisa
</notification>
<notification name="YouHaveBeenLoggedOut">
Nastąpiło wylogowanie z [SECOND_LIFE]
- [MESSAGE]
- <usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Kontynuuj"/>
+[MESSAGE]
+ <usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pokaż IM/czat" />
</notification>
<notification name="OnlyOfficerCanBuyLand">
- Nie możesz kupić posiadłości dla grupy.
-Nie masz praw kupowania posiadłości dla Twojej aktywnej grupy.
+ Nie możesz kupić działek dla grupy.
+Nie masz praw kupowania działek dla Twojej aktywnej grupy.
</notification>
<notification label="Add Friend" name="AddFriendWithMessage">
- Znajomi mogą pozwalać na odnajdywanie się wzajemnie na mapie i na otrzymywanie notyfikacji o logowaniu do [SECOND_LIFE].
+ Znajomi mogą pozwalać na odnajdywanie się wzajemnie na mapie i na otrzymywanie informacji o statusie online.
Zaproponować znajomość [NAME]?
<form name="form">
<input name="message">
- Chcesz zawrzeć znajomość?
+ Chcesz zawrzeć ze mną znajomość?
</input>
- <button name="Offer" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
+ </form>
+ </notification>
+ <notification label="Nowa lista autokorekty" name="AddAutoReplaceList">
+ Nazwa nowej listy:
+ </notification>
+ <notification label="Zmiana nazwy listy autokorekty" name="RenameAutoReplaceList">
+ Nazwa '[DUPNAME]' jest w użyciu
+Wprowadź nową nazwę:
+ <form name="form">
+ <button name="ReplaceList" text="ZastÄ…p obecnÄ… listÄ™" />
+ <button name="SetName" text="Użyj nowej nazwy" />
</form>
</notification>
+ <notification name="InvalidAutoReplaceEntry">
+ Słowo kluczowe musi być pojedynczym ciągiem, a zamiennik nie może być pusty.
+ </notification>
+ <notification name="InvalidAutoReplaceList">
+ Lista zamienników nie jest prawidłowa.
+ </notification>
+ <notification name="SpellingDictImportRequired">
+ Musisz określić plik, nazwę i język.
+ </notification>
+ <notification name="SpellingDictIsSecondary">
+ Wygląda na to, że słownik [DIC_NAME] nie ma pliku "aff"; znaczy to, że jest słownikiem drugorzędnym.
+Może on być użyty jako dodatkowy, ale nie główny słownik.
+
+Zobacz https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+ </notification>
+ <notification name="SpellingDictImportFailed">
+ Nie można skopiować
+[FROM_NAME]
+do
+[TO_NAME]
+ </notification>
<notification label="Zapisz strój" name="SaveOutfitAs">
Zapisz to co noszę jako nowy strój:
<form name="form">
<input name="message">
- [DESC] (nowe)
+ [DESC] (nowy)
</input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification label="Zapisz część stroju" name="SaveWearableAs">
@@ -1021,45 +1001,40 @@ Zaproponować znajomość [NAME]?
<input name="message">
[DESC] (nowy)
</input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification label="Zmień nazwę stroju" name="RenameOutfit">
Nowa nazwa stroju:
<form name="form">
- <input name="new_name">
- [NAME]
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="RemoveFromFriends">
Czy chcesz usunąć <nolink>[NAME]</nolink> z listy znajomych?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="RemoveMultipleFromFriends">
Chcesz usunąć grupę osób z listy Twoich znajomych?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="GodDeleteAllScriptedPublicObjectsByUser">
Na pewno chcesz usunąć wszystkie skryptowane obiekty należące do
** [AVATAR_NAME] **
-z posiadłości innych w tym symulatorze?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+z działek innych w tym symulatorze?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="GodDeleteAllScriptedObjectsByUser">
Na pewno chcesz usunąć wszystkie skryptowane obiekty należące do
** [AVATAR_NAME] **
-ze wszystkich posiadłości w tym symulatorze?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ze wszystkich działek w tym symulatorze?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="GodDeleteAllObjectsByUser">
Na pewno chcesz usunąć wszystkie obiekty (skryptowane i nie) należące do
** [AVATAR_NAME] **
-ze wszystkich posiadłości w tym symulatorze?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ze wszystkich działek w tym symulatorze?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BlankClassifiedName">
Musisz nadać tytuł Twojej reklamie.
@@ -1070,185 +1045,187 @@ ze wszystkich posiadłości w tym symulatorze?
Wybierz wyższą cenę.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Co najmiej jeden z elementów, które masz posiada połączone z nim obiekty. Jeśli go usuniesz połączenia zostaną usunięte na stałe. Zaleca się usunięcie połączeń w pierwszej kolejności.
+ Co najmniej jeden z zaznaczonych przez Ciebie elementów ma połączone z nim obiekty. Jeśli go usuniesz połączenia zostaną usunięte na stałe. Zaleca się usunięcie połączeń w pierwszej kolejności.
-Jesteś pewnien/pewna, że chcesz usunąć te elementy?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Jesteś pewien/pewna, że chcesz usunąć te elementy?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteLock">
- Przynajmnie jeden z wybranych obiektów jest zablokowany.
+ Przynajmniej jeden z wybranych obiektów jest zablokowany.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteNoCopy">
Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteNoOwn">
Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
- Przynajmnie jeden z wybranych obiektów jest zablokowany.
-Przynajmniej jeden z wybranych obiektów jest niekopiwalny.
+ Przynajmniej jeden z wybranych obiektów jest zablokowany.
+Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteLockNoOwn">
- Przynajmnie jeden z wybranych obiektów jest zablokowany.
+ Przynajmniej jeden z wybranych obiektów jest zablokowany.
Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
- Przynajmnie jeden z wybranych obiektów jest zablokowany.
-Przynajmniej jeden z wybranych obiektów jest niekopiwalny.
+ Przynajmniej jeden z wybranych obiektów jest zablokowany.
+Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectTakeLock">
- Przynajmnie jeden obiekt jest zablokowany.
+ Przynajmniej jeden obiekt jest zablokowany.
-Na pewno chcesz usunąć te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Na pewno chcesz wziąć te obiekty?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectTakeNoOwn">
Przynajmniej jeden obiekt nie należy do Ciebie.
-Jeżeli będziesz kontynuować prawa następnego właściciela zostaną przypisane co, potencjalnie, może ograniczyć Twoje prawa do modyfikacji lub kopiowania obiektów.
+Jeżeli będziesz kontynuować prawa następnego właściciela zostaną przypisane, co - potencjalnie - może ograniczyć Twoje prawa do modyfikacji lub kopiowania obiektów.
-Na pewno chcesz wziąść te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Na pewno chcesz wziąć te obiekty?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmObjectTakeLockNoOwn">
- Przynajmnie jeden obiekt jest zablokowany.
+ Przynajmniej jeden obiekt jest zablokowany.
Przynajmniej jeden obiekt nie należy do Ciebie.
-Jeżeli będziesz kontynuować prawa następnego właściciela zostaną przypisane co, potencjalnie, może ograniczyć Twoje prawa do modyfikacji lub kopiowania obiektów.
+Jeżeli będziesz kontynuować prawa następnego właściciela zostaną przypisane co - potencjalnie - może ograniczyć Twoje prawa do modyfikacji lub kopiowania obiektów.
-Na pewno chcesz wziąść te obiekty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Na pewno chcesz wziąć te obiekty?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="CantBuyLandAcrossMultipleRegions">
- Nie możesz kupić posiadłości ponieważ wybrany obszar przekracza granicę regionów.
+ Nie możesz kupić działki, ponieważ wybrany obszar przekracza granicę regionów.
Wybierz mniejszy obszar i spróbuj jeszcze raz.
</notification>
<notification name="DeedLandToGroup">
- Po przekazaniu tej posiadłości grupa będzia musiała mieć i utrzymywać wystarczający kredyt na używanie posiadłości. Cena zakupu posiadłości nie jest zwracana właścicielowi. Jeżeli przekazana posiadłość zostanie sprzedana, cana sprzedaży zostanie podzielona pomiędzy członków grupy.
+ Po przekazaniu tej działki grupa będzie musiała mieć i utrzymywać wystarczający kredyt na używanie działki.
+Cena zakupu działki nie jest zwracana właścicielowi. Jeżeli przekazana działka zostanie sprzedana, cena sprzedaży zostanie podzielona pomiędzy członków grupy.
-Przekazać tą posiadłość o powierzchni [AREA] m² grupie '[GROUP_NAME]'?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Przekazać tą działkę o powierzchni [AREA] m² grupie '[GROUP_NAME]'?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="DeedLandToGroupWithContribution">
- Po przekazaniu tej posiadłości grupa będzia musiała mieć i utrzymywać wystarczający kredyt na używanie posiadłości.
-Przekazanie będzie zawierać równoczesne przypisanie posiadłości do grupy od '[NAME]'.
-Cena zakupu posiadłości nie jest zwracana właścicielowi. Jeżeli przekazana posiadłość zostanie sprzedana, cana sprzedaży zostanie podzielona pomiędzy członków grupy.
+ Po przekazaniu tej działki grupa będzie musiała mieć i utrzymywać wystarczający kredyt na używanie działki.
+Przekazanie będzie zawierać równoczesne przypisanie działki do grupy od '[NAME]'.
+Cena zakupu działki nie jest zwracana właścicielowi. Jeżeli przekazana działka zostanie sprzedana, cena sprzedaży zostanie podzielona pomiędzy członków grupy.
-Przekazać tą posiadłość o powierzchni [AREA] m² grupie '[GROUP_NAME]'?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Przekazać tą działkę o powierzchni [AREA] m² grupie '[GROUP_NAME]'?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="DisplaySetToSafe">
Ustawienia grafiki zostały zmienione do bezpiecznego poziomu ponieważ opcja -safe została wybrana.
</notification>
- <notification name="ErrorMessage">
- [ERROR_MESSAGE]
- <usetemplate name="okbutton" yestext="OK"/>
+ <notification name="DisplaySetToRecommendedGPUChange">
+ Ustawienia grafiki zostały zmienione do zalecanego poziomu, ponieważ karta graficzna została zmieniona
+z '[LAST_GPU]'
+na '[THIS_GPU]'
+ </notification>
+ <notification name="DisplaySetToRecommendedFeatureChange">
+ Ustawienia grafiki zostały zmienione do zalecanego poziomu ze względu na zmianę podsystemu renderingu.
</notification>
<notification name="AvatarMovedDesired">
- Miejsce, do którego chcesz się teleportować jest chwilowo nieobecne.
-Zostałeś przeniesiony do regionu sąsiedniego.
+ Miejsce, do którego chcesz się teleportować jest chwilowo niedostępne.
+Zostałeś/aś przeniesiony/a do regionu sąsiedniego.
</notification>
<notification name="AvatarMovedLast">
- Twoje miejsce startu jest obecnie niedostępne.
-Zostałeś przeniesiony do sąsiedniego regionu.
+ Żądane przez Ciebie miejsce jest obecnie niedostępne.
+Zostałeś/aś przeniesiony/a do sąsiedniego regionu.
</notification>
<notification name="AvatarMovedHome">
Twoje miejsce startu jest obecnie niedostępne.
-Zostałeś przeniesiony do pobliskiego regionu.
+Zostałeś/aś przeniesiony/a do sąsiedniego regionu.
Możesz ustawić nowe miejsce startu.
</notification>
<notification name="ClothingLoading">
Twoje ubranie wciąż się ładuje.
Możesz normalnie używać [SECOND_LIFE], inni użytkownicy będą Cię widzieli poprawnie.
<form name="form">
- <ignore name="ignore" text="Åadowanie ubraÅ„ nadal trwa"/>
+ <ignore name="ignore" text="Åadowanie ubraÅ„ nadal trwa" />
</form>
</notification>
<notification name="FirstRun">
Instalacja [APP_NAME] zakończona.
Jeżeli używasz [SECOND_LIFE] po raz pierwszy to musisz stworzyć konto żeby móc się zalogować.
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Nowe konto..."/>
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Stwórz konto..." />
</notification>
<notification name="LoginPacketNeverReceived">
Problemy z połączeniem. Problem może być spowodowany Twoim połączeniem z Internetem albo może istnieć po stronie [SECOND_LIFE_GRID].
-Możesz sprawdzić swoje połączenie z Internetem i spróbować ponownie za kilka minut lub połączyć się ze stroną pomocy technicznej tutaj [SUPPORT_SITE] lub wybrać Teleportuj by teleportować się do swojego miejsca startu.
+Możesz sprawdzić swoje połączenie z Internetem i spróbować ponownie za kilka minut, połączyć się ze stroną pomocy technicznej ([SUPPORT_SITE]) lub wybrać Teleportuj, by teleportować się do swojego miejsca startu.
<form name="form">
- <button name="OK" text="OK"/>
- <button name="Help" text="Pomoc"/>
- <button name="Teleport" text="Teleportuj"/>
+ <button name="Help" text="Pomoc" />
+ <button name="Teleport" text="Teleportuj" />
</form>
</notification>
<notification name="WelcomeChooseSex">
Twoja postać pojawi się za moment.
-Używaj strzałek żeby sie poruszać.
+Używaj strzałek żeby się poruszać.
Naciśnij F1 w dowolnej chwili po pomoc albo żeby dowiedzieć się więcej o [SECOND_LIFE].
-Wybierz awatara właściwej płci.
-Ten wybór będzie można później zmienić.
- <usetemplate name="okcancelbuttons" notext="Kobieta" yestext="Mężczyzna"/>
+Wybierz awatara właściwej płci. Ten wybór będzie można później zmienić.
+ <usetemplate name="okcancelbuttons" notext="Kobieta" yestext="Mężczyzna" />
</notification>
<notification name="CantTeleportToGrid">
- Nie można teleportować do [SLURL], ponieważ jest na innym gridzie ([GRID]) niż obecny grid ([CURRENT_GRID]). Proszę zamknąć przeglądarkę i spróbować ponownie.
- <usetemplate name="okbutton" yestext="OK"/>
+ Nie można teleportować do [SLURL], ponieważ jest na innej siatce ([GRID]) niż obecna siatka ([CURRENT_GRID]). Proszę zamknąć przeglądarkę i spróbować ponownie.
</notification>
<notification name="GeneralCertificateError">
Połączenie z serwerem nie mogło zostać nawiązane.
[REASON]
-SubjectName: [SUBJECT_NAME_STRING]
-IssuerName: [ISSUER_NAME_STRING]
-Valid From: [VALID_FROM]
-Valid To: [VALID_TO]
-MD5 Fingerprint: [SHA1_DIGEST]
-SHA1 Fingerprint: [MD5_DIGEST]
-Key Usage: [KEYUSAGE]
-Extended Key Usage: [EXTENDEDKEYUSAGE]
-Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
- <usetemplate name="okbutton" yestext="OK"/>
+Nazwa podmiotu: [SUBJECT_NAME_STRING]
+Nazwa wydawcy: [ISSUER_NAME_STRING]
+Ważny od: [VALID_FROM]
+Ważny do: [VALID_TO]
+Odcisk palca MD5: [SHA1_DIGEST]
+Odcisk palca SHA1: [MD5_DIGEST]
+Użycie klucza: [KEYUSAGE]
+Rozszerzone użycie klucza: [EXTENDEDKEYUSAGE]
+Identyfikator klucza podmiotu: [SUBJECTKEYIDENTIFIER]
+
</notification>
<notification name="TrustCertificateError">
Wydawca certyfikatu dla tego serwera nie jest znany.
Informacje o certyfikacie:
-SubjectName: [SUBJECT_NAME_STRING]
-IssuerName: [ISSUER_NAME_STRING]
-Valid From: [VALID_FROM]
-Valid To: [VALID_TO]
-MD5 Fingerprint: [SHA1_DIGEST]
-SHA1 Fingerprint: [MD5_DIGEST]
-Key Usage: [KEYUSAGE]
-Extended Key Usage: [EXTENDEDKEYUSAGE]
-Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+Nazwa podmiotu: [SUBJECT_NAME_STRING]
+Nazwa wydawcy: [ISSUER_NAME_STRING]
+Ważny od: [VALID_FROM]
+Ważny do: [VALID_TO]
+Odcisk palca MD5: [SHA1_DIGEST]
+Odcisk palca SHA1: [MD5_DIGEST]
+Użycie klucza: [KEYUSAGE]
+Rozszerzone użycie klucza: [EXTENDEDKEYUSAGE]
+Identyfikator klucza podmiotu: [SUBJECTKEYIDENTIFIER]
Czy chcesz zaufać temu wydawcy?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Zaufaj"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Zaufaj" />
</notification>
<notification name="NotEnoughCurrency">
[NAME] [PRICE]L$ Masz za mało L$.
@@ -1262,45 +1239,46 @@ Czy chcesz zaufać temu wydawcy?
<notification name="FlushMapVisibilityCaches">
To spowoduje wyczyszczenie buforów map regionu.
Jest to użyteczne wyłącznie podczas szukania błędów.
-(Podczas produkcji poczekaj 5 minut i mapy wszystkich zostanÄ… uaktualnione po relogu.)
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+(W normalnym użytkowaniu poczekaj 5 minut, a mapy wszystkich zostaną uaktualnione po relogu.)
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BuyOneObjectOnly">
- Nie możesz zakupić więcej niż jednego obiektu w tym samym czasie. Proszę wybrać tylko jeden obiekt i spróbować ponowanie.
+ Nie możesz zakupić więcej niż jednego obiektu w tym samym czasie. Proszę wybrać tylko jeden obiekt i spróbować ponownie.
</notification>
<notification name="OnlyCopyContentsOfSingleItem">
Nie można kopiować zawartości więcej niż jednego obiektu naraz.
Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="KickUsersFromRegion">
- Teleportować wszystkich Rezydentów z tego regionu to ich miejsca startu?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Teleportować wszystkich Rezydentów z tego regionu do ich miejsc startu?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="EstateObjectReturn">
- Na pewno chcesz odesłać wszystkie obiekty należące do
-[USER_NAME] ?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Na pewno chcesz odesłać wszystkie obiekty należące do [USER_NAME]?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="InvalidTerrainBitDepth">
Nie można ustawić tekstur regionu:
Tekstura terenu [TEXTURE_NUM] ma niewłaściwą głębię koloru - [TEXTURE_BIT_DEPTH].
-Zamień teksturę [TEXTURE_NUM] na 24-o bitową teksturę o wymiarze 512x512 lub mniejszą i ponownie kliknij Zastosuj.
+
+Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub mniejszą i ponownie kliknij na "Zastosuj".
</notification>
<notification name="InvalidTerrainSize">
Nie można ustawić tekstur regionu:
Tekstura terenu [TEXTURE_NUM] jest za duża - [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
-Zamień teksturę [TEXTURE_NUM] na 24-o bitową teksturę o wymiarze 512x512 lub mniejszą i ponownie kliknij Zastosuj.
+
+Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub mniejszą i ponownie kliknij na "Zastosuj".
</notification>
<notification name="RawUploadStarted">
Åadowanie rozpoczÄ™te. Może potrwać do dwóch minut zależnie od prÄ™dkoÅ›ci Twojego poÅ‚Ä…czenia.
</notification>
<notification name="ConfirmBakeTerrain">
- Na pewno chcesz zapisać obecne ukształtowanie terenu jako punkt odniesienia dla górnego i dolnego limitu terenu i jako domyślą wartość dla opcji Odtwórz?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Na pewno chcesz zapisać obecne ukształtowanie terenu jako punkt odniesienia dla górnego i dolnego limitu terenu oraz jako domyślną wartość dla opcji 'Odtwórz'?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="MaxAllowedAgentOnRegion">
- Maksymalna liczba gości wynosi [MAX_AGENTS].
+ Maksymalna liczba Rezydentów wynosi [MAX_AGENTS].
</notification>
<notification name="MaxBannedAgentsOnRegion">
Maksymalna liczba niepożądanych Rezydentów (banów) wynosi [MAX_BANNED].
@@ -1311,7 +1289,7 @@ Zamień teksturę [TEXTURE_NUM] na 24-o bitową teksturę o wymiarze 512x512 lub
</notification>
<notification name="MaxAllowedGroupsOnRegion">
Możesz mieć maksymalnie [MAX_GROUPS] dozwolonych grup.
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Ustal"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Ustal" />
</notification>
<notification name="MaxManagersOnRegion">
Możesz mieć maksymalnie [MAX_MANAGER] zarządców Majątku.
@@ -1320,277 +1298,316 @@ Zamień teksturę [TEXTURE_NUM] na 24-o bitową teksturę o wymiarze 512x512 lub
Nie możesz dodać właściciela majątku do listy 'Niepożądanych Rezydentów (banów)' majątku.
</notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
- Nie możesz zmienić wyglądu podczas ładowania ubrań i kształtów.
+ Nie możesz zmienić wyglądu podczas ładowania ubrań i kształtu.
</notification>
<notification name="ClassifiedMustBeAlphanumeric">
Tytuł Twojej reklamy musi zaczynać się od litery (A-Z) albo cyfry. Znaki przestankowe są niedozwolone.
</notification>
<notification name="CantSetBuyObject">
- Nie możesz wybrać Kup obiekt ponieważ obiekt nie jest na sprzedaż.
+ Nie możesz wybrać 'Kup obiekt', ponieważ obiekt nie jest na sprzedaż.
Wybierz obiekt na sprzedaż i spróbuj jeszcze raz.
</notification>
<notification name="FinishedRawDownload">
- Plik surowego terenu załadowany pod:
+ Plik surowego terenu pobrany do:
[DOWNLOAD_PATH].
</notification>
<notification name="DownloadWindowsMandatory">
Nowa wersja [APP_NAME] została opublikowana.
[MESSAGE]
Musisz zainstalować nową wersję żeby używać [APP_NAME].
- <usetemplate name="okcancelbuttons" notext="Wyłącz program" yestext="Załaduj"/>
+ <usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pobierz" />
</notification>
<notification name="DownloadWindows">
Uaktualniona wersja [APP_NAME] została opublikowana.
[MESSAGE]
-Aktualizacja nie jest wymagana ale jest zalecana w celu poprawy prędkości i stabilności.
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Załaduj"/>
+Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
</notification>
<notification name="DownloadWindowsReleaseForDownload">
Uaktualniona wersja [APP_NAME] została opublikowana.
[MESSAGE]
-Aktualizacja nie jest wymagana ale jest zalecana w celu poprawy prędkości i stabilności.
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Załaduj"/>
+Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
</notification>
<notification name="DownloadLinuxMandatory">
Nowa wersja [APP_NAME] jest dostępna.
[MESSAGE]
Musisz pobrać aktualizację aby korzystać z [APP_NAME].
- <usetemplate name="okcancelbuttons" notext="Wyjdź" yestext="Pobieranie"/>
+ <usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pobierz" />
</notification>
<notification name="DownloadLinux">
Aktualizacja [APP_NAME] jest dostępna.
[MESSAGE]
-Ta aktualizacja nie jest wymagana ale zaleca się jej instalację w celu poprawienia szybkości i stabilności.
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobieranie"/>
+Ta aktualizacja nie jest wymagana, ale zaleca się jej instalację w celu poprawienia wydajności i stabilności.
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
</notification>
<notification name="DownloadLinuxReleaseForDownload">
Uaktualniona wersja [APP_NAME]została opublikowana.
[MESSAGE]
-Aktualizacja nie jest wymagana ale jest zalecana w celu poprawy prędkości i stabilności.
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobieranie"/>
+Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
</notification>
<notification name="DownloadMacMandatory">
Nowa wersja [APP_NAME] została opublikowana.
[MESSAGE]
Musisz zainstalować nową wersję żeby używać [APP_NAME].
-Pobrać i zapisać w folderze Aplikacji?
- <usetemplate name="okcancelbuttons" notext="Wyłącz program" yestext="Załaduj"/>
+Pobrać i zapisać w folderze Aplikacje?
+ <usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pobierz" />
</notification>
<notification name="DownloadMac">
Uaktualniona wersja [APP_NAME] została opublikowana.
[MESSAGE]
-Aktualizacja nie jest wymagana ale jest zalecana w celu poprawy prędkości i stabilności.
+Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
-Pobrać i zapisać w folderze Aplikacji?
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Załaduj"/>
+Pobrać i zapisać w folderze Aplikacje?
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
</notification>
<notification name="DownloadMacReleaseForDownload">
Uaktualniona wersja [APP_NAME] została opublikowana.
[MESSAGE]
-Aktualizacja nie jest wymagana ale jest zalecana w celu poprawy prędkości i stabilności.
+Aktualizacja nie jest wymagana, ale jest zalecana w celu poprawy wydajności i stabilności.
-Pobrać i zapisać w folderze Aplikacji?
- <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Załaduj"/>
+Pobrać i zapisać w folderze Aplikacje?
+ <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Pobierz" />
</notification>
<notification name="FailedUpdateInstall">
- Podczas aktualizacji pojawił się błąd. Proszę pobrać i zainstalować najnowszego klienta z http://secondlife.com/download.
- <usetemplate name="okbutton" yestext="OK"/>
+ Podczas aktualizacji pojawił się błąd.
+Proszę pobrać i zainstalować najnowszego klienta z
+http://secondlife.com/download
</notification>
<notification name="FailedRequiredUpdateInstall">
- Nie można zainstalować wymaganej aktualizacji. Nie będzie można zalogować się dopóki [APP_NAME] nie zostanie zaktualizowana.
- Proszę pobrać i zainstalować najnowszą wersję z http://secondlife.com/download.
- <usetemplate name="okbutton" yestext="Rezygnuj"/>
+ Nie można zainstalować wymaganej aktualizacji.
+Nie będzie można zalogować się dopóki [APP_NAME] nie zostanie zaktualizowana.
+Proszę pobrać i zainstalować najnowszą wersję z
+http://secondlife.com/download
+ <usetemplate name="okbutton" yestext="Wyjdź" />
</notification>
<notification name="UpdaterServiceNotRunning">
- Istnieje obowiązkowa aktualizacja dla Second Life. Możesz ją pobrać z http://www.secondlife.com/downloads lub zainstalować teraz.
- <usetemplate name="okcancelbuttons" notext="Opuść Second Life" yestext="Pobierz i zainstaluj teraz"/>
+ Istnieje obowiÄ…zkowa aktualizacja dla Second Life.
+Możesz ją pobrać z http://www.secondlife.com/downloads
+lub zainstalować teraz.
+ <usetemplate name="okcancelbuttons" notext="Opuść Second Life" yestext="Pobierz i instaluj teraz" />
</notification>
<notification name="DownloadBackgroundTip">
Aktualizacja dla [APP_NAME] została pobrana.
-Wersja [VERSION] [[RELEASE_NOTES_FULL_URL] Informacja o tej aktualizacji]
- <usetemplate name="okcancelbuttons" notext="Później..." yestext="Zainstaluj teraz i restartuj [APP_NAME]"/>
+Wersja [VERSION] [[INFO_URL] Informacja o tej aktualizacji]
+ <usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i restartuj [APP_NAME]" />
</notification>
<notification name="DownloadBackgroundDialog">
Aktualizacja [APP_NAME] została pobrana.
-Wersja [VERSION] [[RELEASE_NOTES_FULL_URL] Informacja o aktualizacji]
- <usetemplate name="okcancelbuttons" notext="Później..." yestext="Zainstaluj teraz i restartuj [APP_NAME]"/>
+Wersja [VERSION] [[INFO_URL] Informacja o aktualizacji]
+ <usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i restartuj [APP_NAME]" />
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
Pobrano wymaganÄ… aktualizacjÄ™.
-Wersja [VERSION]
+Wersja [VERSION] [[INFO_URL] Informacje o tej aktualizacji]
-W celu instalacji aktualizacji musi zostać wykonany restart [APP_NAME].
- <usetemplate name="okbutton" yestext="OK"/>
+W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
</notification>
<notification name="RequiredUpdateDownloadedDialog">
- W celu instalacji aktualizacji musi zostać wykonany restart [APP_NAME].
-[[INFO_URL] Information about this update]
- <usetemplate name="okbutton" yestext="OK"/>
+ W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
+[[INFO_URL] Informacje o tej aktualizacji]
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ Została pobrana aktualizacja dla Twojej instalacji [APP_NAME].
+Wersja [VERSION]
+Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
+ <usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i zrestartuj [APP_NAME]" />
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ Została pobrana aktualizacja dla Twojej instalacji [APP_NAME].
+Wersja [VERSION]
+Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
+ <usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i zrestartuj [APP_NAME]" />
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ Została pobrana wymagana aktualizacja.
+Wersja [VERSION]
+Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
+
+W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
+Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
</notification>
<notification name="DeedObjectToGroup">
Przekazanie tego obiektu spowoduje, że grupa:
* Otrzyma L$ zapłacone temu obiektowi
- <usetemplate ignoretext="Proszę potwierdzić decyzję przed przepisaniem obiektu do grupy" name="okcancelignore" notext="Anuluj" yestext="Przekaż"/>
+ <usetemplate ignoretext="Potwierdź decyzję przypisania obiektu do grupy" name="okcancelignore" notext="Anuluj" yestext="Przekaż" />
</notification>
<notification name="WebLaunchExternalTarget">
Czy chcesz otworzyć swoją przeglądarkę internetową by zobaczyć zawartość?
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć stronę internetową" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+Otwieranie stron internetowych z nieznanego źródła może narazić Twój komputer na niebezpieczeństwo.
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć stronę" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchJoinNow">
- By dokonać zmian i aktualizacji swojego konta, odwiedź [http://secondlife.com/account/ Dashboard].
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by dokonać zmian w konfiguracji mojego konta" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ By dokonać zmian i aktualizacji swojego konta, odwiedź [http://secondlife.com/account/ Tablicę].
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by dokonać zmian w konfiguracji mojego konta" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchSecurityIssues">
Odwiedź [SECOND_LIFE] Wiki i zobacz jak zgłaszać problemy z bezpieczeństwem danych.
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by dowiedzieć się więcej na temat zgłaszania problemów bezpieczeństwa" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by dowiedzieć się więcej na temat zgłaszania problemów bezpieczeństwa" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchQAWiki">
Odwiedź [SECOND_LIFE] Wiki pytań i odpowiedzi.
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć QA Wiki" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć QA Wiki" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchPublicIssue">
Odwiedź [SECOND_LIFE] katalog publicznych problemów, gdzie możesz zgłaszać błędy i inne problemy.
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by wysłać Błędy klienta" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by wysłać Błędy klienta" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchSupportWiki">
Otwórz oficjalny blog Lindenów żeby zobaczyć nowe wiadomości i informacje.
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć blog" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć blog" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchLSLGuide">
Czy chcesz otworzyć samouczek Języka skryptowania?
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by samouczek Języka skryptowania" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć samouczek Języka skryptowania" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="WebLaunchLSLWiki">
- Czy napewno chcesz odwiedzić portal LSL Portal?
- <usetemplate ignoretext="Uruchom przeglÄ…darkÄ™ internetowÄ… by LSL Portal" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ Czy na pewno chcesz odwiedzić portal skrypterów LSL?
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć LSL Portal" name="okcancelignore" notext="Anuluj" yestext="Pokaż stronę" />
</notification>
<notification name="ReturnToOwner">
Czy na pewno chcesz zwrócić wybrane obiekty do ich właścicieli? Wszystkie udostępnione obiekty z prawem transferu zostaną zwrócone poprzednim właścicielom.
*UWAGA* Wszystkie udostępnione obiekty bez prawa transferu zostaną usunięte!
- <usetemplate ignoretext="Potwierdź zanim zwrócisz obiekty do ich właścicieli" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Potwierdź zanim zwrócisz obiekty do ich właścicieli" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="GroupLeaveConfirmMember">
Jesteś członkiem grupy <nolink>[GROUP]</nolink>.
-Chcesz opuścić grupę?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+Chcesz ją opuścić?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
+ </notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Nie możesz opuścić tej grupy, ponieważ jesteś ostatnim z jej właścicieli. Przydziel najpierw innemu użytkownikowi rolę właściciela.
+ </notification>
+ <notification name="GroupDepartError">
+ Nie można opuścić grupy: [reason].
+ </notification>
+ <notification name="GroupDepart">
+ Opuściłeś/aś grupę [group_name].
</notification>
<notification name="ConfirmKick">
- Napewno chcesz wyrzucić wszystkich Rezydentów z gridu?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć wszystkich Rezydentów"/>
+ Na pewno chcesz wyrzucić wszystkich Rezydentów z siatki?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Wyrzuć Rezydentów" />
</notification>
<notification name="MuteLinden">
Przepraszamy, ale nie możesz zablokować Lindena.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="CannotStartAuctionAlreadyForSale">
- Aukcja nie może zostać rozpoczęta w posiadłości, która została już wcześniej wystawiona na aukcję. Deaktywuj opcję sprzedaży posiadłości jeżeli chcesz rozpocząć aukcję.
+ Aukcja nie może zostać rozpoczęta dla działki, która została już wcześniej wystawiona na sprzedaż. Dezaktywuj opcję sprzedaży działki, jeżeli chcesz rozpocząć aukcję.
</notification>
- <notification label="Zablokuj obiekty według wpisanej nazwy" name="MuteByNameFailed">
+ <notification label="Blokowanie obiektów według nazwy nie powiodło się" name="MuteByNameFailed">
Rezydent/obiekt jest już zablokowany.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RemoveItemWarn">
- Pomimo, że jest to dozwolone, usunięcie zawartości może zniszczyć obiekt. Chcesz usunąć?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Pomimo, że jest to dozwolone, usunięcie zawartości może uszkodzić obiekt. Chcesz usunąć?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="CantOfferCallingCard">
Nie możesz dać wizytówki w tym momencie. Spróbuj jeszcze raz za chwilę.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="CantOfferFriendship">
Nie możesz zaoferować znajomości w tym momencie. Spróbuj jeszcze raz za chwilę.
- <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="DoNotDisturbModeSet">
+ Tryb Zajętości jest włączony. Nie będziesz powiadamiany/a o nadchodzących rozmowach.
+
+- Inni Rezydenci będą otrzymywać Twoją wiadomość Trybu Zajętości (Ustawienia > Prywatność > Autoodpowiedzi).
+- Propozycje teleportacji będą odrzucane.
+- Propozycje rozmów głosowych będą odrzucane.
+ <usetemplate ignoretext="Status zmieniony na Tryb Zajętości" name="okignore" />
</notification>
<notification name="JoinedTooManyGroupsMember">
Należysz już do maksymalnej ilości grup. Opuść proszę przynajmniej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
[NAME] oferuje Ci członkostwo w grupie.
- <usetemplate name="okcancelbuttons" notext="Odmów" yestext="Przyjmij"/>
+ <usetemplate name="okcancelbuttons" notext="Odmów" yestext="Przyjmij" />
</notification>
<notification name="JoinedTooManyGroups">
- Należysz już do maksymalnej ilości grup. Opuść proszę przynajmiej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
- <usetemplate name="okbutton" yestext="OK"/>
+ Należysz już do maksymalnej ilości grup. Opuść proszę przynajmniej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
</notification>
<notification name="KickUser">
Wyrzuć tego Rezydenta, wysyłając następujący komunikat.
<form name="form">
<input name="message">
- Administrator wylogował Cię.
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ Administrator wylogował Cię.
+ </input>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="KickAllUsers">
Z jakim komunikatem wyrzucić wszystkich użytkowników z regionu?
<form name="form">
<input name="message">
- Administrator wylogował Cię.
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ Administrator wylogował Cię.
+ </input>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="FreezeUser">
Unieruchom tego Rezydenta, wysyłając następujący komunikat.
<form name="form">
<input name="message">
- Unieruchomiono Cię. Nie możesz się ruszać ani rozmawiać. Administrator skontaktuje się z Tobą poprzez IM.
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ Unieruchomiono Cię. Nie możesz się ruszać ani rozmawiać. Administrator skontaktuje się z Tobą poprzez IM.
+ </input>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="UnFreezeUser">
- Cofnij unieruchomienie tego Rezydenta, wysyłając następujący komunikat.
+ Cofnij unieruchomienie (zamrożenie) tego Rezydenta, wysyłając następujący komunikat.
<form name="form">
<input name="message">
- Odblokowano CiÄ™.
- </input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ Odblokowano CiÄ™.
+ </input>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="SetDisplayNameSuccess">
Witaj [DISPLAY_NAME]!
-Podobnie jak w realnym życiu potrzeba trochę czasu zanim wszyscy dowiedzą się o nowej nazwie. Kolejne kilka dni zajmie [http://wiki.secondlife.com/wiki/Setting_your_display_name aktualizacja nazwy] w obiektach, skryptach, wyszukiwarce, etc.
+Podobnie jak w realnym życiu potrzeba trochę czasu zanim wszyscy dowiedzą się o nowym imieniu. Kolejne kilka dni zajmie [http://wiki.secondlife.com/wiki/Setting_your_display_name aktualizacja imienia] w obiektach, skryptach, wyszukiwarce, etc.
</notification>
<notification name="SetDisplayNameBlocked">
- Przepraszamy, nie można zmienić Twojej wyświetlanej nazwy. Jeśli uważasz ze jest to spowodowane błędem skontaktuj się z obsługą klienta.
+ Przepraszamy, nie można zmienić Twojego Wyświetlanego Imienia. Jeśli uważasz, że jest to spowodowane błędem skontaktuj się z obsługą klienta.
</notification>
<notification name="SetDisplayNameFailedLength">
- Przepraszamy, ta nazwa jest zbyt długa. Wyświetlana nazwa może mieć maksymalnie [LENGTH] znaków.
+ Przepraszamy, to imię jest zbyt długie. Wyświetlane Imię może mieć maksymalnie [LENGTH] znaków.
-Proszę wprowadzić krótszą nazwę.
+Proszę wprowadzić krótsze imię.
</notification>
<notification name="SetDisplayNameFailedGeneric">
- Przepraszamy, nie można ustawić Twojej wyświetlanej nazwy. Spróbuj ponownie później.
+ Przepraszamy, nie można ustawić Twojego Wyświetlanego Imienia. Spróbuj ponownie później.
</notification>
<notification name="SetDisplayNameMismatch">
- Podana wyświetlana nazwa nie pasuje. Proszę wprowadzić ją ponownie.
+ Podane Wyświetlane Imię nie pasuje. Proszę wprowadzić je ponownie.
</notification>
<notification name="AgentDisplayNameUpdateThresholdExceeded">
- Przepraszamy, musisz jeszcze poczekać zanim będzie można zmienić Twoją wyświetlaną nazwę.
+ Przepraszamy, musisz jeszcze poczekać zanim będzie można zmienić Twoje Wyświetlane Imię.
Zobacz http://wiki.secondlife.com/wiki/Setting_your_display_name
Proszę spróbować ponownie później.
</notification>
<notification name="AgentDisplayNameSetBlocked">
- Przepraszamy, nie można ustawić wskazanej nazwy, ponieważ zawiera zabronione słowa.
-
- Proszę spróbować wprowadzić inną nazwę.
+ Przepraszamy, nie można ustawić wskazanego imienia, ponieważ zawiera zabronione słowa.
+
+Proszę spróbować wprowadzić inne imię.
</notification>
<notification name="AgentDisplayNameSetInvalidUnicode">
- Wyświetlana nazwa, którą chcesz ustawić zawiera niepoprawne znaki.
+ Wyświetlane Imię, które chcesz ustawić zawiera niepoprawne znaki.
</notification>
<notification name="AgentDisplayNameSetOnlyPunctuation">
- Twoje wyświetlane imię musi zawierać litery inne niż znaki interpunkcyjne.
+ Twoje Wyświetlane Imię musi zawierać litery inne niż znaki interpunkcyjne.
</notification>
<notification name="DisplayNameUpdate">
- [OLD_NAME] ([SLID]) jest od tej pory znana/znany jako [NEW_NAME].
+ [OLD_NAME] ([SLID]) jest od tej pory znana/y jako [NEW_NAME].
</notification>
<notification name="OfferTeleport">
Zaproponować teleportację do miejsca Twojego pobytu z tą wiadomością?
@@ -1598,210 +1615,269 @@ Proszę spróbować ponownie później.
<input name="message">
Zapraszam do siebie. Region: [REGION]
</input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
+ </form>
+ </notification>
+ <notification name="TeleportRequestPrompt">
+ Poproś [NAME] o teleport z następującą wiadomością
+ <form name="form">
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
+ <notification name="TooManyTeleportOffers">
+ Próbujesz wysłać [OFFERS] ofert teleportu,
+co przekracza limit [LIMIT].
+ </notification>
<notification name="OfferTeleportFromGod">
Wysłać propozycję teleportacji do Twojego miejsca?
<form name="form">
<input name="message">
Zapraszam do siebie. Region: [REGION]
</input>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="TeleportFromLandmark">
Na pewno chcesz się teleportować do <nolink>[LOCATION]</nolink>?
- <usetemplate ignoretext="Potwierdź próbę teleportacji do zapisanego miejsca" name="okcancelignore" notext="Anuluj" yestext="Teleportuj"/>
+ <usetemplate ignoretext="Potwierdź próbę teleportacji do zapisanego miejsca" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
</notification>
+ <notification name="TeleportViaSLAPP">
+ Na pewno chcesz się teleportować do <nolink>[LOCATION]</nolink>?
+ <usetemplate ignoretext="Potwierdź próbę teleportacji przez SLAPP" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
+ </notification>
<notification name="TeleportToPick">
- Teleportuj do [PICK]?
- <usetemplate ignoretext="Potwierdź, że chcesz teleportować się do miejsca w Ulubionych" name="okcancelignore" notext="Anuluj" yestext="Teleportuj"/>
+ Teleportować do [PICK]?
+ <usetemplate ignoretext="Potwierdź, że chcesz teleportować się do miejsca w Ulubionych" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
</notification>
<notification name="TeleportToClassified">
- Teleportuj do [CLASSIFIED]?
- <usetemplate ignoretext="Potwierdź, że chcesz teleportować się do lokalizacji z reklamy" name="okcancelignore" notext="Anuluj" yestext="Teleportuj"/>
+ Teleportować do [CLASSIFIED]?
+ <usetemplate ignoretext="Potwierdź, że chcesz teleportować się do lokalizacji z reklamy" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
</notification>
<notification name="TeleportToHistoryEntry">
- Teleportuj do [HISTORY_ENTRY]?
- <usetemplate ignoretext="Potwierdź teleportację do lokalizacji z historii" name="okcancelignore" notext="Anuluj" yestext="Teleportuj"/>
+ Teleportować do [HISTORY_ENTRY]?
+ <usetemplate ignoretext="Potwierdź teleportację do lokalizacji z historii" name="okcancelignore" notext="Anuluj" yestext="Teleportuj" />
</notification>
- <notification label="Wiadomość do Wszystkich w Twoim Majątku" name="MessageEstate">
+ <notification label="Wiadomość do wszystkich w Twoim Majątku" name="MessageEstate">
Wpisz krótką wiadomość która zostanie wysłana do wszystkich osób w Twoim majątku.
<form name="form">
- <input name="message"/>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification label="Zmiana Majątku Lindenów" name="ChangeLindenEstate">
- Czy napewno chcesz zmienić ustawienia majątku Linden (mainland, teen grid, orientacja, itp).
+ Zamierzasz zmienić ustawienia majątku Lindenów (region główny, teen grid, orientacja, itp).
-Jest to wyjątkowo niebezpieczna decyzja, odczuwalna przez wszystkich Rezydentów. Dla mainland, spowoduje to zmianę tysięcy regionów oraz ich przestrzeń serwerową.
+Jest to wyjątkowo niebezpieczna decyzja, odczuwalna przez wszystkich Rezydentów. Dla regionu głównego, spowoduje to zmianę tysięcy regionów oraz ich przestrzeń serwerową, spowoduje lagi.
Kontynuować?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
- <notification label="Zmiana Dostępu do Majątku Lindenów" name="ChangeLindenAccess">
+ <notification label="Zmiana dostępu do Majątku Lindenów" name="ChangeLindenAccess">
Dokonujesz zmiany w liście dostępu Regionu głównego należącego do Lindenów (Regiony Główne, Teen Grid, Orientacja).
Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie i powinna być używana wyłącznie w celu zablokowania opcji pozwalającej na przeniesienie obiektów/L$ do/z sieci.
Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów.
Kontynuować?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateAllowedAgentAdd">
- Dodać do listy dostępu do tego majątku czy do [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Dodać do listy dostępu tylko do tego majątku czy do [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateAllowedAgentRemove">
- Usunąć z listy dostępu do tego majątku czy do [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Usunąć z listy dostępu tylko z tego majątku czy do [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateAllowedGroupAdd">
- Dodać do listy dostępu grup do tego majątku czy do [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Dodać do listy dostępu grup tylko do tego majątku czy do [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateAllowedGroupRemove">
- Usunąć z listy dostępu grup do tego majątku czy do [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Usunąć z listy dostępu grup tylko z tego majątku czy do [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateBannedAgentAdd">
- Zablokować dostęp do tego majątku czy do [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Zablokować dostęp tylko do tego majątku czy do [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateBannedAgentRemove">
- Zdjąć tego Rezydenta z listy niepożądanych (bany) dla tego majątku czy dla [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Zdjąć tego Rezydenta z listy niepożądanych (bany) tylko dla tego majątku czy dla [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateManagerAdd">
- Dodać zarządce majątku do tego majątku czy do [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Dodać zarządcę majątku tylko do tego majątku czy do [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Wybierz MajÄ…tek" name="EstateManagerRemove">
- Usunąć zarządce majątku z tego majątku czy z [ALL_ESTATES]?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek"/>
+ Usunąć zarządcę majątku tylko z tego majątku czy z [ALL_ESTATES]?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majÄ…tki" yestext="Ten majÄ…tek" />
</notification>
<notification label="Potwierdź Wyrzucenie" name="EstateKickUser">
Wyrzucić [EVIL_USER] z tego majątku?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="EstateChangeCovenant">
- Na pewno chcesz zminić treść umowy dla tego majątku?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Na pewno chcesz zmienić treść umowy dla tego majątku?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="RegionEntryAccessBlocked">
- Ze względu na Twój wiek, nie jesteś uprawniony do przebywania w tym regionie. Może być to wynikiem braku informacji na temat weryfikacji Twojego wieku.
-
-Upewnij się, że masz zainstalowaną najnowszą wersję klienta i skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
- <usetemplate name="okbutton" yestext="OK"/>
+ Region, który próbujesz odwiedzić zawiera treści przekraczające Twoje bieżące preferencje. Możesz je zmienić używając Ja > Ustawienia > Ogólne.
</notification>
- <notification name="SLM_UPDATE_FOLDER">
- [MESSAGE]
+ <notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
+ <usetemplate ignoretext="Zmiana regionu: Region, który próbujesz odwiedzić zawiera treści, które są dostępne tylko dla dorosłych." name="okcancelignore" notext="Zamknij" yestext="Baza wiedzy" />
</notification>
<notification name="RegionEntryAccessBlocked_Notify">
- Ze względu na Twój wiek, nie jesteś uprawniony do przebywania w tym regionie.
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY].
+ </notification>
+ <notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
</notification>
<notification name="RegionEntryAccessBlocked_Change">
- Nie masz zezwolenia na przebywanie w tym Regionie z powodu Twojego statusu ustawień wieku.
-
-W celu uzyskania dostępu do tego regiony zmień proszę swój status ustawień wieku. Będziesz mógł/mogła szukać i mieć dostęp do treści [REGIONMATURITY]. W celu cofnięcia zmian wybierz z menu Ja > Ustawienia > Ogólne.
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY]. Możesz zmienić swoje preferencje albo anulować. Gdy zostaną zmienione możesz spróbować wejść do regionu ponownie.
<form name="form">
- <button name="OK" text="Zmień ustawienia"/>
- <button default="true" name="Cancel" text="Zamknij"/>
- <ignore name="ignore" text="Moje ustawienia wieku nie dopuszczajÄ… do regionu"/>
+ <button name="OK" text="Zmień preferencje" />
+ <button name="Cancel" text="Anuluj" />
+ <ignore name="ignore" text="Zmiana regionu: Region, który próbujesz odwiedzić zawiera treści, które są wykluczane przez Twoje preferencje." />
</form>
</notification>
+ <notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+ Mamy trudności techniczne z Twoim wejściem w region, ponieważ Twoje preferencje są rozsynchronizowane z serwerem.
+ </notification>
+ <notification name="TeleportEntryAccessBlocked">
+ Region, który próbujesz odwiedzić zawiera treści przekraczające Twoje bieżące preferencje. Możesz je zmienić używając Ja > Ustawienia > Ogólne.
+ </notification>
+ <notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
+ <usetemplate name="okcancelignore" yestext="Baza wiedzy" notext="Zamknij" ignoretext="Teleport: Region, który próbujesz odwiedzić zawiera treści, które są dostępne tylko dla dorosłych." />
+ </notification>
+ <notification name="TeleportEntryAccessBlocked_Notify">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY].
+ </notification>
+ <notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
+ </notification>
+ <notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY]. Możesz zmienić swoje preferencje i kontynuować teleport albo anulować go.
+ <form name="form">
+ <button name="OK" text="Zmień i kontynuuj" />
+ <button name="Cancel" text="Anuluj" />
+ <ignore name="ignore" text="Teleport (restartowalny): Region, który próbujesz odwiedzić zawiera treści, które są wykluczane przez Twoje preferencje." />
+ </form>
+ </notification>
+ <notification name="TeleportEntryAccessBlocked_Change">
+ Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY]. Możesz zmienić swoje preferencje albo anulować. Gdy zostaną zmienione możesz spróbować wejść do regionu ponownie.
+ <form name="form">
+ <button name="OK" text="Zmień preferencje" />
+ <button name="Cancel" text="Anuluj" />
+ <ignore name="ignore" text="Teleport (nierestartowalny): Region, który próbujesz odwiedzić zawiera treści, które są wykluczane przez Twoje preferencje." />
+ </form>
+ </notification>
+ <notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+ Mamy trudności techniczne z Twoim teleportem, ponieważ Twoje preferencje są rozsynchronizowane z serwerem.
+ </notification>
+ <notification name="RegionTPSpecialUsageBlocked">
+ Nie można wejść do tego regionu. '[REGION_NAME]' jest miejscem z grami (Skill Gaming Region) - musisz spełnić określone wymagania, jeśli chcesz go odwiedzić. Aby dowiedzieć się więcej zapoznaj się z [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ </notification>
<notification name="PreferredMaturityChanged">
- Twoja obecna klasyfikacja wieku to [RATING].
+ Nie będziesz już otrzymywać żadnych powiadomień związanych z odwiedzaniem regionów z treściami [RATING]. Możesz zmienić swoją preferencję treści w przyszłości używając Ja > Ustawienia > Ogólne w pasku menu.
+ </notification>
+ <notification name="MaturityChangeError">
+ Nie można zmienić Twoich preferencji odnośnie treści [PREFERRED_MATURITY] w tej chwili. Twoje preferencje zostały zresetowane do oglądania treści [ACTUAL_MATURITY]. Możesz spróbować zmienić swoją preferencję treści ponownie używając Ja > Ustawienia > Ogólne w pasku menu.
</notification>
<notification name="LandClaimAccessBlocked">
- W związku ze statusem ustawień Twojego wieku, nie możesz odzyskać tej posiadłości. Możesz potrzebować weryfikacji wieku bądź instalacji najnowszej wersji klienta.
-
-Upewnij się, że masz zainstalowaną najnowszą wersję klienta i skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
- <usetemplate name="okbutton" yestext="OK"/>
+ Ziemia, którą próbujesz odzyskać ma klasyfikację treści przekraczającą Twoje obecne preferencje treści. Możesz je zmienić używając Ja > Ustawienia > Ogólne w pasku menu.
+ </notification>
+ <notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+ Tylko dorośli mogą odzyskać tą ziemię.
+ <usetemplate ignoretext="Tylko dorośli mogą odzyskać tą ziemię." name="okcancelignore" notext="Zamknij" yestext="Baza wiedzy" />
</notification>
<notification name="LandClaimAccessBlocked_Notify">
- Ze względu na Twój wiek, nie możesz odzyskać tej posiadłości.
+ Ziemia, którą próbujesz odzyskać zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY].
+ </notification>
+ <notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+ Ziemia, którą próbujesz odzyskać zawiera treści [REGIONMATURITY], dostępne tylko dla dorosłych.
</notification>
<notification name="LandClaimAccessBlocked_Change">
- W związku ze statusem ustawień Twojego wieku, nie możesz odzyskać tej posiadłości.
-
-Możesz wybrać 'Zmień Ustawienia' by dokonać zmian w ustawieniach Twojego wieku by uzyskać dostęp do regionu. Wówczas będziesz w stanie znaleźć oraz mieć dostęp do [REGIONMATURITY] treści. Jeżeli zdecydujesz się na powrót do poprzednich ustawień, wybierz Ja > Ustawienia > Główne.
+ Region, który próbujesz odzyskać zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY]. Możesz zmienić swoje preferencje, a potem spróbować odzyskać region ponownie.
+ <form name="form">
+ <button name="OK" text="Zmień preferencje" />
+ <button name="Cancel" text="Anuluj" />
+ <ignore name="ignore" text="Region, który próbujesz odzyskać zawiera treści, które są wykluczane przez Twoje preferencje." />
+ </form>
</notification>
<notification name="LandBuyAccessBlocked">
- Ze względu na Twój wiek, nie możesz kupić tej posiadłości. Może być to wynikiem braku informacji na temat weryfikacji Twojego wieku.
-
-Upewnij się, że masz zainstalowaną najnowszą wersję klienta i skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
- <usetemplate name="okbutton" yestext="OK"/>
+ Ziemia, którą próbujesz kupić ma klasyfikację treści przekraczającą Twoje obecne preferencje treści. Możesz je zmienić używając Ja > Ustawienia > Ogólne w pasku menu.
+ </notification>
+ <notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+ Tylko dorośli mogą kupić tą ziemię.
+ <usetemplate ignoretext="Tylko dorośli mogą kupić tą ziemię." name="okcancelignore" notext="Zamknij" yestext="Baza wiedzy" />
</notification>
<notification name="LandBuyAccessBlocked_Notify">
- Ze względu na Twój wiek, nie możesz kupić tej posiadłości.
+ Ziemia, którą próbujesz kupić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY].
+ </notification>
+ <notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+ Ziemia, którą próbujesz kupić zawiera treści [REGIONMATURITY], dostępne tylko dla dorosłych.
</notification>
<notification name="LandBuyAccessBlocked_Change">
- W związku ze statusem ustawień Twojego wieku, nie możesz kupić tej posiadłości.
-
-Możesz wybrać 'Zmień Ustawienia' by dokonać zmian w ustawieniach Twojego wieku by uzyskać dostęp do regionu. Wówczas będziesz w stanie znaleźć oraz mieć dostęp do [REGIONMATURITY] treści. Jeżeli zdecydujesz się na powrót do poprzednich ustawień, wybierz Ja > Ustawienia > Główne.
+ Region, który próbujesz kupić zawiera treści [REGIONMATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGIONMATURITY]. Możesz zmienić swoje preferencje, a potem spróbować kupić region ponownie.
+ <form name="form">
+ <button name="OK" text="Zmień preferencje" />
+ <button name="Cancel" text="Anuluj" />
+ <ignore name="ignore" text="Region, który próbujesz kupić zawiera treści, które są wykluczane przez Twoje preferencje." />
+ </form>
</notification>
<notification name="TooManyPrimsSelected">
Zbyt wiele wybranych obiektów. Wybierz [MAX_PRIM_COUNT] lub mniej i spróbuj ponownie
</notification>
<notification name="ProblemImportingEstateCovenant">
Problem z importem umowy majÄ…tku.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ProblemAddingEstateManager">
- Problemy z dodawaniem nowego zarządcy majątku. Jeden lub więcaj majątk może mieć wypełnioną listę zarządców.
+ Problemy z dodawaniem nowego zarządcy majątku. Jeden lub więcej majątków może mieć wypełnioną listę zarządców.
+ </notification>
+ <notification name="ProblemAddingEstateBanManager">
+ Nie można dodać właściciela lub zarządcy majątku na listę banów.
</notification>
<notification name="ProblemAddingEstateGeneric">
- Problemy z dodawaniem do listy majątku. Jeden lub więcaj majątk może mieć wypełnioną listę.
+ Problemy z dodawaniem do listy majątku. Jeden lub więcej majątków może mieć wypełnioną listę.
</notification>
<notification name="UnableToLoadNotecardAsset">
Brak możliwości załadowania noty w tej chwili.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="NotAllowedToViewNotecard">
NiewystarczajÄ…ce prawa do zobaczenia notki przypisanej do wybranego ID.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="MissingNotecardAssetID">
- ID notki nie znalezione w bazie danych.
- <usetemplate name="okbutton" yestext="OK"/>
+ ID notki nie zostało znalezione w bazie danych.
</notification>
<notification name="PublishClassified">
Pamiętaj: Opłaty za reklamę są bezzwrotne.
Zamieścić tą reklamę za [AMOUNT]L$?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="SetClassifiedMature">
- Czy ta reklama zawiera treść 'Mature'?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie" yestext="Tak"/>
+ Czy ta reklama zawiera treść Moderate?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="SetGroupMature">
- Czy ta grupa zawiera treść 'Mature'?
- <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie" yestext="Tak"/>
+ Czy ta grupa zawiera treść Moderate?
+ <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification label="Potwierdź Restart" name="ConfirmRestart">
Na pewno chcesz zrobić restart tego regionu za 2 minuty?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
- <notification label="Wiadomość do Wszystkich w tym Regionie" name="MessageRegion">
+ <notification label="Wiadomość do wszystkich w tym Regionie" name="MessageRegion">
Wpisz krótką wiadomość która zostanie wysłana do wszystkich osób w tym regionie.
<form name="form">
- <input name="message"/>
- <button name="OK" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification label="Zmienione Restrykcje Wieku dla Regionu" name="RegionMaturityChange">
- Ustawienie restrykcji wieku dla regionu zostało zmienione.
-Zazwyczaj musi upłynąć nieco czasu zanim ta zmiana zostanie odzwierciedlona na mapie.
-
-Aby wejść do regionu Adult, Rezydenci muszą posiadać zweryfikowane konto, albo w wyniku weryfikacji wieku albo płatości.
+ Klasyfikacja wieku dla tego regionu została zmieniona.
+Może minąć trochę czasu, zanim zmiana będzie odzwierciedlona na mapie.
</notification>
<notification label="Wersja Niezgodna z Systemem Rozmów" name="VoiceVersionMismatch">
Ta wersja [APP_NAME] nie jest kompatybilna z systemem rozmów w tym Regionie. Musisz zainstalować aktualną wersję [APP_NAME] aby komunikacja głosowa działała poprawnie.
@@ -1824,7 +1900,7 @@ Zostaniesz właścicielem tego obiektu z następującymi prawami:
Modyfikacje: [MODIFYPERM]
Kopiowanie: [COPYPERM]
Odsprzedawanie i oddawanie: [RESELLPERM]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BuyOriginalNoOwner">
Kupić oryginalny obiekt za [PRICE]L$?
@@ -1832,7 +1908,7 @@ Zostaniesz właścicielem tego obiektu z następującymi prawami:
Modyfikacje: [MODIFYPERM]
Kopiowanie: [COPYPERM]
Odsprzedawanie i oddawanie: [RESELLPERM]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BuyCopy">
Kupić kopię obiektu od [OWNER] za [PRICE]L$?
@@ -1840,7 +1916,7 @@ Obiekt zostanie skopiowany do Twojej szafy z następującymi prawami:
Modyfikacje: [MODIFYPERM]
Kopiowanie: [COPYPERM]
Odsprzedawanie i oddawanie: [RESELLPERM]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BuyCopyNoOwner">
Kupić kopię obiektu za [PRICE]L$?
@@ -1848,48 +1924,46 @@ Obiekt zostanie skopiowany do Twojej szafy z następującymi prawami:
Modyfikacje: [MODIFYPERM]
Kopiowanie: [COPYPERM]
Odsprzedawanie i oddawanie: [RESELLPERM]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BuyContents">
Kupić zawartość od [OWNER] za [PRICE]L$?
Zawartość zostanie skopiowana do Twojej szafy.
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BuyContentsNoOwner">
Kupić zawartość za [PRICE]L$?
Zawartość zostanie skopiowana do Twojej szafy.
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmPurchase">
Ta transakcja spowoduje:
[ACTION]
Na pewno chcesz dokonać tego zakupu?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmPurchasePassword">
Ta transakcja spowoduje:
[ACTION]
Na pewno chcesz dokonać tego zakupu?
-Wpisz hasło ponownie i kliknij OK.
+Wpisz hasło ponownie i kliknij na OK.
<form name="form">
- <input name="message"/>
- <button name="ConfirmPurchase" text="OK"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="SetPickLocation">
Uwaga:
-Lokalizacja tego wyboru została zaktualizowana ale pozostałe szczegóły zachowają oryginalne wartości.
- <usetemplate name="okbutton" yestext="OK"/>
+Lokalizacja tego miejsca została zaktualizowana, ale pozostałe szczegóły zachowają oryginalne wartości.
+
</notification>
<notification name="MoveInventoryFromObject">
Wybrane obiekty Szafy nie majÄ… praw kopiowania.
Obiekty zostanÄ… przeniesione do Twojej Szafy, nie zostanÄ… skopiowane.
Przenieść obiekty Szafy?
- <usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="MoveInventoryFromScriptedObject">
Wybrane obiekty Szafy nie majÄ… praw kopiowania.
@@ -1897,32 +1971,51 @@ Obiekty zostanÄ… przeniesione do Twojej Szafy, nie zostanÄ… skopiowane.
Ponieważ obiekty zawierają skrypty, przeniesienie obiektów do Twojej Szafy może spowodować niepoprawne działanie skryptów.
Przenieść obiekty szafy?
- <usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu, która może uszkodzić skrypty obiektu" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu, które może uszkodzić skrypty obiektu" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="ClickActionNotPayable">
- Uwaga: Opcja Zapłać obiektowi została wybrana, ale żeby ta opcja działała musi być dodany skrypt z funkcją money().
+ Uwaga: Opcja 'Zapłać obiektowi' została wybrana, ale żeby ta opcja działała musi być dodany skrypt z funkcją money().
<form name="form">
- <ignore name="ignore" text="Opcja Zapłać Obiektowi została aktywowana podczas budowania obiektów bez skryptu z funkcją money()."/>
+ <ignore name="ignore" text="Opcja 'Zapłać Obiektowi' została aktywowana podczas budowania obiektów bez skryptu z funkcją money()." />
</form>
</notification>
<notification name="PayConfirmation">
Potwierdź, że na pewno chcesz zapłacić [AMOUNT]L$ dla [TARGET].
- <usetemplate ignoretext="Potwierdź przed płaceniem (kwoty ponad 200 L$)" name="okcancelignore" notext="Anuluj" yestext="Płać"/>
+ <usetemplate ignoretext="Potwierdź przed płaceniem (kwoty ponad 200 L$)" name="okcancelignore" notext="Anuluj" yestext="Zapłać" />
+ </notification>
+ <notification name="PayObjectFailed">
+ Płatność nie powiodła się: nie można znaleźć obiektu.
</notification>
<notification name="OpenObjectCannotCopy">
W tym obiekcie nie ma elementów które możesz skopiować.
</notification>
<notification name="WebLaunchAccountHistory">
- Przejść na stronę [http://secondlife.com/account/ Dashboard] żeby zobaczyć historię konta?
- <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć historię konta" name="okcancelignore" notext="Anuluj" yestext="Idź na stronę"/>
+ Przejść na stronę [http://secondlife.com/account/ Tablicy] żeby zobaczyć historię konta?
+ <usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć historię konta" name="okcancelignore" notext="Anuluj" yestext="Idź na stronę" />
+ </notification>
+ <notification name="ConfirmAddingChatParticipants">
+ Po dodaniu osoby do istniejÄ…cej rozmowy - nowa rozmowa zostanie utworzona. Wszyscy uczestnicy otrzymajÄ… powiadomienie o nowej rozmowie.
+ <usetemplate ignoretext="Potwierdź dodanie uczestników rozmowy" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="ConfirmQuit">
- Na pewno chcesz skończyć?
- <usetemplate ignoretext="Na pewno chcesz skończyć?" name="okcancelignore" notext="Nie kończ" yestext="Wyłącz"/>
+ Na pewno chcesz zakończyć?
+ <usetemplate ignoretext="Na pewno chcesz zakończyć?" name="okcancelignore" notext="Nie kończ" yestext="Wyłącz" />
+ </notification>
+ <notification name="ConfirmRestoreToybox">
+ Ta akcja przywróci domyślny układ przycisków i pasków.
+
+Nie możesz tego cofnąć.
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
+ </notification>
+ <notification name="ConfirmClearAllToybox">
+ Ta akcja usunie wszystkie przyciski z pasków, będą one puste.
+
+Nie możesz tego cofnąć.
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="DeleteItems">
[QUESTION]
- <usetemplate ignoretext="Potwierdź, że na pewno chcesz skasować obiekty" name="okcancelignore" notext="Cofnij" yestext="OK"/>
+ <usetemplate ignoretext="Potwierdź, że na pewno chcesz skasować obiekty" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="HelpReportAbuseEmailLL">
Używaj tej opcji do zgłaszania nadużyć [http://secondlife.com/corporate/tos.php Warunków Umowy (Terms of Service)] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa (Community Standards)].
@@ -1931,31 +2024,31 @@ Wszystkie zgłoszone nadużycia są badane i rozwiązywane.
</notification>
<notification name="HelpReportAbuseSelectCategory">
Wybierz kategorię dla tego raportu o nadużyciu.
-Określenie kategorii pomoże nam w klasyfikacji i prztwarzaniu raportu.
+Określenie kategorii pomoże nam w klasyfikacji i przetwarzaniu raportu.
</notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
- Wprowadź imię i nazwisko osoby popełniającej nadużycie.
-Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
+ Wprowadź imię/nazwę osoby popełniającej nadużycie.
+Dokładne dane pomogą nam w klasyfikacji i przetwarzaniu raportu.
</notification>
<notification name="HelpReportAbuseAbuserLocationEmpty">
Wprowadź nazwę miejsca gdzie popełniono nadużycie.
-Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
+Dokładne dane pomogą nam w klasyfikacji i przetwarzaniu raportu.
</notification>
<notification name="HelpReportAbuseSummaryEmpty">
- Wprowadź opis popełnionego nadużycia.
-Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
+ Wprowadź podsumowanie popełnionego nadużycia.
+Dokładne dane pomogą nam w klasyfikacji i przetwarzaniu raportu.
</notification>
<notification name="HelpReportAbuseDetailsEmpty">
- Wprowadź szczgółowy opis popełnionego nadużycia.
-Podaj maksymalną ilość szczgółów oraz imiona i nazwiska osób związanych z nadużyciem które zgłaszasz.
-Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
+ Wprowadź szczegółowy opis popełnionego nadużycia.
+Podaj maksymalną ilość szczegółów oraz imiona/nazwy osób związanych z nadużyciem, które zgłaszasz.
+Dokładne dane pomogą nam w klasyfikacji i przetwarzaniu raportu.
</notification>
<notification name="HelpReportAbuseContainsCopyright">
Szanowny Rezydencie,
Jeżeli składasz raport dotyczący naruszenia praw autorskich proszę się upewnić, że robisz to poprawnie:
-(1) Przypadek Nadużycia. Możesz złożyć raport jeżeli sądzisz, że Rezydent narusza system przywilejów [SECOND_LIFE], na przykład używając CopyBot lub podobnych narzędzi robiących kopie, naruszając prawa autorskie. Komisja Nadużyć bada wykroczenia i stosuje akcje dyscyplinarne za zachowania sprzeczne z zasadami Warunków Umowy [SECOND_LIFE] [http://secondlife.com/corporate/tos.php Terms of Service] i Standardów Społeczeństwa [http://secondlife.com/corporate/cs.php Community Standards]. Komisja Nadużyć nie zajmuje się i nie odpowiada na żądania usunięcia treści ze środowiska [SECOND_LIFE].
+(1) Przypadek Nadużycia. Możesz złożyć raport jeżeli sądzisz, że Rezydent narusza system przywilejów [SECOND_LIFE], na przykład używając CopyBot lub podobnych narzędzi robiących kopie, naruszając prawa autorskie. Komisja Nadużyć bada wykroczenia i stosuje akcje dyscyplinarne za zachowania sprzeczne z zasadami [http://secondlife.com/corporate/tos.php Warunków Umowy] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa] w [SECOND_LIFE]. Komisja Nadużyć nie zajmuje się i nie odpowiada na żądania usunięcia treści ze środowiska [SECOND_LIFE].
(2) Przypadek DMCA lub Usuwanie Treści. Aby wystąpić z żądaniem o usunięcie treści ze środowiska [SECOND_LIFE] MUSISZ przedłożyć ważne zawiadomienie o nadużyciu zgodne z naszą polityką DMCA [http://secondlife.com/corporate/dmca.php DMCA Policy].
@@ -1973,47 +2066,64 @@ Linden Lab
Obecnie masz już dołączony obiekt do tej części Twojego ciała.
Chcesz go zamienić na wybrany obiekt?
<form name="form">
- <ignore name="ignore" save_option="true" text="Obecnie masz już dołączony obiekt do tej części Twojego ciała.Chcesz go zamienić na wybrany obiekt?"/>
- <button ignore="Zamień automatycznie" name="Yes" text="OK"/>
- <button ignore="Nie zamieniaj" name="No" text="Anuluj"/>
+ <ignore name="ignore" text="Zamień dodatek z wybranym obiektem" />
+ <button ignore="Zamień automatycznie" name="Yes" />
+ <button ignore="Nie zamieniaj" name="No" text="Anuluj" />
+ </form>
+ </notification>
+ <notification name="TooManyWearables">
+ Nie możesz założyć folderu, który zawiera więcej niż [AMOUNT] przedmiotów. Możesz zmienić ten limit w Zaawansowane > Pokaż ustawienia debugowania > WearFolderLimit.
+ </notification>
+ <notification label="Ostrzeżenie Trybu Zajętości" name="DoNotDisturbModePay">
+ Jesteś w Trybie Zajętości co oznacza, że nie dostaniesz żadnych obiektów w zamian za tą opłatę.
+
+Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
+ <form name="form">
+ <ignore name="ignore" text="Chcę zapłacić w Trybie Zajętości" />
+ <button ignore="Zawsze wyłączaj tryb Zajętości" name="Yes" />
+ <button ignore="Nigdy nie wyłączaj trybu Zajętości" name="No" text="Anuluj" />
</form>
</notification>
<notification name="ConfirmDeleteProtectedCategory">
- Ten folder '[FOLDERNAME]' to folder systemowy. Usunięcie foldera systemowego spowoduje niestabilność. Czy na pewno chcesz go skasować?
- <usetemplate ignoretext="Potwierdź zanim folder systemu zostanie skasowany" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ Ten folder '[FOLDERNAME]' to folder systemowy. Usunięcie folderu systemowego spowoduje niestabilność. Czy na pewno chcesz go skasować?
+ <usetemplate ignoretext="Potwierdź zanim folder systemu zostanie skasowany" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="ConfirmEmptyTrash">
Na pewno chcesz permanentnie usunąć zawartość Kosza?
- <usetemplate ignoretext="Potwierdź przed usunięciem zawartości Kosza" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Potwierdź przed usunięciem zawartości Kosza" name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="ConfirmClearBrowserCache">
- Na pewno chcesz wyczyścić bufor przeglądarki?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ Na pewno chcesz wyczyścić bufory przeglądarki internetowej, wyszukiwania i podróży?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
+ </notification>
+ <notification name="ConfirmClearCache">
+ Na pewno chcesz wyczyścić bufor Przeglądarki?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ConfirmClearCookies">
Na pewno chcesz wyczyścić ciasteczka?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak" />
</notification>
<notification name="ConfirmClearMediaUrlList">
Na pewno chcesz wyczyścić listę zapisanych linków?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak" />
</notification>
<notification name="ConfirmEmptyLostAndFound">
- Na pewno chcesz permanentnie usunąć zawartość Twojego foldera Zgubione i odnalezione?
- <usetemplate ignoretext="Potwierdź przed usunięciem zawartości foldera Zagubione i odnalezione" name="okcancelignore" notext="Nie" yestext="Tak"/>
+ Na pewno chcesz permanentnie usunąć zawartość Twojego folderu Zagubione i odnalezione?
+ <usetemplate ignoretext="Potwierdź przed usunięciem zawartości foldera Zagubione i odnalezione" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="CopySLURL">
- Następujący link SLURL został skopiowany do schowka:
- [SLURL]
+ Następujący link SLurl został skopiowany do schowka:
+[SLURL]
-Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do tego miejsca, albo wklej go do panela adresu Twojej przeglądarki żeby go otworzyć.
+Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do tego miejsca, albo wklej go do panelu adresu Twojej przeglądarki, żeby go otworzyć.
<form name="form">
- <ignore name="ignore" text="SLurl skopiowany do schowka"/>
+ <ignore name="ignore" text="SLurl skopiowany do schowka" />
</form>
</notification>
<notification name="WLSavePresetAlert">
- Chcesz zmienić zapisane ustawienia?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ Chcesz nadpisać zapisane ustawienia?
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="WLNoEditDefault">
Nie możesz edytować lub usunąć domyślnych ustawień.
@@ -2021,58 +2131,55 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
<notification name="WLMissingSky">
Ten plik cyklu dziennego używa brakującego pliku nieba: [SKY].
</notification>
+ <notification name="WLRegionApplyFail">
+ Ustawienia nie mogą zostać zastosowane w regionie. Opuszczenie regionu, a następnie powrócenie do niego może naprawić problem. Powód: [FAIL_REASON]
+ </notification>
+ <notification name="EnvCannotDeleteLastDayCycleKey">
+ Nie można usunąć ostatniego klucza w cyklu dnia, bo nie może on być pusty. Zmodyfikuj ten klucz zamiast go usuwać, a potem dodaj nowy.
+ </notification>
+ <notification name="DayCycleTooManyKeyframes">
+ Nie możesz dodać więcej klatek kluczowych w tym cyklu dnia. Maksymalna liczba klatek kluczowych zakresu [SCOPE] wynosi [MAX].
+ </notification>
+ <notification name="EnvUpdateRate">
+ Możesz aktualizować ustawienia otoczenia co [WAIT] sekund. Poczekaj przynajmniej tyle i spróbuj ponownie.
+ </notification>
<notification name="PPSaveEffectAlert">
- Efekt post-procesu już istnieje. Chcesz zapisać nowy na jego miejsce?
- <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
+ Efekt post-procesu już istnieje. Chcesz ciągle go nadpisać?
+ <usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak" />
</notification>
<notification name="ChatterBoxSessionStartError">
BÅ‚Ä…d podczas rozpoczynania czatu/IM z [RECIPIENT].
[REASON]
- <usetemplate name="okbutton" yestext="OK"/>
- </notification>
- <notification name="ChatterBoxSessionEventError">
- [EVENT]
-[REASON]
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ForceCloseChatterBoxSession">
Twój czat/IM z [NAME] zostanie zamknięty.
[REASON]
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="Cannot_Purchase_an_Attachment">
- Rzeczy nie mogą być kupione jeżeli są częścią załącznika.
+ Rzeczy nie mogą być kupione jeżeli są częścią dodatku.
</notification>
<notification label="Prośba o Zgodę na Pobieranie L$" name="DebitPermissionDetails">
- Akceptując tą prośbę wyrażasz zgodę na ciągłe pobieranie Lindenów (L$) z Twojego konta. Żeby cofnąć to pozwolenie właściciel obiektu będzie musiał usunąć ten obiekt albo zresetowć skrypty obieku.
- <usetemplate name="okbutton" yestext="OK"/>
+ Akceptując tą prośbę wyrażasz zgodę na ciągłe pobieranie Lindenów (L$) z Twojego konta. Żeby cofnąć to pozwolenie właściciel obiektu będzie musiał usunąć ten obiekt albo zresetować skrypty obiektu.
</notification>
<notification name="AutoWearNewClothing">
Czy chcesz automatycznie nosić ubranie które tworzysz?
- <usetemplate ignoretext="Załóż ubranie automatycznie będąc w trybie Edycji Wyglądu" name="okcancelignore" notext="Nie" yestext="Tak"/>
+ <usetemplate ignoretext="Załóż ubranie automatycznie będąc w trybie Edycji Wyglądu" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="NotAgeVerified">
- Nie masz dostępu do tej posiadłości ze względu na brak weryfikacji Twojego wieku. Czy chcesz odwiedzić stronę [SECOND_LIFE] żeby to zmienić?
-
-[_URL]
+ Miejsce, które próbujesz odwiedzić jest dostępne dla osób mających 18 lat lub więcej.
+ <usetemplate ignoretext="Nie mam odpowiedniego wieku do odwiedzania ograniczonych wiekowo stref" name="okignore" />
+ </notification>
+ <notification name="NotAgeVerified_Notify">
+ Miejsce dostępne dla osób mających 18 lat lub więcej.
</notification>
<notification name="Cannot enter parcel: no payment info on file">
- Nie masz dostępu do tej posiadłości ze względu na brak danych o Twoim koncie. Czy chcesz odwiedzić stronę [SECOND_LIFE] żeby to zmienić?
+ Nie masz dostępu do tej działki ze względu na brak danych płatniczych o Twoim koncie. Czy chcesz odwiedzić stronę [SECOND_LIFE] żeby to zmienić?
[_URL]
- <url name="url" option="0">
- https://secondlife.com/account/
- </url>
- <usetemplate ignoretext="Brak danych o koncie" name="okcancelignore" notext="Nie" yestext="Tak"/>
+ <usetemplate ignoretext="Brak danych płatniczych o koncie" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="MissingString">
- Zdanie [STRING_NAME] nie znalezione w strings.xml
- </notification>
- <notification name="SystemMessageTip">
- [MESSAGE]
- </notification>
- <notification name="IMSystemMessageTip">
- [MESSAGE]
+ Ciąg [STRING_NAME] nie został znaleziony w strings.xml
</notification>
<notification name="Cancelled">
Anulowane
@@ -2081,41 +2188,44 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
Siadanie anulowane
</notification>
<notification name="CancelledAttach">
- Dołączenie anulowane
+ Dołączanie anulowane
</notification>
<notification name="ReplacedMissingWearable">
- Barkujące ubranie/części ciała zastąpiono domyślnymi obiektami.
+ Brakujące ubranie/części ciała zastąpiono domyślnymi obiektami.
</notification>
<notification name="GroupNotice">
Temat: [SUBJECT], Treść: [MESSAGE]
</notification>
+ <notification name="FriendOnlineOffline">
+ <nolink>[NAME]</nolink> jest [STATUS]
+ </notification>
<notification name="AddSelfFriend">
- Nie możesz dodać siebie do listy znajomych.
+ Niewątpliwie znasz siebie najlepiej, ale nie możesz dodać swojej własnej osoby do listy znajomych.
</notification>
<notification name="UploadingAuctionSnapshot">
- Åadowanie obrazu z Internetu...
+ Åadowanie obrazów z Internetu...
(Zajmuje około 5 minut.)
</notification>
<notification name="UploadPayment">
Åadowanie kosztowaÅ‚o [AMOUNT]L$.
</notification>
<notification name="UploadWebSnapshotDone">
- Åadowanie obrazu z Internetu zakoÅ„czne pomyÅ›lnie.
+ Åadowanie obrazu z Internetu zakoÅ„czone pomyÅ›lnie.
</notification>
<notification name="UploadSnapshotDone">
Åadowanie zdjÄ™cia zakoÅ„czone pomyÅ›lnie.
</notification>
<notification name="TerrainDownloaded">
- Plik terrain.raw ściągniety.
+ Plik terrain.raw ściągnięty.
</notification>
<notification name="GestureMissing">
- Gesturka [NAME] nie znaleziony w bazie danych.
+ Gest [NAME] nie został znaleziony w bazie danych.
</notification>
<notification name="UnableToLoadGesture">
- Åadowanie gesturki [NAME] nie powiodÅ‚o siÄ™.
+ Åadowanie gestu [NAME] nie powiodÅ‚o siÄ™.
</notification>
<notification name="LandmarkMissing">
- Miejsce (LM) nie znalezione w bazie danych.
+ Miejsce (LM) nie zostało znalezione w bazie danych.
</notification>
<notification name="UnableToLoadLandmark">
Åadowanie miejsca (LM) nie powiodÅ‚o siÄ™.
@@ -2123,32 +2233,39 @@ Spróbuj jeszcze raz.
</notification>
<notification name="CapsKeyOn">
Twój Caps Lock jest włączony.
-Ponieważ to ma wpływ na wpisywane hasło, możesz chcieć go wyłączyć.
+Ponieważ ma to wpływ na wpisywane hasło, możesz chcieć go wyłączyć.
</notification>
<notification name="NotecardMissing">
Notka nie została znaleziona w bazie danych.
</notification>
<notification name="NotecardNoPermissions">
- Nie masz pozwolenia na zobaczenie notki.
+ Nie masz uprawnień na zobaczenie notki.
</notification>
<notification name="RezItemNoPermissions">
- Nie masz pozwolenia na stworzenie obiektu.
+ Nie masz uprawnień na stworzenie obiektu.
+ </notification>
+ <notification name="IMAcrossParentEstates">
+ Nie można wysłać IM poprzez Majątki.
+ </notification>
+ <notification name="TransferInventoryAcrossParentEstates">
+ Nie można przesłać przedmiotów poprzez Majątki.
</notification>
<notification name="UnableToLoadNotecard">
- Nie można załadować danych notki w tym momencie.
+ Nie można załadować notki w tym momencie.
+Spróbuj jeszcze raz.
</notification>
<notification name="ScriptMissing">
- Skrypt nie znaleziony w bazie danych.
+ Skrypt nie został znaleziony w bazie danych.
</notification>
<notification name="ScriptNoPermissions">
- Nie masz pozwolenia na zobaczenie skryptu.
+ Nie masz uprawnień na podejrzenie skryptu.
</notification>
<notification name="UnableToLoadScript">
Åadowanie skryptu nie powiodÅ‚o siÄ™.
Spróbuj jeszcze raz.
</notification>
<notification name="IncompleteInventory">
- Zawartość obiektów którą chcesz podarować nie jest dostępna lokalnie. Spróbuj podarować te obiekty jeszcze raz za jakiś czas.
+ Zawartość obiektów, którą chcesz podarować nie jest jeszcze dostępna lokalnie. Spróbuj podarować te obiekty jeszcze raz za jakiś czas.
</notification>
<notification name="CannotModifyProtectedCategories">
Nie możesz zmienić chronionych kategorii.
@@ -2161,7 +2278,7 @@ Spróbuj jeszcze raz.
Spróbuj jeszcze raz.
</notification>
<notification name="UnableToLinkWhileDownloading">
- Nie można łączyć w trakcie ładowania danych obiektu.
+ Nie można scalać w trakcie ładowania danych obiektu.
Spróbuj jeszcze raz.
</notification>
<notification name="CannotBuyObjectsFromDifferentOwners">
@@ -2172,7 +2289,7 @@ Wybierz jeden obiekt.
Obiekt nie jest na sprzedaż.
</notification>
<notification name="EnteringGodMode">
- WÅ‚Ä…cznie trybu boskiego, poziom [LEVEL]
+ WÅ‚Ä…czanie trybu boskiego, poziom [LEVEL]
</notification>
<notification name="LeavingGodMode">
Wyłączanie trybu boskiego, poziom [LEVEL]
@@ -2186,9 +2303,6 @@ Wybierz jeden obiekt.
<notification name="InventoryDeclined">
Podarunek od Ciebie został odrzucony przez [NAME].
</notification>
- <notification name="ObjectMessage">
- [NAME]: [MESSAGE]
- </notification>
<notification name="CallingCardAccepted">
Twoja wizytówka została przyjęta.
</notification>
@@ -2196,128 +2310,132 @@ Wybierz jeden obiekt.
Twoja wizytówka została odrzucona.
</notification>
<notification name="TeleportToLandmark">
- Jesteś w Głównym Regionie i możesz się stąd teleportować do innych miejsc jak '[NAME]' wybierając Moja Szafa w prawym dolnym rogu ekranu
-i wybierajÄ…c folder Zapisane Miejsca (LM).
-(Kliknij dwa razy na miejsce (LM) i wybierz 'Teleport' żeby tam się przenieść.)
+ Aby teleportować się do innych miejsc, takich jak '[NAME]', kliknij na przycisk "Miejsca",
+a następnie wybierz zakładkę Landmarki w oknie, które się otworzy. Kliknij na dowolną pozycję
+by ją zaznaczyć, a potem wybierz 'Teleportuj' na spodzie okna.
+(Możesz też kliknąć na nim podwójnie lub wybrać 'Teleportuj' z menu kontekstowego
+dostępnego pod prawym przyciskiem myszy)
</notification>
<notification name="TeleportToPerson">
- Możesz skontaktować się z Rezydentem '[NAME]' poprzez otworzenie panelu Ludzie po prawej stronie ekranu.
-Wybierz Rezydenta z listy, następnie kliknij 'IM' na dole panelu.
-(Możesz także kliknąć podwójnie na ich imię na liście, lub prawym przyciskiem i wybrać 'IM').
+ Aby rozpocząć z kimś prywatną rozmowę, kliknij prawym przyciskiem myszy na jego/jej awatarze i wybierz 'IM' z menu.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
- Nie możesz przekraczać granic serwera wybierając obszar.
+ Nie możesz przekraczać granic regionu wybierając obszar.
Spróbuj wybrać mniejszy obszar.
</notification>
<notification name="SearchWordBanned">
Pewne frazy podczas wyszukiwania zostały usunięte w związku z restrykcjami zawartymi w Standardach Społecznościowych (Community Standards).
</notification>
<notification name="NoContentToSearch">
- Proszę wybrać przynajmiej jeden z podanych rodzajów treści jaką zawiera region podczas wyszukiwania ('General', 'Moderate', lub 'Adult').
- </notification>
- <notification name="SystemMessage">
- [MESSAGE]
- </notification>
- <notification name="PaymentReceived">
- [MESSAGE]
- </notification>
- <notification name="PaymentSent">
- [MESSAGE]
+ Proszę wybrać przynajmniej jeden z podanych rodzajów treści jaką zawiera region podczas wyszukiwania (General, Moderate lub Adult).
</notification>
<notification name="EventNotification">
- Zawiadomienie o imprezie:
+ Zawiadomienie o zdarzeniu:
[NAME]
[DATE]
<form name="form">
- <button name="Details" text="Szczegóły"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Details" text="Szczegóły" />
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="TransferObjectsHighlighted">
- Obiekty na tej posiadłości które zostaną przekazane kupcowi tej posiadłości są teraz rozjaśnione.
+ Obiekty na tej działce, które zostaną przekazane kupcowi tej działki są teraz podświetlone.
-* Drzewa i trawy które zostaną przekazne nie są rozjaśnione.
+* Drzewa i trawy, które zostaną przekazane nie są podświetlone.
<form name="form">
- <button name="Done" text="Zastosuj"/>
+ <button name="Done" text="Gotowe" />
</form>
</notification>
<notification name="DeactivatedGesturesTrigger">
- Zablokowane gesturki z jednakowym aktywowaniem:
+ Zablokowane gesty z jednakowym aktywowaniem:
[NAMES]
</notification>
<notification name="NoQuickTime">
- Wygląda na to, że QuickTime z Apple nie jest zainstalowany na Twoim komputerze.
-Jeżeli chcesz odtwarzać media na tej posiadłości które używają QuickTime idź do [http://www.apple.com/quicktime strona QuickTime] i zainstaluj odtwarzacz.
+ Wygląda na to, że Apple QuickTime nie jest zainstalowany na Twoim komputerze.
+Jeżeli chcesz odtwarzać media na tej działce, które używają QuickTime idź do [http://www.apple.com/quicktime strony QuickTime] i zainstaluj odtwarzacz.
</notification>
<notification name="NoPlugin">
- Nie znaleziono wtyczki mediów dla "[MIME_TYPE]" typu mime. Media tego typu będą niedostępne.
+ Nie znaleziono wtyczki mediów dla typu mime "[MIME_TYPE]". Media tego typu będą niedostępne.
</notification>
<notification name="MediaPluginFailed">
Następujące wtyczki mediów nie działają:
- [PLUGIN]
+[PLUGIN]
-Zainstaluj proszę wtyczki ponownie lub skontaktuj się z dostawcą jeśli nadal problem będzie występował.
+Zainstaluj wtyczki ponownie lub skontaktuj się z dostawcą, jeśli problem nadal będzie występował.
<form name="form">
- <ignore name="ignore" text="Wtyczka mediów nie działa"/>
+ <ignore name="ignore" text="Wtyczka mediów nie działa" />
</form>
</notification>
<notification name="OwnedObjectsReturned">
- Twoje obiekty z wybranej posiadłości zostały zwrócone do Twojej Szafy.
+ Twoje obiekty z wybranej działki zostały zwrócone do Twojej Szafy.
</notification>
<notification name="OtherObjectsReturned">
- Obiekty należące do [NAME] na wybranej posiadłości zostały zwrócone do Szafy tej osoby.
+ Obiekty należące do [NAME] na wybranej działce zostały zwrócone do Szafy tej osoby.
</notification>
<notification name="OtherObjectsReturned2">
- Obiekty z posiadłości należącej do Rezydenta'[NAME]' zostały zwrócone do właściciela.
+ Obiekty z działki należącej do Rezydenta [NAME] zostały zwrócone do jego Szafy.
</notification>
<notification name="GroupObjectsReturned">
- Obiekty z wybranej posiadłości przypisane do grupy [GROUPNAME] zostały zwrócone do szafy ich właścicieli.
-Przekazywalne obiekty przekazne grupie zostały zwrócone do ich poprzednich właścicieli.
+ Obiekty z wybranej działki przypisane do grupy [GROUPNAME] zostały zwrócone do szaf ich właścicieli.
+Przekazywalne obiekty przekazane grupie zostały zwrócone do ich poprzednich właścicieli.
Nieprzekazywalne obiekty przekazane grupie zostały usunięte.
</notification>
<notification name="UnOwnedObjectsReturned">
- Obiekty z wybranej posiadłości które nie należą do Ciebie zostały zwrócone do ich właścicieli.
+ Obiekty z wybranej działki które nie należą do Ciebie zostały zwrócone do ich właścicieli.
</notification>
<notification name="ServerObjectMessage">
Wiadomość od [NAME]:
<nolink>[MSG]</nolink>
</notification>
<notification name="NotSafe">
- Ta posiadłość pozwala na uszkodzenia.
+ Ta działka pozwala na uszkodzenia.
Możesz doznać tutaj urazu. Jeżeli zginiesz nastąpi teleportacja do Twojego miejsca startu.
</notification>
<notification name="NoFly">
- Ta posiadłość nie pozwala na latanie.
+ Ta działka nie pozwala na latanie.
Nie możesz tutaj latać.
</notification>
<notification name="PushRestricted">
- Popychanie niedozwolone. Nie możesz tutaj popychać innych, chyba, że jesteś właścicielem tej posiadłości.
+ Popychanie niedozwolone. Nie możesz tutaj popychać innych chyba, że jesteś właścicielem tej działki.
</notification>
<notification name="NoVoice">
- Ta posiadłość nie pozwala na rozmowy.
+ Ta działka nie pozwala na rozmowy głosowe.
</notification>
<notification name="NoBuild">
- Ta posiadłość nie pozwala na budowanie. Nie możesz tworzyć tutaj obiektów.
+ Ta działka nie pozwala na budowanie. Nie możesz tworzyć tutaj obiektów.
+ </notification>
+ <notification name="PathfindingDirty">
+ W tym regionie sÄ… oczekujÄ…ce zmiany w odnajdywaniu Å›cieżek. JeÅ›li posiadasz prawa budowania możesz odÅ›wieżyć region klikajÄ…c na przycisk “OdÅ›wież regionâ€.
+ </notification>
+ <notification name="DynamicPathfindingDisabled">
+ Dynamiczne odnajdywanie ścieżek nie jest włączone w tym regionie. Oskryptowane obiekty używające odwołań LSL wykorzystujących odnajdywanie ścieżek mogą nie działać zgodnie z oczekiwaniami.
+ </notification>
+ <notification name="PathfindingCannotRebakeNavmesh">
+ Wystąpił błąd. To może być problem sieci, serwera lub Twojego braku praw do budowania. Czasami wylogowanie się i zalogowanie ponownie może naprawić problem.
+ </notification>
+ <notification name="SeeAvatars">
+ Ta działka ukrywa czat tekstowy i awatary z innych działek. Nie będziesz widzieć rezydentów na zewnątrz tej działki - ani oni Ciebie. Wspólny kanał czatu 0 również jest zablokowany.
</notification>
<notification name="ScriptsStopped">
- Administrator czasowo zatrzymał skrypty w tym regionie.
+ Administrator tymczasowo zatrzymał skrypty w tym regionie.
</notification>
<notification name="ScriptsNotRunning">
Żadne skrypty nie działają w tym regionie.
</notification>
<notification name="NoOutsideScripts">
- Ta posiadłość nie pozwala na zewnętrzne skrypty.
+ Ta działka nie pozwala na zewnętrzne skrypty.
-Żadne skrypty nie będą tutaj działać za wyjątkiem skryptów należących do właściciela posiadłości.
+Żadne skrypty nie będą tutaj działać za wyjątkiem skryptów należących do właściciela działki.
</notification>
<notification name="ClaimPublicLand">
- Tylko publiczne posiadłości w tym regionie mogą być przejęte.
+ Tylko publiczne działki w tym regionie, co Ty, mogą być przejęte.
</notification>
<notification name="RegionTPAccessBlocked">
- Ze względu na Twój wiek, nie jesteś uprawniony do przebywania w tym regionie. Możesz potrzebować weryfikacji wieku bądź instalacji najnowszej wersji klienta.
-
-Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostępu do regionów z podanym rodzajem treści jaką zawiera.
+ Region, który próbujesz odwiedzić ma klasyfikację treści przekraczającą Twoje obecne preferencje treści. Możesz je zmienić używając Ja > Ustawienia > Ogólne w pasku menu.
+ </notification>
+ <notification name="RegionAboutToShutdown">
+ Region, do którego próbujesz się dostać, właśnie się wyłącza.
</notification>
<notification name="URBannedFromRegion">
Zostałeś zbanowany w regionie.
@@ -2328,8 +2446,11 @@ Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostęp
<notification name="ImproperPaymentStatus">
Nie posiadasz odpowiedniego statusu płatniczego by uzyskać dostęp do regionu.
</notification>
+ <notification name="MustGetAgeRegion">
+ Musisz mieć 18 lat lub więcej, aby móc wejść do tego regionu.
+ </notification>
<notification name="MustGetAgeParcel">
- By móc przebywać na tej posiadłości wymagana jest weryfikacja Twojego wieku.
+ Musisz mieć 18 lat lub więcej, aby móc wejść na tą działkę.
</notification>
<notification name="NoDestRegion">
Żądana lokalizacja regionu nie została odnaleziona.
@@ -2338,10 +2459,10 @@ Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostęp
Brak dostępu do podanej lokalizacji.
</notification>
<notification name="RegionParcelBan">
- Nie możesz przejść przez zamkniętą posiadłość. Spróbuj skorzystać z innej drogi.
+ Nie możesz przejść przez zamkniętą działkę. Spróbuj skorzystać z innej drogi.
</notification>
<notification name="TelehubRedirect">
- Zostałeś przeniesiony do teleportera.
+ Zostałeś/aś przeniesiony/a do teleportera (telehuba).
</notification>
<notification name="CouldntTPCloser">
Brak możliwości teleportacji do bliższej lokacji.
@@ -2351,22 +2472,22 @@ Skorzystaj z [SECOND_LIFE]:Pomoc by uzyskać więcej informacji na temat dostęp
</notification>
<notification name="FullRegionTryAgain">
Region, który chcesz odwiedzić jest w tej chwili pełny.
-Spróbuj ponowanie za kilka minut.
+Spróbuj ponownie za kilka minut.
</notification>
<notification name="GeneralFailure">
- Nieudana próba.
+ Błąd ogólny.
</notification>
<notification name="RoutedWrongRegion">
- Wysłano niewłaściwe połączenie do regionu. Proszę spróbować ponownie.
+ Wysłano do niewłaściwego regionu. Proszę spróbować ponownie.
</notification>
<notification name="NoValidAgentID">
- Nieważny identyfikator agenta.
+ Brak poprawnego identyfikatora agenta.
</notification>
<notification name="NoValidSession">
- Nieważny identyfikator sesji.
+ Brak poprawnego identyfikatora sesji.
</notification>
<notification name="NoValidCircuit">
- Nieważny obwód kodowania.
+ Brak poprawnego obwodu kodowania.
</notification>
<notification name="NoPendingConnection">
Brak możliwości wykonania połączenia.
@@ -2378,63 +2499,96 @@ Spróbuj ponowanie za kilka minut.
Brak lokalizacji punktu do teleportacji w podanym regionie.
</notification>
<notification name="InternalErrorRegionResolver">
- Podczas próby odnalezienia globalnych współrzędych dla żądanej teleportacji pojawił się wewnętrzny błąd. Może być to wynikiem problemów serwera.
+ Podczas próby odnalezienia globalnych współrzędnych dla żądanej teleportacji pojawił się wewnętrzny błąd. Może być to wynikiem problemów serwera.
</notification>
<notification name="NoValidLanding">
- Nieważny punkt lądowania.
+ Niepoprawny punkt lÄ…dowania.
</notification>
<notification name="NoValidParcel">
- Nieważana posiadłość.
+ Niepoprawna działka.
</notification>
<notification name="ObjectGiveItem">
- Obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink>, należący do [NAME_SLURL] dał Tobie [OBJECTTYPE]:
+ Obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink> należący do [NAME_SLURL] dał Tobie [OBJECTTYPE]:
<nolink>[ITEM_SLURL]</nolink>
<form name="form">
- <button name="Keep" text="Zachowaj"/>
- <button name="Discard" text="Wyrzuć"/>
- <button name="Mute" text="Zablokuj"/>
+ <button name="Keep" text="Zachowaj" />
+ <button name="Discard" text="Odrzuć" />
+ <button name="Mute" text="Zablokuj" />
+ </form>
+ </notification>
+ <notification name="OwnObjectGiveItem">
+ Twój obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink> dał Tobie [OBJECTTYPE]:
+<nolink>[ITEM_SLURL]</nolink>
+ <form name="form">
+ <button name="Keep" text="Zachowaj" />
+ <button name="Discard" text="Odrzuć" />
</form>
</notification>
<notification name="UserGiveItem">
[NAME_SLURL] dał Ci [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
- <button name="Show" text="Pokaż"/>
- <button name="Discard" text="Wyrzuć"/>
- <button name="Mute" text="Zablokuj"/>
+ <button name="Show" text="Pokaż" />
+ <button name="Discard" text="Wyrzuć" />
+ <button name="Mute" text="Zablokuj" />
</form>
</notification>
- <notification name="GodMessage">
- [NAME]
-
-[MESSAGE]
- </notification>
<notification name="JoinGroup">
[MESSAGE]
<form name="form">
- <button name="Join" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
- <button name="Info" text="Info"/>
+ <button name="Join" text="Zaakceptuj" />
+ <button name="Decline" text="Odmów" />
</form>
</notification>
<notification name="TeleportOffered">
[NAME_SLURL] proponuje Ci teleportacjÄ™ do siebie:
-[MESSAGE] - [MATURITY_STR] <icon>[MATURITY_ICON]</icon>
+[MESSAGE]
+<icon>[MATURITY_ICON]</icon> - [MATURITY_STR]
<form name="form">
- <button name="Teleport" text="Teleportuj"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Teleport" text="Teleportuj" />
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
+ <notification name="TeleportOffered_MaturityExceeded">
+ [NAME_SLURL] proponuje Ci teleportacjÄ™ do siebie:
+
+[MESSAGE]
+<icon>[MATURITY_ICON]</icon> - [MATURITY_STR]
+
+Ten region zawiera treści [REGION_CONTENT_MATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGION_CONTENT_MATURITY]. Możesz zmienić swoje preferencje i kontynuować teleport albo anulować go.
+ <form name="form">
+ <button name="Teleport" text="Zmień i teleportuj" />
+ <button name="Cancel" text="Anuluj" />
+ </form>
+ </notification>
+ <notification name="TeleportOffered_MaturityBlocked">
+ [NAME_SLURL] zaproponował/a Ci teleportację do siebie:
+
+[MESSAGE]
+<icon>[MATURITY_ICON]</icon> - [MATURITY_STR]
+
+Ten region zawiera jednak treści tylko dla dorosłych.
+ </notification>
<notification name="TeleportOfferSent">
Oferta teleportacji wysłana do [TO_NAME]
</notification>
+ <notification name="TeleportRequest">
+ [NAME_SLURL] prosi o teleportacjÄ™ do miejsca, w jakim siÄ™ znajdujesz.
+[MESSAGE]
+
+Zaproponować teleport?
+ <form name="form">
+ <button name="Yes" text="Tak" />
+ <button name="No" text="Nie" />
+ </form>
+ </notification>
<notification name="GotoURL">
[MESSAGE]
[URL]
<form name="form">
- <button name="Later" text="Póżniej"/>
- <button name="GoNow..." text="Teraz..."/>
+ <button name="Later" text="Później" />
+ <button name="GoNow..." text="Teraz..." />
</form>
</notification>
<notification name="OfferFriendship">
@@ -2444,20 +2598,20 @@ Spróbuj ponowanie za kilka minut.
(Będziecie mogli widzieć swój status online)
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odrzuć" />
</form>
</notification>
<notification name="FriendshipOffered">
- Oferta znajomości dla [TO_NAME]
+ Zaoferowałeś/aś znajomość osobie [TO_NAME]
</notification>
<notification name="OfferFriendshipNoMessage">
[NAME_SLURL] proponuje Ci znajomość.
-(Z zalożenia będzie widzić swój status online.)
+(Będziecie mogli widzieć swój status online)
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odrzuć" />
</form>
</notification>
<notification name="FriendshipAccepted">
@@ -2476,27 +2630,27 @@ Spróbuj ponowanie za kilka minut.
[NAME] oferuje swoją wizytówkę.
Wizytówka w Twojej Szafie umożliwi szybki kontakt IM z tym Rezydentem.
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odrzuć" />
</form>
</notification>
<notification name="RegionRestartMinutes">
- Restart regionu za [MINUTES] min.
+ Restart regionu "[NAME]" za [MINUTES] min.
Nastąpi wylogowanie jeżeli zostaniesz w tym regionie.
</notification>
<notification name="RegionRestartSeconds">
- Restart regionu za [SECONDS] sec.
+ Restart regionu "[NAME]" za [SECONDS] sek.
Nastąpi wylogowanie jeżeli zostaniesz w tym regionie.
</notification>
<notification name="LoadWebPage">
- Załadować stronę [URL]?
+ Załadować stronę [URL] ?
[MESSAGE]
-Od obiektu: <nolink>[OBJECTNAME]</nolink>, właściciel właściciel: [NAME_SLURL]?
+Od obiektu: <nolink>[OBJECTNAME]</nolink>, właściciela: [NAME_SLURL]?
<form name="form">
- <button name="Gotopage" text="Załaduj"/>
- <button name="Cancel" text="Anuluj"/>
+ <button name="Gotopage" text="Załaduj" />
+ <button name="Cancel" text="Anuluj" />
</form>
</notification>
<notification name="FailedToFindWearableUnnamed">
@@ -2506,7 +2660,7 @@ Od obiektu: <nolink>[OBJECTNAME]</nolink>, właściciel właściciel
[TYPE] [DESC] - nie znaleziono w bazie danych.
</notification>
<notification name="InvalidWearable">
- Obiekt, który chcesz założyć używa narzędzia nieobecnego w wersji klienta, którą używasz. By go założyć ściągnij najnowszą wersję [APP_NAME].
+ Obiekt, który chcesz założyć używa funkcji nieobecnej w wersji klienta, którą używasz. By go założyć ściągnij najnowszą wersję [APP_NAME].
</notification>
<notification name="ScriptQuestion">
Obiekt '<nolink>[OBJECTNAME]</nolink>', którego właścicielem jest '[NAME]', chciałby:
@@ -2514,63 +2668,82 @@ Od obiektu: <nolink>[OBJECTNAME]</nolink>, właściciel właściciel
[QUESTIONS]
Czy siÄ™ zgadzasz?
<form name="form">
- <button name="Yes" text="Tak"/>
- <button name="No" text="Nie"/>
- <button name="Mute" text="Zablokuj"/>
+ <button name="Yes" text="Tak" />
+ <button name="No" text="Nie" />
+ <button name="Mute" text="Zablokuj" />
</form>
</notification>
<notification name="ScriptQuestionCaution">
- Obiekt '<nolink>[OBJECTNAME]</nolink>', którego właścicielem jest '[NAME]' chciałby:
+ Obiekt '<nolink>[OBJECTNAME]</nolink>' chciałby uzyskać zgodę na pobieranie Linden Dolarów (L$) z Twojego konta. Jeśli zezwolisz, to będzie on mógł brać z niego wszystkie lub część środków, w dowolnej chwili, bez dodatkowych ostrzeżeń.
-[QUESTIONS]
-Jeśli nie ufasz temu obiektowi i jego kreatorowi, odmów.
+Zanim zezwolisz na dostęp upewnij się, że wiesz jaki to obiekt i dlaczego pyta o zgodę - oraz że ufasz jego twórcy. Jeśli nie masz pewności kliknij na Odmów.
+ <form name="form">
+ <button name="Grant" text="Zezwól na dostęp" />
+ <button name="Deny" text="Odmów" />
+ </form>
+ </notification>
+ <notification name="UnknownScriptQuestion">
+ Zezwolenia, o jakie prosi skrypt z '<nolink>[OBJECTNAME]</nolink>', którego właścicielem jest '[NAME]', nie są rozpoznawane przez przeglądarkę i nie mogą zostać udzielone.
-Czy siÄ™ zgadzasz?
+Aby ich udzielić prosimy zaktualizować przeglądarkę do najnowszej wersji z [DOWNLOADURL].
<form name="form">
- <button name="Grant" text="Zaakceptuj"/>
- <button name="Deny" text="Odmów"/>
+ <button name="Deny" text="Ok, odmów jednorazowo" />
+ <button name="Mute" text="Zablokuj/Wycisz" />
</form>
</notification>
<notification name="ScriptDialog">
- [NAME]'s '<nolink>[TITLE]</nolink>'
+ '<nolink>[TITLE]</nolink>' - [NAME]
[MESSAGE]
- <form name="form"/>
+ <form name="form">
+ <button name="Client_Side_Mute" text="Blokuj" />
+ <button name="Client_Side_Ignore" text="Zignoruj" />
+ </form>
</notification>
<notification name="ScriptDialogGroup">
- [GROUPNAME]'s '<nolink>[TITLE]</nolink>'
+ '<nolink>[TITLE]</nolink>' - [GROUPNAME]
[MESSAGE]
- <form name="form"/>
+ <form name="form">
+ <button name="Client_Side_Mute" text="Blokuj" />
+ <button name="Client_Side_Ignore" text="Zignoruj" />
+ </form>
+ </notification>
+ <notification name="FirstBalanceIncrease">
+ Właśnie otrzymałeś/aś [AMOUNT] L$.
+Twój stan L$ jest widoczny w prawym górnym narożniku ekranu.
+ </notification>
+ <notification name="FirstBalanceDecrease">
+ Właśnie wydałeś/aś [AMOUNT] L$.
+Twój stan L$ jest widoczny w prawym górnym narożniku ekranu.
</notification>
<notification name="BuyLindenDollarSuccess">
Dziękujemy za wpłatę!
-Twój stan konta L$ zostanie zaktualizowany w momencie zakończenia transakcji. Jeżeli w ciągu 20 minut, Twój balans konta nie ulegnie zmianie, transakcja została anulowana. W tym przypadku, pobrana kwota zostanie zwrócona na stan konta w US$.
+Twój stan konta L$ zostanie zaktualizowany w momencie zakończenia transakcji. Jeżeli zajmie to ponad 20 minut, to Twój balans konta nie ulegnie zmianie, a transakcja zostanie anulowana. W tym przypadku pobrana kwota zostanie zwrócona na stan konta w US$.
-Status transkacji możesz sprawdzić odwiedzając Historię Transakcji swojego konta na [http://secondlife.com/account/ Dashboard]
+Status transakcji możesz sprawdzić odwiedzając Historię Transakcji swojego konta na [http://secondlife.com/account/ Tablicy]
</notification>
<notification name="FirstOverrideKeys">
- Twoje sterujące klawisze zostały przejęte przez obiekt.
+ Twoje klawisze sterujące zostały przejęte przez obiekt.
Użyj strzałek lub AWSD żeby sprawdzić ich działanie.
-Niektóre obiekty (np broń) wymagają trybu panoramicznego.
-Nacisnij 'M' żeby go wybrać.
+Niektóre obiekty (np broń) wymagają trybu pierwszej osoby.
+Naciśnij 'M' żeby go włączyć.
</notification>
<notification name="FirstSandbox">
- Ten region to piaskownica.
+ Ten region to piaskownica, jego celem jest pomóc rezydentom w nauce budowania.
-Obiekty które tu zbudujesz mogą zostać usunięte jak opuścisz ten obszar - piaskownice są regularnie czyszczone, sprawdź informacje na górze ekranu obok nazwy regionu.
+Obiekty które tu zbudujesz zostaną usunięte gdy opuścisz ten obszar, a więc nie zapomnij ich zabrać ze sobą - kliknij prawym przyciskiem myszy na obiekcie i wybierz 'Weź'.
</notification>
<notification name="MaxListSelectMessage">
- Maksymalnie możesz wybrać [MAX_SELECT] rzeczy
-z tej listy.
+ Maksymalnie możesz wybrać [MAX_SELECT] rzeczy z tej listy.
</notification>
<notification name="VoiceInviteP2P">
- [NAME] zaprasza Cię do rozmowy głosem.
+ [NAME] zaprasza Cię do rozmowy głosowej.
Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
-Wybierz Zablokuj żeby wyciszyć dzwoniącą osób
+Wybierz Zablokuj żeby wyciszyć wszystkie wiadomości od tej osoby.
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
- <button name="Mute" text="Zablokuj"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odmów" />
+ <button name="Mute" text="Zablokuj" />
</form>
</notification>
<notification name="AutoUnmuteByIM">
@@ -2580,131 +2753,135 @@ Wybierz Zablokuj żeby wyciszyć dzwoniącą osób
Przekazano [NAME] pieniądze i ta osoba została automatycznie odblokowana.
</notification>
<notification name="AutoUnmuteByInventory">
- Zaoferowno [NAME] obiekty i ta osoba została automatycznie odblokowana.
+ Zaoferowano [NAME] obiekty i ta osoba została automatycznie odblokowana.
</notification>
<notification name="VoiceInviteGroup">
- [NAME] zaczyna rozmowÄ™ z grupÄ… [GROUP].
-Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia. Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
+ [NAME] zaczyna rozmowę głosową z grupą [GROUP].
+Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
+Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
- <button name="Mute" text="Zablokuj"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odmów" />
+ <button name="Mute" text="Zablokuj" />
</form>
</notification>
<notification name="VoiceInviteAdHoc">
- [NAME] zaczyna konferencję głosem.
-Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia. Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
+ [NAME] zaczyna konferencję głosową.
+Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
+Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
- <button name="Mute" text="Zablokuj"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odmów" />
+ <button name="Mute" text="Zablokuj" />
</form>
</notification>
<notification name="InviteAdHoc">
[NAME] zaprasza CiÄ™ do konferencji poprzez Czat/IM.
-Wybierz Zaakceptuj żeby zacząć czat albo Odmów żeby nie przyjąć zaproszenia. Wybierz Zablokuj żeby wyciszyć tą osobę.
+Wybierz Zaakceptuj żeby zacząć czat albo Odmów żeby nie przyjąć zaproszenia.
+Wybierz Zablokuj żeby wyciszyć tą osobę.
<form name="form">
- <button name="Accept" text="Zaakceptuj"/>
- <button name="Decline" text="Odmów"/>
- <button name="Mute" text="Block"/>
+ <button name="Accept" text="Zaakceptuj" />
+ <button name="Decline" text="Odmów" />
+ <button name="Mute" text="Zablokuj" />
</form>
</notification>
<notification name="VoiceChannelFull">
- Rozmowa w której chcesz uczestniczyć, [VOICE_CHANNEL_NAME], nie akceptuje więcej rozmówców. Spróbuj póżniej.
+ Rozmowa w której chcesz uczestniczyć, [VOICE_CHANNEL_NAME], nie akceptuje więcej rozmówców. Spróbuj później.
</notification>
<notification name="ProximalVoiceChannelFull">
Przepraszamy. Limit rozmów został przekroczony w tym obszarze. Spróbuj w innym miejscu.
</notification>
<notification name="VoiceChannelDisconnected">
- [VOICE_CHANNEL_NAME] odłączył się. Przełączanie do rozmowy przestrzennej.
+ [VOICE_CHANNEL_NAME] odłączył się. Przełączanie do rozmowy w czacie lokalnym.
</notification>
<notification name="VoiceChannelDisconnectedP2P">
- [VOICE_CHANNEL_NAME] skończył rozmowę. Przełączanie do rozmowy przestrzennej.
+ [VOICE_CHANNEL_NAME] skończył rozmowę. Przełączanie do rozmowy w czacie lokalnym.
</notification>
<notification name="P2PCallDeclined">
- [VOICE_CHANNEL_NAME] odmówił połączenia. Przełączanie do rozmowy przestrzennej.
+ [VOICE_CHANNEL_NAME] odmówił połączenia. Przełączanie do rozmowy w czacie lokalnym.
</notification>
<notification name="P2PCallNoAnswer">
- [VOICE_CHANNEL_NAME] nie odpowiada. Przełączanie do rozmowy przestrzennej.
+ [VOICE_CHANNEL_NAME] nie odpowiada. Przełączanie do rozmowy w czacie lokalnym.
</notification>
<notification name="VoiceChannelJoinFailed">
- Brak połączenia z [VOICE_CHANNEL_NAME], spróbuj póżniej. Przełączanie do rozmowy przestrzennej.
+ Brak połączenia z [VOICE_CHANNEL_NAME], spróbuj później. Przełączanie do rozmowy w czacie lokalnym.
</notification>
<notification name="VoiceLoginRetry">
- Tworzymy kanał głosu dla Ciebie. Moze potrwać minutę.
+ Tworzymy kanał głosu dla Ciebie. To może potrwać minutę.
</notification>
<notification name="VoiceEffectsExpired">
- Subskrypcja jednego lub więcej z Voice Morph wygasła.
+ Subskrypcja jednego lub więcej Przekształceń Głosu wygasła.
[[URL] Kliknij tutaj] oby odnowić subskrypcję.
</notification>
<notification name="VoiceEffectsExpiredInUse">
- Czas aktywności Voice Morph wygasł, normalne ustawienia Twojego głosu zostały zastosowane.
+ Czas aktywności Przekształcenia Głosu wygasł, normalne ustawienia Twojego głosu zostały zastosowane.
[[URL] Kliknij tutaj] aby odnowić subskrypcję.
</notification>
<notification name="VoiceEffectsWillExpire">
- Jedno lub więcej z Twoich Voice Morph wygaśnie za mniej niż [INTERVAL] dni.
-[[URL] Klinij tutaj] aby odnowić subskrypcję.
+ Jedno lub więcej z Twoich Przekształceń Głosu wygaśnie za mniej niż [INTERVAL] dni.
+[[URL] Kliknij tutaj] aby odnowić subskrypcję.
</notification>
<notification name="VoiceEffectsNew">
- Nowe Voice Morph są dostępne!
+ Nowe Przekształcenia Głosu są dostępne!
</notification>
<notification name="Cannot enter parcel: not a group member">
- Nie masz dostępu do posiadłości, nie należysz do właściwej grupy.
+ Nie masz dostępu do działki, nie należysz do właściwej grupy.
</notification>
<notification name="Cannot enter parcel: banned">
- Masz wzbroniony wstęp na tą posiadłości (ban).
+ Masz wzbroniony wstęp na tą działkę (ban).
</notification>
<notification name="Cannot enter parcel: not on access list">
- Nie masz dostępu do posiadłości, nie jesteś na liście dostępu.
+ Nie masz dostępu do działki, nie jesteś na liście dostępu.
</notification>
<notification name="VoiceNotAllowed">
Nie masz pozwolenia na połączenie z rozmową [VOICE_CHANNEL_NAME].
</notification>
<notification name="VoiceCallGenericError">
- Błąd podczas łączenia z rozmową [VOICE_CHANNEL_NAME]. Spróbuj póżniej.
+ Błąd podczas łączenia z rozmową [VOICE_CHANNEL_NAME]. Spróbuj później.
</notification>
<notification name="UnsupportedCommandSLURL">
- Nie można otworzyć wybranego SLurl.
+ Wybrany SLurl nie jest obsługiwany.
</notification>
<notification name="BlockedSLURL">
- SLurl został otrzymany z niesprawdzonej przeglądarki i został zablokowany dla bezpieczeństwa.
+ SLurl został otrzymany z niezaufanej przeglądarki i został zablokowany dla bezpieczeństwa.
</notification>
<notification name="ThrottledSLURL">
- Wiele SLurlów zostało otrzymanych w krótkim czasie od niesprawdzonej przeglądarki.
+ Wiele SLurlów zostało otrzymanych w krótkim czasie od niezaufanej przeglądarki.
Zostaną zablokowane na kilka sekund dla bezpieczeństwa.
</notification>
<notification name="IMToast">
[MESSAGE]
<form name="form">
- <button name="respondbutton" text="Odpowiedź"/>
+ <button name="respondbutton" text="Odpowiedź" />
</form>
</notification>
<notification name="ConfirmCloseAll">
Czy chcesz zamknąć wszystkie wiadomości IM?
- <usetemplate ignoretext="Potwierdź, przed zamknięciem wszystkich wiadomości prywatnych (IM)." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+ <usetemplate ignoretext="Potwierdź przed zamknięciem wszystkich wiadomości prywatnych (IM)." name="okcancelignore" notext="Anuluj" />
</notification>
<notification name="AttachmentSaved">
Załącznik został zapisany.
</notification>
<notification name="UnableToFindHelpTopic">
- Nie można znależć tematu pomocy dla tego elementu.
+ Nie można znaleźć tematu pomocy dla tego elementu.
</notification>
<notification name="ObjectMediaFailure">
Błąd serwera: aktualizacja mediów nie powiodła się.
'[ERROR]'
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="TextChatIsMutedByModerator">
Twój czat został wyciszony przez moderatora.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="VoiceIsMutedByModerator">
Twoja rozmowa głosowa została wyciszona przez moderatora.
- <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UploadCostConfirmation">
+ Załadowanie tego na serwer będzie kosztować [PRICE]L$, chcesz kontynuować?
+ <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Załaduj" />
</notification>
<notification name="ConfirmClearTeleportHistory">
Czy na pewno chcesz usunąć historię teleportacji?
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="BottomTrayButtonCanNotBeShown">
Wybrany przycisk nie może zostać wyświetlony w tej chwili.
@@ -2713,6 +2890,17 @@ Przycisk zostanie wyświetlony w przypadku dostatecznej ilości przestrzeni.
<notification name="ShareNotification">
Zaznacz Rezydentów, z którymi chcesz się podzielić.
</notification>
+ <notification name="MeshUploadError">
+ Nie można załadować [LABEL]: [MESSAGE] [IDENTIFIER]
+
+Zobacz log, aby dowiedzieć się więcej.
+ </notification>
+ <notification name="MeshUploadPermError">
+ Wystąpił błąd podczas pobierania uprawnień ładowania meszy.
+ </notification>
+ <notification name="RegionCapabilityRequestError">
+ Nie udało się uzyskać zdolności regionu: '[CAPABILITY]'.
+ </notification>
<notification name="ShareItemsConfirmation">
Czy na pewno chcesz udostępnić następujące obiekty:
@@ -2720,8 +2908,20 @@ Przycisk zostanie wyświetlony w przypadku dostatecznej ilości przestrzeni.
następującym Rezydentom:
-[RESIDENTS]
- <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Ok"/>
+<nolink>[RESIDENTS]</nolink>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
+ </notification>
+ <notification name="ShareFolderConfirmation">
+ Możesz się podzielić tylko jednym folderem jednocześnie.
+
+Czy na pewno chcesz udostępnić następujące obiekty:
+
+<nolink>[ITEMS]</nolink>
+
+następującym Rezydentom:
+
+<nolink>[RESIDENTS]</nolink>
+ <usetemplate name="okcancelbuttons" notext="Anuluj" />
</notification>
<notification name="ItemsShared">
Obiekty zostały udostępnione.
@@ -2729,13 +2929,26 @@ następującym Rezydentom:
<notification name="DeedToGroupFail">
Przekazanie grupie nie powiodło się.
</notification>
+ <notification name="ReleaseLandThrottled">
+ Działka [PARCEL_NAME] nie może teraz zostać porzucona.
+ </notification>
+ <notification name="ReleasedLandWithReclaim">
+ Działka '[PARCEL_NAME]' o obszarze [AREA] m² została porzucona.
+
+Masz [RECLAIM_PERIOD] godzin na odzyskanie jej za 0L$ zanim zostanie wystawiona na sprzedaż każdemu.
+ </notification>
+ <notification name="ReleasedLandNoReclaim">
+ Działka '[PARCEL_NAME]' o obszarze [AREA] m² została porzucona.
+
+Jest teraz dostępna do kupienia dla każdego.
+ </notification>
<notification name="AvatarRezNotification">
( [EXISTENCE] sekund w Second Life)
-Awatar '[NAME]' rozchmurzył się po [TIME] sekundach.
+Awatar '[NAME]' przestał/a być chmurą po [TIME] sekundach.
</notification>
<notification name="AvatarRezSelfBakedDoneNotification">
( [EXISTENCE] sekund w Second Life)
-You finished baking your outfit after [TIME] seconds.
+Skończono wstępne przetwarzanie stroju po [TIME] sekundach.
</notification>
<notification name="AvatarRezSelfBakedUpdateNotification">
( [EXISTENCE] sekund w Second Life )
@@ -2765,16 +2978,14 @@ Awatar '[NAME]' opuścił edycję wyglądu.
<notification name="NoConnect">
Występuje problem z połączeniem [PROTOCOL] [HOSTID].
Proszę sprawdź swoją sieć i ustawienia firewall.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="NoVoiceConnect">
- Występuje problem z Twoim połączniem głosowym:
+ Występuje problem z Twoim połączeniem głosowym:
[HOSTID]
Komunikacja głosowa nie będzie dostępna.
Proszę sprawdź swoją sieć i ustawienia firewall.
- <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="AvatarRezLeftNotification">
( [EXISTENCE] sekund w Second Life)
@@ -2782,142 +2993,917 @@ Awatar '[NAME]' pozostał w pełni załadowany.
</notification>
<notification name="AvatarRezSelfBakedTextureUploadNotification">
( [EXISTENCE] sekund w Second Life )
-Zbakowane tekstury [RESOLUTION] dla '[BODYREGION]' zostały załadowane po[TIME] sekundach.
+Wstępnie przetworzone tekstury [RESOLUTION] dla '[BODYREGION]' zostały załadowane po [TIME] sekundach.
</notification>
<notification name="AvatarRezSelfBakedTextureUpdateNotification">
( [EXISTENCE] sekund w Second Life )
-Zbakowane tekstury zostały lokalnie zaktualizowane [RESOLUTION] dla '[BODYREGION]' po [TIME] sekundach.
+Wstępnie przetworzone tekstury [RESOLUTION] zostały lokalnie zaktualizowane dla '[BODYREGION]' po [TIME] sekundach.
+ </notification>
+ <notification name="CannotUploadTexture">
+ Nie można załadować tekstury.
+[REASON]
+ </notification>
+ <notification name="LivePreviewUnavailable">
+ Nie można wyświetlić podglądu tej tekstury - jest niekopiowalna lub/oraz nietransferowalna.
+ <usetemplate ignoretext="Ostrzegaj, gdy podgląd na żywo nie może wyświetlić niekopiowalnych/nietransferowalnych tekstur" name="okignore" />
</notification>
<notification name="ConfirmLeaveCall">
- Czy jestes pewien/pewna, że chcesz zakończyć rozmowę?
- <usetemplate ignoretext="Potwierdź zanim rozmowa głosowa zostanie zakończona" name="okcancelignore" notext="Nie" yestext="Tak"/>
+ Czy jesteś pewien/pewna, że chcesz zakończyć rozmowę?
+ <usetemplate ignoretext="Potwierdź zanim rozmowa głosowa zostanie zakończona" name="okcancelignore" notext="Nie" yestext="Tak" />
</notification>
<notification name="ConfirmMuteAll">
Wybrano wyciszenie wszystkich uczestników rozmowy głosowej w grupie.
-To spowoduje również wyciszenie wszystkich Rezydentów, którzy dołączą póżniej do rozmowy, nawet jeśli zakończysz rozmowę.
+To spowoduje również wyciszenie wszystkich Rezydentów, którzy dołączą później
+do rozmowy nawet, jeśli ją zakończysz.
Wyciszyć wszystkich?
- <usetemplate ignoretext="Potwierdź zanim zostaną wyciszeni wszyscy uczestnicy rozmowy głosowej w grupie" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+ <usetemplate ignoretext="Potwierdź zanim zostaną wyciszeni wszyscy uczestnicy rozmowy głosowej w grupie" name="okcancelignore" notext="Anuluj" />
</notification>
<notification label="Czat" name="HintChat">
- W celu przylączenia się do rozmowy zacznij pisać w poniższym polu czatu.
+ W celu przyłączenia się do rozmowy zacznij pisać w poniższym polu czatu.
</notification>
<notification label="Wstań" name="HintSit">
Aby wstać i opuścić pozycję siedzącą, kliknij przycisk Wstań.
</notification>
<notification label="Mów" name="HintSpeak">
- Kliknij przycisk "Mów" aby włączyć i wyłączyć Twój mikrofon.
+ Kliknij na przycisku "Mów" aby włączyć i wyłączyć Twój mikrofon.
Kliknij w strzałkę aby zobaczyć panel kontroli głosu.
Ukrycie przycisku "Mów" zdezaktywuje głos.
</notification>
<notification label="Odkrywaj Åšwiat" name="HintDestinationGuide">
- Destination Guide zawiera tysiące nowych miejsc do odkrycia. Wybierz lokalizację i teleportuj się aby rozpocząć zwiedzanie.
+ Cele podróży (Destination Guide) zawierają tysiące nowych miejsc do odkrycia. Wybierz lokalizację i teleportuj się, aby rozpocząć zwiedzanie.
</notification>
- <notification label="Schowek" name="HintSidePanel">
- Schowek umożliwia szybki dostęp do Twojej Szafy, ubrań, profili i innych w panelu bocznym.
+ <notification label="Panel boczny" name="HintSidePanel">
+ Panel boczny umożliwia szybki dostęp do Twojej Szafy, ubrań, profili i innych rzeczy.
</notification>
<notification label="Ruch" name="HintMove">
Aby chodzić lub biegać, otwórz panel ruchu i użyj strzałek do nawigacji. Możesz także używać strzałek z klawiatury.
</notification>
- <notification label="" name="HintMoveClick">
+ <notification name="HintMoveClick">
1. Kliknij aby chodzić.
Kliknij gdziekolwiek na ziemi aby przejść do wskazanego miejsca.
2. Kliknij i przeciągnij aby zmienić widok.
Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
</notification>
- <notification label="Wyświetlana nazwa" name="HintDisplayName">
- Ustaw wyświetlaną nazwę, którą możesz zmieniać tutaj. Jest ona dodatkiem do unikatowej nazwy użytkownika, która nie może być zmieniona. Możesz zmienić sposób w jaki widzisz nazwy innych osób w Twoich Ustawieniach.
+ <notification label="Wyświetlane Imię" name="HintDisplayName">
+ Możesz zmieniać tutaj swoje Wyświetlane Imię. Jest ono dodatkiem do unikatowej nazwy użytkownika, która nie może być zmieniona. Możesz zmienić sposób w jaki widzisz imiona innych osób w Twoich Ustawieniach.
</notification>
<notification label="Widok" name="HintView">
- To change your camera view, use the Orbit and Pan controls. Zresetuj widok poprzez wciśnięcie klawisza Esc lub chodzenie.
+ Aby zmienić widok kamery użyj narzędzi służących do okrążania i panoramowania. Zresetuj widok poprzez wciśnięcie klawisza Esc lub poruszając się.
</notification>
<notification label="Szafa" name="HintInventory">
- Sprawdź swoją Szafę aby znaleźć obiekty. Najnowsze obiekty mogą być łatwo odnalezione w zakładce Nowe obiekty.
+ Sprawdź swoją Szafę aby znaleźć obiekty. Najnowsze obiekty mogą być łatwo odnalezione w zakładce Ostatnie.
</notification>
<notification label="Otrzymano L$!" name="HintLindenDollar">
- Tutaj znajduje się Twoj bieżący bilans L$. Kliknij Kup aby kupić więcej L$.
+ Tutaj znajduje się Twój bieżący bilans L$. Kliknij Kup aby kupić więcej L$.
+ </notification>
+ <notification name="LowMemory">
+ Masz zbyt mały zapas pamięci. Pewne funkcje SL zostały wyłączone, aby zapobiec awarii. Wyłącz inne aplikacje. Zrestartuj SL, jeśli problem pozostanie.
+ </notification>
+ <notification name="ForceQuitDueToLowMemory">
+ SL zostanie wyłączone za 30 sekund, brak pamięci.
</notification>
<notification name="PopupAttempt">
Wyskakujące okienko zostało zablokowane.
<form name="form">
- <ignore name="ignore" text="Zezwól na wyskakujące okienka"/>
- <button name="open" text="Otwórz wyskakujące okno."/>
+ <ignore name="ignore" text="Zezwól na wyskakujące okienka" />
+ <button name="open" text="Otwórz wyskakujące okno" />
</form>
</notification>
+ <notification name="SOCKS_NOT_PERMITTED">
+ Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmawia połączenia, brak dostępu na podstawie zestawu reguł.
+ </notification>
+ <notification name="SOCKS_CONNECT_ERROR">
+ Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmawia połączenia, nie można otworzyć kanału TCP.
+ </notification>
+ <notification name="SOCKS_NOT_ACCEPTABLE">
+ Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmówił połączenia na ustawionym sposobie autoryzacji.
+ </notification>
+ <notification name="SOCKS_AUTH_FAIL">
+ Serwer proxy SOCKS 5 "[HOST]:[PORT]" określił Twoje dane uwierzytelniające jako nieprawidłowe.
+ </notification>
+ <notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+ Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmówił skojarzonego żądania UDP.
+ </notification>
+ <notification name="SOCKS_HOST_CONNECT_FAILED">
+ Nie można połączyć z serwerem proxy SOCKS 5 "[HOST]:[PORT]".
+ </notification>
+ <notification name="SOCKS_UNKNOWN_STATUS">
+ Nieznany błąd proxy z serwerem "[HOST]:[PORT]".
+ </notification>
+ <notification name="SOCKS_INVALID_HOST">
+ Nieprawidłowy adres lub port proxy SOCKS "[HOST]:[PORT]".
+ </notification>
+ <notification name="SOCKS_BAD_CREDS">
+ Nieprawidłowy użytkownik lub hasło SOCKS 5.
+ </notification>
+ <notification name="PROXY_INVALID_HTTP_HOST">
+ Nieprawidłowy adres lub port proxy HTTP "[HOST]:[PORT]".
+ </notification>
+ <notification name="PROXY_INVALID_SOCKS_HOST">
+ Nieprawidłowy adres lub port proxy SOCKS "[HOST]:[PORT]".
+ </notification>
+ <notification name="ChangeProxySettings">
+ Ustawienia proxy zaczną obowiązywać po restarcie [APP_NAME].
+ </notification>
<notification name="AuthRequest">
- Strpna '<nolink>[HOST_NAME]</nolink>' w domenie '[REALM]' wymaga nazwy użytkownika i hasła.
+ Strona '<nolink>[HOST_NAME]</nolink>' w domenie '[REALM]' wymaga nazwy użytkownika i hasła.
<form name="form">
- <input name="username" text="Nazwa użytkownika"/>
- <input name="password" text="Hasło"/>
- <button name="ok" text="Wyślij"/>
- <button name="cancel" text="Anuluj"/>
+ <input name="username" text="Nazwa użytkownika" />
+ <input name="password" text="Hasło" />
+ <button name="ok" text="Wyślij" />
+ <button name="cancel" text="Anuluj" />
</form>
</notification>
- <notification label="" name="NoClassifieds">
+ <notification name="NoClassifieds">
Tworzenie i edycja reklam jest możliwa tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
</notification>
- <notification label="" name="NoGroupInfo">
+ <notification name="NoGroupInfo">
Tworzenie i edycja grup jest możliwa tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
</notification>
- <notification label="" name="NoPicks">
+ <notification name="NoPlaceInfo">
+ Oglądanie profilu miejsca jest możliwe tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
+ <usetemplate name="okcancelbuttons" yestext="Zamknij" notext="Nie zamykaj" />
+ </notification>
+ <notification name="NoPicks">
Tworzenie i edycja Ulubionych jest możliwa jedynie w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
</notification>
- <notification label="" name="NoWorldMap">
+ <notification name="NoWorldMap">
Oglądanie mapy świata jest możliwe tylko w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
</notification>
- <notification label="" name="NoVoiceCall">
- Rozmowy głosowe są możliwe tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb?
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <notification name="NoVoiceCall">
+ Rozmowy głosowe są możliwe tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
</notification>
- <notification label="" name="NoAvatarShare">
+ <notification name="NoAvatarShare">
Udostępnienie jest możliwe tylko w trybie zaawansowanym. Czy chcesz wylogować się i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
</notification>
- <notification label="" name="NoAvatarPay">
+ <notification name="NoAvatarPay">
Płacenie innym Rezydentom jest możliwe tylko w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
- <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij"/>
+ <usetemplate name="okcancelbuttons" notext="Nie zamykaj" yestext="Zamknij" />
+ </notification>
+ <notification name="NoInventory">
+ Przeglądanie Szafy jest możliwe tylko w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
+ <usetemplate name="okcancelbuttons" yestext="Zamknij" notext="Nie zamykaj" />
+ </notification>
+ <notification name="NoAppearance">
+ Zmiana wyglądu jest możliwa tylko w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
+ <usetemplate name="okcancelbuttons" yestext="Zamknij" notext="Nie zamykaj" />
+ </notification>
+ <notification name="NoSearch">
+ Wyszukiwanie jest możliwe tylko w trybie zaawansowanym. Czy chcesz się wylogować i zmienić tryb? Opcja wyboru trybu życia jest widoczna na ekranie logowania.
+ <usetemplate name="okcancelbuttons" yestext="Zamknij" notext="Nie zamykaj" />
+ </notification>
+ <notification name="ConfirmHideUI">
+ Ta akcja ukryje wszystkie menu i przyciski. Aby je pokazać użyj skrótu [SHORTCUT] ponownie.
+ <usetemplate name="okcancelignore" notext="Anuluj" ignoretext="Potwierdź przed ukryciem interfejsu" />
+ </notification>
+ <notification name="PathfindingLinksets_WarnOnPhantom">
+ Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_MismatchOnRestricted">
+ Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_MismatchOnVolume">
+ Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione, ponieważ kształt nie jest wypukły." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+ Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
+
+Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy, a inne nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+ Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
+
+Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy, a inne nie mogą zostać ustawione, ponieważ kształt nie jest wypukły." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+ Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
+
+Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły. Ich typ nie ulegnie zmianie.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części i niewypukły kształt." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+ Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
+
+Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
+
+Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły. Ich typ nie ulegnie zmianie.
+
+Czy chcesz kontynuować?
+ <usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy, a inne nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części i niewypukły kształt." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PathfindingLinksets_ChangeToFlexiblePath">
+ Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha.
+ <usetemplate ignoretext="Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha." name="okcancelignore" notext="Anuluj" />
</notification>
<global name="UnsupportedGLRequirements">
Wygląda na to, że Twój system nie spełnia wymagań sprzętowych [APP_NAME]. [APP_NAME] wymaga karty graficznej kompatybilnej z OpenGL z multiteksturami. Jeżeli masz taką kartę zainstaluj najnowsze sterowniki do niej i uaktualnienia systemu operacyjnego.
Jeżeli wciąż masz problemy sprawdź: [SUPPORT_SITE].
</global>
- <global name="UnsupportedCPUAmount">
- 796
- </global>
- <global name="UnsupportedRAMAmount">
- 510
- </global>
<global name="UnsupportedGPU">
- Twoja karta graficzna nie spełnia minimalnych wymagań.
</global>
<global name="UnsupportedRAM">
- Pamięć Twojego systemu nie spełnia minimalnych wymagań.
</global>
- <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
- Jeśli jesteś właścicielem posiadłości, możesz ustawić na niej miejsce startu.
-W innym przypadku możesz poszukać na mapie miejsca oznaczone jako "Infohub".
+ <global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
+ If you own a piece of land, you can make it your home location.
+Otherwise, you can look at the Map and find places marked "Infohub".
</global>
<global name="You died and have been teleported to your home location">
Nastąpiła śmierć i teleportacja do Miejsca Startu.
</global>
+ <notification name="LocalBitmapsUpdateFileNotFound">
+ [FNAME] nie może zostać zaktualizowany, ponieważ plik nie może zostać znaleziony.
+Aktualizacje dla tego pliku wyłączone.
+ </notification>
+ <notification name="LocalBitmapsUpdateFailedFinal">
+ [FNAME] nie mógł zostać otwarty lub zdekodowany [NRETRIES] razy i został uznany za uszkodzony.
+Aktualizacje dla tego pliku wyłączone.
+ </notification>
+ <notification name="LocalBitmapsVerifyFail">
+ Próba dodania niewłaściwego lub niemożliwego do odczytania pliku graficznego [FNAME], który nie może zostać otwarty lub zdekodowany.
+Anulowano.
+ </notification>
+ <notification name="PathfindingReturnMultipleItems">
+ Zwracasz [NUM_ITEMS] przedmiotów. Na pewno chcesz kontynuować?
+ <usetemplate ignoretext="Na pewno chcesz zwrócić wiele przedmiotów?" name="okcancelignore" notext="Nie" yestext="Tak" />
+ </notification>
+ <notification name="PathfindingDeleteMultipleItems">
+ Usuwasz [NUM_ITEMS] przedmiotów. Na pewno chcesz kontynuować?
+ <usetemplate ignoretext="Na pewno chcesz usunąć wiele przedmiotów?" name="okcancelignore" notext="Nie" yestext="Tak" />
+ </notification>
+ <notification name="AvatarFrozen">
+ [AV_FREEZER] unieruchomił/a Cię. Nie możesz się poruszać ani podejmować interakcji ze światem.
+ </notification>
+ <notification name="AvatarFrozenDuration">
+ [AV_FREEZER] unieruchomił/a Cię na [AV_FREEZE_TIME] sekund. Nie możesz się poruszać ani podejmować interakcji ze światem.
+ </notification>
+ <notification name="YouFrozeAvatar">
+ Awatar unieruchomiony.
+ </notification>
+ <notification name="AvatarHasUnFrozenYou">
+ [AV_FREEZER] odblokował/a Cię.
+ </notification>
+ <notification name="AvatarUnFrozen">
+ Awatar odblokowany.
+ </notification>
+ <notification name="AvatarFreezeFailure">
+ Unieruchomienie nie powiodło się, ponieważ nie masz uprawnień administratora na tej działce.
+ </notification>
+ <notification name="AvatarFreezeThaw">
+ Czas Twojego unieruchomienia minął, możesz zająć się swoimi sprawami.
+ </notification>
+ <notification name="AvatarCantFreeze">
+ Przepraszam, ale nie mogę unieruchomić tego użytkownika.
+ </notification>
+ <notification name="NowOwnObject">
+ Jesteś od teraz właścicielem obiektu [OBJECT_NAME]
+ </notification>
+ <notification name="CantRezOnLand">
+ Nie można zrezzować obiektu na pozycji [OBJECT_POS], ponieważ właściciel działki na to nie zezwala. Użyj narzędzia ziemi, aby zobaczyć kto nim jest.
+ </notification>
+ <notification name="RezFailTooManyRequests">
+ Obiekt nie może zostać zrezzowany, ponieważ jest zbyt wiele żądań.
+ </notification>
+ <notification name="SitFailCantMove">
+ Nie możesz usiąść, ponieważ nie możesz się teraz poruszać.
+ </notification>
+ <notification name="SitFailNotAllowedOnLand">
+ Nie możesz usiąść, ponieważ nie masz zezwolenia do przebywania na tej ziemi.
+ </notification>
+ <notification name="SitFailNotSameRegion">
+ Spróbuj podejść bliżej. Nie można usiąść na obiekcie, bo nie jest w tym samym regionie, co Ty.
+ </notification>
+ <notification name="NoNewObjectRegionFull">
+ Nie można utworzyć nowego obiektu. Region jest pełny.
+ </notification>
+ <notification name="FailedToPlaceObject">
+ Nie udało się ustawić obiektu w podanym miejscu. Spróbuj ponownie.
+ </notification>
+ <notification name="NoOwnNoGardening">
+ Nie możesz tworzyć drzew i trawy na ziemi, która nie należy do Ciebie.
+ </notification>
+ <notification name="NoCopyPermsNoObject">
+ Kopiowanie nie powiodło się, ponieważ nie masz zezwoleń na kopiowanie obiektu '[OBJ_NAME]'.
+ </notification>
+ <notification name="NoTransPermsNoObject">
+ Kopiowanie nie powiodło się, ponieważ obiekt '[OBJ_NAME]' nie może zostać przetransferowany do Ciebie.
+ </notification>
+ <notification name="AddToNavMeshNoCopy">
+ Kopiowanie nie powiodło się, ponieważ obiekt '[OBJ_NAME]' ma wpływ na Navmesh.
+ </notification>
+ <notification name="DupeWithNoRootsSelected">
+ Wybrano duplikat bez obiektów głównych.
+ </notification>
+ <notification name="CantDupeCuzRegionIsFull">
+ Nie można zduplikować obiektów, ponieważ region jest pełny.
+ </notification>
+ <notification name="CantDupeCuzParcelNotFound">
+ Nie można zduplikować obiektów - nie można znaleźć działki, na której one są.
+ </notification>
+ <notification name="CantCreateCuzParcelFull">
+ Nie można utworzyć obiektu, ponieważ działka jest pełna.
+ </notification>
+ <notification name="RezAttemptFailed">
+ Próba zrezzowania obiektu nie powiodła się.
+ </notification>
+ <notification name="ToxicInvRezAttemptFailed">
+ Nie można utworzyć obiektu, który spowodował problemy w tym regionie.
+ </notification>
+ <notification name="InvItemIsBlacklisted">
+ Ten przedmiot znajduje się na czarnej liście.
+ </notification>
+ <notification name="NoCanRezObjects">
+ W tej chwili nie masz zezwolenia na tworzenie obiektów.
+ </notification>
+ <notification name="LandSearchBlocked">
+ Wyszukiwanie ziemi zablokowane.
+Zostało wysłanych zbyt wiele żądań wyszukiwania w zbyt krótkim czasie.
+Spróbuj ponownie za minutę.
+ </notification>
+ <notification name="NotEnoughResourcesToAttach">
+ Za mało dostępnych zasobów skryptów, aby dołączyć obiekt!
+ </notification>
+ <notification name="YouDiedAndGotTPHome">
+ Zginąłeś/aś i zostałeś/aś przeteleportowany/a do swojego miejsca startu
+ </notification>
+ <notification name="EjectComingSoon">
+ Nie masz już dłużej pozwolenia na przebywanie w tym miejscu i w ciągu [EJECT_TIME] sekund musisz je opuścić.
+ </notification>
+ <notification name="NoEnterRegionMaybeFull">
+ Nie możesz wejść do regionu "[NAME]", może być pełny lub właśnie restartuje.
+ </notification>
+ <notification name="SaveBackToInvDisabled">
+ Zabieranie z powrotem do Szafy zostało wyłączone.
+ </notification>
+ <notification name="NoExistNoSaveToContents">
+ Nie można zapisać '[OBJ_NAME]' do zawartości obiektu, ponieważ obiekt z którego został zrezzowany już nie istnieje.
+ </notification>
+ <notification name="NoModNoSaveToContents">
+ Nie można zapisać '[OBJ_NAME]' do zawartości obiektu, ponieważ nie masz praw do modyfikacji obiektu '[DEST_NAME]'.
+ </notification>
+ <notification name="NoSaveBackToInvDisabled">
+ Nie można zabrać '[OBJ_NAME]' z powrotem do Szafy -- ta operacja została wyłączona.
+ </notification>
+ <notification name="NoCopyNoSelCopy">
+ Nie możesz skopiować tego, co jest zaznaczone, ponieważ nie masz prawa do skopiowania obiektu '[OBJ_NAME]'.
+ </notification>
+ <notification name="NoTransNoSelCopy">
+ Nie możesz skopiować tego, co jest zaznaczone, ponieważ obiektu '[OBJ_NAME]' nie można transferować.
+ </notification>
+ <notification name="NoTransNoCopy">
+ Nie możesz skopiować tego, co jest zaznaczone, ponieważ obiektu '[OBJ_NAME]' nie można transferować.
+ </notification>
+ <notification name="NoPermsNoRemoval">
+ Usunięcie obiektu '[OBJ_NAME]' z symulatora zostało wzbronione przez system zezwoleń.
+ </notification>
+ <notification name="NoModNoSaveSelection">
+ Nie możesz zapisać tego, co jest zaznaczone, ponieważ nie masz prawa do modyfikacji obiektu '[OBJ_NAME]'.
+ </notification>
+ <notification name="NoCopyNoSaveSelection">
+ Nie możesz zapisać tego, co jest zaznaczone, ponieważ obiektu '[OBJ_NAME]' nie można kopiować.
+ </notification>
+ <notification name="NoModNoTaking">
+ Nie możesz zabrać tego, co jest zaznaczone, ponieważ nie masz prawa do modyfikacji obiektu '[OBJ_NAME]'.
+ </notification>
+ <notification name="RezDestInternalError">
+ Błąd wewnętrzny: Nieznany typ lokalizacji docelowej.
+ </notification>
+ <notification name="DeleteFailObjNotFound">
+ Usuwanie nie powiodło się, ponieważ obiekt nie został znaleziony
+ </notification>
+ <notification name="SorryCantEjectUser">
+ Przepraszam, ale nie można wyrzucić tego użytkownika.
+ </notification>
+ <notification name="RegionSezNotAHome">
+ Ten region nie pozwala Ci na ustawienie miejsca startu w tej lokalizacji.
+ </notification>
+ <notification name="HomeLocationLimits">
+ Możesz ustawić 'miejsce startu' tylko na swojej własnej ziemi lub obok Infohuba na Mainlandzie.
+ </notification>
+ <notification name="HomePositionSet">
+ Ustawiono miejsce startu.
+ </notification>
+ <notification name="AvatarEjected">
+ Awatar wyrzucony.
+ </notification>
+ <notification name="AvatarEjectFailed">
+ Wyrzucenie nie powiodło się, ponieważ nie masz uprawnień administratora na tej działce.
+ </notification>
+ <notification name="CantMoveObjectParcelFull">
+ Nie można przesunąć obiektu '[OBJECT_NAME]' do
+[OBJ_POSITION] w regionie [REGION_NAME], ponieważ działka jest zbyt pełna.
+ </notification>
+ <notification name="CantMoveObjectParcelPerms">
+ Nie można przesunąć obiektu '[OBJECT_NAME]' do
+[OBJ_POSITION] w regionie [REGION_NAME], ponieważ Twoje obiekty nie są dozwolone na tej działce.
+ </notification>
+ <notification name="CantMoveObjectParcelResources">
+ Nie można przesunąć obiektu '[OBJECT_NAME]' do
+[OBJ_POSITION] w regionie [REGION_NAME], ponieważ nie ma wystarczającej ilości zasobów na tej działce.
+ </notification>
+ <notification name="CantMoveObjectRegionVersion">
+ Nie można przesunąć obiektu '[OBJECT_NAME]' do
+[OBJ_POSITION] w regionie [REGION_NAME], ponieważ the region działa na starszej wersji symulatora, która nie obsługuje otrzymywania obiektów przez granice działek.
+ </notification>
+ <notification name="CantMoveObjectNavMesh">
+ Nie można przesunąć obiektu '[OBJECT_NAME]' do
+[OBJ_POSITION] w regionie [REGION_NAME], ponieważ nie możesz modyfikować Navmesha przez granice regionów.
+ </notification>
+ <notification name="CantMoveObjectWTF">
+ Nie można przesunąć obiektu '[OBJECT_NAME]' do
+[OBJ_POSITION] w regionie [REGION_NAME] ze względu na nieznany powód. ([FAILURE_TYPE])
+ </notification>
+ <notification name="NoPermModifyObject">
+ Nie masz uprawnień do modyfikowania tego obiektu
+ </notification>
+ <notification name="CantEnablePhysObjContributesToNav">
+ Nie można włączyć fizyki dla obiektu, który ma wpływ na Navmesh.
+ </notification>
+ <notification name="CantEnablePhysKeyframedObj">
+ Nie można włączyć fizyki dla obiektów, które używają animacji opartej o klatki kluczowe.
+ </notification>
+ <notification name="CantEnablePhysNotEnoughLandResources">
+ Nie można włączyć fizyki dla obiektu -- niewystarczające zasoby na działce.
+ </notification>
+ <notification name="CantEnablePhysCostTooGreat">
+ Nie można włączyć fizyki dla obiektu, którego łączny koszt zajmowanych zasobów fizycznych jest większy, niż [MAX_OBJECTS]
+ </notification>
+ <notification name="PhantomWithConcavePiece">
+ Ten obiekt nie może mieć części wklęsłej, ponieważ jest widmowy i ma wpływ na Navmesh.
+ </notification>
+ <notification name="UnableAddItem">
+ Nie można dodać przedmiotu!
+ </notification>
+ <notification name="UnableEditItem">
+ Nie można tego edytować!
+ </notification>
+ <notification name="NoPermToEdit">
+ Brak zezwoleń na zmianę tego.
+ </notification>
+ <notification name="NoPermToCopyInventory">
+ Brak zezwoleń na kopiowanie tego przedmiotu.
+ </notification>
+ <notification name="CantSaveItemDoesntExist">
+ Nie można zapisać do zawartości obiektu: Przedmiot już nie istnieje.
+ </notification>
+ <notification name="CantSaveItemAlreadyExists">
+ Nie można zapisać do zawartości obiektu: Przedmiot z tą nazwą już w niej istnieje.
+ </notification>
+ <notification name="CantSaveModifyAttachment">
+ Nie można zapisać do zawartości obiektu: To zmodyfikowałoby prawa dodatku.
+ </notification>
+ <notification name="TooManyScripts">
+ Za dużo skryptów.
+ </notification>
+ <notification name="UnableAddScript">
+ Nie można dodać skryptu!
+ </notification>
+ <notification name="AssetServerTimeoutObjReturn">
+ Czas odpowiedzi z serwera zasobów danych przekroczył dozwolony limit. Obiekt został zwrócony do sima.
+ </notification>
+ <notification name="RegionDisablePhysicsShapes">
+ Ten region nie ma włączonych kształtów fizycznych.
+ </notification>
+ <notification name="NoModNavmeshAcrossRegions">
+ Nie możesz modyfikować Navmeshu przez granice regionów.
+ </notification>
+ <notification name="NoSetPhysicsPropertiesOnObjectType">
+ Nie można ustawić właściwości fizycznych na tym typie obiektu.
+ </notification>
+ <notification name="NoSetRootPrimWithNoShape">
+ Nie można ustawić primy głównej bez żadnego kształtu.
+ </notification>
+ <notification name="NoRegionSupportPhysMats">
+ Ten region nie ma włączonych materiałów fizycznych.
+ </notification>
+ <notification name="OnlyRootPrimPhysMats">
+ Tylko primy główne mogą mieć dostrajane materiały fizyczne.
+ </notification>
+ <notification name="NoSupportCharacterPhysMats">
+ Ustawianie materiałów fizycznych na postaciach nie jest jeszcze wspierane.
+ </notification>
+ <notification name="InvalidPhysMatProperty">
+ Jedna lub więcej właściwości określonego materiału fizycznego jest nieprawidłowa.
+ </notification>
+ <notification name="NoPermsAlterStitchingMeshObj">
+ Nie możesz zmieniać typu zszywania obiektu meszowego.
+ </notification>
+ <notification name="NoPermsAlterShapeMeshObj">
+ Nie możesz zmieniać kształtu obiektu meszowego.
+ </notification>
+ <notification name="FullRegionCantEnter">
+ Nie możesz wejść do tego regionu, \nponieważ jest pełny.
+ </notification>
+ <notification name="LinkFailedOwnersDiffer">
+ Scalanie nie powiodło się -- właściciele są różni
+ </notification>
+ <notification name="LinkFailedNoModNavmeshAcrossRegions">
+ Scalanie nie powiodło się -- nie można modyfikować Navmeshu przez granice regionów.
+ </notification>
+ <notification name="LinkFailedNoPermToEdit">
+ Scalanie nie powiodło się, ponieważ nie masz praw modyfikacji.
+ </notification>
+ <notification name="LinkFailedTooManyPrims">
+ Scalanie nie powiodło się -- za dużo prim
+ </notification>
+ <notification name="LinkFailedCantLinkNoCopyNoTrans">
+ Scalanie nie powiodło się -- nie można scalić obiektu niekopiowalnego z nietransferowalnym
+ </notification>
+ <notification name="LinkFailedNothingLinkable">
+ Scalanie nie powiodło się -- nic nie wygląda na możliwe do scalenia.
+ </notification>
+ <notification name="LinkFailedTooManyPathfindingChars">
+ Scalanie nie powiodło się -- zbyt dużo postaci odnajdywania ścieżek
+ </notification>
+ <notification name="LinkFailedInsufficientLand">
+ Scalanie nie powiodło się -- niewystarczające zasoby ziemi
+ </notification>
+ <notification name="LinkFailedTooMuchPhysics">
+ Obiekt zużywa zbyt dużo zasobów fizycznych -- jego cechy dynamiczne zostały wyłączone.
+ </notification>
+ <notification name="EstateManagerFailedllTeleportHome">
+ Obiekt '[OBJECT_NAME]' na pozycji [SLURL] nie może teleportować zarządców majątku do ich miejsc startu.
+ </notification>
+ <notification name="TeleportedHomeByObjectOnParcel">
+ Zostałeś/aś przeniesiony/a do lokalizacji startowej przez obiekt '[OBJECT_NAME]' na działce '[PARCEL_NAME]'
+ </notification>
+ <notification name="TeleportedHomeByObject">
+ Zostałeś/aś przeniesiony/a do lokalizacji startowej przez obiekt '[OBJECT_NAME]'
+ </notification>
<notification name="TeleportedByAttachment">
- You have been teleported by an attachment on [ITEM_ID]
- <usetemplate ignoretext="Zostałeś/aś teleportowany/a przez dodatek" name="notifyignore"/>
+ Zostałeś/aś teleportowany/a przez dodatek na [ITEM_ID]
+ <usetemplate ignoretext="Teleport: Zostałeś/aś teleportowany/a przez dodatek" name="notifyignore" />
</notification>
<notification name="TeleportedByObjectOnParcel">
- You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
- <usetemplate ignoretext="Zostałeś/aś teleportowany/a przez obiekt na działce" name="notifyignore"/>
+ Zostałeś/aś teleportowany/a przez obiekt '[OBJECT_NAME]' na działce '[PARCEL_NAME]'
+ <usetemplate ignoretext="Teleport: Zostałeś/aś teleportowany/a przez obiekt na działce" name="notifyignore" />
+ </notification>
+ <notification name="TeleportedByObjectOwnedBy">
+ Zostałeś/aś teleportowany/a przez obiekt '[OBJECT_NAME]' należący do [OWNER_ID]
+ </notification>
+ <notification name="TeleportedByObjectUnknownUser">
+ Zostałeś/aś teleportowany/a przez obiekt '[OBJECT_NAME]' należący do nieznanej osoby.
+ </notification>
+ <notification name="CantCreateObjectRegionFull">
+ Nie można utworzyć żądanego obiektu. Region jest pełny.
+ </notification>
+ <notification name="CantAttackMultipleObjOneSpot">
+ Nie możesz podłączyć wielu obiektów do jednego punktu.
+ </notification>
+ <notification name="CantCreateMultipleObjAtLoc">
+ Nie możesz tutaj stworzyć wielu obiektów.
+ </notification>
+ <notification name="UnableToCreateObjTimeOut">
+ Nie można utworzyć żądanego obiektu. Obiektu nie ma w bazie danych.
+ </notification>
+ <notification name="UnableToCreateObjUnknown">
+ Nie można utworzyć żądanego obiektu. Upłynął limit czasu żądania. Spróbuj jeszcze raz.
+ </notification>
+ <notification name="UnableToCreateObjMissingFromDB">
+ Nie można utworzyć żądanego obiektu. Spróbuj jeszcze raz.
+ </notification>
+ <notification name="RezFailureTookTooLong">
+ Rezzowanie nie powiodło się, żądany obiekt ładował się zbyt długo.
+ </notification>
+ <notification name="FailedToPlaceObjAtLoc">
+ Nie udało się ustawić obiektu w podanej lokalizacji. Spróbuj ponownie.
+ </notification>
+ <notification name="CantCreatePlantsOnLand">
+ Nie możesz tworzyć roślin na tej ziemi.
+ </notification>
+ <notification name="CantRestoreObjectNoWorldPos">
+ Nie można przywrócić obiektu. Nie znaleziono pozycji w świecie.
+ </notification>
+ <notification name="CantRezObjectInvalidMeshData">
+ Nie można zrezzować obiektu, ponieważ dane jego mesza są nieprawidłowe.
+ </notification>
+ <notification name="CantRezObjectTooManyScripts">
+ Nie można zrezzować obiektu, ponieważ w regionie jest już zbyt dużo skryptów.
+ </notification>
+ <notification name="CantCreateObjectNoAccess">
+ Twoje prawa dostępu nie zezwalają Ci na tworzenie tutaj obiektów.
+ </notification>
+ <notification name="CantCreateObject">
+ W tej chwili nie masz pozwolenia na tworzenie obiektów.
+ </notification>
+ <notification name="InvalidObjectParams">
+ Nieprawidłowe parametry obiektu
+ </notification>
+ <notification name="CantDuplicateObjectNoAcess">
+ Twoje uprawnienia nie pozwalają Ci na duplikowanie obiektów w tym miejscu.
+ </notification>
+ <notification name="CantChangeShape">
+ Nie masz pozwolenia na zmianę tego kształtu.
+ </notification>
+ <notification name="NoAccessToClaimObjects">
+ Twoje uprawnienia nie pozwalają Ci na żądanie obiektów w tym miejscu.
+ </notification>
+ <notification name="DeedFailedNoPermToDeedForGroup">
+ Przypisywanie obiektu na grupę nie powiodło się, ponieważ nie masz w niej na to uprawnień.
+ </notification>
+ <notification name="NoPrivsToBuyObject">
+ Twoje uprawnienia nie pozwalają Ci na kupowanie obiektów w tym miejscu.
+ </notification>
+ <notification name="CantAttachObjectAvatarSittingOnIt">
+ Nie można założyć obiektu, ponieważ siedzi na nim awatar.
+ </notification>
+ <notification name="WhyAreYouTryingToWearShrubbery">
+ Drzewa i trawa nie mogą zostać założone jako dodatki.
+ </notification>
+ <notification name="CantAttachGroupOwnedObjs">
+ Nie można zakładać obiektów, które należą do grupy.
+ </notification>
+ <notification name="CantAttachObjectsNotOwned">
+ Nie możesz zakładać obiektów, jakie nie należą do Ciebie.
+ </notification>
+ <notification name="CantAttachNavmeshObjects">
+ Nie możesz zakładać obiektów, jakie mają wpływ na Navmesh.
+ </notification>
+ <notification name="CantAttachObjectNoMovePermissions">
+ Nie można założyć obiektu, ponieważ nie masz uprawnień do poruszenia go.
+ </notification>
+ <notification name="CantAttachNotEnoughScriptResources">
+ Niewystarczające dostępne zasoby skryptowe, aby założyć obiekt!
+ </notification>
+ <notification name="CantAttachObjectBeingRemoved">
+ Nie możesz odłączyć dodatku, ponieważ jest on już odłączony.
+ </notification>
+ <notification name="CantDropItemTrialUser">
+ Nie możesz tutaj upuszczać obiektów; spróbuj w strefie Darmowej Próby.
+ </notification>
+ <notification name="CantDropMeshAttachment">
+ Nie możesz upuszczać meszowych dodatków. Odłącz do Szafy, a potem zrezzuj w świecie.
+ </notification>
+ <notification name="CantDropAttachmentNoPermission">
+ Upuszczenie dodatku nie powiodło się: nie masz uprawnień do ich upuszczania w tym miejscu.
+ </notification>
+ <notification name="CantDropAttachmentInsufficientLandResources">
+ Upuszczenie dodatku nie powiodło się: niewystarczające zasoby ziemi.
+ </notification>
+ <notification name="CantDropAttachmentInsufficientResources">
+ Upuszczenie dodatku nie powiodło się: niewystarczające dostępne zasoby.
+ </notification>
+ <notification name="CantDropObjectFullParcel">
+ Nie można tutaj upuścić obiektu. Działka jest pełna.
+ </notification>
+ <notification name="CantTouchObjectBannedFromParcel">
+ Nie można dotknąć/chwycić tego obiektu, ponieważ jesteś zbanowany/a z działki ziemi.
+ </notification>
+ <notification name="PlzNarrowDeleteParams">
+ Sprecyzuj proszÄ™ swoje parametry usuwania.
+ </notification>
+ <notification name="UnableToUploadAsset">
+ Nie można załadować zasobu danych (assetu).
+ </notification>
+ <notification name="CantTeleportCouldNotFindUser">
+ Nie można znaleźć użytkownika, aby teleportować do domu
+ </notification>
+ <notification name="GodlikeRequestFailed">
+ żądanie administracyjne nie powiodło się
+ </notification>
+ <notification name="GenericRequestFailed">
+ żądanie ogólne nie powiodło się
+ </notification>
+ <notification name="CantUploadPostcard">
+ Nie można załadować pocztówki. Spróbuj ponownie później.
+ </notification>
+ <notification name="CantFetchInventoryForGroupNotice">
+ Nie można pobrać szczegółów dołączonego przedmiotu dla ogłoszenia grupy.
+ </notification>
+ <notification name="CantSendGroupNoticeNotPermitted">
+ Nie można wysłać ogłoszenia grupy -- brak zezwoleń.
+ </notification>
+ <notification name="CantSendGroupNoticeCantConstructInventory">
+ Nie można wysłać ogłoszenia grupy -- nie można stworzyć przedmiotu.
+ </notification>
+ <notification name="CantParceInventoryInNotice">
+ Nie można zanalizować przedmiotu z ogłoszenia.
+ </notification>
+ <notification name="TerrainUploadFailed">
+ Åadowanie podÅ‚oża na serwer nie powiodÅ‚o siÄ™.
+ </notification>
+ <notification name="TerrainFileWritten">
+ Plik podłoża zapisany.
+ </notification>
+ <notification name="TerrainFileWrittenStartingDownload">
+ Plik podłoża zapisany, pobieranie rozpoczęte...
+ </notification>
+ <notification name="TerrainBaked">
+ Podłoże zostało zrenderowane.
+ </notification>
+ <notification name="TenObjectsDisabledPlzRefresh">
+ Tylko pierwszych 10 zaznaczonych obiektów zostało wyłączonych. Odśwież i zaznacz więcej, jeśli potrzeba.
+ </notification>
+ <notification name="UpdateViewerBuyParcel">
+ Musisz zaktualizować swoją przeglądarkę, aby móc kupić tą działkę.
+ </notification>
+ <notification name="CantBuyParcelNotForSale">
+ Nie można kupić, ta działka nie jest na sprzedaż.
+ </notification>
+ <notification name="CantBuySalePriceOrLandAreaChanged">
+ Nie można kupić, cena sprzedaży lub obszar działki uległy zmianie.
+ </notification>
+ <notification name="CantBuyParcelNotAuthorized">
+ Nie jesteś upoważnionym kupcem dla tej działki.
+ </notification>
+ <notification name="CantBuyParcelAwaitingPurchaseAuth">
+ Nie możesz kupić tej działki, ponieważ oczekuje już ona na autoryzację zakupu.
+ </notification>
+ <notification name="CantBuildOverflowParcel">
+ Nie możesz tutaj budować obiektów, ponieważ mogłoby to przekroczyć pojemność działki.
+ </notification>
+ <notification name="SelectedMultipleOwnedLand">
+ Zaznaczona przez Ciebie ziemia ma różnych właścicieli. Zaznacz mniejszy obszar i spróbuj ponownie.
+ </notification>
+ <notification name="CantJoinTooFewLeasedParcels">
+ Zbyt mało dzierżawionych działek w zaznaczeniu do przyłączenia.
+ </notification>
+ <notification name="CantDivideLandMultipleParcelsSelected">
+ Nie można podzielić ziemi.
+Zaznaczono więcej niż jedną działkę.
+Spróbuj zaznaczyć mniejszy obszar ziemi.
+ </notification>
+ <notification name="CantDivideLandCantFindParcel">
+ Nie można podzielić ziemi.
+Nie można znaleźć działki.
+Prosimy o zgłoszenie błędu, w menu Pomoc.
+ </notification>
+ <notification name="CantDivideLandWholeParcelSelected">
+ Nie można podzielić ziemi.
+Cała działka jest zaznaczona.
+Spróbuj zaznaczyć mniejszy obszar ziemi.
+ </notification>
+ <notification name="LandHasBeenDivided">
+ Ziemia została podzielona.
+ </notification>
+ <notification name="PassPurchased">
+ Kupiłeś/aś przepustkę.
+ </notification>
+ <notification name="RegionDisallowsClassifieds">
+ Region nie zezwala na ogłoszenia reklamowe.
+ </notification>
+ <notification name="LandPassExpireSoon">
+ Twoja przepustka na tej ziemi za chwilę wygaśnie.
+ </notification>
+ <notification name="CantSitNoSuitableSurface">
+ Nie znaleziono odpowiedniej powierzchni, aby usiąść. Spróbuj w innym miejscu.
+ </notification>
+ <notification name="CantSitNoRoom">
+ Nie ma gdzie tutaj usiąść, spróbuj w innym miejscu.
+ </notification>
+ <notification name="ClaimObjectFailedNoPermission">
+ Zażądanie obiektu nie powiodło się, ponieważ nie masz uprawnień
+ </notification>
+ <notification name="ClaimObjectFailedNoMoney">
+ Zażądanie obiektu nie powiodło się, ponieważ nie masz wystarczającej ilości L$.
+ </notification>
+ <notification name="CantDeedGroupLand">
+ Nie można przypisać ziemi, której właścicielem jest grupa.
+ </notification>
+ <notification name="BuyObjectFailedNoMoney">
+ Kupowanie obiektu nie powiodło się, ponieważ nie masz wystarczającej ilości L$.
+ </notification>
+ <notification name="BuyInventoryFailedNoMoney">
+ Kupowanie przedmiotu nie powiodło się, ponieważ nie masz wystarczającej ilości L$
+ </notification>
+ <notification name="BuyPassFailedNoMoney">
+ Nie masz wystarczającej ilości L$, any kupić przepustkę na tą ziemię.
+ </notification>
+ <notification name="CantBuyPassTryAgain">
+ Nie można w tej chwili kupić przepustki. Spróbuj ponownie później.
+ </notification>
+ <notification name="CantCreateObjectParcelFull">
+ Nie można utworzyć obiektu, \n ponieważ działka jest pełna.
+ </notification>
+ <notification name="FailedPlacingObject">
+ Nie udało się umieścić obiektu w żądanej lokalizacji. Spróbuj ponownie.
+ </notification>
+ <notification name="CantCreateLandmarkForEvent">
+ Nie można utworzyć landmarka dla wydarzenia.
+ </notification>
+ <notification name="GodBeatsFreeze">
+ Twoje Boskie moce przezwyciężyły unieruchomienie!
+ </notification>
+ <notification name="SpecialPowersRequestFailedLogged">
+ Zażądanie specjalnych uprawnień nie powiodło się. To żądanie zostało zapisane w logach serwera.
+ </notification>
+ <notification name="ExpireExplanation">
+ System nie jest teraz w stanie przetworzyć Twojego żądania. Upłynął limit czasu.
+ </notification>
+ <notification name="DieExplanation">
+ System nie jest w stanie przetworzyć Twojego żądania.
+ </notification>
+ <notification name="AddPrimitiveFailure">
+ NiewystarczajÄ…ce fundusze do utworzenia primy.
+ </notification>
+ <notification name="RezObjectFailure">
+ NiewystarczajÄ…ce fundusze do utworzenia obiektu.
+ </notification>
+ <notification name="ResetHomePositionNotLegal">
+ Twoje miejsce startu zostało zresetowane, ponieważ poprzednie było nielegalne/niepoprawne.
+ </notification>
+ <notification name="CantInviteRegionFull">
+ Nie możesz nikogo w tej chwili zaprosić do Twojej lokalizacji, ponieważ region jest pełny. Spróbuj ponownie później.
+ </notification>
+ <notification name="CantSetHomeAtRegion">
+ Ten region nie pozwala Ci na ustawienie miejsca startu w tej lokalizacji.
+ </notification>
+ <notification name="ListValidHomeLocations">
+ Możesz ustawić 'miejsce startu' tylko na swojej własnej ziemi lub obok Infohuba na Mainlandzie.
+ </notification>
+ <notification name="SetHomePosition">
+ Ustawiono miejsce startu.
+ </notification>
+ <notification name="CantDerezInventoryError">
+ Nie można zderezzować obiektu ze względu na błąd przedmiotu.
+ </notification>
+ <notification name="CantCreateRequestedInv">
+ Nie można utworzyć żądanego przedmiotu.
+ </notification>
+ <notification name="CantCreateRequestedInvFolder">
+ Nie można utworzyć żądanego folderu przedmiotów.
+ </notification>
+ <notification name="CantCreateInventory">
+ Nie można utworzyć tego przedmiotu.
+ </notification>
+ <notification name="CantCreateLandmark">
+ Nie można utworzyć landmarka.
+ </notification>
+ <notification name="CantCreateOutfit">
+ Nie można utworzyć stroju w tej chwili. Spróbuj ponownie za minutę.
+ </notification>
+ <notification name="InventoryNotForSale">
+ Przedmiot nie jest na sprzedaż.
+ </notification>
+ <notification name="CantFindInvItem">
+ Nie można znaleźć przedmiotu.
+ </notification>
+ <notification name="CantFindObject">
+ Nie można znaleźć obiektu.
+ </notification>
+ <notification name="CantTransfterMoneyRegionDisabled">
+ Transfery pieniędzy do obiektów są obecnie wyłączone w tym regionie.
+ </notification>
+ <notification name="CantPayNoAgent">
+ Nie udało się ustalić, komu zapłacić.
+ </notification>
+ <notification name="CantDonateToPublicObjects">
+ Nie możesz dawać L$ publicznym obiektom.
+ </notification>
+ <notification name="InventoryCreationInWorldObjectFailed">
+ Utworzenie przedmiotu w obiekcie będącym w świecie nie powiodło się.
+ </notification>
+ <notification name="UserBalanceOrLandUsageError">
+ Błąd wewnętrzny uniemożliwił poprawną aktualizację danych przeglądarki. Stan konta L$ lub posiadane działki wyświetlane w przeglądarce mogą nie odzwierciedlać faktycznego stanu posiadania na serwerach.
+ </notification>
+ <notification name="LargePrimAgentIntersect">
+ Nie można utworzyć wielkich prim, które nachodzą na innych rezydentów. Spróbuj jeszcze raz, gdy przesuną się oni.
+ </notification>
+ <notification name="PreferenceChatClearLog">
+ Ta opcja usunie dzienniki poprzednich rozmów i wszelkie kopie zapasowe tego pliku.
+ <usetemplate ignoretext="Potwierdź, zanim usunę dzienniki poprzednich rozmów." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PreferenceChatDeleteTranscripts">
+ Ta opcja usunie logi wszystkich poprzednich rozmów. Nie będzie to miało wpływu na listę rozmów odbytych w przeszłości. Wszystkie pliki z przyrostkami .txt oraz txt.backup w folderze [FOLDER] zostaną usunięte.
+ <usetemplate ignoretext="Potwierdź, zanim usunę logi rozmów." name="okcancelignore" notext="Anuluj" />
+ </notification>
+ <notification name="PreferenceChatPathChanged">
+ Nie można przenieść plików. Przywrócono poprzednią ścieżkę.
+ <usetemplate ignoretext="Nie można przenieść plików. Przywrócono poprzednią ścieżkę." name="okignore" />
</notification>
<notification name="DefaultObjectPermissions">
Wystąpił problem z zapisywaniem domyślnych zezwoleń obiektu: [REASON]. Spróbuj ustawić je ponownie później.
- <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="ChatHistoryIsBusyAlert">
+ Plik historii czatu jest w tej chwili przetwarzany przez poprzednią operację. Spróbuj ponownie za kilka minut lub wybierz czat innej osoby.
</notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
deleted file mode 100755
index bac885e5d81756a31eac16578c7b3452879ff33a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
-<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
-<accordion_tab name="Mockup Tab" title="Mockup Tab"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
old mode 100755
new mode 100644
index ab1d8d70072b08e1f56364af4337008e66cf630e..47a22c808cea79626aaf793dbc73a4d5d680350f
--- a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_activeim_row">
- <string name="unknown_obj">
- Nieznany obiekt
- </string>
<text name="object_name">
Nienazwany obiekt
</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
deleted file mode 100755
index ba0c85e4ef4811297922b339dd327d344648224d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
- <layout_stack name="vertical_stack">
- <layout_panel name="call_btn_panel">
- <button label="Dzwoń" name="call_btn"/>
- </layout_panel>
- <layout_panel name="end_call_btn_panel">
- <button label="Zakończ rozmowę" name="end_call_btn"/>
- </layout_panel>
- <layout_panel name="voice_ctrls_btn_panel">
- <button label="Przełączniki głosu" name="voice_ctrls_btn"/>
- </layout_panel>
- </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
old mode 100755
new mode 100644
index c43a9bed811a09ba51110abfb79cd349297a2beb..d448f74486261dec114e551a49906f8728416770
--- a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
@@ -1,16 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="avatar_list_item">
- <string name="FormatSeconds">
- [COUNT]s
- </string>
- <string name="FormatMinutes">
- [COUNT]m
- </string>
<string name="FormatHours">
- [COUNT]h
- </string>
- <string name="FormatDays">
- [COUNT]d
+ [COUNT]g
</string>
<string name="FormatWeeks">
[COUNT]tyg
@@ -21,10 +12,11 @@
<string name="FormatYears">
[COUNT]lat
</string>
- <text name="avatar_name" value="(Å‚adowanie)"/>
- <icon name="permission_edit_theirs_icon" tool_tip="Możesz edytować obiekty tego Znajomego"/>
- <icon name="permission_edit_mine_icon" tool_tip="Ten Znajomy może edytować, kasować lub wziąć Twoje obiekty"/>
- <icon name="permission_map_icon" tool_tip="Ten Znajomy może zlokalizować Ciebie na mapie"/>
- <icon name="permission_online_icon" tool_tip="Ten Znajomy widzi Ciebie kiedy jesteÅ› obecny/obecna w SL"/>
- <button name="profile_btn" tool_tip="Zobacz profil"/>
+ <text name="avatar_name" value="(Å‚adowanie)" />
+ <icon name="permission_edit_theirs_icon" tool_tip="Możesz edytować obiekty tego Znajomego" />
+ <icon name="permission_edit_mine_icon" tool_tip="Ten Znajomy może edytować, kasować lub wziąć Twoje obiekty" />
+ <icon tool_tip="Ten Znajomy może zlokalizować Cię na mapie" name="permission_map_icon" />
+ <icon name="permission_online_icon" tool_tip="Ten Znajomy widzi Ciebie kiedy jesteÅ› obecny/a w SL" />
+ <button name="info_btn" tool_tip="Więcej informacji" />
+ <button name="profile_btn" tool_tip="Zobacz profil" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
index 62cb392ba742497284624d7c301387f267f7086c..348076ecdd7e4c6a8e9cb14807ed9103f6e7817c
--- a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="block_list_panel">
- <text name="title_text">
- Lista blokad
- </text>
- <scroll_list name="blocked" tool_tip="Lista zablokowanych osób"/>
- <button label="Zablokuj Rezydenta..." label_selected="Zablokuj Rezydenta..." name="Block resident..." tool_tip="Wybierz Rezydenta aby zablokować"/>
- <button label="Zablokuj obiekt według nazwy..." label_selected="Zablokuj obiekt według nazwy..." name="Block object by name..."/>
- <button label="Odblokuj" label_selected="Odblokuj" name="Unblock" tool_tip="Usuń Rezydenta lub obiekt z listy zablokowanych"/>
+ <panel name="blocked_buttons_panel">
+ <filter_editor label="Filtruj" name="blocked_filter_input" />
+ <menu_button name="blocked_gear_btn" tool_tip="Akcje możliwe do wykonania dla wybranego Rezydenta lub obiektu" />
+ <menu_button name="view_btn" tool_tip="Opcje sortowania" />
+ <menu_button name="plus_btn" tool_tip="Wybierz Rezydenta lub obiekt do zablokowania" />
+ <button name="unblock_btn" tool_tip="Usuń Rezydenta lub obiekt z listy zablokowanych" />
+ </panel>
+ <block_list name="blocked" tool_tip="Lista zablokowanych osób" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
index cebb6e3cfe7590a8a41db8df0bfa0bdc36227a44..0066f01d7ab83c6bec183dc71179b44fcc622b4a
--- a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="wearable_item">
- <text name="item_name" value="..."/>
- <panel name="btn_lock" tool_tip="Nie masz pozwolenia na edycjÄ™"/>
+ <panel name="btn_lock" tool_tip="Nie masz pozwolenia na edycjÄ™" />
<panel name="btn_edit_panel">
- <button name="btn_edit" tool_tip="Edytuj ten kształt"/>
+ <button name="btn_edit" tool_tip="Edytuj ten kształt" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
index 560bfe78f4b093493fd7102ce0d16f484802de16..745f77e8521844e764409bcf519eefd7387e17a0
--- a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="clothing_list_button_bar_panel">
- <button label="Switch" name="switch_btn"/>
- <button label="Zakupy >" name="bodyparts_shop_btn"/>
+ <button label="Zmień" name="switch_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml
deleted file mode 100755
index 8a033fc32fb1809efb43cedf9dff5d94ef27f97e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
- <string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
- <string name="SpeakBtnToolTip" value="Włącza/wyłącza mikrofon"/>
- <string name="VoiceControlBtnToolTip" value="Pokazuje/Ukrywa panel kontroli głosu"/>
- <layout_stack name="toolbar_stack">
- <layout_panel name="speak_panel">
- <talk_button name="talk">
- <speak_button label="Mów" label_selected="Mów" name="speak_btn"/>
- </talk_button>
- </layout_panel>
- <layout_panel name="gesture_panel">
- <gesture_combo_list label="Gesturki" name="Gesture" tool_tip="Pokazuje/Ukrywa gesturki"/>
- </layout_panel>
- <layout_panel name="movement_panel">
- <bottomtray_button label="Ruch" name="movement_btn" tool_tip="Pokaż/Ukryj ustawienia ruchu"/>
- </layout_panel>
- <layout_panel name="cam_panel">
- <bottomtray_button label="Widok" name="camera_btn" tool_tip="Pokaż/Ukryj ustawienia kamery"/>
- </layout_panel>
- <layout_panel name="snapshot_panel">
- <bottomtray_button label="" name="snapshots" tool_tip="Zrób zdjęcie"/>
- </layout_panel>
- <layout_panel name="build_btn_panel">
- <bottomtray_button label="Buduj" name="build_btn" tool_tip="Pokazuje/ukrywa narzędzia budowania"/>
- </layout_panel>
- <layout_panel name="search_btn_panel">
- <bottomtray_button label="Szukaj" name="search_btn" tool_tip="Pokazuje/ukrywa Szukaj"/>
- </layout_panel>
- <layout_panel name="world_map_btn_panel">
- <bottomtray_button label="Mapa" name="world_map_btn" tool_tip="Pokazuje/ukrywa MapÄ™ Åšwiata"/>
- </layout_panel>
- <layout_panel name="mini_map_btn_panel">
- <bottomtray_button label="Mini-Mapa" name="mini_map_btn" tool_tip="Pokazuje/ukrywa Mini-MapÄ™"/>
- </layout_panel>
- <layout_panel name="im_well_panel">
- <chiclet_im_well name="im_well">
- <button name="Unread IM messages" tool_tip="Rozmowy"/>
- </chiclet_im_well>
- </layout_panel>
- <layout_panel name="notification_well_panel">
- <chiclet_notification name="notification_well">
- <button name="Unread" tool_tip="Ogłoszenia"/>
- </chiclet_notification>
- </layout_panel>
- </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
index e32c12a8eecec6cf41b0d8b1fd2ef53648ffb3de..37573f48774f6295e18eeaa480753c19e9569aaf
--- a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="bottom_tray_lite">
<layout_stack name="toolbar_stack_lite">
<layout_panel name="gesture_panel">
- <gesture_combo_list label="Gesturki" name="Gesturki" tool_tip="Pokaż/ukryj gesturki"/>
+ <gesture_combo_list label="Gesty" name="Gesture" tool_tip="Pokaż/ukryj gesty" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/pl/panel_chiclet_bar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..81e749fa63393669d3eb5837c63ca546ca92feda
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_chiclet_bar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="chiclet_bar">
+ <layout_stack name="toolbar_stack">
+ <layout_panel name="notification_well_panel">
+ <chiclet_notification name="notification_well">
+ <button name="Unread" tool_tip="Powiadomienia" />
+ </chiclet_notification>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_classified_info.xml b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
old mode 100755
new mode 100644
index 52f54fc7cf730322c69c7c3fbae5b0c1e15511b2..c191e1bf236334d3a889ac54a4ec84f542af7147
--- a/indra/newview/skins/default/xui/pl/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_classified_info">
+ <panel.string name="type_pg">
+ Zawartość General
+ </panel.string>
<panel.string name="l$_price">
- L$[PRICE]
+ [PRICE]L$
</panel.string>
<panel.string name="click_through_text_fmt">
- [TELEPORT] teleport, [MAP] map, [PROFILE] profile
- </panel.string>
- <panel.string name="date_fmt">
- [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ [TELEPORT] teleport, [MAP] mapa, [PROFILE] profil
</panel.string>
<panel.string name="auto_renew_on">
Aktywne
@@ -15,32 +15,27 @@
<panel.string name="auto_renew_off">
Wyłączone
</panel.string>
- <text name="title" value="Reklama"/>
+ <text name="title" value="Reklama" />
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <text_editor name="classified_name" value="[name]"/>
- <text name="classified_location_label" value="Miejsce:"/>
- <text_editor name="classified_location" value="[loading...]"/>
- <text name="content_type_label" value="Rodzaj Zawartości:"/>
- <text_editor name="content_type" value="[content type]"/>
- <text name="category_label" value="Kategoria:"/>
- <text_editor name="category" value="[category]"/>
- <text name="creation_date_label" value="Data stworzenia:"/>
- <text_editor name="creation_date" tool_tip="Data stworzenia" value="[date]"/>
- <text name="price_for_listing_label" value="Cena za wyświetlenie:"/>
- <text_editor name="price_for_listing" tool_tip="Cena za umieszczenie reklamy." value="[price]"/>
+ <text name="classified_location_label" value="Miejsce:" />
+ <text name="content_type_label" value="Zawartość:" />
+ <text name="category_label" value="Kategoria:" />
+ <text name="creation_date_label" value="Data utworzenia:" />
+ <text_editor name="creation_date" tool_tip="Data utworzenia" />
+ <text name="price_for_listing_label" value="Koszt listowania:" />
+ <text_editor name="price_for_listing" tool_tip="Cena za umieszczenie reklamy." />
<layout_stack name="descr_stack">
<layout_panel name="clickthrough_layout_panel">
- <text name="click_through_label" value="Kliknięcia:"/>
- <text_editor name="click_through_text" tool_tip="Kliknij według daty" value="[clicks]"/>
+ <text name="click_through_label" value="Kliknięcia:" />
+ <text_editor name="click_through_text" tool_tip="Współczynnik klikalności" />
</layout_panel>
<layout_panel name="price_layout_panel">
- <text name="auto_renew_label" value="Automatyczne przedłużenie:"/>
- <text name="auto_renew" value="Aktywne"/>
+ <text name="auto_renew_label" value="Autoprzedłużanie:" />
+ <text name="auto_renew" value="Aktywne" />
</layout_panel>
<layout_panel name="descr_layout_panel">
- <text name="classified_desc_label" value="Opis:"/>
- <text_editor name="classified_desc" value="[description]"/>
+ <text name="classified_desc_label" value="Opis:" />
</layout_panel>
</layout_stack>
</panel>
@@ -48,13 +43,13 @@
<panel name="buttons">
<layout_stack name="layout_stack1">
<layout_panel name="layout_panel1">
- <button label="Teleportuj" name="teleport_btn"/>
+ <button label="Teleportuj" name="teleport_btn" />
</layout_panel>
<layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn"/>
+ <button label="Mapa" name="show_on_map_btn" />
</layout_panel>
<layout_panel name="edit_btn_lp">
- <button label="Edytuj" name="edit_btn"/>
+ <button label="Edytuj" name="edit_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
index 17a6d1eb8b62e7efa7364fcfa3139f16150ae699..48acffb656464e4e16869d505aa113de7619106e
--- a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="clothing_list_button_bar_panel">
- <button label="Dodaj +" name="add_btn"/>
- <button label="Zakupy >" name="clothing_shop_btn"/>
+ <button label="Dodaj +" name="add_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
old mode 100755
new mode 100644
index 42d1ead400671441b8195491f20518eaa4bb56ac..8b83dcfe69428b4290d071bce2831d3bedded0e7
--- a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="wearable_item">
- <button name="btn_delete" tool_tip="Usuń ze stroju"/>
- <text name="item_name" value="..."/>
- <panel name="btn_lock" tool_tip="Nie masz pozwolenia na edycjÄ™"/>
+ <button name="btn_delete" tool_tip="Usuń ze stroju" />
+ <panel name="btn_lock" tool_tip="Nie masz pozwolenia na edycjÄ™" />
<panel name="btn_edit_panel">
- <button name="btn_edit" tool_tip="Edytuj część stroju"/>
+ <button name="btn_edit" tool_tip="Edytuj część stroju" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
old mode 100755
new mode 100644
index 970b994c201d9d4fcefa0f403ec8b8a3a372a68b..b856dc52a72d0b7ad94e98be39c33ce7de15854e
--- a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="cof_wearables">
<accordion name="cof_wearables_accordion">
- <accordion_tab name="tab_attachments" title="Załączniki"/>
- <accordion_tab name="tab_clothing" title="Ubranie"/>
- <accordion_tab name="tab_body_parts" title="Części ciała"/>
+ <accordion_tab name="tab_clothing" title="Ubrania" />
+ <accordion_tab name="tab_attachments" title="Dodatki" />
+ <accordion_tab name="tab_body_parts" title="Części ciała" />
</accordion>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pl/panel_conversation_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..732c2be0865cc86e25bc532a6ec38ea61a93e1e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="conversation_list_item">
+ <layout_stack name="conversation_item_stack">
+ <layout_panel name="conversation_title_panel">
+ <text name="conversation_title" value="(wczytywanie)" />
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pl/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dda9a86d62ffbc99e323d010212ada8a827d19d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="conversation_log_list_item">
+ <icon name="voice_session_icon" tool_tip="Z rozmową głosową" />
+ <icon name="unread_ims_icon" tool_tip="Wiadomości pojawiły się w czasie, gdy byłeś/aś wylogowany/a" />
+ <button name="delete_btn" tool_tip="Usuń ten wpis" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
index f9fba4d79ff287c3b59c2cd607875cbe34c4cf8d..3210cc4c72f86dd60ba9066fd7d057c33e7b088a
--- a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="deletable_wearable_item">
- <button name="btn_delete" tool_tip="Usuń ze stroju"/>
- <text name="item_name" value="..."/>
+ <button name="btn_delete" tool_tip="Usuń ze stroju" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
index 83210808f129045a9936155492b8e5133d1168f7..829c8a9823de2a81f2472b6a36d85cf54c1230b3
--- a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="dummy_clothing_item">
- <text name="item_name" value="..."/>
<panel name="btn_add_panel">
- <button name="btn_add" tool_tip="Dodaj więcej obiektów tego typu"/>
+ <button name="btn_add" tool_tip="Dodaj więcej obiektów tego typu" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
old mode 100755
new mode 100644
index 51ee3af00d830402797ff0f707f7ec7db9e2c917..a2d2f7ab74ed1ce1066326028ba78d8498f93bff
--- a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_alpha_panel">
<scroll_container name="avatar_alpha_color_panel_scroll">
<panel name="avatar_alpha_color_panel">
- <texture_picker label="Alpha dolnej części ciała" name="Lower Alpha" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Alpha górnej części ciała" name="Upper Alpha" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Alpha głowy" name="Head Alpha" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Alpha oka" name="Eye Alpha" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Alpha włosów" name="Hair Alpha" tool_tip="Kliknij aby wybrać teksturę"/>
+ <texture_picker label="Alpha dolnej części" name="Lower Alpha" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Alpha górnej części" name="Upper Alpha" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Alpha głowy" name="Head Alpha" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Alpha oczu" name="Eye Alpha" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Alpha włosów" name="Hair Alpha" tool_tip="Kliknij aby wybrać teksturę" />
</panel>
</scroll_container>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
old mode 100755
new mode 100644
index 7cfd9c221c3b23882d13464fa5aeb07c9c03bfa9..2d442b054d0c3ca694c22ceb156d1c7410c54220
--- a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Edytuj ReklamÄ™" name="panel_edit_classified">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Edytuj reklamÄ™" name="panel_edit_classified">
<panel.string name="location_notice">
(zostanie zaktualizowane po zapisaniu)
</panel.string>
@@ -15,7 +15,7 @@
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
<panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Kliknij by wybrać teksturę"/>
+ <icon name="edit_icon" tool_tip="Kliknij by wybrać teksturę" />
</panel>
<text name="Name:">
Tytuł:
@@ -29,25 +29,22 @@
<text name="classified_location">
Å‚adowanie...
</text>
- <button label="Ustaw na bieżącą lokalizację" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Kategoria:"/>
- <text name="content_type_label" value="Typ zawartości:"/>
+ <button label="Ustaw na bieżącą lokalizację" name="set_to_curr_location_btn" />
+ <text name="category_label" value="Kategoria:" />
+ <text name="content_type_label" value="Typ zawartości:" />
<icons_combo_box label="Treść General" name="content_type">
- <icons_combo_box.item label="Treść Moderate" name="mature_ci" value="Mature"/>
- <icons_combo_box.item label="Treść General" name="pg_ci" value="PG"/>
+ <icons_combo_box.item label="Treść Moderate" name="mature_ci" />
+ <icons_combo_box.item label="Treść General" name="pg_ci" />
</icons_combo_box>
- <check_box label="Ponawiaj automatycznie co tydzień." name="auto_renew"/>
- <text name="price_for_listing_label" value="Cena za wyświetlenie:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Cena za umieszczenie reklamy." value="50"/>
+ <check_box label="Ponawiaj automatycznie co tydzień" name="auto_renew" />
+ <text name="price_for_listing_label" value="Koszt listowania:" />
+ <spinner name="price_for_listing" tool_tip="Koszt listowania reklamy." />
</panel>
</scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
+ <panel name="bottom_panel">
<layout_stack name="bottom_panel_ls">
- <layout_panel name="save_changes_btn_lp">
- <button label="[LABEL]" name="save_changes_btn"/>
- </layout_panel>
<layout_panel name="show_on_map_btn_lp">
- <button label="Cofnij" name="cancel_btn"/>
+ <button label="Anuluj" name="cancel_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
old mode 100755
new mode 100644
index 390a5313b5bba4d8a4b8e0b80ab5143ad6ad3ab3..41dcb06353ca0c9c41f7b18dbeced49b48edb094
--- a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_eyes_panel">
<panel name="avatar_eye_color_panel">
- <texture_picker label="Iris" name="Iris" tool_tip="Kliknij aby wybrać teksturę"/>
+ <texture_picker label="Tęczówka" name="Iris" tool_tip="Kliknij aby wybrać teksturę" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="eyes_main_tab" title="Oczy"/>
+ <accordion_tab name="eyes_main_tab" title="Oczy" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
old mode 100755
new mode 100644
index d32646d1a3db242c84d980388061d617f63a03d2..ad20d9d4d938477bce8220930649c41c76a3d31b
--- a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_gloves_panel">
<panel name="avatar_gloves_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać teksturę"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij by wybrać grafikę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="gloves_main_tab" title="Rękawiczki"/>
+ <accordion_tab name="gloves_main_tab" title="Rękawiczki" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
old mode 100755
new mode 100644
index cbcba97eb6563ac53e646d209989c1798821ac03..61fcd63c9797016762da0694fc4e2f2a2f1498e5
--- a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_hair_panel">
- <panel name="avatar_hair_color_panel">
- <texture_picker label="Tekstura" name="Texture" tool_tip="Kliknij aby wybrać teksturę"/>
+ <panel name="avatar_hair_color_panel">
+ <texture_picker label="Tekstura" name="Texture" tool_tip="Kliknij aby wybrać teksturę" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="hair_color_tab" title="Kolor"/>
- <accordion_tab name="hair_style_tab" title="Styl"/>
- <accordion_tab name="hair_eyebrows_tab" title="Brwi"/>
- <accordion_tab name="hair_facial_tab" title="Twarzy"/>
+ <accordion_tab name="hair_color_tab" title="Kolor" />
+ <accordion_tab name="hair_style_tab" title="Styl" />
+ <accordion_tab name="hair_eyebrows_tab" title="Brwi" />
+ <accordion_tab name="hair_facial_tab" title="Twarz" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
old mode 100755
new mode 100644
index 7653e84cc09ed74993e1e15969ba80f090305318..e8ce8066f5f487e01669cfb0295385d12f5c4ba6
--- a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_jacket_panel">
<panel name="avatar_jacket_color_panel">
- <texture_picker label="Górna tekstura" name="Upper Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Dolna tekstura" name="Lower Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Górna teks." name="Upper Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Dolna teks." name="Lower Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="jacket_main_tab" title="Kurtka"/>
+ <accordion_tab name="jacket_main_tab" title="Kurtka" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
old mode 100755
new mode 100644
index 7975e5574672a5691ef65bbe1f8e659b29922b9a..ee8cc37e3447784b5d061360e3d0a5f9939efa55
--- a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_pants_panel">
<panel name="avatar_pants_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="pants_main_tab" title="Spodnie"/>
+ <accordion_tab name="pants_main_tab" title="Spodnie" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
old mode 100755
new mode 100644
index a773a52a59c60a249d9b4cb683c9434192fe563f..961ee899f385013aa92fad6ba16b1ef2264fae27
--- a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_physics_panel">
- <panel label="" name="accordion_panel">
+ <panel name="accordion_panel">
<accordion name="physics_accordion">
- <accordion_tab name="physics_breasts_updown_tab" title="Podskakiwanie piersi"/>
- <accordion_tab name="physics_breasts_inout_tab" title="Rowek między piersiami"/>
- <accordion_tab name="physics_breasts_leftright_tab" title="Kołysanie piersi"/>
- <accordion_tab name="physics_belly_tab" title="Poskakiwanie brzucha"/>
- <accordion_tab name="physics_butt_tab" title="Podksakiwanie pośladków"/>
- <accordion_tab name="physics_butt_leftright_tab" title="Kołysanie pośladków"/>
- <accordion_tab name="physics_advanced_tab" title="Zaawansowane parametry"/>
+ <accordion_tab name="physics_breasts_updown_tab" title="Podskakiwanie piersi" />
+ <accordion_tab name="physics_breasts_inout_tab" title="Rowek między piersiami" />
+ <accordion_tab name="physics_breasts_leftright_tab" title="Kołysanie piersi" />
+ <accordion_tab name="physics_belly_tab" title="Podskakiwanie brzucha" />
+ <accordion_tab name="physics_butt_tab" title="Podskakiwanie pośladków" />
+ <accordion_tab name="physics_butt_leftright_tab" title="Kołysanie pośladków" />
+ <accordion_tab name="physics_advanced_tab" title="Zaawansowane parametry" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
old mode 100755
new mode 100644
index 72c162f63dc28c223cf0f7269bcaff402714c03a..15838e53b1eb70073053b8a710e1c76b4a95fe7a
--- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Edytuj Ulubione" name="panel_edit_pick">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Edytuj Miejsce" name="panel_edit_pick">
<panel.string name="location_notice">
(aktualizacja nastÄ…pi po zapisaniu)
</panel.string>
<text name="title">
- Edytuj Ulubione
+ Edytuj Miejsce
</text>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Kliknij aby wybrać teksturę"/>
+ <icon name="edit_icon" tool_tip="Kliknij aby wybrać teksturę" />
<text name="Name:">
Tytuł:
</text>
@@ -21,16 +21,16 @@
<text name="pick_location">
Å‚adowanie...
</text>
- <button label="Ustaw na bieżąca lokalizację" name="set_to_curr_location_btn"/>
+ <button label="Ustaw na bieżącą lokalizację" name="set_to_curr_location_btn" />
</panel>
</scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
+ <panel name="bottom_panel">
<layout_stack name="layout_stack1">
<layout_panel name="layout_panel1">
- <button label="Zapisz obrazek" name="save_changes_btn"/>
+ <button label="Zapisz Miejsce" name="save_changes_btn" />
</layout_panel>
<layout_panel name="layout_panel2">
- <button label="Cofnij" name="cancel_btn"/>
+ <button label="Anuluj" name="cancel_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
old mode 100755
new mode 100644
index e6fd8b18f8d05adacdf5a679783c6d7adc22b5c2..4e48c6a27cb39eddd0a1873b1e262247c17e8ea3
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
@@ -1,60 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Edycja profilu" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Rezydent"/>
- <string name="AcctTypeTrial" value="Próbne"/>
- <string name="AcctTypeCharterMember" value="Członek-zalożyciel"/>
- <string name="AcctTypeEmployee" value="Pracownik Linden Lab"/>
- <string name="PaymentInfoUsed" value="Dane konta używane"/>
- <string name="PaymentInfoOnFile" value="Dane konta dostępne"/>
- <string name="NoPaymentInfoOnFile" value="Brak danych konta"/>
- <string name="AgeVerified" value="Wiek zweryfikowany"/>
- <string name="NotAgeVerified" value="Brak weryfikacji wieku"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=pl
- </string>
- <string name="no_partner_text" value="Żadne"/>
+ <string name="AcctTypeResident" value="Rezydent" />
+ <string name="AcctTypeTrial" value="Próbne" />
+ <string name="AcctTypeCharterMember" value="Założyciel" />
+ <string name="AcctTypeEmployee" value="Pracownik Linden Lab" />
+ <string name="PaymentInfoUsed" value="Płatności: Dane użyte" />
+ <string name="PaymentInfoOnFile" value="Płatności: Dane znane" />
+ <string name="NoPaymentInfoOnFile" value="Płatności: Dane nieznane" />
+ <string name="AgeVerified" value="Wiek zweryfikowany" />
+ <string name="NotAgeVerified" value="Wiek niezweryfikowany" />
+ <string name="no_partner_text" value="Brak" />
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
<panel name="data_panel">
- <text name="display_name_label" value="Wyświetlana nazwa:"/>
- <text name="solo_username_label" value="Nazwa użytkownika:"/>
- <button name="set_name" tool_tip="Ustaw wyświetlanią nazwę."/>
- <text name="user_label" value="Nazwa użytkownika:"/>
+ <text name="display_name_label" value="Wyświetlane imię:" />
+ <text name="solo_username_label" value="Nazwa użytkownika:" />
+ <button name="set_name" tool_tip="Ustaw wyświetlane imię" />
+ <text name="user_label" value="Użytkownik:" />
<panel name="lifes_images_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Kliknij aby wybrać teksturę"/>
+ <icon name="2nd_life_edit_icon" tool_tip="Kliknij, aby wybrać obrazek" />
</panel>
<panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Życie#1:"/>
+ <text name="real_world_photo_title_text" value="Åšwiat realny:" />
</panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Kliknij aby wybrać teksturę"/>
+ <icon name="real_world_edit_icon" tool_tip="Kliknij, aby wybrać obrazek" />
<text name="title_homepage_text">
- WWW:
+ Strona www:
</text>
- <check_box label="Pokaż w wyszukiwarce" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Moje konto:"/>
- <text_editor name="acc_status_text" value="Rezydent. Brak danych konta."/>
- <text name="my_account_link" value="[[URL] idź do dashboard]"/>
- <text name="title_partner_text" value="Partner:"/>
+ <text name="title_acc_status_text" value="Moje konto:" />
+ <text_editor name="acc_status_text" value="Rezydent. Płatności: Dane nieznane." />
+ <text name="my_account_link" value="[[URL] Idź do Tablicy]" />
+ <text name="title_partner_text" value="Mój partner:" />
<panel name="partner_data_panel">
- <text initial_value="(wyszukiwanie)" name="partner_text"/>
+ <text initial_value="(pobieranie)" name="partner_text" />
</panel>
- <text name="partner_edit_link" value="[[URL] Edytuj]"/>
+ <text name="partner_edit_link" value="[[URL] Edytuj]" />
</panel>
</panel>
</scroll_container>
<panel name="profile_me_buttons_panel">
<layout_stack name="bottom_panel_ls">
<layout_panel name="save_changes_btn_lp">
- <button label="Zapisz zmiany" name="save_btn"/>
+ <button label="Zapisz zmiany" name="save_btn" />
</layout_panel>
<layout_panel name="show_on_map_btn_lp">
- <button label="Cofnij" name="cancel_btn"/>
+ <button label="Anuluj" name="cancel_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
old mode 100755
new mode 100644
index 54f9fdc21c14f134929d01d73a1a62f6157c3762..fda9d9dc0687c27204ae58fbe21fc056c38a51f0
--- a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_shape_panel">
<string name="meters">
Metry
</string>
<string name="feet">
- Feet
+ Stopy
</string>
<string name="height">
Wysokość:
</string>
- <text name="avatar_height"/>
<panel label="Koszula" name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="shape_body_tab" title="Ciało"/>
- <accordion_tab name="shape_head_tab" title="GÅ‚owa"/>
- <accordion_tab name="shape_eyes_tab" title="Oczy"/>
- <accordion_tab name="shape_ears_tab" title="Uszy"/>
- <accordion_tab name="shape_nose_tab" title="Nos"/>
- <accordion_tab name="shape_mouth_tab" title="Usta"/>
- <accordion_tab name="shape_chin_tab" title="Podbródek"/>
- <accordion_tab name="shape_torso_tab" title="Tors"/>
- <accordion_tab name="shape_legs_tab" title="Nogi"/>
+ <accordion_tab name="shape_body_tab" title="Ciało" />
+ <accordion_tab name="shape_head_tab" title="GÅ‚owa" />
+ <accordion_tab name="shape_eyes_tab" title="Oczy" />
+ <accordion_tab name="shape_ears_tab" title="Uszy" />
+ <accordion_tab name="shape_nose_tab" title="Nos" />
+ <accordion_tab name="shape_mouth_tab" title="Usta" />
+ <accordion_tab name="shape_chin_tab" title="Podbródek" />
+ <accordion_tab name="shape_torso_tab" title="Tułów" />
+ <accordion_tab name="shape_legs_tab" title="Nogi" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
old mode 100755
new mode 100644
index 9530c781ab839091ada6722205eb00ef749397e8..1ee3cf28cab548b67a0b38fb4b09c3543843d3c3
--- a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_shirt_panel">
<panel name="avatar_shirt_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij by wybrać grafikę"/>
- <color_swatch label="Kolor/Odcień" name="Color/Tint" tool_tip="Kliknij by wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij by wybrać grafikę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="shirt_main_tab" title="Spódnica"/>
+ <accordion_tab name="shirt_main_tab" title="Koszula" />
</accordion>
- </panel>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
old mode 100755
new mode 100644
index d90a6d8726658e02066f47f96f8abb475709d330..5cecddc5b441260774216eb38e1ea75b4f662680
--- a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_shoes_panel">
<panel name="avatar_shoes_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij, aby wybrać obrazek" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij, aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="shoes_main_tab" title="Buty"/>
+ <accordion_tab name="shoes_main_tab" title="Buty" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
old mode 100755
new mode 100644
index 9e0acd3cec8a7674cd9cf49ba8f267d48a1c4e13..9e78c90bc50f821e6e41c44e7c0262fa9f8f32e8
--- a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_skin_panel">
<panel name="avatar_skin_color_panel">
- <texture_picker label="Tatuaż na głowie" name="Head Tattoos" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Górny tatuaż" name="Upper Tattoos" tool_tip="Kliknij aby wybrać teksturę"/>
- <texture_picker label="Dolny tatuaż" name="Lower Tattoos" tool_tip="Kliknij aby wybrać teksturę"/>
+ <texture_picker label="Głowa" name="Head" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Górne ciało" name="Upper Body" tool_tip="Kliknij aby wybrać teksturę" />
+ <texture_picker label="Dolne ciało" name="Lower Body" tool_tip="Kliknij aby wybrać teksturę" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="skin_color_tab" title="Kolor skórki"/>
- <accordion_tab name="skin_face_tab" title="Szczegóły twarzy"/>
- <accordion_tab name="skin_makeup_tab" title="Makijaż"/>
- <accordion_tab name="skin_body_tab" title="Szczegóły ciała"/>
+ <accordion_tab name="skin_color_tab" title="Kolor skóry" />
+ <accordion_tab name="skin_face_tab" title="Detale twarzy" />
+ <accordion_tab name="skin_makeup_tab" title="Makijaż" />
+ <accordion_tab name="skin_body_tab" title="Detale ciała" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
old mode 100755
new mode 100644
index f74ad916cd47b3fbdcd67c992d0ebcb4593bd344..f40334ff46fb1a6ea7935c34d8e58fa88b4c4b22
--- a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_skirt_panel">
<panel name="avatar_skirt_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="skirt_main_tab" title="Spódnica"/>
+ <accordion_tab name="skirt_main_tab" title="Spódnica" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
old mode 100755
new mode 100644
index b41069e8d75f53ca803ba3b6065f743ba3b5b74d..9a965150add9e780c235c8879e50bc230aa896e6
--- a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_socks_panel">
<panel name="avatar_socks_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="socks_main_tab" title="Skarpetki"/>
+ <accordion_tab name="socks_main_tab" title="Skarpetki" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
old mode 100755
new mode 100644
index 6fd1e2277a8943987783bd89d66ce82c681c6f8c..d4bf347325d5e3b46c679743868bb0819b521b18
--- a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_tattoo_panel">
<panel name="avatar_tattoo_color_panel">
- <texture_picker label="Tatuaż głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
- <texture_picker label="Tatuaż górnej części ciała" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
- <texture_picker label="Tatuaż dolnej części ciała" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
- <color_swatch label="Color/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tatuaż głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: górny tułów" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: dolny tułów" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
old mode 100755
new mode 100644
index f2a9b10f17371cdace338a68ce33269bd3e8a7c9..c983ee26e8cb524cbe80e69338c46610e7e7e185
--- a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_underpants_panel">
<panel name="avatar_underpants_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać kolor"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="underpants_main_tab" title="Bielizna"/>
+ <accordion_tab name="underpants_main_tab" title="Bielizna" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
old mode 100755
new mode 100644
index 7da1341e96be4dad20e028ef97cda0b8ae00fb7b..aeec930e967fee0ef0602fc7d57b486df9f75334
--- a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="edit_undershirt_panel">
<panel name="avatar_undershirt_color_panel">
- <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
- <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
+ <texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
</panel>
<panel name="accordion_panel">
<accordion name="wearable_accordion">
- <accordion_tab name="undershirt_main_tab" title="Podkoszulek"/>
+ <accordion_tab name="undershirt_main_tab" title="Podkoszulek" />
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
old mode 100755
new mode 100644
index 2027b8715b6d03cbd64a713c7d6a013e2fa8bee7..2501e0ae4e1e86105fa0478a67831bdeb79e15a3
--- a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Ubranie/części ciała" name="panel_edit_wearable">
<string name="edit_shape_title">
Edycja kształtu
</string>
<string name="edit_skin_title">
- Edycja skórki
+ Edycja skóry
</string>
<string name="edit_hair_title">
Edycja włosów
@@ -13,7 +13,7 @@
Edycja oczu
</string>
<string name="edit_shirt_title">
- Edycja spódnicy
+ Edycja koszuli
</string>
<string name="edit_pants_title">
Edycja spodni
@@ -34,13 +34,13 @@
Edycja rękawiczek
</string>
<string name="edit_undershirt_title">
- Edycja podkoszulki
+ Edycja podkoszulka
</string>
<string name="edit_underpants_title">
Edycja bielizny
</string>
<string name="edit_alpha_title">
- Edycja maski alpha
+ Edycja przezroczystości
</string>
<string name="edit_tattoo_title">
Edycja tatuażu
@@ -52,7 +52,7 @@
Kształt:
</string>
<string name="skin_desc_text">
- Skórka:
+ Skóra:
</string>
<string name="hair_desc_text">
WÅ‚osy:
@@ -88,7 +88,7 @@
Bielizna:
</string>
<string name="alpha_desc_text">
- Maska alpha:
+ Przezroczystość:
</string>
<string name="tattoo_desc_text">
Tatuaż:
@@ -96,24 +96,24 @@
<string name="physics_desc_text">
Fizyka:
</string>
- <labeled_back_button label="Zapisz" name="back_btn" tool_tip="Powrót do edycji stroju"/>
- <text name="edit_wearable_title" value="Edycja kształtu"/>
+ <labeled_back_button label="Zapisz" name="back_btn" tool_tip="Powrót do edycji stroju" />
+ <text name="edit_wearable_title" value="Edycja kształtu" />
<panel label="Koszula" name="wearable_type_panel">
- <text name="description_text" value="Kształt:"/>
+ <text name="description_text" value="Kształt:" />
<radio_group name="sex_radio">
- <radio_item label="" name="sex_male" tool_tip="Mężczyzna" value="1"/>
- <radio_item label="" name="sex_female" tool_tip="Kobieta" value="0"/>
+ <radio_item name="sex_male" tool_tip="Mężczyzna" />
+ <radio_item name="sex_female" tool_tip="Kobieta" />
</radio_group>
- <icon name="male_icon" tool_tip="Mężczyzna"/>
- <icon name="female_icon" tool_tip="Kobieta"/>
+ <icon name="male_icon" tool_tip="Mężczyzna" />
+ <icon name="female_icon" tool_tip="Kobieta" />
</panel>
<panel name="button_panel">
- <layout_stack name="button_panel_ls">
+ <layout_stack name="button_panel_ls">
<layout_panel name="save_as_btn_lp">
- <button label="Zapisz jako" name="save_as_button"/>
+ <button label="Zapisz jako" name="save_as_button" />
</layout_panel>
<layout_panel name="revert_btn_lp">
- <button label="Cofnij zmiany" name="revert_button"/>
+ <button label="Cofnij zmiany" name="revert_button" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_friends.xml b/indra/newview/skins/default/xui/pl/panel_facebook_friends.xml
new file mode 100644
index 0000000000000000000000000000000000000000..97e2db704fc83b06179bae7d905b76cdc5011e93
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_friends.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_facebook_friends">
+ <string name="facebook_friends_empty" value="Żaden z Twoich znajomych na Facebooku nie jest w tej chwili rezydentem w Second Life. Poproś swoich facebookowych przyjaciół, aby dołączyli do Second Life!" />
+ <string name="facebook_friends_no_connected" value="Brak połączenia z Facebookiem. Przejdź na kartę Status, aby włączyć tą funkcjonalność." />
+ <accordion name="friends_accordion">
+ <accordion_tab name="tab_second_life_friends" title="Znajomi z Second Life" />
+ <accordion_tab name="tab_suggested_friends" title="Dodaj te osoby do znajomych w Second Life" />
+ </accordion>
+ <text name="facebook_friends_status">
+ Brak połączenia z Facebookiem.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml b/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5ecd6482095d9ece02899c84da40ab47198e8a9c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_facebook_photo">
+ <combo_box name="resolution_combobox" tool_tip="Rozdzielczość obrazka">
+ <combo_box.item label="Obecne okno" name="CurrentWindow" />
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtry obrazka">
+ <combo_box.item label="Bez filtru" name="NoFilter" />
+ </combo_box>
+ <text name="working_lbl">
+ Odświeżanie...
+ </text>
+ <button label="Odśwież" name="new_snapshot_btn" tool_tip="Kliknij, aby odświeżyć" />
+ <button label="Podgląd" name="big_preview_btn" tool_tip="Kliknij, aby przełączyć podgląd" />
+ <text name="caption_label">
+ Komentarz (opcjonalnie):
+ </text>
+ <button label="Wyślij" name="post_photo_btn" />
+ <button label="Anuluj" name="cancel_photo_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_place.xml b/indra/newview/skins/default/xui/pl/panel_facebook_place.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0514f4c326ebafe0d2fc1395b40996e5012f7c5f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_place.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_facebook_place">
+ <text name="place_caption_label">
+ Opowiedz coś o miejscu, w którym jesteś:
+ </text>
+ <check_box label="Dołącz widok z lotu ptaka" name="add_place_view_cb" />
+ <button label="Wyślij" name="post_place_btn" />
+ <button label="Anuluj" name="cancel_place_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_facebook_status.xml b/indra/newview/skins/default/xui/pl/panel_facebook_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c0052e1f121e253058778024cfaa0e1641fb2ab
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_facebook_status.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_facebook_status">
+ <string name="facebook_connected" value="Połączenie z Facebookiem jako:" />
+ <string name="facebook_disconnected" value="Brak połączenia z Facebookiem" />
+ <text name="account_caption_label">
+ Brak połączenia z Facebookiem.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Połącz..." name="connect_btn" />
+ <button label="Rozłącz" name="disconnect_btn" />
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Więcej o wysyłaniu na Facebooka]
+ </text>
+ </panel>
+ <text name="status_caption_label">
+ O czym teraz myślisz?
+ </text>
+ <button label="Wyślij" name="post_status_btn" />
+ <button label="Anuluj" name="cancel_status_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_flickr_account.xml b/indra/newview/skins/default/xui/pl/panel_flickr_account.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43ce268d770c1d1c5c3dde64f9fe6ebc42db9101
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_flickr_account.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_flickr_account">
+ <string name="flickr_connected" value="Połączenie z Flickr jako:" />
+ <string name="flickr_disconnected" value="Brak połączenia z Flickr" />
+ <text name="account_caption_label">
+ Brak połączenia z Flickr.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Połącz..." name="connect_btn" />
+ <button label="Rozłącz" name="disconnect_btn" />
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Więcej o wysyłaniu na Flickr]
+ </text>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_flickr_photo.xml b/indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a76d16f743adfb956786c15fa3f6f2336efb59d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_flickr_photo">
+ <combo_box name="resolution_combobox" tool_tip="Rozdzielczość obrazka">
+ <combo_box.item label="Obecne okno" name="CurrentWindow" />
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtry obrazka">
+ <combo_box.item label="Bez filtru" name="NoFilter" />
+ </combo_box>
+ <text name="working_lbl">
+ Odświeżanie...
+ </text>
+ <button label="Odśwież" name="new_snapshot_btn" tool_tip="Kliknij, aby odświeżyć" />
+ <button label="Podgląd" name="big_preview_btn" tool_tip="Kliknij, aby przełączyć podgląd" />
+ <text name="title_label">
+ Tytuł:
+ </text>
+ <text name="description_label">
+ Opis:
+ </text>
+ <check_box label="Dołącz lokalizację z SL na końcu opisu" name="add_location_cb" />
+ <text name="tags_label">
+ Tagi:
+ </text>
+ <text name="tags_help_label">
+ Rozdziel tagi spacjami
+Użyj "" dla tagów wielosłownych
+ </text>
+ <combo_box name="rating_combobox" tool_tip="Klasyfikacja treści Flickr">
+ <combo_box.item label="Flickr: Treść bezpieczna" name="SafeRating" />
+ <combo_box.item label="Flickr: Treść umiarkowana" name="ModerateRating" />
+ <combo_box.item label="Flickr: Treść ograniczona" name="RestrictedRating" />
+ </combo_box>
+ <button label="Wyślij" name="post_photo_btn" />
+ <button label="Anuluj" name="cancel_photo_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4688631f50515aff8cf7a2eef89f6c3efde10abc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Banowanie Rezydentów" name="bulk_ban_panel">
+ <panel.string name="loading">
+ (wczytywanie...)
+ </panel.string>
+ <panel.string name="ban_selection_too_large">
+ Bany grupowe nie zostały wysłane: zaznaczono zbyt wielu Rezydentów. Limit to 100 na jedno żądanie.
+ </panel.string>
+ <panel.string name="ban_not_permitted">
+ Bany grupowe nie zostały wysłane: nie masz przywileju zarządzania listą banów.
+ </panel.string>
+ <panel.string name="ban_limit_fail">
+ Bany grupowe nie zostały wysłane: Twoja grupa osiągnęła ich limit.
+ </panel.string>
+ <panel.string name="partial_ban">
+ Niektóre bany grupowe nie zostały wysłane:
+[REASONS]
+ </panel.string>
+ <panel.string name="ban_failed">
+ Bany grupowe nie zostały wysłane:
+[REASONS]
+ </panel.string>
+ <panel.string name="residents_already_banned">
+ - Następujące osoby są już zbanowane: [RESIDENTS].
+ </panel.string>
+ <panel.string name="ban_limit_reached">
+ - Osiągnięto limit banów, następujące osoby nie zostały zbanowane: [RESIDENTS].
+ </panel.string>
+ <panel.string name="cant_ban_yourself">
+ - Nie możesz zbanować samego/samej siebie.
+ </panel.string>
+ <text name="help_text">
+ Możesz wybrać wielu Rezydentów do zbanowania z grupy. Kliknij na 'Wybierz osoby', aby rozpocząć.
+ </text>
+ <button label="Wybierz osoby" name="add_button" />
+ <name_list name="banned_agent_list" tool_tip="Przytrzymaj klawisz Ctrl i klikaj na imionach Rezydentów, aby wybrać wiele pozycji" />
+ <button label="Usuń wybrane z listy" name="remove_button" tool_tip="Usuń wybranych powyżej Rezydentów z listy zbanowanych" />
+ <button label="Banuj Rezydentów" name="ban_button" />
+ <button label="Anuluj" name="cancel_button" />
+ <string name="GroupBulkBan">
+ Bany grupowe
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
deleted file mode 100755
index 4e373cdf8f7fe79904e33bce3937d4db2205413c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
- <layout_stack name="vertical_stack">
- <layout_panel name="group_info_btn_panel">
- <button label="Grupa" name="group_info_btn"/>
- </layout_panel>
- <layout_panel name="call_btn_panel">
- <button label="Dzwoń" name="call_btn"/>
- </layout_panel>
- <layout_panel name="end_call_btn_panel">
- <button label="Zakończ rozmowę" name="end_call_btn"/>
- </layout_panel>
- <layout_panel name="voice_ctrls_btn_panel">
- <button label="Przełączniki głosu" name="voice_ctrls_btn"/>
- </layout_panel>
- </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml
old mode 100755
new mode 100644
index a4d76badf0dadf7259619ed2a2d277a43e65f393..08627f16c607defe33b17642913c1e48bcf9d410
--- a/indra/newview/skins/default/xui/pl/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml
@@ -1,58 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Ogólne" name="general_tab">
<panel.string name="help_text">
- Zakładka Główne zawiera ogólne informacje na temat tej grupy, ustawień dla całej grupy oraz danego członka.
+ Zakładka Główne zawiera ogólne informacje na temat tej grupy, listę osób wraz z danymi oraz panel ustawień.
-By otrzymać pomoc i dodatkowe wskazówki przesuń kursor na przyciski.
+By otrzymać dodatkowe wskazówki przytrzymuj kursor ponad opcjami.
</panel.string>
<panel.string name="group_info_unchanged">
Ogólne informacje na temat grupy uległy zmianie.
</panel.string>
<panel.string name="incomplete_member_data_str">
- Wyszukiwanie informacji o członku
+ Wyszukiwanie informacji o osobie
</panel.string>
<panel name="group_info_top">
- <texture_picker label="" name="insignia" tool_tip="Kliknij by wybrać obraz"/>
+ <texture_picker name="insignia" tool_tip="Kliknij by wybrać obraz" />
<text name="prepend_founded_by">
Założyciel:
</text>
- <name_box initial_value="(przetwarzanie)" name="founder_name"/>
<text name="join_cost_text">
Wstęp wolny
</text>
- <button label="DOÅÄ„CZ TERAZ!" name="btn_join"/>
+ <button label="DOÅÄ„CZ!" name="btn_join" />
</panel>
<text_editor name="charter">
Status grupy
- </text_editor>
- <name_list name="visible_members">
- <name_list.columns label="Członek" name="name"/>
- <name_list.columns label="Tytuł" name="title"/>
- <name_list.columns label="Status" name="status"/>
- </name_list>
+ </text_editor>
<text name="my_group_settngs_label">
- ja
+ Moje ustawienia
</text>
<text name="active_title_label">
- Mój aktywny tytuł:
+ Aktywny tytuł:
</text>
- <combo_box name="active_title" tool_tip="Ustaw tytuł który wyświetla się kiedy grupa jest aktywna."/>
- <check_box label="Otrzymuj grupowe ogłoszenia" name="receive_notices" tool_tip="Zaznacz jeżeli chcesz otrzymywać ogłoszenia z tej grupy. Anuluj z zaznaczenia, jeżeli nie chcesz otrzymywać żadnych ogłoszeń z tej grupy."/>
- <check_box label="Wyświetl grupę w profilu" name="list_groups_in_profile" tool_tip="Zaznacz jeżeli chcesz by grupa wyświetlała się w Twoim profilu"/>
+ <combo_box name="active_title" tool_tip="Ustaw tytuł, który wyświetla się kiedy grupa jest aktywna." />
+ <check_box label="Otrzymuj ogłoszenia grupowe" name="receive_notices" tool_tip="Zaznacz, jeżeli chcesz otrzymywać ogłoszenia z tej grupy. Odznacz, jeśli grupa Cię spamuje." />
+ <check_box label="Wyświetl grupę w profilu" name="list_groups_in_profile" tool_tip="Zaznacz, jeżeli chcesz by grupa wyświetlała się w Twoim profilu." />
<panel name="preferences_container">
<text name="group_settngs_label">
- Grupa
+ Ustawienia grupy
</text>
- <check_box label="Wolny wstęp" name="open_enrollement" tool_tip="Sprawdź czy grupa oferuje wolny wstęp i nie wymaga zaproszenia."/>
- <check_box label="Opłata wstępu" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/>
- <spinner label="L$" name="spin_enrollment_fee" tool_tip="Nowi członkowie grupy muszą zapłacić wymaganą opłatę by dołączyć do grupy."/>
- <combo_box name="group_mature_check" tool_tip="Wybierz jeżeli uważasz, iż Twoja grupa klasyfikowana jest jako 'Mature'.">
+ <check_box label="Wolny wstęp" name="open_enrollement" tool_tip="Grupa oferuje wolny wstęp dla każdego i nie wymaga zaproszenia." />
+ <check_box label="Opłata wstępu" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy." />
+ <spinner name="spin_enrollment_fee" tool_tip="Nowe osoby muszą zapłacić tą sumę by dołączyć do grupy, jeśli 'Opłata wstępu' jest zaznaczona." />
+ <combo_box name="group_mature_check" tool_tip="Wybierz jeżeli uważasz, że Twoja grupa klasyfikowana jest jako Moderate.">
<combo_item name="select_mature">
- Wybierz klasyfikacjÄ™ wieku -
</combo_item>
- <combo_box.item label="Treść 'Moderate'" name="mature"/>
- <combo_box.item label="Treść 'General'" name="pg"/>
+ <combo_box.item label="Treść Moderate" name="mature" />
+ <combo_box.item label="Treść General" name="pg" />
</combo_box>
- <check_box initial_value="true" label="Wyświetlaj w wyszukiwarce" name="show_in_group_list" tool_tip="Udostępnij info o grupie w wyszukiwarce"/>
+ <check_box label="Pokaż w wyszukiwarce" name="show_in_group_list" tool_tip="Udostępnij info o grupie w wyszukiwarce" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
index 37fb529f2bac303de3b212d95576bb3b0f27f45e..10db59ac9c649353d30e386d4441e0af68ace95c
--- a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="O Grupie" name="GroupInfo">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Profil Grupy" name="GroupInfo">
<panel.string name="default_needs_apply_text">
- Nie zapisałeś zmian
+ Nie zapisałeś/aś zmian
</panel.string>
<panel.string name="want_apply_text">
Czy chcesz zachować te zmiany?
</panel.string>
<panel.string name="group_join_btn">
- Dołącz (L$[AMOUNT])
+ Dołącz ([AMOUNT]L$)
</panel.string>
<panel.string name="group_join_free">
Darmowe
</panel.string>
<panel name="group_info_top">
- <text_editor name="group_name" value="(Åadowanie...)"/>
- <line_editor label="Wpisz nazwÄ™ swojej nowej grupy tutaj" name="group_name_editor"/>
+ <text_editor name="group_name" value="(Åadowanie...)" />
+ <line_editor label="Wpisz tutaj nowÄ… nazwÄ™ swojej grupy" name="group_name_editor" />
</panel>
<layout_stack name="layout">
<layout_panel name="group_accordions">
<accordion name="groups_accordion">
- <accordion_tab name="group_general_tab" title="Ogólne"/>
- <accordion_tab name="group_roles_tab" title="Funkcja"/>
- <accordion_tab name="group_notices_tab" title="Notki"/>
- <accordion_tab name="group_land_tab" title="Posiadlość/Majątek"/>
+ <accordion_tab name="group_general_tab" title="Ogólne" />
+ <accordion_tab name="group_roles_tab" title="Funkcje i osoby" />
+ <accordion_tab name="group_notices_tab" title="Ogłoszenia" />
+ <accordion_tab name="group_land_tab" title="Działka/Majątek" />
</accordion>
</layout_panel>
</layout_stack>
<layout_stack name="button_row_ls">
<layout_panel name="btn_chat_lp">
- <button label="Czat" name="btn_chat"/>
+ <button label="Czat" name="btn_chat" />
</layout_panel>
<layout_panel name="call_btn_lp">
- <button label="Konferencja głosowa w grupie" name="btn_call" tool_tip="Rozpocznij konferencję głosową w tej grupie"/>
+ <button name="btn_call" label="Konferencja głosowa" tool_tip="Rozpocznij konferencję głosową w tej grupie" />
</layout_panel>
<layout_panel name="btn_apply_lp">
- <button label="Zapisz" label_selected="Zapisz" name="btn_apply"/>
- <button label="Stwórz grupę" name="btn_create" tool_tip="Stwórz nową grupę"/>
+ <button label="Zapisz" label_selected="Zapisz" name="btn_apply" />
+ <button label="Stwórz grupę" name="btn_create" tool_tip="Stwórz nową grupę" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
old mode 100755
new mode 100644
index 1822551e8685efe7b06e176dd80d082822751790..6bc71171f60a735af3458b9544a10c8e5a5aeb73
--- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Zaproszenie do Grupy" name="invite_panel">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="ZaproÅ› do grupy" name="invite_panel">
<panel.string name="confirm_invite_owner_str">
Jesteś pewny/a, że chcesz wybrać nowych właścieli grupy? Ta decyzja jest ostateczna!
</panel.string>
@@ -7,20 +7,23 @@
(Å‚adowanie...)
</panel.string>
<panel.string name="already_in_group">
- Niektórzy Rezydenci, których wybrałeś już należą do grupy i nie otrzymali zaproszenia.
+ Niektórzy Rezydenci, których wybrałeś/aś już należą do grupy i nie otrzymali zaproszenia.
+ </panel.string>
+ <panel.string name="invite_selection_too_large">
+ Zaproszenia nie zostały wysłane: wybrano zbyt wielu Rezydentów. Limit to 100 zaproszeń na jedno żądanie.
</panel.string>
<text name="help_text">
Możesz zaprosić kilku Rezydentów do swojej grupy. Wybierz 'Otwórz Katalog Osobisty' aby rozpocząć.
</text>
- <button label="Otwórz Katalog Osobisty" name="add_button" tool_tip=""/>
- <name_list name="invitee_list" tool_tip="Przytrzymaj klawisz Ctrl i kliknij imię Rezydenta aby wybrać kilka osób."/>
- <button label="Usuń z Listy" name="remove_button" tool_tip="Usuwa wybranych powyżej Rezydentów z listy zaproszeń."/>
+ <button label="Otwórz Katalog Osobisty" name="add_button" />
+ <name_list name="invitee_list" tool_tip="Przytrzymaj klawisz Ctrl i kliknij imię Rezydenta aby wybrać kilka osób." />
+ <button label="Usuń z listy" name="remove_button" tool_tip="Usuwa wybranych powyżej Rezydentów z listy zaproszeń." />
<text name="role_text">
- Wybierz rolę dla nowego członka:
+ Wybierz funkcjÄ™ dla nowej osoby:
</text>
- <combo_box name="role_name" tool_tip="Wybierz z listy Role, które możesz przypisać członkom"/>
- <button label="Wyślij Zaproszenia" name="ok_button"/>
- <button label="Anuluj" name="cancel_button"/>
+ <combo_box name="role_name" tool_tip="Wybierz rolę z listy funkcji, które możesz przypisać osobom w grupie" />
+ <button label="Wyślij zaproszenia" name="invite_button" />
+ <button label="Anuluj" name="cancel_button" />
<string name="GroupInvitation">
Zaproszenie do grupy
</string>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
old mode 100755
new mode 100644
index aea4e50fd533bb8d1f9549fca6c6036ce0829fe8..33201fc3fbd49927eca69c97712be1deb4471499
--- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Posiadłości i L$" name="land_money_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Działki i L$" name="land_money_tab">
<panel.string name="help_text">
- Ostrzeżenie pojawia się kiedy łączna powierzchnia posiadłości jest mniejsza lub = Kontrybucjom
+ Ostrzeżenie pojawia się kiedy łączna powierzchnia działek jest mniejsza lub = Kontrybucjom
</panel.string>
<panel.string name="cant_view_group_land_text">
- Nie masz pozwolenia na oglądanie posiadłości grupy.
+ Nie masz pozwolenia na oglądanie działek grupy.
</panel.string>
<panel.string name="epmty_view_group_land_text">
- Brak wstępu
+ Brak pozycji
</panel.string>
<panel.string name="cant_view_group_accounting_text">
- Nie masz dostępu do konta, finansów grupy.
+ Nie masz dostępu do finansów grupy.
</panel.string>
<panel.string name="loading_txt">
Åadowanie...
@@ -18,44 +18,34 @@
<panel.string name="land_contrib_error">
Nie można ustalić Twoich kontrybucji.
</panel.string>
+ <text name="group_land_heading">
+ Własność grupy
+ </text>
<panel name="layout_panel_landmoney">
<scroll_list name="group_parcel_list">
- <scroll_list.columns label="Posiadłość" name="name"/>
- <scroll_list.columns label="Region" name="location"/>
- <scroll_list.columns label="Typ" name="type"/>
- <scroll_list.columns label="Obszar" name="area"/>
- <scroll_list.columns label="Ukryte" name="hidden"/>
+ <scroll_list.columns label="Działka" name="name" />
+ <scroll_list.columns label="Typ" name="type" />
+ <scroll_list.columns label="Obszar" name="area" />
+ <scroll_list.columns label="Ukryte" name="hidden" />
</scroll_list>
<text name="total_contributed_land_label">
Kontrybucje:
</text>
- <text name="total_contributed_land_value">
- [AREA] m²
- </text>
- <button label="Mapa" label_selected="Mapa" name="map_button"/>
+ <button label="Mapa" label_selected="Mapa" name="map_button" />
<text name="total_land_in_use_label">
- Używane posiadłości:
- </text>
- <text name="total_land_in_use_value">
- [AREA] m²
+ Używane działki:
</text>
<text name="land_available_label">
- Dostępne posiadłości:
- </text>
- <text name="land_available_value">
- [AREA] m²
+ Dostępne działki:
</text>
<text name="your_contribution_label">
Twoje kontrybucje:
</text>
- <text name="your_contribution_units">
- m²
- </text>
<text name="your_contribution_max_value">
- ([AMOUNT] max)
+ (maks. [AMOUNT])
</text>
<text name="group_over_limit_text">
- Należy zwięszyć kredyt na używanie posiadłości.
+ Należy zwiększyć kredyt na używanie działek
</text>
<text name="group_money_heading">
L$ grupy
@@ -71,15 +61,15 @@
<text_editor name="group_money_details_text">
Åadowanie...
</text_editor>
- <button label="< Wcześniej" label_selected="< Wcześniej" name="earlier_details_button" tool_tip="Wcześniej"/>
- <button label="Później >" label_selected="Później >" name="later_details_button" tool_tip="Później"/>
+ <button name="earlier_details_button" tool_tip="Wcześniej" />
+ <button name="later_details_button" tool_tip="Później" />
</panel>
<panel label="SPRZEDAÅ»" name="group_money_sales_tab">
<text_editor name="group_money_sales_text">
Åadowanie...
</text_editor>
- <button label="< Wcześniej" label_selected="< Wcześniej" name="earlier_sales_button" tool_tip="Wcześniej"/>
- <button label="Później >" label_selected="Później >" name="later_sales_button" tool_tip="Później"/>
+ <button name="earlier_sales_button" tool_tip="Wcześniej" />
+ <button name="later_sales_button" tool_tip="Później" />
</panel>
</tab_container>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
old mode 100755
new mode 100644
index a8b405697654e9d937ac8dca76474b81fa6cce25..fbb313d8aed43a1471adcc9d3cc6dfc9eefa4049
--- a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="group_list_item">
- <text name="group_name" value="Nieznana"/>
- <button name="profile_btn" tool_tip="Zobacz profil"/>
+ <text name="group_name" value="Nieznana" />
+ <button name="info_btn" tool_tip="Więcej informacji" />
+ <button name="profile_btn" tool_tip="Zobacz profil" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
old mode 100755
new mode 100644
index a3b0998de380a5b723d9f8c724f04b834be20541..6daec1c835318b3f53eb42b5370e4c5daf3d8aca
--- a/indra/newview/skins/default/xui/pl/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ogłoszenia" name="notices_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Notices" name="notices_tab">
<panel.string name="help_text">
- Ogłoszenia to szybka droga do komunikowania się ze wszystkmi członkami grupy poprzez wysylanie ich na grupowym kanale. Dodatkowo, do ogłoszenia można dołańczać załączniki. Ogłoszenia docierają jedynie do członków grupy, którzy mają zdolność ich otrzymywania. By nie otrzymywać ogłoszeń, w zakładce Ogólne pozostaw niezaznaczonym "Otrzymuj grupowe ogłoszenia".
+ Ogłoszenia to szybka droga do komunikowania się ze wszystkimi osobami w grupie poprzez wysyłanie ich na grupowym kanale.
+Dodatkowo, do ogłoszenia można dołączać załączniki. Ogłoszenia docierają jedynie do tych osób, które mają zdolność ich otrzymywania.
+By nie otrzymywać ogłoszeń, w zakładce Ogólne pozostaw niezaznaczone "Otrzymuj grupowe ogłoszenia".
</panel.string>
<panel.string name="no_notices_text">
- Brak przeszłych ogłoszeń
+ Brak ogłoszeń
</panel.string>
<text name="lbl2">
Ogłoszenia przechowywane są przez 14 dni.
Limit dzienny ogłoszeń dla grupy wynosi 200.
</text>
<scroll_list name="notice_list">
- <scroll_list.columns label="" name="icon"/>
- <scroll_list.columns label="Temat" name="subject"/>
- <scroll_list.columns label="Autor" name="from"/>
- <scroll_list.columns label="Data" name="date"/>
+ <scroll_list.columns label="Temat" name="subject" />
+ <scroll_list.columns label="Autor" name="from" />
+ <scroll_list.columns label="Data" name="date" />
</scroll_list>
<text name="notice_list_none_found">
Nie znaleziono
</text>
- <button label="Stwórz Ogłoszenie" label_selected="Stwórz nowe ogłoszenie" name="create_new_notice" tool_tip="Stwórz ogłoszenie"/>
- <button label="Odśwież" label_selected="Odśwież Listę" name="refresh_notices" tool_tip="Użyj Odśwież by zobaczyć czy nowe ogłoszenia zostały wysłane."/>
+ <button label="Nowe" name="create_new_notice" tool_tip="Stwórz nowe ogłoszenie" />
+ <button name="refresh_notices" tool_tip="Odśwież listę Ogłoszeń" />
<panel label="Stwórz nowe ogłoszenie" name="panel_create_new_notice">
<text name="lbl">
Stwórz ogłoszenie
@@ -35,19 +36,19 @@ Limit dzienny ogłoszeń dla grupy wynosi 200.
Załącz:
</text>
<text name="string">
- Przeciągnij i upuść załącznik tutaj aby go dodać:
+ Przeciągnij załącznik tutaj aby go dodać:
</text>
- <button label="Szafa" name="open_inventory" tool_tip="Otwórz Szafę"/>
- <button label="Usuń załącznik" label_selected="Usuń Załącznik" name="remove_attachment" tool_tip="Usuń załącznik z noty"/>
- <button label="Wyślij" label_selected="Wyślij" name="send_notice"/>
- <group_drop_target name="drop_target" tool_tip="Przeciągnij załącznik ze swojej Szafy na pole docelowe aby wysłać go z Ogłoszeniem. Musisz posiadać prawo do kopiowania i transferu załącznika aby go dodać do ogłoszenia."/>
+ <button name="open_inventory" label="Szafa" tool_tip="Otwórz Szafę" />
+ <button name="remove_attachment" tool_tip="Usuń załącznik z ogłoszenia" />
+ <button label="Wyślij" label_selected="Wyślij" name="send_notice" />
+ <group_drop_target name="drop_target" tool_tip="Przeciągnij załącznik ze swojej Szafy na to pole docelowe aby wysłać go z Ogłoszeniem. Musisz posiadać prawo do kopiowania i transferu załącznika aby go dodać do ogłoszenia." />
</panel>
- <panel label="Zobacz przeszłe Ogłoszenia" name="panel_view_past_notice">
+ <panel label="Zobacz ogłoszenia archiwalne" name="panel_view_past_notice">
<text name="lbl">
- Ogłoszenia zachowane
+ Ogłoszenia archiwalne
</text>
<text name="lbl2">
- W celu wysłania nowego ogłoszenia kliknij + Stwórz ogłoszenie
+ Aby wysłać nowe ogłoszenie kliknij na "+Nowe"
</text>
<text name="lbl3">
Temat:
@@ -55,6 +56,6 @@ Limit dzienny ogłoszeń dla grupy wynosi 200.
<text name="lbl4">
Treść:
</text>
- <button label="Otwórz załącznik" label_selected="Otwórz załącznik" name="open_attachment"/>
+ <button label="Otwórz załącznik" name="open_attachment" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notify.xml b/indra/newview/skins/default/xui/pl/panel_group_notify.xml
old mode 100755
new mode 100644
index d27a81217a4ca271d914a88aa063bfd33b2e4d92..63c49033c6ba70044bb5b44792c192dae8b09486
--- a/indra/newview/skins/default/xui/pl/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_notify.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_group_notify">
- <panel label="header" name="header">
- <text name="title" value="ImiÄ™ nadawcy / Nazwa grupy"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_group_notify">
+ <panel name="header">
+ <text name="title" value="Nadawca / Grupa" />
</panel>
- <text name="attachment" value="Załącznik"/>
- <button label="OK" name="btn_ok"/>
+ <text name="attachment" value="Załącznik" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
old mode 100755
new mode 100644
index 9e9c79d26aa014c5577e1ea0954f147d9dbe15f0..74cecd0977161249ebc4804d2f96c002558932d9
--- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Członkowie" name="roles_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Osoby i funkcje" name="roles_tab">
<panel.string name="default_needs_apply_text">
Panel zawiera niezapisane zmiany.
</panel.string>
@@ -7,108 +7,100 @@
Czy chcesz zapisać zmiany?
</panel.string>
<tab_container name="roles_tab_container">
- <panel label="CZÅONKOWIE" name="members_sub_tab" tool_tip="CzÅ‚onkowie">
+ <panel label="OSOBY" name="members_sub_tab" tool_tip="Osoby">
<panel.string name="help_text">
- Możesz dodawać i usuwać funkcje przypisane do członków.
-Możesz wybrać wielu członków naciskając Ctrl i klikając na ich imionach.
+ Możesz dodawać i usuwać funkcje przypisane do osób.
+Możesz wybrać wiele osób naciskając Ctrl i klikając na ich imionach.
</panel.string>
- <panel.string name="donation_area">
- [AREA] m²
- </panel.string>
- <filter_editor label="Filtruj członków" name="filter_input"/>
+ <filter_editor label="Filtruj osoby" name="filter_input" />
<name_list name="member_list">
- <name_list.columns label="Członek" name="name"/>
- <name_list.columns label="Dotacje" name="donated"/>
- <name_list.columns label="Status" name="online"/>
+ <name_list.columns label="ImiÄ™" name="name" />
+ <name_list.columns label="Dotacje" name="donated" />
+ <name_list.columns label="Tytuł" name="title" />
</name_list>
- <button label="ZaproÅ› do grupy" name="member_invite"/>
- <button label="Usuń z grupy" name="member_eject"/>
+ <button label="ZaproÅ› do grupy" name="member_invite" />
+ <button label="Usuń z grupy" name="member_eject" />
+ <button label="Zbanuj" name="member_ban" />
</panel>
<panel label="FUNKCJE" name="roles_sub_tab">
<panel.string name="help_text">
- Wszystkie funkcje mają tytuł oraz przypisane do niego przywileje
-które umożliwiają wykonywanie danej funckji. Każdy członek może pełnić
+ Wszystkie funkcje mają tytuł oraz przypisane przywileje
+które umożliwiają wykonywanie danej funkcji. Każda osoba może pełnić
jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
łącznie z funkcją Każdy i Właściciel.
</panel.string>
<panel.string name="cant_delete_role">
- Funkcje "Wszyscy" oraz "Właściciele" są domyślnie oraz nie mogą zostać usunięte.
- </panel.string>
- <panel.string name="power_folder_icon">
- Inv_FolderClosed
+ Funkcje "Wszyscy" oraz "Właściciele" są specjalne i nie mogą zostać usunięte.
</panel.string>
- <filter_editor label="Filtruj funkcje" name="filter_input"/>
+ <filter_editor label="Filtruj funkcje" name="filter_input" />
<scroll_list name="role_list">
- <scroll_list.columns label="Funkcja" name="name"/>
- <scroll_list.columns label="Tytuł" name="title"/>
- <scroll_list.columns label="#" name="members"/>
+ <scroll_list.columns label="Funkcja" name="name" />
+ <scroll_list.columns label="Tytuł" name="title" />
</scroll_list>
- <button label="Stwórz nową funkcję" name="role_create"/>
- <button label="Usuń funkcję" name="role_delete"/>
+ <button label="Nowa funkcja" name="role_create" />
+ <button label="Usuń funkcję" name="role_delete" />
</panel>
- <panel label="PRZYWILEJE" name="actions_sub_tab" tool_tip="Możesz sprawdzić szczegóły dotyczące dangego przywileju oraz jakie funkcje oraz jacy członkowie posiadają prawo korzystania z niego.">
+ <panel label="PRZYWILEJE" name="actions_sub_tab" tool_tip="Możesz sprawdzić szczegóły dotyczące danego przywileju oraz jakie funkcje oraz jakie osoby posiadają prawo korzystania z niego.">
<panel.string name="help_text">
- Przywileje pozwalają członkom przypisanym do funkcji na wykonywanie różnych zadań.
-Istnieje wiele przywilejów.
+ Przywileje pozwalajÄ… osobom przypisanym do funkcji
+na wykonywanie różnych zadań. Istnieje wiele przywilejów.
</panel.string>
- <filter_editor label="Filtruj przywileje" name="filter_input"/>
- <scroll_list name="action_list" tool_tip="Wybierz przywilej aby zobaczyć szczegóły">
- <scroll_list.columns label="" name="icon"/>
- <scroll_list.columns label="" name="action"/>
- </scroll_list>
+ <filter_editor label="Filtruj przywileje" name="filter_input" />
+ <scroll_list name="action_list" tool_tip="Wybierz przywilej aby zobaczyć szczegóły" />
+ </panel>
+ <panel label="ZBANOWANI" name="banlist_sub_tab" tool_tip="Zobacz, jakie osoby sÄ… zbanowane w tej grupie.">
+ <panel.string name="help_text">
+ Jeśli rezydent znajduje się na liście banów, to nie będzie w stanie dołączyć do grupy.
+ </panel.string>
+ <panel.string name="ban_count_template">
+ Bany: [COUNT]/[LIMIT]
+ </panel.string>
+ <name_list name="ban_list">
+ <name_list.columns label="Rezydent" name="name" />
+ <name_list.columns label="Zbanowano" name="ban_date" />
+ </name_list>
+ <button label="Dodaj bana" name="ban_create" tool_tip="Zbanuj Rezydentów z Twojej grupy" />
+ <button label="Usuń bana" name="ban_delete" tool_tip="Odbanuj zaznaczonych Rezydentów w Twojej grupie" />
+ <button name="ban_refresh" tool_tip="Odśwież listę banów" />
</panel>
</tab_container>
<panel name="members_footer">
<text name="static">
- Przywileje
+ Funkcje
</text>
- <scroll_list name="member_assigned_roles">
- <scroll_list.columns label="" name="checkbox"/>
- <scroll_list.columns label="" name="role"/>
- </scroll_list>
<text name="static2">
Przywileje
</text>
- <scroll_list name="member_allowed_actions" tool_tip="Aby zobaczyć szczegóły, wybierz zakładkę Przywileje">
- <scroll_list.columns label="" name="icon"/>
- <scroll_list.columns label="" name="action"/>
- </scroll_list>
+ <scroll_list name="member_allowed_actions" tool_tip="Aby zobaczyć szczegóły, wybierz zakładkę Przywileje" />
</panel>
<panel name="roles_footer">
<text name="static">
- Nazwa funkcji
+ Nazwa fun.
</text>
- <line_editor name="role_name"/>
<text name="static3">
- Nazwa funkcji
+ Tytuł funkcji
</text>
- <line_editor name="role_title"/>
<text name="static2">
Opis
</text>
- <text_editor name="role_description"/>
<text name="static4">
- Przypisane funkcje
+ Przypisane osoby
</text>
- <check_box label="Opcja widoczności jest aktywna" name="role_visible_in_list" tool_tip="Opcja ta pozwala określić widoczność członków pełniących tę funkcję dla ludzi spoza grupy."/>
- <text name="static5" tool_tip="Przywileje przypisane do wybranej Funkcji.">
- Przypisane przywileje
+ <check_box label="Publikuj osoby z funkcją" name="role_visible_in_list" tool_tip="Opcja ta pozwala określić widoczność osób pełniących tę funkcję dla ludzi spoza grupy." />
+ <text name="static5">
+ Dozwolone przywileje
</text>
- <scroll_list name="role_allowed_actions" tool_tip="Aby zobaczyć szczegóły dozwolonych przywilejów wybierz zakładkę Przywileje">
- <scroll_list.columns label="" name="icon"/>
- <scroll_list.columns label="" name="checkbox"/>
- <scroll_list.columns label="" name="action"/>
- </scroll_list>
+ <scroll_list name="role_allowed_actions" tool_tip="Aby zobaczyć szczegóły dozwolonych przywilejów wybierz zakładkę Przywileje" />
</panel>
<panel name="actions_footer">
<text_editor name="action_description">
- Przywilej 'Usuń członka z grupy'. Tylko właściciel może usunąć innego właściciela.
+ Przywilej 'Usuń osobę z grupy'. Tylko właściciel może usunąć innego właściciela.
</text_editor>
<text name="static2">
Funkcje z tym przywilejem
</text>
<text name="static3">
- Członkowie z tym przywilejem
+ Osoby z tym przywilejem
</text>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
deleted file mode 100755
index 4aadd3b93b24d3c1203d14f246dadeb20a625773..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
- <layout_stack name="button_stack">
- <layout_panel name="view_profile_btn_panel">
- <button label="Profil" name="view_profile_btn"/>
- </layout_panel>
- <layout_panel name="add_friend_btn_panel">
- <button label="Poznaj" name="add_friend_btn"/>
- </layout_panel>
- <layout_panel name="teleport_btn_panel">
- <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj"/>
- </layout_panel>
- <layout_panel name="share_btn_panel">
- <button label="Udostępnij" name="share_btn"/>
- </layout_panel>
- <layout_panel name="pay_btn_panel">
- <button label="Zapłać" name="pay_btn"/>
- </layout_panel>
- <layout_panel name="call_btn_panel">
- <button label="Dzwoń" name="call_btn"/>
- </layout_panel>
- <layout_panel name="end_call_btn_panel">
- <button label="Zakończ rozmowę" name="end_call_btn"/>
- </layout_panel>
- <layout_panel name="voice_ctrls_btn_panel">
- <button label="Przełączniki głosu" name="voice_ctrls_btn"/>
- </layout_panel>
- </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml
deleted file mode 100755
index d18047fbcfaff5835094aa3aeb54e1f0ba47c183..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="inventory_item">
- <text name="item_name" value="..."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
old mode 100755
new mode 100644
index 3370f6f58ebd51a33ee5999dd27cab9a0bd5281b..ffcdf2f3c080f67b4b5b6b96a69c8a954eeac3ee
--- a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="landmark_info">
- <string name="title_create_landmark" value="Zapamiętaj miejsce (LM)"/>
- <string name="title_edit_landmark" value="Edytuj landmarki"/>
- <string name="title_landmark" value="Landmarki (LM)"/>
- <string name="not_available" value="(N\A)"/>
- <string name="unknown" value="(nieznane)"/>
- <string name="public" value="(publiczne)"/>
+ <string name="title_create_landmark" value="Zapamiętaj miejsce (LM)" />
+ <string name="title_edit_landmark" value="Edytuj landmark" />
+ <string name="title_landmark" value="Landmark (LM)" />
+ <string name="unknown" value="(nieznane)" />
+ <string name="public" value="(publiczne)" />
<string name="server_update_text">
Informacje o miejscu nie są dostępne bez aktualizacji serwera.
</string>
@@ -13,25 +12,22 @@
Informacje o miejscu nie są dostępne w tej chwili. Prosimy sprobować później.
</string>
<string name="server_forbidden_text">
- Informacje o miejscu są niedostępne z powodu braku dostępu. Prosimy sprawdzić swoje prawa z właścicielem posiadłości.
+ Informacje o miejscu są niedostępne z powodu braku dostępu. Prosimy sprawdzić swoje prawa z właścicielem działki.
</string>
- <string name="acquired_date">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </string>
- <button name="back_btn" tool_tip="Cofnij"/>
- <text name="title" value="Profil miejsca"/>
+ <button name="back_btn" tool_tip="Cofnij" />
+ <text name="title" value="Profil miejsca" />
<scroll_container name="place_scroll">
<panel name="scrolling_panel">
- <text name="maturity_value" value="nieznany"/>
+ <text name="maturity_value" value="nieznany" />
<panel name="landmark_info_panel">
- <text name="owner_label" value="Właściciel:"/>
- <text name="creator_label" value="Twórca:"/>
- <text name="created_label" value="Stworzone:"/>
+ <text name="owner_label" value="Właściciel:" />
+ <text name="creator_label" value="Twórca:" />
+ <text name="created_label" value="Data:" />
</panel>
<panel name="landmark_edit_panel">
- <text name="title_label" value="Tytuł:"/>
- <text name="notes_label" value="Moje notatki:"/>
- <text name="folder_label" value="Lokalizacja zapisanego miejsca:"/>
+ <text name="title_label" value="Tytuł:" />
+ <text name="notes_label" value="Moje notatki:" />
+ <text name="folder_label" value="Lokalizacja:" />
</panel>
</panel>
</scroll_container>
diff --git a/indra/newview/skins/default/xui/pl/panel_landmarks.xml b/indra/newview/skins/default/xui/pl/panel_landmarks.xml
old mode 100755
new mode 100644
index 039be3b504ebcfdeadf7a7e9928a3b212b513fd6..eac2ee379cc16b499fa6c636f92e4f55a6f67763
--- a/indra/newview/skins/default/xui/pl/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_landmarks.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Landmarks">
<accordion name="landmarks_accordion">
- <accordion_tab name="tab_favorites" title="Ulubione"/>
- <accordion_tab name="tab_landmarks" title="Landmarki"/>
- <accordion_tab name="tab_inventory" title="Moja Szafa"/>
- <accordion_tab name="tab_library" title="Biblioteka"/>
+ <accordion_tab name="tab_favorites" title="Ulubione" />
+ <accordion_tab name="tab_landmarks" title="Landmarki" />
+ <accordion_tab name="tab_inventory" title="Moja Szafa" />
+ <accordion_tab name="tab_library" title="Biblioteka" />
</accordion>
<panel name="bottom_panel">
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Pokaż opcje dodatkowe"/>
+ <menu_button tool_tip="Pokaż opcje dodatkowe" name="options_gear_btn" />
</layout_panel>
<layout_panel name="add_btn_panel">
- <button name="add_btn" tool_tip="Dodaj nowy landmark"/>
+ <button name="add_btn" tool_tip="Dodaj nowy landmark" />
</layout_panel>
<layout_panel name="trash_btn_panel">
- <dnd_button name="trash_btn" tool_tip="Usuń wybrany landmark"/>
+ <dnd_button name="trash_btn" tool_tip="Usuń wybrany landmark" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
old mode 100755
new mode 100644
index 42809a8afb402955af815d1dace358a6de865a84..2d6e40ce917db434f159941139decfa670191a37
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -1,11 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_login">
- <panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
- <combo_box label="My favorite places" name="start_location_combo">
- <combo_box.item label="Ostatnia lokalizacja" name="MyLastLocation"/>
+ <combo_box label="Użytkownik" tool_tip="Nazwa użytkownika wybrana przy rejestracji, np. bobsmith12 lub Steller Sunshine" name="username_combo" />
+ <line_editor name="password_edit" label="Hasło" />
+ <combo_box label="Moje ulubione miejsca" name="start_location_combo">
+ <combo_box.item label="Ostatnia lokalizacja" name="MyLastLocation" />
+ <combo_box.item label="Moje miejsce startu" name="MyHome" />
</combo_box>
+ <button label="Zaloguj" name="connect_btn" />
+ <check_box label="Pamiętaj mnie" name="remember_check" />
+ <text name="forgot_password_text">
+ Zapomniałem/am hasła
+ </text>
+ <combo_box label="Wybierz siatkÄ™" name="server_combo" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_login_first.xml b/indra/newview/skins/default/xui/pl/panel_login_first.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0604ecbcff572dd74cf3dfc6a5a051734a6cabe4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_login_first.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_login">
+ <layout_stack name="logo_stack">
+ <layout_panel name="parent_panel2">
+ <layout_stack name="widget_stack">
+ <layout_panel name="widget_container">
+ <combo_box label="Użytkownik" tool_tip="Nazwa użytkownika wybrana przy rejestracji, np. bobsmith12 lub Steller Sunshine" name="username_combo" />
+ <line_editor name="password_edit" label="Hasło" />
+ <button label="Zaloguj" name="connect_btn" />
+ <check_box label="Zapamiętaj mnie" name="remember_check" />
+ <text name="forgot_password_text">
+ Zapomniałem/am hasła
+ </text>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="parent_panel3">
+ <layout_stack name="images_stack">
+ <layout_panel name="images_container">
+ <text name="image_caption_left">
+ Wyspa Nauki to Twój pierwszy krok. Znajdź portal z wyjściem!
+ </text>
+ <text name="image_caption_right">
+ Potem zwiedź Wyspę Towarzyską i poznaj innych nowych rezydentów!
+ </text>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
old mode 100755
new mode 100644
index 8d6fa1173cf254136a262ad0e417c2951e9f9cfd..dc254e246f09b7ec73678833ae663f4c1397ec6d
--- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Rzeczy" name="main inventory panel">
<panel.string name="ItemcountFetching">
- Dostarczanie [ITEM_COUNT] obiektów... [FILTER]
+ Pobieranie [ITEM_COUNT] obiektów... [FILTER]
</panel.string>
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] obiekty [FILTER]
@@ -9,20 +9,20 @@
<text name="ItemcountText">
Obiekty:
</text>
- <filter_editor label="Filtr" name="inventory search editor"/>
+ <filter_editor label="Filtruj SzafÄ™" name="inventory search editor" />
<tab_container name="inventory filter tabs">
- <inventory_panel label="Wszystkie obiekty" name="All Items"/>
- <recent_inventory_panel label="Ostatnio dodane obiekty" name="Recent Items"/>
+ <inventory_panel label="MOJA SZAFA" name="All Items" />
+ <recent_inventory_panel label="OSTATNIE" name="Recent Items" />
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje"/>
+ <menu_button tool_tip="Pokaż dodatkowe opcje" name="options_gear_btn" />
</layout_panel>
<layout_panel name="add_btn_panel">
- <button name="add_btn" tool_tip="Dodaj nowy obiekt"/>
+ <button name="add_btn" tool_tip="Dodaj nowy obiekt" />
</layout_panel>
<layout_panel name="trash_btn_panel">
- <dnd_button name="trash_btn" tool_tip="Usuń zaznaczony obiekt"/>
+ <dnd_button name="trash_btn" tool_tip="Usuń zaznaczony obiekt" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml
old mode 100755
new mode 100644
index 72a5f51520c360ef78e7edad4003b5620bdb341a..431929420aa92386b591b55df9192870f4833da7
--- a/indra/newview/skins/default/xui/pl/panel_me.xml
+++ b/indra/newview/skins/default/xui/pl/panel_me.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Mój Profil" name="panel_me">
- <tab_container name="tabs">
- <panel label="PROFIL" name="panel_profile"/>
- <panel label="ULUBIONE" name="panel_picks"/>
- </tab_container>
+ <panel label="MIEJSCA" name="panel_picks" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
old mode 100755
new mode 100644
index 914a2aee7309a81330a9566aa571f82392d6d2b8..eef54c93aa313b6973910deac26d34cb52acb101
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
@@ -1,32 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Ogólne" name="Media Settings General">
<text name="home_label">
Strona domowa:
</text>
<text name="home_fails_whitelist_label">
- (ta strona nie została zaakceptowana przez filtr listy dostępowej (Biała Lista)
+ (Ta strona nie przeszła przez filtr białej listy)
</text>
- <line_editor name="home_url" tool_tip="Strona domowa dla źródla mediów"/>
+ <line_editor name="home_url" tool_tip="Strona domowa dla źródła mediów" />
<text name="preview_label">
- Pokaż
+ PodglÄ…d
</text>
- <text name="current_url_label">
+ <text name="current_url_label">
Obecna strona:
</text>
- <text name="current_url" tool_tip="The current page for this media source" value=""/>
- <button label="Zresetuj" name="current_url_reset_btn"/>
- <check_box initial_value="false" label="Pętla" name="auto_loop"/>
- <check_box initial_value="false" label="Interakcja kliknięcia" name="first_click_interact"/>
- <check_box initial_value="false" label="Autopowiększenie" name="auto_zoom"/>
- <check_box initial_value="false" label="Automatyczne odtwarzanie mediów" name="auto_play"/>
+ <text name="current_url" tool_tip="Obecna strona dla tego źródła mediów" />
+ <button label="Zresetuj" name="current_url_reset_btn" />
+ <check_box label="Autopowtarzanie" name="auto_loop" />
+ <check_box label="Interakcja kliknięcia" name="first_click_interact" />
+ <check_box label="Autopowiększenie" name="auto_zoom" />
+ <check_box label="Autoodtwarzanie" name="auto_play" />
<text name="media_setting_note">
Pamiętaj: Rezydenci mogą zmienić to ustawienie
</text>
- <check_box initial_value="false" label="Automatyczne dopasowanie mediów na twarzy lub obiekcie" name="auto_scale"/>
+ <check_box label="Autoskalowanie mediów na powierzchni obiektu" name="auto_scale" />
<text name="size_label">
Rozmiar:
</text>
- <text name="X_label">
- X
- </text>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
index a87c29d7b381bdb2ab3c1eed9a590384e36a83fb..2dcd916acdb0b6fe73271b4af663b583c2543891
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Dopasuj" name="Media settings for controls">
<text name="controls_label">
- Ustawienia:
+ Kontrolki:
</text>
<combo_box name="controls">
<combo_item name="Standard">
Standardowe
</combo_item>
<combo_item name="Mini">
- Mini
+ Małe
</combo_item>
</combo_box>
<text name="owner_label">
Właściciel
</text>
- <check_box initial_value="false" label="Pozwól na nawigację & interaktywność" name="perms_owner_interact"/>
- <check_box initial_value="false" label="Pokaż pasek kontroli" name="perms_owner_control"/>
+ <check_box label="Pozwól na nawigację i interaktywność" name="perms_owner_interact" />
+ <check_box label="Pokaż pasek kontrolek" name="perms_owner_control" />
<text name="group_label">
Grupa:
</text>
- <check_box initial_value="false" label="Pozwól na nawigację & interaktywność" name="perms_group_interact"/>
- <check_box initial_value="false" label="Pokaż pasek kontroli" name="perms_group_control"/>
+ <check_box label="Pozwól na nawigację i interaktywność" name="perms_group_interact" />
+ <check_box label="Pokaż pasek kontrolek" name="perms_group_control" />
<text name="anyone_label">
Każdy
</text>
- <check_box initial_value="false" label="Pozwól na nawigację & interaktywność" name="perms_anyone_interact"/>
- <check_box initial_value="false" label="Pokaż pasek kontroli" name="perms_anyone_control"/>
+ <check_box label="Pozwól na nawigację i interaktywność" name="perms_anyone_interact" />
+ <check_box label="Pokaż pasek kontrolek" name="perms_anyone_control" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
old mode 100755
new mode 100644
index 7e95c4942f561694673f7621f453d3ee75b9c220..1fe40d8c0a4027cfd53994ea9901907da0ebda01
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ochrona" name="Media Settings Security">
- <check_box initial_value="false" label="Dostęp dozwolony tylko dla wybranych URL" name="whitelist_enable"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Ochrona" name="Media Settings Security" >
+ <check_box label="Dostęp dozwolony tylko dla wybranych URL" name="whitelist_enable" />
<text name="home_url_fails_some_items_in_whitelist">
- Wejścia na stronę WWW, które się nie powiodły są
-zaznaczone:
+ Niepowodzenia w Å‚adowaniu stron sÄ… oznaczone:
</text>
- <button label="Dodaj" name="whitelist_add"/>
- <button label="Usuń" name="whitelist_del"/>
+ <button label="Dodaj" name="whitelist_add" />
+ <button label="Usuń" name="whitelist_del" />
<text name="home_url_fails_whitelist">
- UWAGA: WWW wyszczególnione w Ogólne nie przeszły Białej Listy. Została ona wyłączona dopóki poprawny zapis nie zostanie dodany.
+ UWAGA: Adres WWW podany w sekcji Ogólne nie przeszedł Białej Listy. Została ona wyłączona dopóki poprawny zapis nie zostanie dodany.
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
old mode 100755
new mode 100644
index b01e686c4193476fddda1f038ecd0c9e369d1112..0702017564ef13faf3791d9e7c345b799b5cc30a
--- a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
@@ -1,18 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="navigation_bar">
- <panel name="navigation_panel">
- <pull_button name="back_btn" tool_tip="Wróć do poprzedniej lokalizacji"/>
- <pull_button name="forward_btn" tool_tip="Idź do następnej lokalizacji"/>
- <button name="home_btn" tool_tip="Teleportuj do miejsca startu"/>
- <location_input label="Lokalizacja" name="location_combo"/>
- <search_combo_box label="Szukaj" name="search_combo_box" tool_tip="Szukaj">
- <combo_editor label="Szukaj [SECOND_LIFE]" name="search_combo_editor"/>
- </search_combo_box>
- </panel>
- <favorites_bar name="favorite" tool_tip="Przeciągnij swoje landmarki tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!">
- <label name="favorites_bar_label" tool_tip="Przeciągnij swoje landmarki tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!">
- Pasek Ulubionych
- </label>
- <chevron_button name=">>" tool_tip="Pokaż więcej Moich Ulubionych"/>
- </favorites_bar>
+ <layout_stack name="nvp_stack">
+ <layout_panel name="navigation_layout_panel">
+ <panel name="navigation_panel">
+ <pull_button name="back_btn" tool_tip="Wróć do poprzedniej lokalizacji" />
+ <pull_button name="forward_btn" tool_tip="Idź do następnej lokalizacji" />
+ <button name="home_btn" tool_tip="Teleportuj do miejsca startu" />
+ <location_input label="Lokalizacja" name="location_combo" />
+ </panel>
+ </layout_panel>
+ <layout_panel name="favorites_layout_panel">
+ <favorites_bar name="favorite" tool_tip="Przeciągnij swoje landmarki tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!">
+ <label name="favorites_bar_label" tool_tip="Przeciągnij swoje landmarki tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!">
+ Pasek Ulubionych
+ </label>
+ <more_button name=">>" tool_tip="Pokaż więcej Moich Ulubionych">
+ WiÄ™cej ▼
+ </more_button>
+ </favorites_bar>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat.xml
new file mode 100644
index 0000000000000000000000000000000000000000..05e5e79f7e1e7e246dd15593bc78be61d92e1b2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="nearby_chat">
+ <layout_stack name="stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="TÅ‚umacz czat" name="translate_chat_checkbox" />
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
index 4ed3ff669b0e65ca64a0af0d0e9db0c4fae5684b..0ed3b0901dfb99c912dccc930746b2afd5eb9620
--- a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="nearby_chat">
- <string name="min_width">
- 192
- </string>
- <string name="max_width">
- 320
- </string>
- <line_editor label="Kliknij tutaj aby rozmawiać." name="chat_box" tool_tip="Naciśnij Enter aby mówić, Ctrl + Enter aby krzyknąć"/>
- <button name="show_nearby_chat" tool_tip="Pokazuje/ukrywa pobliski czat"/>
+ <line_editor label="Kliknij tutaj aby rozmawiać." name="chat_box" tool_tip="Naciśnij Enter aby mówić, Ctrl+Enter aby krzyknąć" />
+ <button name="show_nearby_chat" tool_tip="Pokazuje/ukrywa czat lokalny" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
old mode 100755
new mode 100644
index d77c6d7852cd96d4d1be4928aeddc83e204ffe96..086e2cdcda32878ac75d2efb01af7908e22f3959
--- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="nearby_media">
<string name="media_item_count_format">
- (%ld media items)
+ (%ld pozycji mediów)
</string>
<string name="empty_item_text">
- <empty>
+ <pusto>
</string>
<string name="parcel_media_name">
- Strumień mediów posiadłości
+ Strumień mediów działki
</string>
<string name="parcel_audio_name">
- Strumień audio posiadłości
+ Strumień audio działki
</string>
<string name="playing_suffix">
(odtwarzanie)
</string>
<panel name="minimized_controls">
- <button label="Zatrzymaj" name="all_nearby_media_disable_btn" tool_tip="Wyłącz wszystkie media w pobliżu"/>
- <button label="Włącz" name="all_nearby_media_enable_btn" tool_tip="Włącz wszystkie media w pobliżu"/>
- <button name="open_prefs_btn" tool_tip="Uruchom preferencje medialne"/>
- <button label="Więcej >>" label_selected="<< Mniej" name="more_btn" tool_tip="Zaawansowane"/>
- <button label="Więcej >>" label_selected="Mniej <<" name="less_btn" tool_tip="Zaawansowane"/>
+ <button name="all_nearby_media_disable_btn" tool_tip="Wyłącz wszystkie media w pobliżu" label="Zatrzymaj" />
+ <button name="all_nearby_media_enable_btn" tool_tip="Włącz wszystkie media w pobliżu" label="Włącz" />
+ <button name="open_prefs_btn" tool_tip="Pokaż preferencje mediów" />
+ <button name="more_btn" tool_tip="Zaawansowane" label="Więcej >>" label_selected="<< Mniej" />
</panel>
<panel name="nearby_media_panel">
<text name="nearby_media_title">
@@ -30,40 +29,40 @@
Pokaż:
</text>
<combo_box name="show_combo">
- <combo_box.item label="Wszystkie" name="All"/>
- <combo_box.item label="Na obecnej posiadłości" name="WithinParcel"/>
- <combo_box.item label="Poza posiadłością" name="OutsideParcel"/>
- <combo_box.item label="Na innych awatarach" name="OnOthers"/>
+ <combo_box.item label="Wszystkie" name="All" />
+ <combo_box.item label="Na obecnej działce" name="WithinParcel" />
+ <combo_box.item label="Poza działką" name="OutsideParcel" />
+ <combo_box.item label="Na innych awatarach" name="OnOthers" />
</combo_box>
<scroll_list name="media_list">
- <scroll_list.columns label="Dokładność" name="media_proximity"/>
- <scroll_list.columns label="Widoczność" name="media_visibility"/>
- <scroll_list.columns label="Klasa" name="media_class"/>
- <scroll_list.columns label="Nazwa" name="media_name"/>
- <scroll_list.columns label="Debugowanie" name="media_debug"/>
+ <scroll_list.columns label="Bliskość" name="media_proximity" />
+ <scroll_list.columns label="Widoczność" name="media_visibility" />
+ <scroll_list.columns label="Klasa" name="media_class" />
+ <scroll_list.columns label="Nazwa" name="media_name" />
+ <scroll_list.columns label="Debugowanie" name="media_debug" />
</scroll_list>
<panel name="media_controls_panel">
<layout_stack name="media_controls">
<layout_panel name="stop">
- <button name="stop_btn" tool_tip="Zatrzymaj wybrane media"/>
+ <button name="stop_btn" tool_tip="Zatrzymaj wybrane media" />
</layout_panel>
<layout_panel name="play">
- <button name="play_btn" tool_tip="WÅ‚Ä…cz wybrane media"/>
+ <button name="play_btn" tool_tip="WÅ‚Ä…cz wybrane media" />
</layout_panel>
<layout_panel name="pause">
- <button name="pause_btn" tool_tip="Zatrzymaj wybrane media"/>
+ <button name="pause_btn" tool_tip="Pauzuj wybrane media" />
</layout_panel>
<layout_panel name="volume_slider_ctrl">
- <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Głośność audio dla wybranych mediów"/>
+ <slider_bar name="volume_slider" tool_tip="Głośność audio dla wybranych mediów" />
</layout_panel>
<layout_panel name="mute">
- <button name="mute_btn" tool_tip="Wycisz audio wybranych mediów"/>
+ <button name="mute_btn" tool_tip="Wycisz audio wybranych mediów" />
</layout_panel>
<layout_panel name="zoom">
- <button name="zoom_btn" tool_tip="Przybliż wybrane media"/>
+ <button name="zoom_btn" tool_tip="Przybliż wybrane media" />
</layout_panel>
<layout_panel name="unzoom">
- <button name="unzoom_btn" tool_tip="Oddal od wybranych mediów"/>
+ <button name="unzoom_btn" tool_tip="Oddal od wybranych mediów" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_notifications_channel.xml b/indra/newview/skins/default/xui/pl/panel_notifications_channel.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea61faca1f51e45ed88e80cd1ed69a897ee2c9f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_notifications_channel.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="notifications_panel">
+ <layout_stack name="stack1">
+ <layout_panel name="notifications_list_panel">
+ <scroll_list name="notifications_list">
+ <scroll_list.columns label="Nazwa" name="name" />
+ <scroll_list.columns label="Zawartość" name="content" />
+ <scroll_list.columns label="Data" name="date" />
+ </scroll_list>
+ </layout_panel>
+ <layout_panel name="rejects_list_panel">
+ <scroll_list name="notification_rejects_list">
+ <scroll_list.columns label="Nazwa" name="name" />
+ <scroll_list.columns label="Zawartość" name="content" />
+ <scroll_list.columns label="Data" name="date" />
+ </scroll_list>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
old mode 100755
new mode 100644
index e1668e1ef15cfab25aae5600001baf6ea66e66c6..4be8524d625efd80f3f1f8a671c6f1b21664bfc3
--- a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_notify_textbox">
- <string name="message_max_lines_count" value="7"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_notify_textbox">
<panel label="info_panel" name="info_panel">
- <text_editor name="message" value="wiadomość"/>
+ <text_editor name="message" value="wiadomość" />
</panel>
- <panel label="control_panel" name="control_panel">
- <button label="Wyślij" name="btn_submit"/>
- <button label="Ignoruj" name="ignore_btn"/>
+ <panel name="control_panel">
+ <button label="Wyślij" name="btn_submit" />
+ <button label="Ignoruj" name="ignore_btn" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
deleted file mode 100755
index fdc489f375ec6eabd344b633f4fb6eb00c3ccef3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outbox_inventory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01d0455215d462ad44331878130ee103d48f3334
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel name="inventory_outbox" tool_tip="Przeciągnij i upuść tutaj przedmioty, aby przygotować je do sprzedaży na Twojej witrynie Marketplace" />
diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
old mode 100755
new mode 100644
index 50353d4fba66771e8e04d0dc29dbc3717afbe390..aaa47ff5610525b8591dd5aaf1cecb5d46505242
--- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
@@ -1,56 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray Outfit Edit panel -->
-<panel label="Edytuj strój" name="outfit_edit">
- <string name="No Outfit" value="Brak stroju"/>
- <string name="unsaved_changes" value="Zmiany niezachowane"/>
- <string name="now_editing" value="Obecnie edytujesz"/>
- <panel.string name="not_available">
- (N\A)
- </panel.string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="outfit_edit">
+ <string name="No Outfit" value="Brak stroju" />
+ <string name="unsaved_changes" value="Zmiany niezachowane" />
+ <string name="now_editing" value="Obecnie edytujesz" />
<panel.string name="unknown">
(nieznany)
</panel.string>
- <string name="Filter.All" value="Wszystko"/>
- <string name="Filter.Clothes/Body" value="Ubrania/Ciało"/>
- <string name="Filter.Objects" value="Obiekty"/>
- <string name="Filter.Clothing" value="Ubranie"/>
- <string name="Filter.Bodyparts" value="Części ciała"/>
- <string name="replace_body_part" value="Kliknij aby zastąpić Twój obecny ksztalt"/>
- <text name="title" value="Edytuj strój"/>
- <panel label="bottom_panel" name="header_panel">
- <panel label="bottom_panel" name="outfit_name_and_status">
- <text name="status" value="Trwa edycja..."/>
- <text name="curr_outfit_name" value="[Current Outfit]"/>
+ <string name="Filter.All" value="Wszystko" />
+ <string name="Filter.Clothes/Body" value="Ubrania/Ciało" />
+ <string name="Filter.Objects" value="Obiekty" />
+ <string name="Filter.Clothing" value="Ubranie" />
+ <string name="Filter.Bodyparts" value="Części ciała" />
+ <string name="replace_body_part" value="Kliknij aby zastąpić Twój obecny kształt" />
+ <text name="title" value="Edytuj strój" />
+ <panel name="header_panel">
+ <panel name="outfit_name_and_status">
+ <text name="status" value="Trwa edycja..." />
</panel>
</panel>
<layout_stack name="im_panels">
- <layout_panel label="Panel kontrolny IM" name="outfit_wearables_panel">
+ <layout_panel name="outfit_wearables_panel">
<layout_stack name="filter_panels">
<layout_panel name="add_button_and_combobox">
- <button label="Dodaj..." name="show_add_wearables_btn" tool_tip="Otwórz/Zamknij"/>
+ <button label="Dodaj..." name="show_add_wearables_btn" tool_tip="Otwórz/Zamknij" />
</layout_panel>
<layout_panel name="filter_panel">
- <filter_editor label="Filtruj części stroju w Szafie" name="look_item_filter"/>
+ <filter_editor label="Filtruj części stroju w Szafie" name="look_item_filter" />
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="add_wearables_panel">
- <button label="Załóż obiekt" name="plus_btn"/>
+ <button label="Załóż obiekt" name="plus_btn" />
</layout_panel>
</layout_stack>
<panel name="no_add_wearables_button_bar">
- <button name="shop_btn_1" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/>
+ <button name="shop_btn_1" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie, a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju." />
</panel>
<panel name="add_wearables_button_bar">
- <button name="shop_btn_2" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/>
+ <button name="shop_btn_2" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie, a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju." />
</panel>
<panel name="save_revert_button_bar">
<layout_stack name="button_bar_ls">
<layout_panel name="save_btn_lp">
- <button label="Zapisz" name="save_btn"/>
+ <button label="Zapisz" name="save_btn" />
</layout_panel>
<layout_panel name="revert_btn_lp">
- <button label="Cofnij zmiany" name="revert_btn" tool_tip="Przywróć ostatnią zapisaną wersję"/>
+ <button label="Cofnij zmiany" name="revert_btn" tool_tip="Przywróć ostatnią zapisaną wersję" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
old mode 100755
new mode 100644
index bf23ace58f41fcce721c5692335b69b5bc021a72..933203f0f684a282933054d5e1d4a63377af52f4
--- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Rzeczy" name="Outfits">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Outfits" label="Rzeczy">
<panel.string name="wear_outfit_tooltip">
Załóż zaznaczony strój
</panel.string>
<panel.string name="wear_items_tooltip">
- Załóż wybrane obiekty
+ Załóż zaznaczone obiekty
</panel.string>
<tab_container name="appearance_tabs">
- <panel label="MOJE UBRANIA" name="outfitslist_tab"/>
- <panel label="ZAÅOÅ»ONE" name="cof_tab"/>
+ <panel name="outfitslist_tab" label="MOJE STROJE" />
+ <panel label="ZAÅOÅ»ONE" name="cof_tab" />
</tab_container>
<panel name="bottom_panel">
- <layout_stack name="bottom_panel_ls">
+ <layout_stack name="bottom_panel_ls">
<layout_panel name="save_btn_lp">
- <button label="Zapisz jako" name="save_btn"/>
+ <button label="Zapisz jako" name="save_btn" />
</layout_panel>
<layout_panel name="wear_btn_lp">
- <button label="Załóż" name="wear_btn"/>
+ <button label="Załóż" name="wear_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
index 2f8c008f98edbb074068420dd94acc503c741504..822d31113fea4f46fd225632426a8e33b61fc69f
--- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_gear_default">
- <menu_item_call label="Zastąp obecny strój" name="wear"/>
- <menu_item_call label="Dodaj do obecnego stroju" name="add"/>
- <menu_item_call label="Usuń z obecnego stroju" name="remove"/>
- <menu_item_call label="Zmień nazwę" name="rename"/>
- <menu_item_call label="Usuń link" name="remove_link"/>
- <menu_item_call label="Usuń strój" name="delete"/>
+ <menu_item_call label="Zastąp obecny strój" name="wear" />
+ <menu_item_call label="Usuń z obecnego stroju" name="remove" />
+ <menu_item_call label="Zmień nazwę" name="rename" />
+ <menu_item_call label="Usuń link" name="remove_link" />
+ <menu_item_call label="Usuń strój" name="delete" />
</menu>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
old mode 100755
new mode 100644
index ed3057399dd6af74f606bcedb960f979325ceac8..e46f5a96c9e8c75bb0bba3a96e46212adaf468ff
--- a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Outfits">
+ <accordion name="outfits_accordion">
+ <no_matched_tabs_text name="no_matched_outfits_msg" value="Nie potrafisz znaleźć tego, czego potrzebujesz? Spróbuj [secondlife:///app/search/all/[SEARCH_TERM] wyszukać]." />
+ <no_visible_tabs_text name="no_outfits_msg" value="Nie masz jeszcze żadnych strojów. Spróbuj [secondlife:///app/search/all/ wyszukać]" />
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje"/>
- <button name="trash_btn" tool_tip="Usuń wybrany strój"/>
+ <menu_button tool_tip="Pokaż dodatkowe opcje" name="options_gear_btn" />
+ <button name="trash_btn" tool_tip="Usuń wybrany strój" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
old mode 100755
new mode 100644
index 5559c151e7a64289d68ae15430d9b5b0993ff3be..f6ac3663008f6b048b21d32fafcfa82c29b6abf4
--- a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Wearing">
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje"/>
+ <menu_button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
old mode 100755
new mode 100644
index ef52e2148b7610f3a263a2c6867e5e35843b6299..56dd8a3e7f053426ffa08c2e829cfadcbefbf719
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -1,94 +1,69 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray panel -->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Ludzie" name="people_panel">
- <string name="no_recent_people" value="Brak ostatnich rozmówców. Chcesz spotkać ludzi? Spróbuj [secondlife:///app/search/people Szukaj] or the [secondlife:///app/worldmap Mapa Świata]."/>
- <string name="no_filtered_recent_people" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/groups/[SEARCH_TERM] Szukaj]."/>
- <string name="no_one_near" value="Nie ma nikogo w pobliżu. Chcesz spotkać ludzi? Spróbuj [secondlife:///app/search/people Szukaj] lub [secondlife:///app/worldmap Mapa Świata]."/>
- <string name="no_one_filtered_near" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/groups/[SEARCH_TERM] Szukaj]."/>
- <string name="no_friends_online" value="Brak dostępnych znajomych"/>
- <string name="no_friends" value="Brak znajomych"/>
+ <string name="no_recent_people" value="Brak ostatnich rozmówców. Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/search/people Wyszukiwarki] lub [secondlife:///app/worldmap Mapy Świata]." />
+ <string name="no_filtered_recent_people" value="Nie znalazłeś/aś tego czego szukasz? Spróbuj użyć [secondlife:///app/search/people/[SEARCH_TERM] Wyszukiwarki]." />
+ <string name="no_one_near" value="Nie ma nikogo w pobliżu. Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/search/people Wyszukiwarki] lub [secondlife:///app/worldmap Mapy Świata]." />
+ <string name="no_one_filtered_near" value="Nie znalazłeś/aś tego czego szukasz? Spróbuj użyć [secondlife:///app/search/people/[SEARCH_TERM] Wyszukiwarki]." />
+ <string name="no_friends_online" value="Brak dostępnych znajomych" />
+ <string name="no_friends" value="Brak znajomych" />
<string name="no_friends_msg">
- Wyszukaj znajomych [secondlife:///app/search/people Szukaj] lub kliknij prawym przyciskiem na Rezydenta aby zaproponować mu znajomość.
-Chcesz spotkać ludzi? Spróbuj [secondlife:///app/worldmap Mapa Świata].
+ Wyszukaj znajomych poprzez [secondlife:///app/search/people Wyszukiwarkę] lub kliknij prawym przyciskiem myszki na Rezydencie i zaproponuj znajomość.
+Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata].
</string>
<string name="no_filtered_friends_msg">
- Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/groups/[SEARCH_TERM] Szukaj].
+ Nie znalazłeś/aś tego czego szukasz? Spróbuj użyć [secondlife:///app/search/people/[SEARCH_TERM] Wyszukiwarki].
</string>
- <string name="people_filter_label" value="Filtruj ludzi"/>
- <string name="groups_filter_label" value="Filtruj grupy"/>
- <string name="no_filtered_groups_msg" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/groups/[SEARCH_TERM] Szukaj]."/>
- <string name="no_groups_msg" value="Chcesz dołączyć do grup? Spróbuj [secondlife:///app/search/groups Szukaj]."/>
- <string name="MiniMapToolTipMsg" value="[REGION](Podwójne kliknięcie otwiera mapę, wciśnij Shift i przeciągnij aby przesunąć)"/>
- <string name="AltMiniMapToolTipMsg" value="[REGION](Podwójne kliknięcie aktywuje teleport, wciśnij Shift i przeciągnij aby przesunąć)"/>
- <filter_editor label="Filtr" name="filter_input"/>
+ <string name="no_filtered_groups_msg" value="Nie znalazłeś/aś tego czego szukasz? Spróbuj użyć [secondlife:///app/search/groups/[SEARCH_TERM] Wyszukiwarki]." />
+ <string name="no_groups_msg" value="Chcesz dołączyć do jakiejś grupy? Spróbuj użyć [secondlife:///app/search/groups Wyszukiwarki]." />
+ <string name="MiniMapToolTipMsg" value="[REGION] (Podwójne kliknięcie otwiera mapę, przeciąganie z Shiftem przesuwa)" />
+ <string name="AltMiniMapToolTipMsg" value="[REGION] (Podwójne kliknięcie teleportuje, przeciąganie z Shiftem przesuwa)" />
<tab_container name="tabs">
<panel label="W POBLIŻU" name="nearby_panel">
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="nearby_view_sort_btn" tool_tip="Opcje"/>
- <button name="add_friend_btn" tool_tip="Dodaj wybranego Rezydenta do znajomych"/>
+ <panel name="nearby_buttons_panel">
+ <filter_editor label="Filtruj ludzi" name="nearby_filter_input" />
+ <button name="gear_btn" tool_tip="Akcje dotyczÄ…ce wybranej osoby" />
+ <menu_button name="nearby_view_btn" tool_tip="Opcje widoku/sortowania" />
+ <button name="add_friend_btn" tool_tip="Dodaj wybranego Rezydenta do znajomych" />
+ <dnd_button name="nearby_del_btn" tool_tip="Usuń zaznaczoną osobę ze swojej listy znajomych" />
</panel>
</panel>
<panel label="ZNAJOMI" name="friends_panel">
+ <panel name="friends_buttons_panel">
+ <filter_editor label="Filtruj ludzi" name="friends_filter_input" />
+ <button name="gear_btn" tool_tip="Akcje dotyczÄ…ce wybranej osoby" />
+ <menu_button name="friends_view_btn" tool_tip="Opcje widoku/sortowania" />
+ <button name="friends_add_btn" tool_tip="Dodaj wybranego Rezydenta do znajomych" />
+ <dnd_button name="friends_del_btn" tool_tip="Usuń zaznaczoną osobę ze swojej listy znajomych" />
+ </panel>
<accordion name="friends_accordion">
- <accordion_tab name="tab_online" title="Dostępni"/>
- <accordion_tab name="tab_all" title="Wszyscy"/>
+ <accordion_tab name="tab_online" title="Dostępni" />
+ <accordion_tab name="tab_all" title="Wszyscy" />
+ <accordion_tab name="tab_suggested_friends" title="Sugerowani" />
</accordion>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="bottom_panel">
- <layout_panel name="options_gear_btn_panel">
- <menu_button name="friends_viewsort_btn" tool_tip="Pokaż opcje dodatkowe"/>
- </layout_panel>
- <layout_panel name="add_btn_panel">
- <button name="add_btn" tool_tip="Dodaj wybranego Rezydenta do znajomych"/>
- </layout_panel>
- <layout_panel name="trash_btn_panel">
- <dnd_button name="del_btn" tool_tip="Usuń zaznaczoną osobę ze swojej listy znajomych"/>
- </layout_panel>
- </layout_stack>
- </panel>
</panel>
<panel label="GRUPY" name="groups_panel">
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="groups_viewsort_btn" tool_tip="Opcje"/>
- <button name="plus_btn" tool_tip="Dołącz do grupy/Stwórz nową grupę"/>
- <button name="activate_btn" tool_tip="Aktywuj wybranÄ… grupÄ™"/>
+ <panel name="groups_buttons_panel">
+ <filter_editor label="Filtruj grupy" name="groups_filter_input" />
+ <menu_button name="groups_gear_btn" tool_tip="Akcje dotyczÄ…ce wybranej grupy" />
+ <menu_button name="groups_view_btn" tool_tip="Opcje widoku/sortowania" />
+ <menu_button name="plus_btn" tool_tip="Dołącz do grupy / Stwórz nową grupę" />
+ <dnd_button name="minus_btn" tool_tip="Opuść wybraną grupę" />
</panel>
+ <text name="groupcount">
+ Należysz do [COUNT] grup ([REMAINING] pozostało).
+ </text>
</panel>
<panel label="OSTATNIE" name="recent_panel">
- <panel label="bottom_panel" name="bottom_panel">
- <menu_button name="recent_viewsort_btn" tool_tip="Opcje"/>
- <button name="add_friend_btn" tool_tip="Dodaj wybranego Rezydenta do znajomych"/>
+ <panel name="recent_buttons_panel">
+ <filter_editor label="Filtruj ludzi" name="recent_filter_input" />
+ <button name="gear_btn" tool_tip="Akcje dotyczÄ…ce wybranej osoby" />
+ <menu_button name="recent_view_btn" tool_tip="Opcje widoku/sortowania" />
+ <button name="add_friend_btn" tool_tip="Dodaj wybranego Rezydenta do znajomych" />
+ <dnd_button name="recent_del_btn" tool_tip="Usuń zaznaczoną osobę ze swojej listy znajomych" />
</panel>
</panel>
+ <panel label="ZABLOKOWANI" name="blocked_panel">
+ <panel name="panel_block_list_sidetray" label="Zablokowani Rezydenci i obiekty" />
+ </panel>
</tab_container>
- <panel name="button_bar">
- <layout_stack name="bottom_bar_ls">
- <layout_panel name="view_profile_btn_lp">
- <button label="Profil" name="view_profile_btn" tool_tip="Pokaż zdjęcie, grupy i inne informacje o Rezydencie"/>
- </layout_panel>
- <layout_panel name="im_btn_lp">
- <button label="IM" name="im_btn" tool_tip="Otwórz wiadomości IM"/>
- </layout_panel>
- <layout_panel name="call_btn_lp">
- <button label="Dzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
- </layout_panel>
- <layout_panel name="share_btn_lp">
- <button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleport"/>
- </layout_panel>
- </layout_stack>
- <layout_stack name="bottom_bar_ls1">
- <layout_panel name="group_info_btn_lp">
- <button label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/>
- </layout_panel>
- <layout_panel name="chat_btn_lp">
- <button label="Czat grupy" name="chat_btn" tool_tip="Otwórz sesję czatu"/>
- </layout_panel>
- <layout_panel name="group_call_btn_lp">
- <button label="Rozmowa głosowa w grupie" name="group_call_btn" tool_tip="Rozmowa głosowa w tej grupie"/>
- </layout_panel>
- </layout_stack>
- </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
old mode 100755
new mode 100644
index 26afded7958a8f2f48362a2b315a6d69e1127208..6ea8a4d8199c647724bc31425fe40693c2131910
--- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_pick_info">
- <text name="title" value="Info o Ulubionych"/>
+ <text name="title" value="Info o Miejscu" />
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[name]"/>
- <text_editor name="pick_location" value="[loading...]"/>
- <text_editor name="pick_desc" value="[description]"/>
+ <text_editor name="pick_name" value="[nazwa]" />
+ <text_editor name="pick_location" value="[wczytywanie...]" />
+ <text_editor name="pick_desc" value="[opis]" />
</panel>
</scroll_container>
<panel name="buttons">
<layout_stack name="layout_stack1">
<layout_panel name="layout_panel1">
- <button label="Teleportuj" name="teleport_btn"/>
+ <button label="Teleportuj" name="teleport_btn" />
</layout_panel>
<layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn"/>
- </layout_panel>
+ <button label="Mapa" name="show_on_map_btn" />
+ </layout_panel>
<layout_panel name="edit_btn_lp">
- <button label="Edytuj" name="edit_btn"/>
+ <button label="Edytuj" name="edit_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
old mode 100755
new mode 100644
index 1ba4e761966b7714c3563d3bab5e589ac24fa8db..8e70f533b2dab150bcdf57773ac54da32341bd2d
--- a/indra/newview/skins/default/xui/pl/panel_picks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_picks.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ulubione" name="panel_picks">
- <string name="no_picks" value="Brak Ulubionych"/>
- <string name="no_classifieds" value="Brak Reklam"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Miejsca" name="panel_picks">
+ <string name="no_picks" value="Brak Miejsc" />
+ <string name="no_classifieds" value="Brak reklam" />
<accordion name="accordion">
- <accordion_tab name="tab_picks" title="Ulubione"/>
- <accordion_tab name="tab_classifieds" title="Reklamy"/>
+ <accordion_tab name="tab_picks" title="Miejsca" />
+ <accordion_tab name="tab_classifieds" title="Reklamy" />
</accordion>
- <panel label="bottom_panel" name="edit_panel">
+ <panel name="edit_panel">
<layout_stack name="edit_panel_ls">
<layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Stwórz w obecnym miejscu nową zakładkę w ulubionych lub reklamę"/>
+ <button name="new_btn" tool_tip="Stwórz nowe Miejsce lub reklamę w obecnej lokalizacji" />
</layout_panel>
</layout_stack>
</panel>
<panel name="buttons_cucks">
<layout_stack name="buttons_cucks_ls">
<layout_panel name="info_btn_lp">
- <button label="Informacja" name="info_btn" tool_tip="Pokaż informację o ulubionych"/>
+ <button name="info_btn" tool_tip="Pokaż informacje o Miejscu" />
</layout_panel>
<layout_panel name="teleport_btn_lp">
- <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do odpowiadajÄ…cego obszaru"/>
+ <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do odpowiadajÄ…cego obszaru" />
</layout_panel>
<layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż odpowiadający obszar na Mapie Świata"/>
+ <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż obszar na mapie świata" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
old mode 100755
new mode 100644
index 2a4ffab36c4ddda0b11d274e4d39e6335d846963..0e27835632f27f50c6b53142d351f7b04be629ba
--- a/indra/newview/skins/default/xui/pl/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
@@ -1,33 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="place_profile">
- <string name="on" value="WÅ‚Ä…cz"/>
- <string name="off" value="Wyłącz"/>
- <string name="anyone" value="Każdy"/>
- <string name="available" value="dostępny"/>
- <string name="allocated" value="przydzielony"/>
- <string name="title_place" value="Profil Miejsca"/>
- <string name="title_teleport_history" value="Historia teleportacji"/>
- <string name="not_available" value="(brak)"/>
- <string name="unknown" value="(nieznany)"/>
- <string name="public" value="(publiczny)"/>
- <string name="none_text" value="(żaden)"/>
- <string name="sale_pending_text" value="(Sprzedaż w toku realizacji)"/>
- <string name="group_owned_text" value="(Własność grupy)"/>
- <string name="price_text" value="L$"/>
- <string name="area_text" value="m²"/>
- <string name="all_residents_text" value="Każdemu"/>
- <string name="group_text" value="Grupie"/>
+ <string name="on" value="WÅ‚Ä…czone" />
+ <string name="off" value="Wyłączone" />
+ <string name="anyone" value="Każdy" />
+ <string name="available" value="dostępny" />
+ <string name="allocated" value="przydzielony" />
+ <string name="title_place" value="Profil Miejsca" />
+ <string name="title_teleport_history" value="Historia teleportacji" />
+ <string name="not_available" value="(niedostępny)" />
+ <string name="unknown" value="(nieznany)" />
+ <string name="public" value="(publiczny)" />
+ <string name="none_text" value="(brak)" />
+ <string name="sale_pending_text" value="(Sprzedaż w toku)" />
+ <string name="group_owned_text" value="(Własność grupy)" />
+ <string name="all_residents_text" value="Każdemu" />
+ <string name="group_text" value="Grupie" />
<string name="can_resell">
- Posiadłość zakupiona w tym regionie może być odsprzedana.
+ Działka zakupiona w tym regionie może być odsprzedana.
</string>
<string name="can_not_resell">
- Posiadłość zakupiona w tym regionie nie może być odsprzedana.
+ Działka zakupiona w tym regionie nie może być odsprzedana.
</string>
<string name="can_change">
- Posiadłość zakupiona w tym regionie może być łączona/dzielona.
+ Działka zakupiona w tym regionie może być łączona/dzielona.
</string>
<string name="can_not_change">
- Posiadłość zakupiona w tym regionie nie może być łączona/dzielona.
+ Działka zakupiona w tym regionie nie może być łączona/dzielona.
</string>
<string name="server_update_text">
Informacje o tym miejscu nie będą dostępne bez aktualizacji serwera.
@@ -36,74 +34,56 @@
Informacje o tym miejscu są obecnie niedostępne, spróbuj później.
</string>
<string name="server_forbidden_text">
- Dostęp do informacji o tym miejscu jest ograniczony. Zweryfikuj swoje przywileje z właścicielem posiadłości.
+ Dostęp do informacji o tym miejscu jest ograniczony. Zweryfikuj swoje przywileje z właścicielem działki.
</string>
- <string name="acquired_date">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </string>
- <button name="back_btn" tool_tip="Cofnij"/>
- <text name="title" value="Profil Miejsca"/>
+ <button name="back_btn" tool_tip="Cofnij" />
+ <text name="title" value="Profil Miejsca" />
<scroll_container name="place_scroll">
<panel name="scrolling_panel">
- <text name="owner_label" value="Właściciel:"/>
- <text name="maturity_value" value="nieznany"/>
+ <text name="owner_label" value="Właściciel:" />
+ <text name="maturity_value" value="nieznany" />
<accordion name="advanced_info_accordion">
- <accordion_tab name="parcel_characteristics_tab" title="Posiadłość">
+ <accordion_tab name="parcel_characteristics_tab" title="Działka">
<panel name="parcel_characteristics_panel">
- <text name="rating_label" value="Rodzaj:"/>
- <text name="rating_value" value="nieznane"/>
- <text name="voice_label" value="Komunikacja głosowa:"/>
- <text name="voice_value" value="WÅ‚Ä…czone"/>
- <text name="fly_label" value="Lataj:"/>
- <text name="fly_value" value="WÅ‚Ä…czone"/>
- <text name="push_label" value="Popchnięcia:"/>
- <text name="push_value" value="Wyłączone"/>
- <text name="build_label" value="Budowanie:"/>
- <text name="build_value" value="WÅ‚Ä…czone"/>
- <text name="scripts_label" value="Skrypty:"/>
- <text name="scripts_value" value="WÅ‚Ä…czone"/>
- <text name="damage_label" value="Zniszczenia:"/>
- <text name="damage_value" value="Wyłączone"/>
- <button label="O Posiadłości" name="about_land_btn"/>
+ <text name="rating_label" value="Rodzaj:" />
+ <text name="voice_label" value="Kom. głosowa:" />
+ <text name="fly_label" value="Latanie:" />
+ <text name="push_label" value="Popchnięcia:" />
+ <text name="build_label" value="Budowanie:" />
+ <text name="scripts_label" value="Skrypty:" />
+ <text name="damage_label" value="Uszkodzenia:" />
+ <text name="see_avatars_label" value="Inne awatary:" />
+ <button label="O działce" name="about_land_btn" />
</panel>
</accordion_tab>
- <accordion_tab name="region_information_tab" title="Region">
+ <accordion_tab name="region_information_tab">
<panel name="region_information_panel">
- <text name="region_name_label" value="Region:"/>
- <text name="region_name" value="Mooseland"/>
- <text name="region_type_label" value="Typ:"/>
- <text name="region_type" value="Moose"/>
- <text name="region_rating_label" value="Rodzaj:"/>
- <text name="region_rating" value="Adult"/>
- <text name="region_owner_label" value="Właściciel:"/>
- <text name="region_owner" value="moose Van Moose extra long name moose"/>
- <text name="region_group_label" value="Grupa:"/>
- <text name="region_group">
- The Mighty Moose of mooseville soundvillemoose
- </text>
- <button label="Region/MajÄ…tek" name="region_info_btn"/>
+ <text name="region_type_label" value="Typ:" />
+ <text name="region_rating_label" value="Rodzaj:" />
+ <text name="region_owner_label" value="Właściciel:" />
+ <text name="region_group_label" value="Grupa:" />
+ <button label="Region/MajÄ…tek" name="region_info_btn" />
</panel>
</accordion_tab>
<accordion_tab name="estate_information_tab" title="MajÄ…tek">
<panel name="estate_information_panel">
- <text name="estate_name_label" value="MajÄ…tek:"/>
- <text name="estate_rating_label" value="Rodzaj:"/>
- <text name="estate_owner_label" value="Właściciel:"/>
- <text name="estate_owner" value="Testing owner name length with long name"/>
- <text name="covenant_label" value="Umowa:"/>
+ <text name="estate_name_label" value="MajÄ…tek:" />
+ <text name="estate_rating_label" value="Rodzaj:" />
+ <text name="estate_owner_label" value="Właściciel:" />
+ <text name="covenant_label" value="Umowa:" />
</panel>
</accordion_tab>
<accordion_tab name="sales_tab" title="Na sprzedaż">
<panel name="sales_panel">
- <text name="sales_price_label" value="Cena:"/>
- <text name="area_label" value="Powierzchnia:"/>
- <text name="traffic_label" value="Ruch:"/>
- <text name="primitives_label" value="Primy:"/>
- <text name="parcel_scripts_label" value="Skrypty:"/>
- <text name="terraform_limits_label" value="Ograniczenia terraformingu:"/>
- <text name="subdivide_label" value="Podziel/ZÅ‚Ä…cz:"/>
- <text name="resale_label" value="Możliwość sprzedaży:"/>
- <text name="sale_to_label" value="Na sprzedaż:"/>
+ <text name="sales_price_label" value="Cena:" />
+ <text name="area_label" value="Obszar:" />
+ <text name="traffic_label" value="Ruch:" />
+ <text name="primitives_label" value="Primy:" />
+ <text name="parcel_scripts_label" value="Skrypty:" />
+ <text name="terraform_limits_label" value="Limity terraform.:" />
+ <text name="subdivide_label" value="Dzielenie/Å‚Ä…czenie:" />
+ <text name="resale_label" value="Możliwość sprzedaży:" />
+ <text name="sale_to_label" value="Na sprzedaż:" />
</panel>
</accordion_tab>
</accordion>
diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml
old mode 100755
new mode 100644
index d69d137d235755ea5aaf7a4832f925d4f79c6f72..532e790246fd736854cefd658560ef1e49a28aea
--- a/indra/newview/skins/default/xui/pl/panel_places.xml
+++ b/indra/newview/skins/default/xui/pl/panel_places.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Miejsca" name="places panel">
- <string name="landmarks_tab_title" value="MOJE LANDMARKI"/>
- <string name="teleport_history_tab_title" value="HISTORIA TELEPORTÓW"/>
- <filter_editor label="Filtruj Moje Miejsca" name="Filter"/>
+ <string name="landmarks_tab_title" value="LANDMARKI" />
+ <string name="teleport_history_tab_title" value="HISTORIA TELEPORTÓW" />
+ <filter_editor label="Filtruj Miejsca" name="Filter" />
<panel name="button_panel">
- <layout_stack name="bottom_bar_ls0">
+ <layout_stack name="bottom_bar_ls0">
<layout_panel name="lp1">
- <layout_stack name="bottom_bar_ls1">
+ <layout_stack name="bottom_bar_ls1">
<layout_panel name="teleport_btn_lp">
- <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj siÄ™ w wybrane miejsce"/>
+ <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj siÄ™ w wybrane miejsce" />
</layout_panel>
<layout_panel name="chat_btn_lp">
- <button label="Mapa" name="map_btn" tool_tip="Pokaż odpowiadające miejsce na Mapie Świata"/>
+ <button label="Mapa" name="map_btn" tool_tip="Pokaż odpowiadające miejsce na Mapie Świata" />
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="lp2">
<layout_stack name="bottom_bar_ls3">
<layout_panel name="edit_btn_lp">
- <button label="Edytuj" name="edit_btn" tool_tip="Edytuj informacje landmarka"/>
+ <button label="Edytuj" name="edit_btn" tool_tip="Edytuj informacje landmarka" />
</layout_panel>
<layout_panel name="overflow_btn_lp">
- <menu_button label="▼" name="overflow_btn" tool_tip="Pokaż opcje dodatkowe"/>
+ <menu_button name="overflow_btn" tool_tip="Pokaż opcje dodatkowe" />
</layout_panel>
</layout_stack>
<layout_stack name="bottom_bar_profile_ls">
<layout_panel name="profile_btn_lp">
- <button label="Profil" name="profile_btn" tool_tip="Pokaż profil miejsca"/>
+ <button label="Profil" name="profile_btn" tool_tip="Pokaż profil miejsca" />
</layout_panel>
</layout_stack>
<layout_stack name="bottom_bar_close_ls3">
<layout_panel name="close_btn_lp">
- <button label="Zamknij" name="close_btn"/>
+ <button label="Zamknij" name="close_btn" />
</layout_panel>
</layout_stack>
</layout_panel>
- </layout_stack>
+ </layout_stack>
<layout_stack name="bottom_bar_ls2">
<layout_panel name="save_btn_lp">
- <button label="Zapisz" name="save_btn"/>
+ <button label="Zapisz" name="save_btn" />
</layout_panel>
<layout_panel name="cancel_btn_lp">
- <button label="Cofnij" name="cancel_btn"/>
+ <button label="Anuluj" name="cancel_btn" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_postcard_message.xml b/indra/newview/skins/default/xui/pl/panel_postcard_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e224c6372b2888d64ad33e6e38ca8c6929bbbeaa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_postcard_message.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_postcard_message">
+ <text name="to_label">
+ Do:
+ </text>
+ <text name="name_label">
+ Od:
+ </text>
+ <text name="subject_label">
+ Temat:
+ </text>
+ <text_editor name="msg_form">
+ Wpisz tutaj wiadomość.
+ </text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_postcard_settings.xml b/indra/newview/skins/default/xui/pl/panel_postcard_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bdd212432a92c3eff31397ea74ea69d132a9c1c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_postcard_settings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_postcard_settings">
+ <combo_box label="Rozdzielczość" name="postcard_size_combo">
+ <combo_box.item label="Obecne okno" name="CurrentWindow" />
+ <combo_box.item label="WÅ‚asna" name="Custom" />
+ </combo_box>
+ <spinner label="Szer. x Wys." name="postcard_snapshot_width" />
+ <check_box label="Zachowaj proporcje" name="postcard_keep_aspect_check" />
+ <slider label="Jakość:" name="image_quality_slider" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 5e61f6269131a78ebc784b9a89025757bd3c831b..cc85ec20f6c6b3af05c633b86b27534702b9b21a
--- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
@@ -1,18 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<panel label="Zaawansowane" name="advanced">
- <panel.string name="aspect_ratio_text">
- [NUM]:[DEN]
- </panel.string>
+ <text name="Cache:">
+ Pamięć podręczna:
+ </text>
+ <spinner label="Rozmiar (64 - 9984 MB)" name="cachesizespinner" />
+ <button label="Wyczyść" label_selected="Wyczyść" name="clear_cache" />
+ <text name="Cache location">
+ Położenie buforu pamięci podręcznej:
+ </text>
+ <button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="set_cache" />
+ <button label="Domyślne" label_selected="Domyślne" name="default_cache_location" />
<text name="UI Size:">
- rozmiar UI:
+ Rozmiar interfejsu:
</text>
- <check_box label="Pokaż błędy skryptu w:" name="show_script_errors"/>
+ <check_box label="Pokaż błędy skryptów w:" name="show_script_errors" />
<radio_group name="show_location">
- <radio_item label="Czat Lokalny" name="0"/>
- <radio_item label="Osobne okno:" name="1"/>
+ <radio_item label="Czacie lokalnym" name="0" />
+ <radio_item label="Osobnym oknie" name="1" />
</radio_group>
- <check_box label="Pozwól na wiele przeglądarek" name="allow_multiple_viewer_check"/>
- <check_box label="Pokaż selekcję siatki przy logowaniu" name="show_grid_selection_check"/>
- <check_box label="Pokaz menu Zaawansowane" name="show_advanced_menu_check"/>
- <check_box label="Pokaz menu Rozwinięcie" name="show_develop_menu_check"/>
+ <check_box label="Zezwól na wiele Przeglądarek" name="allow_multiple_viewer_check" />
+ <check_box label="Zezwól na logowanie do innych siatek" name="show_grid_selection_check" />
+ <check_box label="Pokaż menu Zaawansowane" name="show_advanced_menu_check" />
+ <check_box label="Pokaż menu Programista" name="show_develop_menu_check" />
+ <button label="Domyślne uprawnienia tworzenia" name="default_creation_permissions" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
old mode 100755
new mode 100644
index d53a99e8c107764edef0eb232cb92664b7e1f4c5..59f1421e6e97f7c3fc3b41606cca11a81c418cdb
--- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Informacje" name="popups" title="Popups">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Alerty" name="popups">
<text name="tell_me_label">
Powiadom mnie:
</text>
- <check_box label="Kiedy wydajÄ™ lub otrzymujÄ™ L$" name="notify_money_change_checkbox"/>
- <check_box label="Kiedy moi znajomi zalogowujÄ… siÄ™ i wylogowujÄ…" name="friends_online_notify_checkbox"/>
+ <check_box label="Gdy wydajÄ™ lub dostajÄ™ L$" name="notify_money_change_checkbox" />
+ <check_box label="Gdy znajomi siÄ™ logujÄ…/wylogowywujÄ…" name="friends_online_notify_checkbox" />
<text name="show_label">
Zawsze pokazuj:
</text>
<text name="dont_show_label">
- Nie pokazuj:
+ Nigdy nie pokazuj:
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 7fd1029e6acda23bc7119d231c8514d549583871..afa1d7e2cafc7c5bfd2e97fdd40e284251be28a4
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -1,58 +1,110 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Czat/IM" name="chat">
- <text name="font_size">
- Rozmiar czcionki:
- </text>
- <radio_group name="chat_font_size">
- <radio_item label="Mała" name="radio" value="0"/>
- <radio_item label="Åšrednia" name="radio2" value="1"/>
- <radio_item label="Duża" name="radio3" value="2"/>
- </radio_group>
- <check_box initial_value="true" label="Używaj animacji podczas pisania" name="play_typing_animation"/>
- <check_box label="Wysyłaj wszystkie wiadomości (IM) na moją skrzynkę pocztową kiedy jestem niedostępny" name="send_im_to_email"/>
- <check_box label="Zwykły tekst IM i historia czatu" name="plain_text_chat_history"/>
- <check_box label="Czat chmurkowy" name="bubble_text_chat"/>
- <text name="show_ims_in_label">
- Pokaż wiadomości (IM) w:
- </text>
- <text name="requires_restart_label">
- (restart wymagany)
- </text>
- <radio_group name="chat_window" tool_tip="Pokaż wiadomości IM osobno lub razem (restart wymagany)">
- <radio_item label="Osobne okna" name="radio" value="0"/>
- <radio_item label="Etykiety" name="radio2" value="1"/>
- </radio_group>
- <text name="disable_toast_label">
- Uaktywnij wyskakujące okienka rozpoczynających się rozmów:
- </text>
- <check_box label="Czat grupy" name="EnableGroupChatPopups" tool_tip="Zaznacz aby widzieć wyskakuące okienka kiedy czat grupy się pojawia"/>
- <check_box label="Czat IM" name="EnableIMChatPopups" tool_tip="Zaznacz aby widzieć wyskakujące okienka kiedy IM się pojawia"/>
- <spinner label="Czas widoczności czatu w pobliżu:" name="nearby_toasts_lifetime"/>
- <spinner label="Czas znikania czatu w pobliżu:" name="nearby_toasts_fadingtime"/>
- <check_box name="translate_chat_checkbox"/>
- <text name="translate_chb_label">
- Użyj translatora podczas rozmowy
- </text>
- <text name="translate_language_text">
- Przetłumacz czat na:
- </text>
- <combo_box name="translate_language_combobox">
- <combo_box.item label="Domyślny" name="System Default Language"/>
- <combo_box.item label="English (Angielski)" name="English"/>
- <combo_box.item label="Dansk (Duński)" name="Danish"/>
- <combo_box.item label="Deutsch (Niemiecki)" name="German"/>
- <combo_box.item label="Español (Hiszpański)" name="Spanish"/>
- <combo_box.item label="Français (Francuski)" name="French"/>
- <combo_box.item label="Italiano (WÅ‚oski)" name="Italian"/>
- <combo_box.item label="Magyar (Węgierski)" name="Hungarian"/>
- <combo_box.item label="Nederlands (Holenderski)" name="Dutch"/>
- <combo_box.item label="Polski" name="Polish"/>
- <combo_box.item label="Português (Portugalski)" name="Portugese"/>
- <combo_box.item label="РуÑÑкий (Rosyjski)" name="Russian"/>
- <combo_box.item label="Türkçe (Turecki)" name="Turkish"/>
- <combo_box.item label="УкраїнÑька (UkraiÅ„ski)" name="Ukrainian"/>
- <combo_box.item label="ä¸æ–‡ (æ£é«”) (ChiÅ„ski)" name="Chinese"/>
- <combo_box.item label="日本語 (Japoński)" name="Japanese"/>
- <combo_box.item label="í•œêµì–´ (KoreaÅ„ski)" name="Korean"/>
- </combo_box>
+ <panel name="general_chat_settings">
+ <check_box label="Używaj animacji podczas pisania" name="play_typing_animation" />
+ <check_box label="Ślij IM-y na mój e-mail, gdy jestem offline" name="send_im_to_email" />
+ <check_box label="Tylko znajomi i grupy mogą do mnie pisać lub dzwonić" name="voice_call_friends_only_check" />
+ <text name="font_size">
+ Rozmiar czcionki:
+ </text>
+ <combo_box name="chat_font_size">
+ <item label="Mała" name="Small" />
+ <item label="Åšrednia" name="Medium" />
+ <item label="Duża" name="Large" />
+ </combo_box>
+ <check_box label="Czat ponad awatarami" name="bubble_text_chat" />
+ </panel>
+ <panel name="im_notification_settings">
+ <text name="friend_ims">
+ Czat od znajomych:
+ </text>
+ <combo_box name="FriendIMOptions">
+ <item label="Otwórz okno rozmów" name="OpenConversationsWindow" />
+ <item label="Pokaż wiadomość" name="PopUpMessage" />
+ <item label="Mrugaj przyciskiem na pasku" name="FlashToolbarButton" />
+ <item label="Brak akcji" name="NoAction" />
+ </combo_box>
+ <check_box label="Odtwórz dźwięk" name="play_sound_friend_im" />
+ <text name="non_friend_ims">
+ Czat od nieznajomych:
+ </text>
+ <combo_box name="NonFriendIMOptions">
+ <item label="Otwórz okno rozmów" name="OpenConversationsWindow" />
+ <item label="Pokaż wiadomość" name="PopUpMessage" />
+ <item label="Mrugaj przyciskiem na pasku" name="FlashToolbarButton" />
+ <item label="Brak akcji" name="NoAction" />
+ </combo_box>
+ <check_box label="Odtwórz dźwięk" name="play_sound_non_friend_im" />
+ <text name="conference_ims">
+ Czat konferencji:
+ </text>
+ <combo_box name="ConferenceIMOptions">
+ <item label="Otwórz okno rozmów" name="OpenConversationsWindow" />
+ <item label="Pokaż wiadomość" name="PopUpMessage" />
+ <item label="Mrugaj przyciskiem na pasku" name="FlashToolbarButton" />
+ <item label="Brak akcji" name="NoAction" />
+ </combo_box>
+ <check_box label="Odtwórz dźwięk" name="play_sound_conference_im" />
+ <text name="group_chat">
+ Czat grupowy:
+ </text>
+ <combo_box name="GroupChatOptions">
+ <item label="Otwórz okno rozmów" name="OpenConversationsWindow" />
+ <item label="Pokaż wiadomość" name="PopUpMessage" />
+ <item label="Mrugaj przyciskiem na pasku" name="FlashToolbarButton" />
+ <item label="Brak akcji" name="NoAction" />
+ </combo_box>
+ <check_box label="Odtwórz dźwięk" name="play_sound_group_chat_im" />
+ <text name="nearby_chat">
+ Czat w pobliżu:
+ </text>
+ <combo_box name="NearbyChatOptions">
+ <item label="Otwórz okno rozmów" name="OpenConversationsWindow" />
+ <item label="Pokaż wiadomość" name="PopUpMessage" />
+ <item label="Mrugaj przyciskiem na pasku" name="FlashToolBarButton" />
+ <item label="Brak akcji" name="NoAction" />
+ </combo_box>
+ <check_box label="Odtwórz dźwięk" name="play_sound_nearby_chat_im" />
+ <text name="object_ims">
+ Czat od obiektów:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Otwórz okno rozmów" name="OpenConversationsWindow" />
+ <item label="Pokaż wiadomość" name="PopUpMessage" />
+ <item label="Mrugaj przyciskiem na pasku" name="FlashToolBarButton" />
+ <item label="Brak akcji" name="NoAction" />
+ </combo_box>
+ <check_box label="Odtwórz dźwięk" name="play_sound_object_im" />
+ <text name="notifications_alert">
+ Aby tymczasowo wstrzymać powiadomienia włącz Komunikacja > Zajęty lub Niedostępny
+ </text>
+ </panel>
+ <panel name="play_sound_settings">
+ <text name="play_sound">
+ Odtwórz dźwięk:
+ </text>
+ <check_box label="Nowa rozmowa tekstowa" name="new_conversation" />
+ <check_box label="Nowa rozmowa głosowa" name="incoming_voice_call" />
+ <check_box label="Propozycja teleportacji" name="teleport_offer" />
+ <check_box label="Propozycja przedmiotu" name="inventory_offer" />
+ </panel>
+ <panel name="log_settings">
+ <text name="logging_label">
+ Zapisz:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item name="log_and_transcripts" label="Dziennik i logi rozmów" />
+ <item name="log_only" label="Tylko dziennik" />
+ <item name="no_log_or_transcript" label="Nie zapisuj dziennika ani logów rozmów" />
+ </combo_box>
+ <button label="Wyczyść dziennik" name="clear_log" />
+ <button label="Usuń logi rozmów" name="delete_transcripts" />
+ <text name="log_location_label">
+ Miejsce:
+ </text>
+ <button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="log_path_button" />
+ </panel>
+ <button label="TÅ‚umaczenie..." name="ok_btn" />
+ <button name="autoreplace_showgui" label="Autokorekta" />
+ <button name="spellcheck_showgui" label="Sprawdzanie pisowni" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
old mode 100755
new mode 100644
index 3affda57bf93558481caf8e325c3b67f3f4e01c8..2523496c08818cf83b5679724e4ff579b973066d
--- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Kolory" name="colors_panel">
<text name="effects_color_textbox">
- Moje efekty (opcje wyboru):
+ Efekty wyboru (wiÄ…zka czÄ…stek):
</text>
- <color_swatch name="effect_color_swatch" tool_tip="Kliknij aby wybrać kolor"/>
+ <color_swatch name="effect_color_swatch" tool_tip="Kliknij, aby wybrać kolor" />
<text name="font_colors">
- Kolory czcionki czatu:
+ Wiadomości czatu:
</text>
<text name="text_box1">
- Ja
+ Mój tekst
</text>
<text name="text_box2">
Inni
@@ -16,26 +16,26 @@
<text name="text_box3">
Obiekty
</text>
- <text name="text_box4">
- System
- </text>
<text name="text_box5">
Błędy
</text>
+ <text name="text_box10">
+ Bezpośrednie
+ </text>
<text name="text_box7">
Właściciel
</text>
<text name="text_box9">
- URL
+ URLe
</text>
<text name="bubble_chat">
- Kolor tła taga (dotyczy również czatu chmurkowego):
+ Tło tagów imion i czatu chmurkowego:
</text>
- <color_swatch name="background" tool_tip="Wybierz kolor taga"/>
- <slider label="Przeźroczystość:" name="bubble_chat_opacity" tool_tip="Wybierz przeźroczystość taga"/>
+ <color_swatch name="background" tool_tip="Wybierz kolor tła imienia (taga)" />
+ <slider label="Przezrocz.:" name="bubble_chat_opacity" tool_tip="Wybierz przezroczystość tła tagów imion" />
<text name="floater_opacity">
- Floater Opacity:
+ Przezroczystość okna:
</text>
- <slider label="Aktywne:" name="active"/>
- <slider label="Nieaktywne:" name="inactive"/>
+ <slider label="Aktywne:" name="active" />
+ <slider label="Nieaktywne:" name="inactive" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
old mode 100755
new mode 100644
index fff56eab6e17288b0826a2d8d75a05c478ee42ca..082dc0687ea8edf4da7ddea8998e949de004d6b0
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -1,72 +1,69 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Ogólne" name="general_panel">
<text name="language_textbox">
Język:
</text>
<combo_box name="language_combobox">
- <combo_box.item label="Domyślny" name="System Default Language"/>
- <combo_box.item label="English (Angielski)" name="English"/>
- <combo_box.item label="Dansk (Duński) - Beta" name="Danish"/>
- <combo_box.item label="Deutsch (Niemiecki) - Beta" 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="Polski - Beta" name="Polish"/>
- <combo_box.item label="Português (Portugalski) - Beta" name="Portugese"/>
- <combo_box.item label="日本語 (Japoński) - Beta" name="(Japanese)"/>
+ <combo_box.item label="Domyślny" name="System Default Language" />
+ <combo_box.item label="English (Angielski)" name="English" />
+ <combo_box.item label="Dansk (Duński) - Beta" name="Danish" />
+ <combo_box.item label="Deutsch (Niemiecki) - Beta" 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="Polski - Beta" name="Polish" />
+ <combo_box.item label="Português (Portugalski) - Beta" name="Portugese" />
+ <combo_box.item label="РуÑÑкий (Rosyjski) - Beta" 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>
<text name="language_textbox2">
(Restart wymagany)
</text>
<text name="maturity_desired_prompt">
- Chcę uzyskać dostęp do miejsc zakwalifikowanych jako:
+ Chcę mieć dostęp do miejsc:
</text>
- <text name="maturity_desired_textbox"/>
<combo_box name="maturity_desired_combobox">
- <combo_box.item label="'General', 'Mature' oraz 'Adult'" name="Desired_Adult"/>
- <combo_box.item label="'General' i 'Mature'" name="Desired_Mature"/>
- <combo_box.item label="'General'" name="Desired_PG"/>
+ <combo_box.item label="General, Moderate oraz Adult" name="Desired_Adult" />
+ <combo_box.item label="General oraz Moderate" name="Desired_Mature" />
</combo_box>
- <text name="start_location_textbox">
- Miejsce Startu:
+ <check_box label="Pokaż moje ulubione landmarki przy logowaniu" name="favorites_on_login_check" />
+ <text name="favorites_check_extra_text">
+ (Inni używający tego komputera również będą je widzieć)
</text>
- <combo_box name="start_location_combo">
- <combo_box.item label="Ostatnie Miejsce" name="MyLastLocation" tool_tip="Domyślnie loguj mnie w ostatnio odwiedzonym miejscu."/>
- <combo_box.item label="Mój Start" name="MyHome" tool_tip="Domyślnie loguj mnie w moim Miejscu Startu."/>
- </combo_box>
- <check_box initial_value="true" label="Pokaż przy zalogowaniu" name="show_location_checkbox"/>
+ <check_box label="Pokaż na ekranie logowania" name="show_location_checkbox" />
<text name="name_tags_textbox">
Imiona:
</text>
<radio_group name="Name_Tag_Preference">
- <radio_item label="Wyłącz" name="radio" value="0"/>
- <radio_item label="WÅ‚Ä…cz" name="radio2" value="1"/>
- <radio_item label="Pokaż w skrócie" name="radio3" value="2"/>
+ <radio_item label="Wyłącz" name="radio" />
+ <radio_item label="WÅ‚Ä…cz" name="radio2" />
+ <radio_item label="Pokaż na chwilę" name="radio3" />
</radio_group>
- <check_box label="Wyświetl moje imię" name="show_my_name_checkbox1"/>
- <check_box label="Nazwy użytkowników" name="show_slids" tool_tip="Pokaż nazwy użytkowników, np. bobsmith123"/>
- <check_box label="Wyświetl tytuł grupowy" name="show_all_title_checkbox1" tool_tip="Wyświetl tytuł grupowy np. oficer"/>
- <check_box label="Zaznacz znajomych" name="show_friends" tool_tip="Zaznacz imiona swoich znajomych"/>
- <check_box label="Pokaż wyświetlane nazwy" name="display_names_check" tool_tip="Pokaż wyświetlane nazwy w czacie, IM, imionach, etc."/>
- <check_box label="Uaktywnij wskazówki UI" name="viewer_hints_check"/>
+ <check_box label="Pokaż moje imię" name="show_my_name_checkbox1" />
+ <check_box label="Nazwy użytkowników" name="show_slids" tool_tip="Pokaż nazwy kont użytkowników, np. bobsmith123" />
+ <check_box label="Pokaż tytuły grupowe" name="show_all_title_checkbox1" tool_tip="Pokaż tytuły grupowe, takie jak Officer czy Member" />
+ <check_box label="Podświetl znajomych" name="show_friends" tool_tip="Podświetlaj imiona Twoich znajomych" />
+ <check_box label="Imiona Wyświetlane" name="display_names_check" tool_tip="Pokaż Imiona Wyświetlane (Display Names) w czacie, IM, tagach ponad awatarami itd." />
<text name="inworld_typing_rg_label">
- Wciśnięcie klawiszy liter:
+ Naciskanie liter:
</text>
<radio_group name="inworld_typing_preference">
- <radio_item label="WÅ‚Ä…cza czat lokalny" name="radio_start_chat" value="1"/>
- <radio_item label="Wpływ na ruch (WASD)" name="radio_move" value="0"/>
+ <radio_item label="Rozpoczyna czat" name="radio_start_chat" />
+ <radio_item label="Wpływa na ruch (tzn. WASD)" name="radio_move" />
</radio_group>
<text name="title_afk_text">
- Zasypiaj w czasie:
+ Zasypiaj po czasie:
</text>
- <combo_box label="Czas Trybu Oddalenia:" name="afk">
- <combo_box.item label="2 minuty" name="item0"/>
- <combo_box.item label="5 minut" name="item1"/>
- <combo_box.item label="10 minut" name="item2"/>
- <combo_box.item label="30 minut" name="item3"/>
- <combo_box.item label="nigdy" name="item4"/>
+ <combo_box label="Limit dla Zaśnięcia:" name="afk">
+ <combo_box.item label="2 minuty" name="item0" />
+ <combo_box.item label="5 minut" name="item1" />
+ <combo_box.item label="10 minut" name="item2" />
+ <combo_box.item label="30 minut" name="item3" />
+ <combo_box.item label="Nigdy" name="item4" />
</combo_box>
<text name="text_box3">
- Odpowiedź w trybie pracy:
+ Autoodpowiedź trybu zajętości:
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 4cd271a14125868d8418b2c4db77f39a3d0624ec..738805d8000ad2db240e37a1c246acde24605c90
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Grafika" name="Display panel">
<text name="QualitySpeed">
- Jakość i prędkość:
+ Jakość i szybkość:
</text>
<text name="FasterText">
- Prędkość
+ Wydajność
</text>
<text name="BetterText">
- Lepiej
+ Jakość
</text>
- <slider label="" name="QualityPerformanceSelection"/>
<text name="ShadersPrefText">
Niska
</text>
@@ -19,85 +18,69 @@
<text name="ShadersPrefText3">
Wysoka
</text>
- <text name="ShadersPrefText4">
- Super
- </text>
+ <slider label="Detale postaci:" name="AvatarMeshDetail2" />
+ <slider label="Pole widzenia:" name="DrawDistance" />
+ <check_box label="Zaawansowane oświetlenie" name="UseLightShaders2" />
<panel label="CustomGraphics" name="CustomGraphics Panel">
<text name="ShadersText">
- Cieniowanie pixeli (shadery):
+ Cieniowanie pikseli:
</text>
- <check_box initial_value="true" label="Przeźroczystość wody" name="TransparentWater"/>
- <check_box initial_value="true" label="Mapowanie wypukłości i połysk" name="BumpShiny"/>
- <check_box initial_value="true" label="Podstawowe shadery" name="BasicShaders" tool_tip="Wyłączenie tej opcji może naprawić błędy niektórych sterowników graficznych."/>
- <check_box initial_value="true" label="Shadery atmosfery" name="WindLightUseAtmosShaders"/>
- <text name="reflection_label">
- Refleksy w wodzie:
+ <check_box label="Przezroczysta woda" name="TransparentWater" />
+ <check_box label="Mapping wypukłości i połysk" name="BumpShiny" />
+ <check_box label="Lokalne światła" name="LocalLights" />
+ <check_box label="Podstawowe shadery" name="BasicShaders" tool_tip="Wyłączenie tej opcji może naprawić błędy niektórych sterowników graficznych" />
+ <check_box label="Shadery atmosfery" name="WindLightUseAtmosShaders" />
+ <check_box label="Zaawansowane oświetlenie" name="UseLightShaders" />
+ <check_box label="Okluzja otoczenia" name="UseSSAO" />
+ <check_box label="Włącz głębię ostrości" name="UseDoF" />
+ <text name="shadows_label">
+ Cienie:
</text>
- <combo_box initial_value="true" label="Refleksy w wodzie" name="Reflections">
- <combo_box.item label="Mało" name="0"/>
- <combo_box.item label="Teren i drzewa" name="1"/>
- <combo_box.item label="Obiekty statyczne" name="2"/>
- <combo_box.item label="Awatary i obiekty" name="3"/>
- <combo_box.item label="Wszystko" name="4"/>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Brak" name="0" />
+ <combo_box.item label="Słońce/Księżyc" name="1" />
+ <combo_box.item label="Słońce/Księżyc + inne źródła" name="2" />
</combo_box>
- <slider label="Fizyka awatara:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Niska
- </text>
- <slider label="Pole widzenia:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
+ <text name="reflection_label">
+ Odbicia w wodzie:
</text>
- <slider label="Liczba czÄ…steczek:" name="MaxParticleCount"/>
- <slider label="Max. # awatarów bez impostoryzacji:" name="MaxNumberAvatarDrawn"/>
- <slider label="Jakość post-procesu:" name="RenderPostProcess"/>
+ <combo_box name="Reflections">
+ <combo_box.item label="Minimalne" name="0" />
+ <combo_box.item label="Teren i drzewa" name="1" />
+ <combo_box.item label="Wszystkie obiekty statyczne" name="2" />
+ <combo_box.item label="Wszystkie awatary i obiekty" name="3" />
+ <combo_box.item label="Wszystko" name="4" />
+ </combo_box>
+ <slider label="Fizyka postaci:" name="AvatarPhysicsDetail" />
+ <slider label="Pole widzenia:" name="DrawDistance" />
+ <slider label="Maks. ilość cząsteczek:" name="MaxParticleCount" />
+ <slider label="Maks. il. wyświetlanych awatarów:" name="MaxNumberAvatarDrawn" />
+ <slider label="Jakość post-procesu:" name="RenderPostProcess" />
<text name="MeshDetailText">
- Szczególy obiektów:
- </text>
- <slider label=" Przedmioty:" name="ObjectMeshDetail"/>
- <slider label=" Obiekty elastyczne:" name="FlexibleMeshDetail"/>
- <slider label=" Drzewa:" name="TreeMeshDetail"/>
- <slider label=" Awatary:" name="AvatarMeshDetail"/>
- <slider label=" Teren:" name="TerrainMeshDetail"/>
- <slider label=" Niebo:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Mało
- </text>
- <text name="ObjectMeshDetailText">
- Mało
- </text>
- <text name="FlexibleMeshDetailText">
- Mało
- </text>
- <text name="TreeMeshDetailText">
- Mało
- </text>
- <text name="AvatarMeshDetailText">
- Mało
- </text>
- <text name="TerrainMeshDetailText">
- Mało
- </text>
- <text name="SkyMeshDetailText">
- Mało
+ Poziom szczegółowości obiektów (LOD):
</text>
+ <slider label=" Obiekty i skulpty:" name="ObjectMeshDetail" />
+ <slider label=" Obiekty elastyczne:" name="FlexibleMeshDetail" />
+ <slider label=" Drzewa:" name="TreeMeshDetail" />
+ <slider label=" Awatary:" name="AvatarMeshDetail" />
+ <slider label=" Teren:" name="TerrainMeshDetail" />
+ <slider label=" Niebo:" name="SkyMeshDetail" />
<text name="AvatarRenderingText">
- Rendering awatara:
+ Rendering awatarów:
</text>
- <check_box initial_value="true" label="Impostoryzacja awatarowa" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Rendering awatara przez GPU" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Oddzielne warstwy ubrań" name="AvatarCloth"/>
+ <check_box label="Upraszczaj oddalone awatary" name="AvatarImpostors" />
+ <check_box label="Rendering awatara przez GPU" name="AvatarVertexProgram" />
+ <check_box label="Elastyczne tkaniny ubrań" name="AvatarCloth" />
<text name="TerrainDetailText">
Szczegóły terenu:
</text>
<radio_group name="TerrainDetailRadio">
- <radio_item label="Niska" name="0"/>
- <radio_item label="Wysoka" name="2"/>
+ <radio_item label="Mało" name="0" />
+ <radio_item label="Dużo" name="2" />
</radio_group>
- -->
</panel>
- <button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
- <button label="Zresetuj" name="Defaults"/>
- <button label="Zaawansowane" name="Advanced"/>
- <button label="Sprzęt" label_selected="Sprzęt" name="GraphicsHardwareButton"/>
+ <button label="Zastosuj" label_selected="Zastosuj" name="Apply" />
+ <button label="Resetuj" name="Defaults" />
+ <button label="Zaawansowane" name="Advanced" />
+ <button label="Sprzęt" label_selected="Sprzęt" name="GraphicsHardwareButton" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
old mode 100755
new mode 100644
index 4c2df2c1f3f022769f7bc3faf9fa04b6206fe581..a48824255ded67ea7ba2c693fa10c2e31ba6ab9a
--- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
@@ -1,24 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Ruch" name="move_panel">
- <slider label="KÄ…t widoku kamery" name="camera_fov"/>
- <slider label="Dystans kamery" name="camera_offset_scale"/>
+ <slider label="KÄ…t widzenia" name="camera_fov" />
+ <slider label="Dystans" name="camera_offset_scale" />
<text name="heading2">
Automatyczna pozycja dla:
</text>
- <check_box label="Budowanie/Edycja" name="edit_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas włączania i wyłączania trybu edycji."/>
- <check_box label="Wygląd" name="appearance_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas trybu edycji"/>
- <check_box initial_value="prawda" label="Schowek" name="appearance_sidebar_positioning" tool_tip="Używaj automatycznego pozycjonowania kamery dla panelu bocznego"/>
- <check_box label="Awatar widoczny w trybie panoramicznym" name="first_person_avatar_visible"/>
+ <check_box label="Budowanie/Edycja" name="edit_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas włączania i wyłączania trybu edycji" />
+ <check_box label="Wygląd" name="appearance_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas trybu edycji wyglądu" />
+ <text name="keyboard_lbl">
+ Klawiatura:
+ </text>
+ <check_box label="Przyciski ze strzałkami zawsze poruszają awatarem" name="arrow_keys_move_avatar_check" />
+ <check_box label="Puk-puk-trzymaj, aby biec" name="tap_tap_hold_to_run" />
+ <check_box label="Przytrzymaj klawisz skoku lub kucania, aby zacząć lub przestać latać" name="automatic_fly" />
+ <text name="mouse_lbl">
+ Myszka:
+ </text>
+ <check_box label="Awatar widoczny w trybie pierwszoosobowym" name="first_person_avatar_visible" />
<text name=" Mouse Sensitivity">
- Czułość myszki w widoku panoramicznym:
+ Czułość myszki w trybie pierwszoosobowym:
+ </text>
+ <check_box label="Zamień osie myszy" name="invert_mouse" />
+ <text name="single_click_action_lbl">
+ Pojedynczy klik na ziemi:
+ </text>
+ <combo_box name="single_click_action_combo">
+ <combo_box.item label="Nie rób nic" name="0" />
+ <combo_box.item label="Podejdź do klikniętego punktu" name="1" />
+ </combo_box>
+ <text name="double_click_action_lbl">
+ Podwójny klik na ziemi:
</text>
- <check_box label="Zmień klawisze myszki" name="invert_mouse"/>
- <check_box label="Przyciski ze strzałkami zawsze poruszają awatarem" name="arrow_keys_move_avatar_check"/>
- <check_box label="Wciśnij-wciśnij-przytrzymaj aby biec" name="tap_tap_hold_to_run"/>
- <check_box label="Podwójnie kliknij aby:" name="double_click_chkbox"/>
- <radio_group name="double_click_action">
- <radio_item label="teleportować się" name="radio_teleport"/>
- <radio_item label="włączyć auto-pilota" name="radio_autopilot"/>
- </radio_group>
- <button label="Inne urzÄ…dzenia" name="joystick_setup_button"/>
+ <combo_box name="double_click_action_combo">
+ <combo_box.item label="Nie rób nic" name="0" />
+ <combo_box.item label="Podejdź do klikniętego punktu" name="1" />
+ <combo_box.item label="Teleportuj do klikniętego punktu" name="2" />
+ </combo_box>
+ <button label="Konfiguruj joystick" name="joystick_setup_button" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
old mode 100755
new mode 100644
index 30b64bc97798005f0ff2500375f5a24e788f9a28..529bff9d558f2dfa896a842d03dc1253784513c6
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -1,30 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Komunikacja" name="im">
- <panel.string name="log_in_to_change">
- Zaloguj się ponownie, aby zmienić
- </panel.string>
- <button label="Wyczyść Historię" name="clear_cache" tool_tip="Wyczyść obraz zapisu, ostatniej lokalizacji, historii teleportów, stron i bufor danych tekstur"/>
+ <button label="Wyczyść historię" tool_tip="Wyczyść zapisane obrazy, ostatnią lokalizację, historię teleportów, bufor stron internetowych i bufor danych tekstur" name="clear_cache" />
<text name="cache_size_label_l">
- (Miejsca, obrazy, przeglÄ…darka internetowa, wyszukiwarka historii)
+ (Miejsca, obrazy, strony web, historia wyszukiwarki)
</text>
- <check_box label="Pokaż mój informacje profilu w wynikach wyszukiwania" name="online_searchresults"/>
- <check_box label="Mój status online jest dostępny tylko dla znajomych i grup do których należę" name="online_visibility"/>
- <check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check" top_pad="15"/>
- <check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/>
- <check_box label="Pokaż moje ulubione landmarki przy logowaniu (w rozwijanym menu 'Rozpocznij w')" name="favorites_on_login_check"/>
- <text name="Logs:">
- Logi rozmów:
- </text>
- <check_box label="Zapisz logi rozmów ogólnych na moim komputerze" name="log_nearby_chat"/>
- <check_box label="Zapisuj logi wiadomości prywatnych (IM) na moim komputerze" name="log_instant_messages"/>
- <check_box label="Dodaj znacznik czasu do każdej linii w logu rozmów." name="show_timestamps_check_im"/>
- <check_box label="Dodaj znacznik czasu do nazwy pliku z zapisem rozmów." name="logfile_name_datestamp"/>
- <text name="log_path_desc">
- Lokalizacja zapisu:
- </text>
- <button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="log_path_button"/>
- <button label="Lista zablokowanych" name="block_list"/>
+ <check_box label="Pokaż mój profil w wynikach wyszukiwarki" name="online_searchresults" />
+ <check_box label="Mój status online dostępny tylko dla znajomych i grup" name="online_visibility" />
+ <check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check" />
+ <button label="Lista zablokowanych" name="block_list" />
<text name="block_list_label">
- (Ludzie i/lub obiekty zablokowane)
+ (Ludzie oraz/lub obiekty zablokowane przez Ciebie)
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
old mode 100755
new mode 100644
index b663e182278bd38c7125f0bb72bd61726c37ab7d..bd36f105094257247ede67377f1a46c3c8ff7aa7
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -1,48 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ustawienia" name="Input panel">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Åšrodowisko" name="Input panel">
<text name="Network:">
Sieć:
</text>
<text name="Maximum bandwidth">
- Maksymalna przepustowość
+ Maks. przepustowość
</text>
- <text name="text_box2">
- kbps
- </text>
- <check_box label="Port dedykowany dla aplikacji" name="connection_port_enabled"/>
- <spinner label="Numer Portu:" name="connection_port"/>
- <text name="cache_size_label_l">
- Rozmiar bufora danych
- </text>
- <text name="text_box5">
- MB
- </text>
- <text name="Cache location">
- Lokalizacja bufora danych:
- </text>
- <button label="Ustaw" label_selected="Ustaw" name="set_cache"/>
- <button label="Zresetuj" label_selected="Zresetuj" name="reset_cache"/>
+ <check_box label="WÅ‚asny port" name="connection_port_enabled" />
+ <spinner label="Numer portu:" name="connection_port" />
<text name="Web:">
- Internet:
+ WWW:
</text>
- <radio_group name="use_external_browser">
- <radio_item label="Użyj zewnętrznej przeglądarki (IE, Firefox, Safari)" name="external" tool_tip="Używaj zewnętrznej przeglądarki. Nie jest to rekomendowane w trybie pełnoekranowym." value="true"/>
- <radio_item label="Używaj wbudowanej przeglądarki." name="internal" tool_tip="Używaj wbudowanej przeglądarki. Ta przeglądarka otworzy nowe okno w [APP_NAME]." value=""/>
+ <radio_group name="preferred_browser_behavior">
+ <radio_item label="Własna (Chrome, Firefox, IE) dla wszystkich linków" name="internal" tool_tip="Używa domyślnej systemowej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Nie jest zalecane zaznaczanie tej opcji, jeśli uruchamiasz Second Life na pełnym ekranie." />
+ <radio_item label="Wbudowana tylko dla linków Second Life" name="external" tool_tip="Używa domyślnej systemowej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Przeglądarka wbudowana będzie używana tylko dla linków LindenLab/SecondLife." />
+ <radio_item label="Wbudowana dla wszystkich linków" name="external_all" tool_tip="Używa wbudowanej przeglądarki internetowej do przeglądania plików pomocy, otwierania linków itp. Ta przeglądarka otwiera nowe okienko wewnątrz [APP_NAME]." />
</radio_group>
- <check_box initial_value="true" label="Zezwalaj na wtyczki" name="browser_plugins_enabled"/>
- <check_box initial_value="true" label="Akceptuj ciasteczka z Internetu" name="cookies_enabled"/>
- <check_box initial_value="true" label="Zezwalaj na Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Zezwól na wyskakujące okienka przeglądarki mediów" name="media_popup_enabled"/>
- <text name="Proxy location">
- Lokalizacja proxy:
- </text>
- <line_editor name="web_proxy_editor" tool_tip="Nazwa lub IP proxy, którego chcesz użyć"/>
- <spinner label="Numer portu:" name="web_proxy_port"/>
+ <check_box label="WÅ‚Ä…cz wtyczki" name="browser_plugins_enabled" />
+ <check_box label="Akceptuj ciasteczka" name="cookies_enabled" />
+ <check_box label="WÅ‚Ä…cz Javascript" name="browser_javascript_enabled" />
+ <check_box label="Włącz wyskakujące okienka przeglądarki mediów" name="media_popup_enabled" />
<text name="Software updates:">
- Aktualizaje oprogramowania:
+ Aktualizacje:
</text>
<combo_box name="updater_service_combobox">
- <combo_box.item label="Zainstauj automatycznie" name="Install_automatically"/>
- <combo_box.item label="Pobierz i zainstaluj aktualizacje ręcznie" name="Install_manual"/>
+ <combo_box.item label="Instaluj automatycznie" name="Install_automatically" />
+ <!-- <combo_box.item label="Pytaj przed instalacjÄ…" name="Install_ask" /> -->
+ <combo_box.item label="Pobieraj i instaluj łatki ręcznie" name="Install_manual" />
</combo_box>
+ <check_box label="Chcę aktualizować do wersji testowych" name="update_willing_to_test" />
+ <text name="Proxy Settings:">
+ Ustawienia proxy:
+ </text>
+ <button label="Dostosuj ustawienia" label_selected="PrzeglÄ…daj" name="set_proxy" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
old mode 100755
new mode 100644
index 46f5ebb8e25921ab0a0f071773d761a73d9aec2a..5cc924bc064587d96bb8070eaf87d85b5549df1e
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -1,62 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Dźwięki" name="Preference Media panel">
<panel.string name="middle_mouse">
Åšrodkowy przycisk myszy
</panel.string>
- <slider label="Główny" name="System Volume"/>
- <check_box initial_value="true" name="mute_when_minimized"/>
+ <slider label="Głośność ogólna" name="System Volume" />
<text name="mute_chb_label">
- Wycisz podczas minimalizacji
+ Wycisz gdy zminimalizowane
</text>
- <slider label="Interfejs" name="UI Volume"/>
- <slider label="Otoczenie" name="Wind Volume"/>
- <slider label="Efekty dźwiękowe" name="SFX Volume"/>
- <slider label="Muzyka strumieniowa" name="Music Volume"/>
- <check_box label="Aktywny" name="enable_music"/>
- <slider label="Media" name="Media Volume"/>
- <check_box label="Odtwarzaj media" name="enable_media"/>
- <slider label="Komunikacja głosowa" name="Voice Volume"/>
- <check_box label="Pozwól na rozmowy głosowe" name="enable_voice_check"/>
- <check_box label="Automatycznie odtwarzaj media" name="media_auto_play_btn" tool_tip="Zaznacz tę funkcję aby uruchomić automatyczne uruchamianie mediów" value="true"/>
- <check_box label="Uruchom media załączone do innych awatarów" name="media_show_on_others_btn" tool_tip="Odznacz tę funkcję by ukryć media załączone to awatarów w publiżu" value="true"/>
+ <slider label="Interfejs" name="UI Volume" />
+ <slider label="Otoczenie" name="Wind Volume" />
+ <slider label="Efekty dźwiękowe" name="SFX Volume" />
+ <slider label="Muz. strumieniowa" name="Music Volume" />
+ <check_box label="WÅ‚Ä…czona" name="enable_music" />
+ <check_box label="WÅ‚Ä…czone" name="enable_media" />
+ <slider label="Rozmowy głosowe" name="Voice Volume" />
+ <check_box label="WÅ‚Ä…czone" name="enable_voice_check" />
+ <check_box name="media_auto_play_btn" tool_tip="Zaznacz tę funkcję, aby automatycznie uruchamiać media" label="Automatycznie odtwarzaj media" />
+ <check_box name="media_show_on_others_btn" tool_tip="Odznacz tę funkcję by ukryć media załączone do awatarów w pobliżu" label="Uruchamiaj media dołączone do innych awatarów" />
+ <check_box name="gesture_audio_play_btn" tool_tip="Zaznacz, aby słyszeć dźwięki gestów" label="Odtwarzaj dźwięki gestów" />
<text name="voice_chat_settings">
- Ustawienia komunikacji głosowej
+ Rozmowy głosowe
</text>
<text name="Listen from">
- Odtwarzaj z:
+ Odtwarzaj głos z:
</text>
<radio_group name="ear_location">
- <radio_item label="pozycji kamery" name="0"/>
- <radio_item label="pozycji awatara" name="1"/>
+ <radio_item label="Pozycji mojej kamery" name="0" />
+ <radio_item label="Pozycji mojego awatara" name="1" />
</radio_group>
- <check_box label="Poruszaj ustami awatara podczas mówienia" name="enable_lip_sync"/>
- <check_box label="Włącz/wyłącz mikrofon kiedy naciskam:" name="push_to_talk_toggle_check" tool_tip="Kiedy aktywny jest tryb przełączania wciśnij i zwolnij przełącznik RAZ aby włączyć lub wyłączyć mikrofon. Kiedy tryb przełączania nie jest aktywny mikrofon nadaje głos tylko kiedy przełącznik jest wciśnięty."/>
- <line_editor label="Przełącznik kliknij-aby-mówić" name="modifier_combo"/>
- <button label="Ustaw klawisz" name="set_voice_hotkey_button"/>
- <button name="set_voice_middlemouse_button" tool_tip="Zresetuj do środkowego przycisku myszy"/>
- <button label="Wejściowe/Wyjściowe urządzenia" name="device_settings_btn"/>
- <panel label="Ustawienia sprzętowe" name="device_settings_panel">
- <panel.string name="default_text">
- Domyślne
- </panel.string>
- <panel.string name="default system device">
- Domyślne ustawienia sprzętowe
- </panel.string>
- <panel.string name="no device">
- Brak sprzętu
- </panel.string>
- <text name="Input">
- Wejściowe
- </text>
- <text name="My volume label">
- Moja głośność:
- </text>
- <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Zmień próg głośności korzystając z tego suwaka"/>
- <text name="wait_text">
- Proszę czekać
- </text>
- <text name="Output">
- Wyjściowe
- </text>
- </panel>
+ <check_box label="Poruszaj ustami awatara podczas mówienia" name="enable_lip_sync" />
+ <check_box label="Włącz/wyłącz mikrofon kiedy naciskam:" name="push_to_talk_toggle_check" tool_tip="Kiedy aktywny jest tryb przełączania wciśnij i zwolnij przełącznik RAZ, aby włączyć lub wyłączyć mikrofon. Kiedy tryb przełączania nie jest aktywny mikrofon nadaje głos tylko wtedy, gdy przełącznik jest wciśnięty." />
+ <line_editor name="modifier_combo" label="Przełącznik naciśnij-by-mówić" />
+ <button label="Ustaw klawisz" name="set_voice_hotkey_button" />
+ <button tool_tip="Zresetuj do środkowego przycisku myszy" name="set_voice_middlemouse_button" />
+ <button label="Ustawienia sprzętowe audio" name="device_settings_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index b5763e1291a0e7d73bf471865cc227d257c139f8..0560f511433312f77d07a68e81fd2a3b6a5de192
--- a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
@@ -1,79 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="MediaControlsPanel">
- <string name="min_width">
- 300
- </string>
- <string name="min_height">
- 75
- </string>
- <string name="zoom_medium_padding">
- 1.1
- </string>
- <string name="top_world_view_avoid_zone">
- 50
- </string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="MediaControls">
<layout_stack name="progress_indicator_area">
<layout_panel name="media_progress_indicator">
- <progress_bar name="media_progress_bar" tool_tip="Wczytywanie mediów"/>
+ <progress_bar name="media_progress_bar" tool_tip="Wczytywanie mediów" />
</layout_panel>
</layout_stack>
<layout_stack name="media_controls">
<layout_panel name="back">
- <button name="back_btn" tool_tip="Przejdź do poprzedniego"/>
+ <button name="back_btn" tool_tip="Przejdź do poprzedniej strony" />
</layout_panel>
<layout_panel name="fwd">
- <button name="fwd_btn" tool_tip="Przejdź do następnego"/>
+ <button name="fwd_btn" tool_tip="Przejdź do następnej strony" />
</layout_panel>
<layout_panel name="home">
- <button name="home_btn" tool_tip="Strona domowa"/>
+ <button name="home_btn" tool_tip="Strona startowa" />
</layout_panel>
<layout_panel name="media_stop">
- <button name="media_stop_btn" tool_tip="Zatrzymaj media"/>
+ <button name="media_stop_btn" tool_tip="Zatrzymaj media" />
</layout_panel>
<layout_panel name="reload">
- <button name="reload_btn" tool_tip="Odśwież"/>
+ <button name="reload_btn" tool_tip="Odśwież" />
</layout_panel>
<layout_panel name="stop">
- <button name="stop_btn" tool_tip="Zatrzymaj wczytywanie"/>
+ <button name="stop_btn" tool_tip="Zatrzymaj wczytywanie" />
</layout_panel>
<layout_panel name="play">
- <button name="play_btn" tool_tip="Odtwarzaj media"/>
+ <button name="play_btn" tool_tip="Odtwarzaj media" />
</layout_panel>
<layout_panel name="pause">
- <button name="pause_btn" tool_tip="Wstrzymaj media"/>
+ <button name="pause_btn" tool_tip="Wstrzymaj media" />
</layout_panel>
<layout_panel name="media_address">
- <line_editor name="media_address_url" tool_tip="URL mediów"/>
+ <line_editor name="media_address_url" tool_tip="URL mediów" />
+ <icon name="media_secure_lock_flag" tool_tip="Bezpieczne przeglÄ…danie" />
<layout_stack name="media_address_url_icons">
- <layout_panel>
- <icon name="media_whitelist_flag" tool_tip="Biała Lista aktywna"/>
- </layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Zabezpiecz przeglÄ…danie"/>
+ <layout_panel name="media_address_url_icons_wl">
+ <icon name="media_whitelist_flag" tool_tip="Biała lista aktywna" />
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
- <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Postęp odtwarzania filmu"/>
+ <slider_bar name="media_play_slider" tool_tip="Postęp odtwarzania filmu" />
</layout_panel>
<layout_panel name="skip_back">
- <button name="skip_back_btn" tool_tip="Przewiń do tyłu"/>
+ <button name="skip_back_btn" tool_tip="Przewiń do tyłu" />
</layout_panel>
<layout_panel name="skip_forward">
- <button name="skip_forward_btn" tool_tip="Przewiń do przodu"/>
+ <button name="skip_forward_btn" tool_tip="Przewiń do przodu" />
</layout_panel>
<layout_panel name="media_volume">
- <button name="media_mute_button" tool_tip="Wycisz media"/>
- <slider name="volume_slider" tool_tip="Głośność mediów"/>
+ <button name="media_mute_button" tool_tip="Wycisz media" />
+ <slider name="volume_slider" tool_tip="Głośność mediów" />
</layout_panel>
<layout_panel name="zoom_frame">
- <button name="zoom_frame_btn" tool_tip="Przybliż do mediów"/>
+ <button name="zoom_frame_btn" tool_tip="Przybliż do mediów" />
</layout_panel>
<layout_panel name="close">
- <button name="close_btn" tool_tip="Oddal od mediów"/>
+ <button name="close_btn" tool_tip="Oddal od mediów" />
</layout_panel>
<layout_panel name="new_window">
- <button name="new_window_btn" tool_tip="Otwórz URL w przeglądarce"/>
+ <button name="new_window_btn" tool_tip="Otwórz URL w przeglądarce" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
old mode 100755
new mode 100644
index 932e3631abf6644f314a29e369dff4b093704651..03ad09b1a3fc68935561dd333353f8d5102a06b9
--- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
@@ -1,19 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Umowa" name="Covenant">
+ <panel.string name="can_resell">
+ Działki kupione w Regionie mogą być odsprzedane.
+ </panel.string>
+ <panel.string name="can_not_resell">
+ Działki kupione w Regionie nie mogą być odsprzedane.
+ </panel.string>
+ <panel.string name="can_change">
+ Działki kupione w Regionie mogą być łączone
+i dzielone.
+ </panel.string>
+ <panel.string name="can_not_change">
+ Działki kupione w Regionie nie mogą być łączone
+i dzielone.
+ </panel.string>
<text name="estate_section_lbl">
MajÄ…tek
</text>
<text name="estate_name_lbl">
Nazwa:
</text>
- <text name="estate_name_text">
- mainland
- </text>
<text name="estate_owner_lbl">
Właściciel:
</text>
<text name="estate_owner_text">
- (żaden)
+ (brak)
</text>
<text name="estate_cov_lbl">
Umowa:
@@ -21,63 +32,37 @@
<text name="covenant_timestamp_text">
Ostatnia modyfikacja Wed Dec 31 16:00:00 1969
</text>
- <button label="?" name="covenant_help"/>
<text_editor name="covenant_editor">
Brak umowy dla tego majÄ…tku.
</text_editor>
- <button label="Wyresetuj" name="reset_covenant"/>
- <text bottom_delta="-6" name="covenant_help_text">
+ <button label="Zresetuj" name="reset_covenant" />
+ <text name="covenant_help_text">
Zmiany w umowie zostaną wyświetlone we
-wszystkich posiadłościach majątku.
+wszystkich działkach majątku.
</text>
- <text bottom_delta="-36" name="covenant_instructions">
+ <text name="covenant_instructions">
Przeciągnij oraz wrzuć notę by zmienić umowę dla tego majątku.
</text>
- <text name="region_section_lbl">
- Region
- </text>
<text name="region_name_lbl">
Nazwa:
</text>
- <text left="115" name="region_name_text">
- leyla
- </text>
<text name="region_landtype_lbl">
Typ:
</text>
- <text left="115" name="region_landtype_text">
- Region Główny / Ziemia
- </text>
<text name="region_maturity_lbl">
Rodzaj:
</text>
- <text left="115" name="region_maturity_text">
- 'Adult'
- </text>
<text name="resellable_lbl">
- Odsprzedaj:
+ Odsprzedaż:
</text>
- <text left="115" name="resellable_clause" width="350">
- Posiadłość kupiona w tym Regionie nie może być odsprzedana.
+ <text name="resellable_clause">
+ Działka kupiona w tym Regionie nie może być odsprzedana.
</text>
<text name="changeable_lbl">
- Podziel:
+ Dzielenie:
</text>
- <text left="115" name="changeable_clause" width="350">
- Posiadłość kupiona w tym Regionie nie może być
+ <text name="changeable_clause">
+ Działka kupiona w tym Regionie nie może być
Å‚Ä…czona/dzielona.
</text>
- <string name="can_resell">
- Posiadłości kupione w tym Regionie mogą być odsprzedane.
- </string>
- <string name="can_not_resell">
- Posiadłości kupione w tym Regionie nie mogą być odsprzedane.
- </string>
- <string name="can_change">
- Posiadłości kupione w tym Regionie mogą być łączone i dzielone.
- </string>
- <string name="can_not_change">
- Posiadłości kupione w tym Regionie nie mogą być łączone i
-dzielone.
- </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
old mode 100755
new mode 100644
index c5b08383dcccacab734e57b820fbe839d421094f..d3f5ec021f7b0d88af7be3a4de83db5231bfec03
--- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
@@ -1,20 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Analizy" name="Debug">
- <text name="region_text_lbl">
- Region:
- </text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Debugowanie" name="Debug">
<text name="region_text">
brak danych
</text>
- <check_box label="Zablokuj skrypty" name="disable_scripts_check" tool_tip="Zablokuj wszystkie skrypty w tym Regionie"/>
- <button label="?" name="disable_scripts_help"/>
- <check_box label="Zablokuj kolizje" name="disable_collisions_check" tool_tip="Zablokuj kolizje obiektów (nie awatarów) w tym Regionie"/>
- <button label="?" name="disable_collisions_help"/>
- <check_box label="Zablokuj fizykę" name="disable_physics_check" tool_tip="Zablokuj wpływ fizyki w tym Regionie"/>
- <button label="?" name="disable_physics_help"/>
- <button label="Zastosuj" name="apply_btn"/>
+ <check_box label="Wyłącz skrypty" name="disable_scripts_check" tool_tip="Wyłącz wszystkie skrypty w tym regionie" />
+ <check_box label="Wyłącz kolizje" name="disable_collisions_check" tool_tip="Wyłącz kolizje obiektów (nie awatarów) w tym regionie" />
+ <check_box label="Wyłącz fizykę" name="disable_physics_check" tool_tip="Wyłącz wpływ fizyki w tym regionie" />
+ <button label="Zastosuj" name="apply_btn" />
<text name="objret_text_lbl">
- Zwrot obiektu
+ Zwrot obiektów
</text>
<text name="resident_text_lbl">
Rezydent:
@@ -22,19 +16,17 @@
<line_editor name="target_avatar_name">
(brak)
</line_editor>
- <button label="Wybierz" name="choose_avatar_btn"/>
+ <button label="Wybierz" name="choose_avatar_btn" />
<text name="options_text_lbl">
Opcje:
</text>
- <check_box label="Ze skryptami" name="return_scripts" tool_tip="Odeślij wyłącznie obiekty ze skryptami"/>
- <check_box label="Odeślij wyłącznie obiekty które są na posiadłościach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty które są na posiadłościach innych osób"/>
- <check_box label="W każdym regionie tego majątku" name="return_estate_wide" tool_tip="Odeślij obiekty z wszystkich regionów w tym majątku"/>
- <button label="Odeślij" name="return_btn"/>
- <button label="Znajdź główne kolizje..." name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji"/>
- <button label="?" name="top_colliders_help"/>
- <button label="Główne skrypty..." name="top_scripts_btn" tool_tip="Lista obiektów najdłużej wykonujących skrypty"/>
- <button label="?" name="top_scripts_help"/>
- <button label="Restart Regionu" name="restart_btn" tool_tip="Odliczanie i restart Regionu za dwie minuty"/>
- <button label="?" name="restart_help"/>
- <button label="Opóźnij restart" name="cancel_restart_btn" tool_tip="Opóźnij restart Regionu o godzinę"/>
+ <check_box label="Ze skryptami" name="return_scripts" tool_tip="Return only objects which have scripts" />
+ <check_box label="Wyłącznie obiekty, które są na działkach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty, które są na działkach innych osób" />
+ <check_box label="W każdym regionie tego majątku" name="return_estate_wide" tool_tip="Odeślij obiekty z wszystkich regionów w tym majątku" />
+ <button label="Zwróć" name="return_btn" />
+ <button label="Szczytowe kolizje" name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji" />
+ <button label="Restart regionu" name="restart_btn" tool_tip="Odliczanie i restart regionu za dwie minuty" />
+ <button label="Szczytowe skrypty" name="top_scripts_btn" tool_tip="Lista obiektów najdłużej wykonujących skrypty" />
+ <button label="Anuluj restart" name="cancel_restart_btn" tool_tip="Anuluj restart regionu" />
+ <button label="Debugowanie regionu" name="region_debug_console_btn" tool_tip="Otwórz konsolę debugowania regionu" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_environment.xml b/indra/newview/skins/default/xui/pl/panel_region_environment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6b4a2b24a1713c0e1fdc7f5bf5296f129ea451aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Otoczenie" name="panel_env_info">
+ <text name="water_settings_title">
+ Wybierz ustawienia wody i nieba/dnia jakie mają widzieć goście w Twoim regionie. Więcej
+ </text>
+ <radio_group name="region_settings_radio_group">
+ <radio_item label="Domyślne Second Life" name="use_sl_default_settings" />
+ <radio_item label="Używaj poniższych" name="use_my_settings" />
+ </radio_group>
+ <panel name="user_environment_settings">
+ <text name="water_settings_title">
+ Ustaw wodÄ™
+ </text>
+ <combo_box name="water_settings_preset_combo">
+ <combo_box.item label="-Wybierz ustawienie-" name="item0" />
+ </combo_box>
+ <text name="sky_dayc_settings_title">
+ Cykl dnia/niebo
+ </text>
+ <radio_group name="sky_dayc_settings_radio_group">
+ <radio_item label="Stałe niebo" name="my_sky_settings" />
+ <radio_item label="Cykl dnia" name="my_dayc_settings" />
+ </radio_group>
+ <combo_box name="sky_settings_preset_combo">
+ <combo_box.item label="-Wybierz ustawienie-" name="item0" />
+ </combo_box>
+ <combo_box name="dayc_settings_preset_combo">
+ <combo_box.item label="-Wybierz ustawienie-" name="item0" />
+ </combo_box>
+ </panel>
+ <button label="Zastosuj" name="apply_btn" />
+ <button label="Anuluj" name="cancel_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
old mode 100755
new mode 100644
index 1b64827725a70bb2d4878974dbabf371482d803a..113040f06e1a4f48b78d068ca17acdeb967c5760
--- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="MajÄ…tek" name="Estate">
<text name="estate_help_text">
- Zmiany w tej zakładce będą odczuwalne w całym Regionie.
+ Zmiany na tej zakładce będą odczuwalne we wszystkich regionach.
</text>
<text name="estate_text">
MajÄ…tek:
@@ -15,59 +15,35 @@
<text name="estate_owner">
(brak danych)
</text>
- <check_box label="Używaj czasu światowego" name="use_global_time_check"/>
- <button label="?" name="use_global_time_help"/>
- <check_box label="Stałe Słońce" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Pora doby" name="sun_hour_slider"/>
- <check_box label="Dostęp publiczny" name="externally_visible_check"/>
- <button label="?" name="externally_visible_help"/>
+ <check_box label="Dostęp publiczny" name="externally_visible_check" />
+ <check_box label="Rozmowy głosowe" name="voice_chat_check" />
+ <check_box label="Teleportacja bezpośrednia" name="allow_direct_teleport" />
+ <button label="Zastosuj" name="apply_btn" />
<text name="Only Allow">
- Ogranicz dostęp dla kont zweryfikowanych przez:
+ Dostęp tylko dla Rezydentów:
</text>
- <check_box label="Rezydenci z danymi o koncie" name="limit_payment" tool_tip="Zbanuj niezidentyfikowanych Rezydentów"/>
- <check_box label="Rezydenci, którzy dokonali weryfikacji wieku" name="limit_age_verified" tool_tip="Zbanuj Rezydentów, którzy nie zweryfikowali swojego wieku. Odwiedź stronę [SUPPORT_SITE] po więcej informacji."/>
- <check_box label="Rozmowy dozwolone" name="voice_chat_check"/>
- <button label="?" name="voice_chat_help"/>
- <check_box label="Teleportacja dozwolona" name="allow_direct_teleport"/>
- <button label="?" name="allow_direct_teleport_help"/>
- <text name="abuse_email_text">
- Wysyłaj (email) reporty o nadużyciach do:
- </text>
- <line_editor name="abuse_email_address"/>
- <string name="email_unsupported">
- Opcja niedostępna
- </string>
- <button label="?" name="abuse_email_address_help"/>
- <button label="Zastosuj" name="apply_btn"/>
- <button label="Wyrzuć Rezydenta z Majątku..." name="kick_user_from_estate_btn"/>
- <button label="Wyślij wiadomość do Majątku..." name="message_estate_btn"/>
+ <check_box label="Zarejestrowanych w systemie płatniczym" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
+ <check_box label="Którzy mają 18+ lat" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji." />
<text name="estate_manager_label">
ZarzÄ…dcy MajÄ…tku:
</text>
- <button label="?" name="estate_manager_help"/>
- <name_list name="estate_manager_name_list"/>
- <button label="Usuń..." name="remove_estate_manager_btn"/>
- <button label="Dodaj..." name="add_estate_manager_btn"/>
<text name="allow_resident_label">
Dozwoleni Rezydenci:
</text>
- <button label="?" name="allow_resident_help"/>
- <name_list name="allowed_avatar_name_list"/>
- <button label="Usuń..." name="remove_allowed_avatar_btn"/>
- <button label="Dodaj..." name="add_allowed_avatar_btn"/>
+ <button label="Dodaj..." name="add_estate_manager_btn" />
+ <button label="Usuń..." name="remove_estate_manager_btn" />
+ <button label="Dodaj..." name="add_allowed_avatar_btn" />
+ <button label="Usuń..." name="remove_allowed_avatar_btn" />
<text name="allow_group_label">
Dozwolone grupy:
</text>
- <button label="?" name="allow_group_help"/>
- <name_list name="allowed_group_name_list"/>
- <button label="Usuń..." name="remove_allowed_group_btn"/>
- <button label="Dodaj..." name="add_allowed_group_btn"/>
<text name="ban_resident_label">
Zablokowani Rezydenci (bany):
</text>
- <button label="?" name="ban_resident_help"/>
- <name_list name="banned_avatar_name_list"/>
- <button label="Usuń..." name="remove_banned_avatar_btn"/>
- <button label="Dodaj..." name="add_banned_avatar_btn"/>
+ <button label="Dodaj..." name="add_allowed_group_btn" />
+ <button label="Usuń..." name="remove_allowed_group_btn" />
+ <button label="Dodaj..." name="add_banned_avatar_btn" />
+ <button label="Usuń..." name="remove_banned_avatar_btn" />
+ <button label="Wyślij wiadomość do Majątku..." name="message_estate_btn" />
+ <button label="Wyrzuć Rezydenta z Majątku..." name="kick_user_from_estate_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml
old mode 100755
new mode 100644
index 601571f62ee10e5d24144e0b840b924a71f18d62..893ad372a57d4f756d97996262e083624954c257
--- a/indra/newview/skins/default/xui/pl/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Region" name="General">
- <text name="region_text_lbl">
- Region:
- </text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="General">
<text name="region_text">
brak danych
</text>
@@ -16,28 +13,24 @@
Typ:
</text>
<text name="region_type">
- nieznany
+ brak danych
</text>
- <check_box label="Zablokuj zmiany terenu" name="block_terraform_check"/>
- <check_box label="Zablokuj latanie" name="block_fly_check"/>
- <check_box label="Uszkodzenia dozwolone" name="allow_damage_check"/>
- <check_box label="Zablokuj popychanie" name="restrict_pushobject"/>
- <check_box label="Odsprzedaż dozwolona" name="allow_land_resell_check"/>
- <check_box label="ÅÄ…czenie/Dzielenie dozwolone" name="allow_parcel_changes_check"/>
- <check_box label="Zablokuj wyszukiwanie" name="block_parcel_search_check" tool_tip="Pozwól na wyświetlanie nazwy regionu i posiadłości w wynikach wyszukiwania"/>
- <spinner label="Limit gości" name="agent_limit_spin"/>
- <spinner label="Ekstra obiekty" name="object_bonus_spin"/>
+ <check_box label="Zablokuj zmiany terenu" name="block_terraform_check" />
+ <check_box label="Zablokuj latanie" name="block_fly_check" />
+ <check_box label="Blokuj przelot ponad działką" name="block_fly_over_check" tool_tip="Rozszerz sprawdzanie jeszcze wyżej, aby zapobiec lataniu ponad działką" />
+ <check_box label="Uszkodzenia dozwolone" name="allow_damage_check" />
+ <check_box label="Zablokuj popychanie" name="restrict_pushobject" />
+ <check_box label="Odsprzedaż dozwolona" name="allow_land_resell_check" />
+ <check_box label="ÅÄ…czenie/dzielenie dozwolone" name="allow_parcel_changes_check" />
+ <check_box label="Zablokuj w wyszukiwaniu" name="block_parcel_search_check" tool_tip="Pozwól na wyświetlanie nazwy regionu i działki w wynikach wyszukiwania" />
+ <spinner label="Limit gości" name="agent_limit_spin" />
+ <spinner label="Ekstra obiekty" name="object_bonus_spin" />
<text label="Ograniczenia wieku" name="access_text">
Rodzaj:
</text>
- <icons_combo_box label="'Mature'" name="access_combo">
- <icons_combo_box.item label="'Adult'" name="Adult" value="42"/>
- <icons_combo_box.item label="'Moderate'" name="Mature" value="21"/>
- <icons_combo_box.item label="'General'" name="PG" value="13"/>
- </icons_combo_box>
- <button label="Zastosuj" name="apply_btn"/>
- <button label="Teleportuj do Miejsca Startu jednego Rezydenta..." name="kick_btn"/>
- <button label="Teleportuj do Miejsca Startu wszystkich Rezydentów..." name="kick_all_btn"/>
- <button label="Wyślij wiadomość do Regionu..." name="im_btn"/>
- <button label="Obsługa teleportera..." name="manage_telehub_btn"/>
+ <button label="Zastosuj" name="apply_btn" />
+ <button label="Teleportuj do Startu jednego Rezydenta" name="kick_btn" />
+ <button label="Teleportuj do Startu wszystkich Rezydentów" name="kick_all_btn" />
+ <button label="Wyślij wiadomość do Regionu" name="im_btn" />
+ <button label="Obsługa teleportera" name="manage_telehub_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
old mode 100755
new mode 100644
index f22b4a59897313a8c88442e7c4a31b9c678921f6..f086a52dcd49f5f3c7495e061c33ff8389f1750f
--- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
@@ -1,30 +1,51 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Teren" name="Terrain">
- <text name="region_text_lbl">
- Region:
- </text>
<text name="region_text">
brak danych
</text>
<spinner label="Poziom wody" name="water_height_spin" />
- <button label="?" name="water_height_help" />
<spinner label="Górny limit terenu" name="terrain_raise_spin" />
- <button label="?" name="terrain_raise_help" />
<spinner label="Dolny limit terenu" name="terrain_lower_spin" />
- <button label="?" name="terrain_lower_help" />
- <check_box label="Używaj Słońca Majątku" name="use_estate_sun_check" />
- <button label="?" name="use_estate_sun_help" />
- <check_box label="Stałe Słońce" name="fixed_sun_check" />
- <button label="?" name="fixed_sun_help" />
- <slider label="Pora doby" name="sun_hour_slider" />
+ <text name="detail_texture_text">
+ Tekstury terenu (512x512 / 1024x1024, 24 bitowy plik .tga)
+ </text>
+ <text name="height_text_lbl">
+ 1 (Nisko)
+ </text>
+ <text name="height_text_lbl4">
+ 4 (Wysoko)
+ </text>
+ <text name="height_text_lbl5">
+ Zakresy elewacyjne tekstur
+ </text>
+ <text name="height_text_lbl10">
+ Te wartości reprezentują zakres przenikania tekstur wyżej.
+ </text>
+ <text name="height_text_lbl11">
+ Mierzone w metrach, wartość Nisko jest maksymalną wys. tekstury #1, a wartość Wysoko jest minimalną wys. tekstury #4.
+ </text>
+ <text name="height_text_lbl6">
+ Północny zach.
+ </text>
+ <text name="height_text_lbl7">
+ Północny wsch.
+ </text>
+ <spinner label="Nisko" name="height_start_spin_1" />
+ <spinner label="Nisko" name="height_start_spin_3" />
+ <spinner label="Wys." name="height_range_spin_1" />
+ <spinner label="Wys." name="height_range_spin_3" />
+ <text name="height_text_lbl8">
+ Południowy zach.
+ </text>
+ <text name="height_text_lbl9">
+ Południowy wsch.
+ </text>
+ <spinner label="Nisko" name="height_start_spin_0" />
+ <spinner label="Nisko" name="height_start_spin_2" />
+ <spinner label="Wys." name="height_range_spin_0" />
+ <spinner label="Wys." name="height_range_spin_2" />
+ <button label="Zapisz surowy teren..." name="download_raw_btn" tool_tip="Dostępne tylko dla właścicieli Majątku, nie dla zarządców" />
+ <button label="Załaduj surowy teren..." name="upload_raw_btn" tool_tip="Dostępne tylko dla właścicieli Majątku, nie dla zarządców" />
+ <button label="Ustal teren" name="bake_terrain_btn" tool_tip="(Bake Terrain) Zapamiętaj obecny teren jako punkt odniesienia dla limitów podnoszenia i opuszczania" />
<button label="Zastosuj" name="apply_btn" />
- <button label="Zapisz surowy teren..." name="download_raw_btn"
- tool_tip="Dostępne tylko dla właścicieli Majątku, nie dla zarządców" />
- <button label="?" name="download_raw_help" />
- <button label="Załaduj surowy teren..." name="upload_raw_btn"
- tool_tip="Dostępne tylko dla właścicieli Majątku, nie dla zarządców" />
- <button label="?" name="upload_raw_help" />
- <button label="Ustal teren" name="bake_terrain_btn"
- tool_tip="Zapamiętaj obecny teren jako punkt odniesienia dla limitów podnoszenia i opuszczania" />
- <button label="?" name="bake_terrain_help" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml
deleted file mode 100755
index c6ed2457f1c37ab1302e354689d51f06ba3001fc..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Tekstury Gruntu" name="Textures">
- <text name="region_text_lbl">
- Region:
- </text>
- <text name="region_text">
- brak danych
- </text>
- <text name="detail_texture_text">
- Tekstury terenu (24-bitowe 512x512 pliki .tga wymagane)
- </text>
- <text name="height_text_lbl">
- 1 (Dół)
- </text>
- <text name="height_text_lbl2">
- 2
- </text>
- <text name="height_text_lbl3">
- 3
- </text>
- <text name="height_text_lbl4">
- 4 (Góra)
- </text>
- <text name="height_text_lbl5">
- Zakres poziomów dla tekstury
- </text>
- <text name="height_text_lbl6">
- Północny-Zachód
- </text>
- <text name="height_text_lbl7">
- Północny-Wschód
- </text>
- <text name="height_text_lbl8">
- Południowy-Zachód
- </text>
- <text name="height_text_lbl9">
- Południowy-Wschód
- </text>
- <spinner label="Dół" name="height_start_spin_0"/>
- <spinner label="Dół" name="height_start_spin_1"/>
- <spinner label="Dół" name="height_start_spin_2"/>
- <spinner label="Dół" name="height_start_spin_3"/>
- <spinner label="Góra" name="height_range_spin_0"/>
- <spinner label="Góra" name="height_range_spin_1"/>
- <spinner label="Góra" name="height_range_spin_2"/>
- <spinner label="Góra" name="height_range_spin_3"/>
- <text name="height_text_lbl10">
- Wartości reprezentują zakresy zlewania powyższych tekstur.
- </text>
- <text name="height_text_lbl11">
- Wartość DÓÅ, wyrażona w metrach, to MAKSYMALNY poziom dla tekstury #1, a wartość GÓRA to MINIMALNY poziom dla tekstury #4.
- </text>
- <text name="height_text_lbl12">
- a wartość GÓRA to MINIMALNY poziom dla tekstury #4.
- </text>
- <button label="Zastosuj" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
old mode 100755
new mode 100644
index b05223aa0f4f2a1dacf564fd175c0d6f59664777..828f1c571f29a86d18a811fd2ec5767c1b8a6981
--- a/indra/newview/skins/default/xui/pl/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="script panel">
<panel.string name="loading">
Åadowanie...
</panel.string>
<panel.string name="can_not_view">
- Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to "brak kopiowania". Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
+ Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu, ponieważ ustawione zostały na niego ograniczenia. Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
</panel.string>
<panel.string name="public_objects_can_not_run">
Publiczne obiekty nie mogą uruchamiać skryptów
@@ -20,28 +20,32 @@
</panel.string>
<menu_bar name="script_menu">
<menu label="Plik" name="File">
- <menu_item_call label="Zapisz" name="Save"/>
- <menu_item_call label="Cofnij wszystkie zmiany" name="Revert All Changes"/>
+ <menu_item_call label="Zapisz" name="Save" />
+ <menu_item_call label="Cofnij wszystkie zmiany" name="Revert All Changes" />
+ <menu_item_call label="Wczytaj z pliku..." name="LoadFromFile" />
+ <menu_item_call label="Zapisz do pliku..." name="SaveToFile" />
+ <menu_item_call label="Kolory..." name="Colors" />
</menu>
<menu label="Edytuj" name="Edit">
- <menu_item_call label="Cofnij" name="Undo"/>
- <menu_item_call label="Do przodu" name="Redo"/>
- <menu_item_call label="Wytnij" name="Cut"/>
- <menu_item_call label="Kopiuj" name="Copy"/>
- <menu_item_call label="Wklej" name="Paste"/>
- <menu_item_call label="Wybierz wszystko" name="Select All"/>
- <menu_item_call label="Odznacz" name="Deselect"/>
- <menu_item_call label="Znajdź / Zamień..." name="Search / Replace..."/>
+ <menu_item_call label="Cofnij" name="Undo" />
+ <menu_item_call label="Ponów" name="Redo" />
+ <menu_item_call label="Wytnij" name="Cut" />
+ <menu_item_call label="Kopiuj" name="Copy" />
+ <menu_item_call label="Wklej" name="Paste" />
+ <menu_item_call label="Wybierz wszystko" name="Select All" />
+ <menu_item_call label="Odznacz" name="Deselect" />
+ <menu_item_call label="Znajdź / Zamień..." name="Search / Replace..." />
+ <menu_item_call label="Idź do linii..." name="Go to line..." />
</menu>
<menu label="Pomoc" name="Help">
- <menu_item_call label="Pomoc..." name="Help..."/>
- <menu_item_call label="Pomoc..." name="Keyword Help..."/>
+ <menu_item_call label="Pomoc..." name="Help..." />
+ <menu_item_call label="Pomoc - słowa kluczowe..." name="Keyword Help..." />
</menu>
</menu_bar>
- <text_editor name="Script Editor">
+ <script_editor name="Script Editor">
Åadowanie...
- </text_editor>
- <combo_box label="Wklej..." name="Insert..."/>
- <button label="Zapisz" label_selected="Zapisz" name="Save_btn"/>
- <button label="Edytuj..." name="Edit_btn"/>
+ </script_editor>
+ <combo_box label="Wstaw..." name="Insert..." />
+ <button label="Zapisz" label_selected="Zapisz" name="Save_btn" />
+ <button label="Edytuj..." name="Edit_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
index a52d8aed3df589361b5d0463403d1e4051865533..3a87b488885f75d48f42010a2e7fd1004b538db2
--- a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="MÓJ AWATAR" name="script_limits_my_avatar_panel">
<text name="script_memory">
- Zużycie skryptów przez awatara
+ Obciążenie skryptowe awatara
</text>
<text name="loading_text">
Åadowanie...
</text>
<scroll_list name="scripts_list">
- <scroll_list.columns label="Rozmiar (kb)" name="size"/>
- <scroll_list.columns label="URL" name="urls"/>
- <scroll_list.columns label="Nazwa obiektu" name="name"/>
- <scroll_list.columns label="Lokalizacja" name="location"/>
+ <scroll_list.columns label="Rozm. (kb)" name="size" />
+ <scroll_list.columns label="URLe" name="urls" />
+ <scroll_list.columns label="Nazwa obiektu" name="name" />
+ <scroll_list.columns label="Lokalizacja" name="location" />
</scroll_list>
- <button label="Odśwież listę" name="refresh_list_btn"/>
+ <button label="Odśwież listę" name="refresh_list_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
index 070f025087cc9b6f8e7972885508cbf014e94f2a..8b5b50ffb6bc26ac20777615ec21f2e4d470ea0c
--- a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="PAMIĘĆ REGIONU" name="script_limits_region_memory_panel">
<text name="script_memory">
- Pamięć skryptu na posiadłości
+ Pamięć skryptów na działce
</text>
<text name="loading_text">
Åadowanie...
</text>
<scroll_list name="scripts_list">
- <scroll_list.columns label="Rozmiar (kb)" name="size"/>
- <scroll_list.columns label="URL" name="urls"/>
- <scroll_list.columns label="Nazwa obiektu" name="name"/>
- <scroll_list.columns label="Właściciel" name="owner"/>
- <scroll_list.columns label="Parcela" name="parcel"/>
- <scroll_list.columns label="Lokalizacja" name="location"/>
+ <scroll_list.columns label="Rozm. (kb)" name="size" />
+ <scroll_list.columns label="URLe" name="urls" />
+ <scroll_list.columns label="Nazwa obiektu" name="name" />
+ <scroll_list.columns label="Właściciel" name="owner" />
+ <scroll_list.columns label="Działka" name="parcel" />
+ <scroll_list.columns label="Lokalizacja" name="location" />
</scroll_list>
- <button label="Odśwież listę" name="refresh_list_btn"/>
- <button label="Pokaż" name="highlight_btn"/>
- <button label="Zwróć" name="return_btn"/>
+ <button label="Odśwież listę" name="refresh_list_btn" />
+ <button label="Podświetl" name="highlight_btn" />
+ <button label="Zwróć" name="return_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
old mode 100755
new mode 100644
index 70a6e394120a5701cdbe20d9cb2d7cb6608be484..8cf56b93b8f9f88d5be655091349be7981f6e769
--- a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
@@ -6,7 +6,4 @@
<text name="Loading...2">
Åadowanie...
</text>
- <button label="" label_selected="" name="less" />
- <button label="" label_selected="" name="more" />
- <slider label="[DESC]" name="param slider" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
deleted file mode 100755
index fa659040eaa57c1c5e325093dcc427058ea160b3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="LLScrollingPanelParamBase">
- <slider label="[DESC]" name="param slider"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
deleted file mode 100755
index ff4ca23a4d546d3d619eb44b23edbcd909d2b659..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
- partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
- <sidetray_tab description="Przełącz schowek" name="sidebar_openclose" tab_title="Przełącz schowek"/>
- <sidetray_tab description="Miejsce Startu." name="sidebar_home" tab_title="Home">
- <panel label="miejsce startu" name="panel_home"/>
- </sidetray_tab>
- <sidetray_tab description="Edytuj swój publiczny profil oraz ulubione zakładki." name="sidebar_me" tab_title="My Profile">
- <panel_container name="panel_container">
- <panel label="Ja" name="panel_me"/>
- </panel_container>
- </sidetray_tab>
- <sidetray_tab description="Znajdź swoich znajomych, kontakty oraz Rezydentów w pobliżu Ciebie." name="sidebar_people" tab_title="People">
- <panel_container name="panel_container">
- <panel label="Grupa" name="panel_group_info_sidetray"/>
- <panel label="Zablokowani Rezydenci & Obiekty" name="panel_block_list_sidetray"/>
- </panel_container>
- </sidetray_tab>
- <sidetray_tab description="Znajdź i odwiedź miejsca, w których byłeś wcześniej." label="Miejsca" name="sidebar_places" tab_title="Places">
- <panel label="Miejsca" name="panel_places"/>
- </sidetray_tab>
- <sidetray_tab description="PrzeglÄ…daj SzafÄ™." name="sidebar_inventory" tab_title="My Inventory">
- <panel label="Edytuj SzafÄ™" name="sidepanel_inventory"/>
- </sidetray_tab>
- <sidetray_tab description="Zmień swój obecny wygląd i ubranie." name="sidebar_appearance" tab_title="My Appearance">
- <panel label="Edytuj wyglÄ…d" name="sidepanel_appearance"/>
- </sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
index 95cd7c53dc357fb92c74f2134f622536642357a6..ea4b51431fcee8e7d5a66597904a9a8e35c7538d
--- a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="sidetray_tab_panel">
- <text name="sidetray_tab_title" value="Schowek"/>
- <button name="undock" tool_tip="Odłącz"/>
- <button name="dock" tool_tip="Przyłącz"/>
- <button name="show_help" tool_tip="Pomoc"/>
+ <text name="sidetray_tab_title" value="Panel boczny" />
+ <button name="undock" tool_tip="Odłącz" />
+ <button name="dock" tool_tip="Przyłącz" />
+ <button name="show_help" tool_tip="Pokaż pomoc" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/pl/panel_sidetray_home_tab.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a4dc0dc2f5fe5e5d0ef35493f69dd03c0178e817
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_sidetray_home_tab.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="home_tab">
+ <layout_stack name="stack">
+ <layout_panel name="browser_layout">
+ <web_browser name="browser" start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0AWczytywanie... %3C/h3%3E %3C/body%3E%3C/html%3E" />
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pl/panel_snapshot_inventory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a20036730ffd7e2106ed5fa79cd288c011f8479e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_snapshot_inventory.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_snapshot_inventory">
+ <text name="title">
+ Szafa
+ </text>
+ <combo_box label="Rozdzielczość" name="texture_size_combo">
+ <combo_box.item label="Mała (128x128)" name="Small(128x128)" />
+ <combo_box.item label="Åšrednia (256x256)" name="Medium(256x256)" />
+ <combo_box.item label="Duża (512x512)" name="Large(512x512)" />
+ <combo_box.item label="WÅ‚asna" name="Custom" />
+ </combo_box>
+ <spinner label="Szer. x Wys." name="inventory_snapshot_width" />
+ <check_box label="Zachowaj proporcje" name="inventory_keep_aspect_check" />
+ <text name="hint_lbl">
+ Zapisanie zdjęcia do Szafy kosztuje [UPLOAD_COST]L$. Aby zapisać je jako teksturę wybierz jeden z kwadratowych formatów.
+ </text>
+ <button label="Anuluj" name="cancel_btn" />
+ <button label="Zapisz" name="save_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_snapshot_local.xml b/indra/newview/skins/default/xui/pl/panel_snapshot_local.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7b3d055cfde802d06d111f13889c56f509d18019
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_snapshot_local.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_snapshot_local">
+ <text name="title">
+ Dysk
+ </text>
+ <combo_box label="Rozdzielczość" name="local_size_combo">
+ <combo_box.item label="Obecne okno" name="CurrentWindow" />
+ <combo_box.item label="WÅ‚asna" name="Custom" />
+ </combo_box>
+ <spinner label="Szer. x Wys." name="local_snapshot_width" />
+ <check_box label="Zachowaj proporcje" name="local_keep_aspect_check" />
+ <combo_box name="local_format_combo">
+ <combo_box.item label="PNG (bezstratny)" name="PNG" />
+ <combo_box.item label="BMP (bezstratny)" name="BMP" />
+ </combo_box>
+ <slider label="Jakość:" name="image_quality_slider" />
+ <button label="Anuluj" name="cancel_btn" />
+ <flyout_button label="Zapisz" name="save_btn" tool_tip="Zapisz obraz do pliku">
+ <flyout_button.item label="Zapisz" name="save_item" />
+ <flyout_button.item label="Zapisz jako..." name="saveas_item" />
+ </flyout_button>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
new file mode 100644
index 0000000000000000000000000000000000000000..016b9ca197e0239fed3ec9579ada97328f131480
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_snapshot_options">
+ <button label="Zapisz na dysku twardym" name="save_to_computer_btn" />
+ <button label="Zapisz do Szafy ([AMOUNT]L$)" name="save_to_inventory_btn" />
+ <button label="Wyślij na mój Kanał" name="save_to_profile_btn" />
+ <button label="Załaduj na Facebook" name="send_to_facebook_btn" />
+ <button label="Załaduj na Twitter" name="send_to_twitter_btn" />
+ <button label="Załaduj na Flickr" name="send_to_flickr_btn" />
+ <button label="Wyślij przez e-mail" name="save_to_email_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pl/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000000000000000000000000000000000..20253eb0f96f67ac7fd8a2f022dec67cd7ace7ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_snapshot_postcard">
+ <string name="default_subject">
+ Pocztówka od [SECOND_LIFE].
+ </string>
+ <string name="default_message">
+ Zerknij na to!
+ </string>
+ <string name="upload_message">
+ Wysyłanie...
+ </string>
+ <tab_container name="postcard_tabs">
+ <panel label="Wiadomość" name="panel_postcard_message" />
+ <panel label="Ustawienia" name="panel_postcard_settings" />
+ </tab_container>
+ <button label="Anuluj" name="cancel_btn" />
+ <button label="Wyślij" name="send_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/pl/panel_snapshot_profile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0c837f3a2be7ef5f3e152bb279e291a54c62c136
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_snapshot_profile.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_snapshot_profile">
+ <text name="title">
+ Profil
+ </text>
+ <combo_box label="Rozdzielczość" name="profile_size_combo">
+ <combo_box.item label="Obecne okno" name="CurrentWindow" />
+ <combo_box.item label="WÅ‚asna" name="Custom" />
+ </combo_box>
+ <spinner label="Szer. x Wys." name="profile_snapshot_width" />
+ <check_box label="Zachowaj proporcje" name="profile_keep_aspect_check" />
+ <text name="caption_label">
+ Tytuł:
+ </text>
+ <check_box label="Dołącz lokalizację" name="add_location_cb" />
+ <button label="Anuluj" name="cancel_btn" />
+ <button label="Gotowe" name="post_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_sound_devices.xml b/indra/newview/skins/default/xui/pl/panel_sound_devices.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bd2435b9c944a4052a15ecf66291f009d445e4de
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_sound_devices.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Ustawienia urzÄ…dzenia" name="device_settings_panel">
+ <panel.string name="default_text">
+ Domyślne
+ </panel.string>
+ <string name="name_no_device">
+ Brak
+ </string>
+ <string name="name_default_system_device">
+ Domyślne systemowe
+ </string>
+ <text name="Input">
+ Wejście
+ </text>
+ <text name="Output">
+ Wyjście
+ </text>
+ <text name="My volume label">
+ Moja głośność:
+ </text>
+ <slider_bar name="mic_volume_slider" tool_tip="Zmień głośność używając tego suwaka" />
+ <text name="wait_text">
+ Proszę czekać
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
index 9f7f7f1238a91f6b2c54a19aa68857383b98e9a6..2e241c313a63233e9d15d65f6d193e4a5bbaa635
--- a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_stand_stop_flying">
- <button label="Wstań" name="stand_btn" tool_tip="Kliknij tutaj aby wstać."/>
- <button label="Zatrzymaj latanie" name="stop_fly_btn" tool_tip="Zatrzymaj latanie"/>
+ <button label="Wstań" name="stand_btn" tool_tip="Kliknij tutaj, aby wstać." />
+ <button label="Nie lataj" name="stop_fly_btn" tool_tip="Przestań latać" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
old mode 100755
new mode 100644
index e9b1ba89a5da8ebd4afb9d76bb2ebe4b16cd1019..d50ed3387cd26db89b98ad04ebfb473e1a592996
--- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
@@ -1,17 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="status">
- <panel.string name="StatBarDaysOfWeek">Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota</panel.string>
- <panel.string name="StatBarMonthsOfYear">Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Styczeń:Wrzesień:Październik:Listopad:Grudzień</panel.string>
- <panel.string name="packet_loss_tooltip">Utracone pakiety</panel.string>
- <panel.string name="bandwidth_tooltip">Przepustowość</panel.string>
- <panel.string name="time">[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]</panel.string>
- <panel.string name="timeTooltip">[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]</panel.string>
- <panel.string name="buycurrencylabel">L$ [AMT]</panel.string>
+ <panel.string name="packet_loss_tooltip">
+ Utracone pakiety
+ </panel.string>
+ <panel.string name="bandwidth_tooltip">
+ Przepustowość
+ </panel.string>
+ <panel.string name="time">
+ [hour, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
+ </panel.string>
+ <panel.string name="buycurrencylabel">
+ [AMT] L$
+ </panel.string>
<panel name="balance_bg">
- <text name="balance" tool_tip="Kliknij aby odświeżyć bilans L$" value="L$??"/>
- <button label="Kup L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$"/>
+ <text name="balance" tool_tip="Kliknij aby odświeżyć saldo L$" />
+ <button label="Kup L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$" />
+ <button label="Sklep" name="goShop" tool_tip="Otwórz witrynę Second Life Marketplace" />
</panel>
- <text name="TimeText" tool_tip="Obecny czas (Pacyficzny)">24:00 AM PST</text>
- <button name="media_toggle_btn" tool_tip="Start/Stop wszystkie media (Muzyka, Video, WWW)"/>
- <button name="volume_btn" tool_tip="Regulacja głośności"/>
+ <text name="TimeText" tool_tip="Obecny czas (Pacyficzny)" />
+ <button name="media_toggle_btn" tool_tip="Odtwórz/Zatrzymaj wszystkie media (Muzyka, Wideo, WWW)" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
old mode 100755
new mode 100644
index b43bd96536a5852dfe819eef46be3604ce2c6bbd..2699298e41e335bb273a07bf950737de0cefe688
--- a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Teleport History">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Teleport History">
<accordion name="history_accordion">
- <no_matched_tabs_text name="no_matched_teleports_msg" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] Szukaj]."/>
- <no_visible_tabs_text name="no_teleports_msg" value="Historia teleportacji jest pusta. Spróbuj [secondlife:///app/search/places/ Szukaj]."/>
- <accordion_tab name="today" title="Dzisiaj"/>
- <accordion_tab name="yesterday" title="Wczoraj"/>
- <accordion_tab name="2_days_ago" title="2 dni temu"/>
- <accordion_tab name="3_days_ago" title="3 dni temu"/>
- <accordion_tab name="4_days_ago" title="4 dni temu"/>
- <accordion_tab name="5_days_ago" title="5 dni temu"/>
- <accordion_tab name="6_days_and_older" title="6 dni i więcej"/>
- <accordion_tab name="1_month_and_older" title="1 miesiąc i więcej"/>
- <accordion_tab name="6_months_and_older" title="6 miesięcy i więcej"/>
+ <no_matched_tabs_text name="no_matched_teleports_msg" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] wyszukać]." />
+ <no_visible_tabs_text name="no_teleports_msg" value="Historia teleportacji jest pusta. Spróbuj [secondlife:///app/search/places/ wyszukać]." />
+ <accordion_tab name="today" title="Dzisiaj" />
+ <accordion_tab name="yesterday" title="Wczoraj" />
+ <accordion_tab name="2_days_ago" title="2 dni temu" />
+ <accordion_tab name="3_days_ago" title="3 dni temu" />
+ <accordion_tab name="4_days_ago" title="4 dni temu" />
+ <accordion_tab name="5_days_ago" title="5 dni temu" />
+ <accordion_tab name="6_days_and_older" title="6 dni i więcej" />
+ <accordion_tab name="1_month_and_older" title="1 miesiąc i więcej" />
+ <accordion_tab name="6_months_and_older" title="6 miesięcy i więcej" />
</accordion>
<panel name="bottom_panel">
- <button name="gear_btn" tool_tip="Pokaż dodatkowe opcje"/>
+ <menu_button tool_tip="Pokaż dodatkowe opcje" name="gear_btn" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
old mode 100755
new mode 100644
index f0fe28c4cec72745a2a6a7b37dd4e45c0416e199..6bf8ab008717191bdd821669bffd56d026d06a36
--- a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="teleport_history_item">
- <button name="profile_btn" tool_tip="Pokaż info o obiekcie"/>
+ <button name="profile_btn" tool_tip="Pokaż info o obiekcie" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_tools_texture.xml b/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5bd75c79fe10deb13253d1c997c376e01cc9622
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_tools_texture.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Tekstura" name="Texture">
+ <panel.string name="string repeats per meter">
+ Powtórzenia na metr
+ </panel.string>
+ <panel.string name="string repeats per face">
+ Powtórzenia na stronę
+ </panel.string>
+ <text name="color label">
+ Kolor
+ </text>
+ <color_swatch name="colorswatch" tool_tip="Kliknij, aby wybrać kolor" />
+ <text name="color trans">
+ Przezroczystość
+ </text>
+ <text name="glow label">
+ Blask
+ </text>
+ <check_box label="Pełna jasność" name="checkbox fullbright" />
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Materiały" name="Materials" />
+ <combo_box.item label="Media" name="Media" />
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Tekstura (rozproszenie)" name="Texture (diffuse)" />
+ <combo_box.item label="Powierzchnia (normalny)" name="Bumpiness (normal)" />
+ <combo_box.item label="Lśnienie (odbicie)" name="Shininess (specular)" />
+ </combo_box>
+ <texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij, aby wybrać obraz" />
+ <text name="label alphamode">
+ Tryb alphy
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Brak" name="None" />
+ <combo_box.item label="Przenikanie" name="Alpha blending" />
+ <combo_box.item label="Maskowanie" name="Alpha masking" />
+ <combo_box.item label="Maska emisyjna" name="Emissive mask" />
+ </combo_box>
+ <text name="label maskcutoff">
+ Odcięcie maski
+ </text>
+ <texture_picker label="Tekstura" name="bumpytexture control" tool_tip="Kliknij, aby wybrać obraz" />
+ <text name="label bumpiness">
+ Powierzchnia
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Bez mapowania" name="None" />
+ <combo_box.item label="Rozjaśnienie" name="Brightness" />
+ <combo_box.item label="Przyciemnienie" name="Darkness" />
+ <combo_box.item label="Włókna drewna" name="woodgrain" />
+ <combo_box.item label="Kora drzewa" name="bark" />
+ <combo_box.item label="Cegły" name="bricks" />
+ <combo_box.item label="Plansza szachowa" name="checker" />
+ <combo_box.item label="Beton" name="concrete" />
+ <combo_box.item label="PÅ‚ytki/Kafelki" name="crustytile" />
+ <combo_box.item label="Kamień" name="cutstone" />
+ <combo_box.item label="Dysk CD" name="discs" />
+ <combo_box.item label="Żwir" name="gravel" />
+ <combo_box.item label="Skamieliny" name="petridish" />
+ <combo_box.item label="Brzeg" name="siding" />
+ <combo_box.item label="PÅ‚ytka kamienna" name="stonetile" />
+ <combo_box.item label="Stiuk (gips ozdobny)" name="stucco" />
+ <combo_box.item label="Ssawki" name="suction" />
+ <combo_box.item label="Fale" name="weave" />
+ <!-- <combo_box.item label="Użyj tekstury" name="Use texture" /> -->
+ </combo_box>
+ <texture_picker label="Tekstura" name="shinytexture control" tool_tip="Kliknij, aby wybrać obraz" />
+ <text name="label shininess">
+ Połysk
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Żaden" name="None" />
+ <combo_box.item label="Niski" name="Low" />
+ <combo_box.item label="Åšredni" name="Medium" />
+ <combo_box.item label="Wysoki" name="High" />
+ <!-- <combo_box.item label="Użyj tekstury" name="Use texture" /> -->
+ </combo_box>
+ <text name="label glossiness">
+ Gładkość
+ </text>
+ <text name="label environment">
+ Otoczenie
+ </text>
+ <text name="label shinycolor">
+ Kolor
+ </text>
+ <color_swatch name="shinycolorswatch" tool_tip="Kliknij, aby wybrać kolor" />
+ <text name="media_info">
+ Wybrany URL mediów, jeśli jest obecny
+ </text>
+ <button name="add_media" tool_tip="Dodaj media" label="Wybierz..." />
+ <button name="delete_media" tool_tip="Usuń tą teksturę mediów" label="Usuń" />
+ <button label="Dopasuj" label_selected="Dopasuj Media" name="button align" tool_tip="Wyrównaj teksturę mediów (musi się najpierw załadować)" />
+ <text name="tex gen">
+ Mapowanie
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Domyślne" name="Default" />
+ <combo_box.item label="Planarne" name="Planar" />
+ </combo_box>
+ <spinner label="Rozmiar poziomy" name="TexScaleU" />
+ <spinner label="Rozmiar pionowy" name="TexScaleV" />
+ <spinner label="Powtórzenia na metr" name="rptctrl" />
+ <spinner label="Obrót w stopniach" name="TexRot" />
+ <spinner label="Wyrównanie poziome" name="TexOffsetU" />
+ <spinner label="Wyrównanie pionowe" name="TexOffsetV" />
+ <spinner label="Rozmiar poziomy" name="bumpyScaleU" />
+ <spinner label="Rozmiar pionowy" name="bumpyScaleV" />
+ <spinner label="Obrót w stopniach" name="bumpyRot" />
+ <spinner label="Wyrównanie poziome" name="bumpyOffsetU" />
+ <spinner label="Wyrównanie pionowe" name="bumpyOffsetV" />
+ <spinner label="Rozmiar poziomy" name="shinyScaleU" />
+ <spinner label="Rozmiar pionowy" name="shinyScaleV" />
+ <spinner label="Obrót w stopniach" name="shinyRot" />
+ <spinner label="Wyrównanie poziome" name="shinyOffsetU" />
+ <spinner label="Wyrównanie pionowe" name="shinyOffsetV" />
+ <check_box label="Równaj powierzchnie planarne" name="checkbox planar align" tool_tip="Wyrównuj tekstury na wszystkich wybranych powierzchniach z powierzchnią wybraną jako ostatnia. Wymaga planarnego mapowania tekstur." />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_twitter_account.xml b/indra/newview/skins/default/xui/pl/panel_twitter_account.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c8f60b0dc61108c22fab5a019eb130c4af5bb2ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_twitter_account.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_twitter_account">
+ <string name="twitter_connected" value="Połączenie z Twitterem jako:" />
+ <string name="twitter_disconnected" value="Brak połączenia z Twitterem" />
+ <text name="account_caption_label">
+ Brak połączenia z Twitterem.
+ </text>
+ <panel name="panel_buttons">
+ <button label="Połącz..." name="connect_btn" />
+ <button label="Rozłącz" name="disconnect_btn" />
+ <text name="account_learn_more_label">
+ [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Więcej o wysyłaniu na Twittera]
+ </text>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_twitter_photo.xml b/indra/newview/skins/default/xui/pl/panel_twitter_photo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0716d891f5c9a72e3e0d2b71e2393b2ff4c1633d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_twitter_photo.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_twitter_photo">
+ <text name="status_label">
+ Co siÄ™ dzieje?
+ </text>
+ <check_box label="Dołącz lokalizację z SL" name="add_location_cb" />
+ <check_box label="Dołącz zdjęcie" name="add_photo_cb" />
+ <combo_box name="resolution_combobox" tool_tip="Rozdzielczość obrazka">
+ <combo_box.item label="Obecne okno" name="CurrentWindow" />
+ </combo_box>
+ <combo_box name="filters_combobox" tool_tip="Filtry obrazka">
+ <combo_box.item label="Bez filtru" name="NoFilter" />
+ </combo_box>
+ <text name="working_lbl">
+ Odświeżanie...
+ </text>
+ <button label="Odśwież" name="new_snapshot_btn" tool_tip="Kliknij, aby odświeżyć" />
+ <button label="Podgląd" name="big_preview_btn" tool_tip="Kliknij, aby przełączyć podgląd" />
+ <button label="Tweetnij" name="post_photo_btn" />
+ <button label="Anuluj" name="cancel_photo_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
old mode 100755
new mode 100644
index f8a076424f34f40ea50335211b793cf6dcfe830e..94878943a1fb26b1698f765c1b813bf7ef0932c3
--- a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_voice_effect">
<string name="no_voice_effect">
- Wyłącz Voice Morph
+ Wyłącz Przekształcanie
</string>
<string name="preview_voice_effects">
- PrzeglÄ…daj Voice Morphing â–¶
+ Przeglądaj Przekształcania ▶
</string>
<string name="get_voice_effects">
- Uzyskaj Voice Morphing â–¶
+ Uzyskaj Przekształcanie ▶
</string>
- <combo_box name="voice_effect" tool_tip="Wybierz Voice Morph aby zmienić Twój głos">
- <combo_box.item label="Wyłącz Voice Morph" name="no_voice_effect"/>
+ <combo_box name="voice_effect" tool_tip="Wybierz odpowienie Przekształcanie Głosu, aby zmienić brzmienie swojego głosu">
+ <combo_box.item label="Wyłącz Przekształcanie" name="no_voice_effect" />
</combo_box>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
old mode 100755
new mode 100644
index 1611900700ff20d1305cafc5d57f4df990ffe29b..ffc513828ae9704a3ddcdba9f93f82d0053040f4
--- a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="volumepulldown_floater">
- <slider label="Główny" name="System Volume"/>
- <slider label="Przyciski" name="UI Volume"/>
- <slider label="Okolica" name="Wind Volume"/>
- <slider label="Efekty" name="SFX Volume"/>
- <check_box name="gesture_audio_play_btn" tool_tip="Włącz dźwięki gestów"/>
- <slider label="Muzyka" name="Music Volume"/>
- <check_box tool_tip="WÅ‚Ä…cz muzykÄ™ strumieniowÄ…" name="enable_music"/>
- <slider label="Media" name="Media Volume"/>
- <check_box tool_tip="WÅ‚Ä…cz media strumieniowe" name="enable_media"/>
- <slider label="GÅ‚os" name="Voice Volume"/>
- <check_box tool_tip="Włącz rozmowy głosowe" name="enable_voice_check"/>
+ <slider label="Główny" name="System Volume" />
+ <slider label="Interfejs" name="UI Volume" />
+ <slider label="Okolica" name="Wind Volume" />
+ <slider label="Efekty" name="SFX Volume" />
+ <check_box name="gesture_audio_play_btn" tool_tip="Włącz dźwięki gestów" />
+ <slider label="Muzyka" name="Music Volume" />
+ <check_box tool_tip="WÅ‚Ä…cz muzykÄ™ strumieniowÄ…" name="enable_music" />
+ <check_box tool_tip="WÅ‚Ä…cz media strumieniowe" name="enable_media" />
+ <slider label="GÅ‚os" name="Voice Volume" />
+ <check_box tool_tip="Włącz rozmowy głosowe" name="enable_voice_check" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml
old mode 100755
new mode 100644
index 69f18be76700245110d82474de8e81bd2d976b80..dad4ab15ca3927c135464a7a039f6544e745fbce
--- a/indra/newview/skins/default/xui/pl/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="world_map">
<panel.string name="Loading">
Åadowanie...
@@ -6,58 +6,10 @@
<panel.string name="InvalidLocation">
Niewłaściwa lokalizacja
</panel.string>
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- E
- </panel.string>
- <panel.string name="world_map_west">
- W
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SE
- </panel.string>
- <panel.string name="world_map_northeast">
- NE
- </panel.string>
- <panel.string name="world_map_southwest">
- SW
- </panel.string>
- <panel.string name="world_map_northwest">
- NW
- </panel.string>
<panel.string name="world_map_person">
1 osoba
</panel.string>
<panel.string name="world_map_people">
[NUMBER] ludzi
</panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SW" name="floater_map_southwest" text="SW">
- SW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml
old mode 100755
new mode 100644
index 57df2bc70fbccf71660f7bbc45e0cfe9f1333365..d991dcec6f4bbfb207411207e9dc01883d81db0a
--- a/indra/newview/skins/default/xui/pl/role_actions.xml
+++ b/indra/newview/skins/default/xui/pl/role_actions.xml
@@ -1,73 +1,74 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<role_actions>
- <action_set description="Przywileje pozwajające na dodawanie i usuwanie członków oraz pozwalają nowym członkom na dodawanie się bez zaproszenia." name="Membership">
- <action description="Zapraszanie do grupy" longdescription="Zapraszanie nowych ludzi do grupy używając przycisku 'Zaproś' w sekcji Ról > Członkowie" name="member invite" value="1"/>
- <action description="Usuwanie z grupy" longdescription="Usuwanie członków z grupy używając 'Usuń z Grupy'; pod Członkowie > Członkowie. Właściciel może usunąć każdego za wyjątkiem innego Właściciela. Jeżeli nie jesteś Właścicielem możesz tylko usuwać Członków w Funkcji Każdy i tylko wtedy kiedy nie mają żadnej innej Funkcji. Aby odebrać Członkowi Funkcję musisz mieć Przywilej 'Odbieranie Funkcji'." name="member eject" value="2"/>
- <action description="Selekcja opcji 'Wolne Zapisy' i wybór 'Opłaty Wstępnej'" longdescription="Selekcja opcji 'Wolne Zapisy' (pozwala nowym Członkom na dodawanie się bez zaproszenia) i wybór 'Opłaty Wstępnej' w Ustawieniach Grupy w sekcji Ogólne." name="member options" value="3"/>
+ <action_set description="Przywileje pozwalające na dodawanie i usuwanie osób z grupy oraz umożliwiające nowym osobom na przyłączanie bez zaproszenia." name="Membership">
+ <action description="Zapraszanie do grupy" longdescription="Zapraszanie nowych ludzi do grupy używając przycisku 'Zaproś' w sekcji Funkcje > Osoby" name="member invite" />
+ <action description="Usuwanie z grupy" longdescription="Usuwanie osób z grupy za pomocą przycisku 'Usuń z Grupy' w sekcji Funkcje > Osoby. Właściciel może usunąć każdego za wyjątkiem innego Właściciela. Jeżeli nie jesteś Właścicielem możesz usuwać osoby wtedy (i tylko wtedy), gdy są w funkcji Każdy i nie mają aktywnej ŻADNEJ innej. Aby odebrać osobie funkcję musisz mieć przywilej 'Odbieranie Funkcji'." name="member eject" />
+ <action description="Zarządzanie listą banów" longdescription="Umożliwia banowanie / odbanowywanie w tej grupie." name="allow ban" />
+ <action description="Dostęp do opcji 'Wolny Wstęp' i zmiany 'Opłaty Wstępnej'" longdescription="Dostęp do opcji 'Wolny Wstęp' (pozwala nowym osobom na przyłączanie bez zaproszenia) i zmiany 'Opłaty Wstępnej' w Ustawieniach Grupy w sekcji Ogólne." name="member options" />
</action_set>
- <action_set description="Przywileje pozwalające na dodawanie, usuwanie i edycję funkcji w grupie, oraz na nadawanie i odbieranie funkcji, oraz na przypisywanie Przywilejów do Funkcji." name="Roles">
- <action description="Dodawanie funkcji" longdescription="Dodawanie nowych funkcji pod Członkowie > Funkcje." name="role create" value="4"/>
- <action description="Usuwanie funkcji" longdescription="Usuń Funkcje w zakładce Funkcje > Funkcje" name="role delete" value="5"/>
- <action description="Zmiany nazw funkcji, tytułów i opisów i widoczność członków w informacjach o grupie" longdescription="Zmiany nazw Funkcji, Tytułów i Opisów i wybór czy Członkowie z daną Rolą są widoczni Informacji o Grupie w dolnej części sekcji Funkcji > Funkcje po wybraniu Funkcje." name="role properties" value="6"/>
- <action description="Przypisywanie członków do posiadanych funkcji" longdescription="Przypisywanie Członków do Funkcji w sekcji Przypisane Funkcje pod Członkowie > Członkowie. Członek z tym Przywilejem może dodawać Członków do Funkcji które sam już posiada." name="role assign member limited" value="7"/>
- <action description="Przypisywanie członków do wszystkich funkcji" longdescription="Przypisywanie Członków do wszystkich Funkcji w sekcji Przypisane Funkcje pod Członkowie > Członkowie. *UWAGA* Członek w Funkcji z tym Przywilejem może przypisać siebie i innych Członków nie będących Właścicielami do Funkcji dających więcej Przywilejów niż posiadane obecnie potencjalnie dające możliwości zbliżone do możliwości Właściciela. Udzielaj tego Przywileju z rozwagą." name="role assign member" value="8"/>
- <action description="Odbieranie funkcji" longdescription="Odbieranie Funkcji w sekcji Przypisane Funkcje pod Członkowie > Członkowie. Funkcja Właściciela nie może być odebrana." name="role remove member" value="9"/>
- <action description="Dodawanie i usuwanie przywilejów z funkcji" longdescription="Dodawanie i Usuwanie Przywilejów z Funkcji w sekcji Przwileje pod Członkowie > Funkcje. *UWAGA* Członek w Funkcji z tym Przywilejem może przypisać sobie i innym Członkom nie będącym Właścicielami wszystkie Przywileje potencjalnie dające możliwości zbliżone do możliwości Właściciela. Udzielaj tego Przywileju z rozwagą." name="role change actions" value="10"/>
+ <action_set description="Przywileje pozwalające na dodawanie, usuwanie i edycję funkcji w grupie, na nadawanie i odbieranie funkcji osobom w grupie oraz na przypisywanie Przywilejów do Funkcji." name="Roles">
+ <action description="Dodawanie funkcji" longdescription="Dodawanie nowych funkcji pod Osoby > Funkcje." name="role create" />
+ <action description="Usuwanie funkcji" longdescription="Usuń Funkcje w zakładce Funkcje > Funkcje" name="role delete" />
+ <action description="Zmiany nazw funkcji, tytułów, opisów i widoczności osób w informacjach o grupie" longdescription="Zmiany nazw Funkcji, Tytułów, Opisów i wybór, czy osoby z daną Funkcją są widoczne w Informacjach o grupie - to może zostać przeprowadzone w dolnej części sekcji Funkcje > zakładce Funkcje, po wybraniu odpowiedniej funkcji." name="role properties" />
+ <action description="Przypisywanie osób do posiadanych funkcji" longdescription="Przypisywanie osób do Funkcji w sekcji Przypisane Funkcje pod Funkcje > Osoby. Osoba z tym Przywilejem może dodawać inne osoby tylko do tych Funkcji, które sama już posiada." name="role assign member limited" />
+ <action description="Przypisywanie osób do wszystkich funkcji" longdescription="Przypisywanie osób do wszystkich Funkcji w sekcji Przypisane Funkcje pod Funkcje > Osoby. *UWAGA* Osoba w Funkcji z tym Przywilejem może przypisać siebie i inne osoby, które nie są Właścicielami do Funkcji dających więcej Przywilejów niż posiadane obecnie, potencjalnie dające możliwości zbliżone do możliwości Właściciela. Udzielaj tego Przywileju z rozwagą." name="role assign member" />
+ <action description="Odbieranie funkcji" longdescription="Odbieranie Funkcji w sekcji Przypisane Funkcje pod Funkcje > Osoby. Funkcja Właściciela nie może być odebrana." name="role remove member" />
+ <action description="Dodawanie i usuwanie przywilejów z funkcji" longdescription="Dodawanie i Usuwanie Przywilejów z Funkcji w sekcji Przywileje pod Funkcje > Funkcje. *UWAGA* Osoba w Funkcji z tym Przywilejem może przypisać sobie i innym osobom, które nie są Właścicielami wszystkie Przywileje potencjalnie dające możliwości zbliżone do możliwości Właściciela. Udzielaj tego Przywileju z rozwagą." name="role change actions" />
</action_set>
- <action_set description="Przywileje pozwalające na edycję atrybutów Grupy takich jak widoczność w wyszukiwarce, status i insygnia." name="Group Identity">
- <action description="Zmiany statusu grupy, insygniów, 'Widoczność w Wyszukiwarce' i widoczność Członków w Informacjach o Grupie." longdescription="Zmiany Statusu Grupy, Insygniów, i Widoczność w Wyszukiwarce. Dostęp poprzez ustawienia Ogólne." name="group change identity" value="11"/>
+ <action_set description="Przywileje pozwalające na edycję atrybutów Grupy, takich jak widoczność w wyszukiwarce, status i insygnia." name="Group Identity">
+ <action description="Zmiany statusu grupy, insygniów i 'Widoczność w Wyszukiwarce' w Informacjach o Grupie." longdescription="Zmiany statusu Grupy, Insygniów, i widoczności w Wyszukiwarce. Dostęp poprzez ustawienia Ogólne." name="group change identity" />
</action_set>
- <action_set description="Przywileje pozwalające na przypisywanie, modyfikacje i sprzedaż posiadłości grupy. Aby zobaczyć okno O Posiadłości wybierz grunt prawym klawiszem myszki i wybierz 'O Posiadłości' albo wybierz ikonę 'i' w głównym menu." name="Parcel Management">
- <action description="Przypisywanie i kupowanie posiadłości dla grupy" longdescription="Przypisywanie i kupowanie Posiadłości dla Grupy. Dostęp poprzez O Posiadlości > ustawienia Ogólne." name="land deed" value="12"/>
- <action description="Oddawanie posiadłości do Linden Lab" longdescription="Oddawanie Posiadłości do Linden Lab. *UWAGA* Członek w Funkcji z tym Przywilejem może porzucać Posiadlości Grupy poprzez O Posiadlości > ustawienia Ogólne oddając Posiadłości za darmo do Linden Labs! Udzielaj tego Przywileju z rozwagą." name="land release" value="13"/>
- <action description="Sprzedaż posiadłości" longdescription="Sprzedaż Posiadłości. *UWAGA* Członek w Funkcji z tym Przywilejem może sprzedawać Posiadlości Grupy poprzez O Posiadlości > ustawienia Ogólne! Udzielaj tego Przywileju z rozwagą." name="land set sale info" value="14"/>
- <action description="PodziaÅ‚ i Å‚Ä…czenie posiadÅ‚oÅ›ci" longdescription="PodziaÅ‚ i ÅÄ…czenie PosiadÅ‚oÅ›ci. DostÄ™p poprzez wybranie gruntu prawym klawiszem myszki, 'Edycja Terenu', i przesuwanie myszkÄ… po gruncie wybierajÄ…c obszar. Aby podzielić wybierz obszar i naciÅ›nij 'Podziel'. Aby poÅ‚Ä…czyć wybierz dwie albo wiÄ™cej sÄ…siadujÄ…ce PosiadÅ‚oÅ›ci i naciÅ›nij 'PoÅ‚Ä…cz'." name="land divide join" value="15"/>
+ <action_set description="Przywileje pozwalające na przypisywanie, modyfikacje i sprzedaż działek grupy. Aby zobaczyć okno O działce kliknij na ziemi prawym klawiszem myszki i wybierz 'O działce' albo użyj ikony 'i' na pasku nawigacji." name="Parcel Management">
+ <action description="Przypisywanie i kupowanie działek dla grupy" longdescription="Przypisywanie i kupowanie działek dla Grupy. Dostęp poprzez O działce > ustawienia Ogólne." name="land deed" />
+ <action description="Porzucanie działek na rzecz Linden Lab" longdescription="Porzucanie działek na rzecz Linden Lab. *UWAGA* Osoba w Funkcji z tym Przywilejem może porzucać działki Grupy poprzez O działce > ustawienia Ogólne oddając działki za darmo Linden Lab! Udzielaj tego Przywileju z rozwagą." name="land release" />
+ <action description="Sprzedaż działek" longdescription="Sprzedaż działek. *UWAGA* Osoba w Funkcji z tym Przywilejem może sprzedawać działki Grupy poprzez O działce > ustawienia Ogólne! Udzielaj tego Przywileju z rozwagą." name="land set sale info" />
+ <action description="Podział i łączenie działek" longdescription="Podział i łączenie działek. Dostęp poprzez wybranie gruntu prawym klawiszem myszki, 'Edycja Terenu', i przesuwanie myszką po gruncie wybierając obszar. Aby podzielić wybierz obszar i naciśnij 'Podziel'. Aby połączyć wybierz dwie albo więcej sąsiadujących działek i naciśnij 'Połącz'." name="land divide join" />
</action_set>
- <action_set description="Przywileje pozwalające na zmianę nazwy Posiadłości, widoczność w wyszukiwarce, widoczność w wyszukiwarce, wybór miejsce lądowania i zmianę ustawień teleportacji (TP)." name="Parcel Identity">
- <action description="Selekcja opcji 'Pokazuj w szukaniu miejsc' i wybór kategorii" longdescription="Selekcja opcji 'Pokazuj w szukaniu miejsc' i wybór kategorii Posiadłości pod O Posiadłości > Opcje." name="land find places" value="17"/>
- <action description="Zmiany nazwy Posiadłości, opisu i selekcja 'Widoczność w Wyszukiwarce'" longdescription="Zmiany nazwy Posiadłości, opisu i selekcja 'Widoczność w Wyszukiwarce'. Dostęp poprzez O Posiadłości > Opcje." name="land change identity" value="18"/>
- <action description="Wybór miejsca lądowania i ustawienia teleportacji (TP)" longdescription="Na Posiadłości Grupy Członek w Funkcji z tym Przywilejem może wybrać miejsce gdzie teleportujące się osoby będą ladować oraz może ustalić dodatkowe parametry teleportacji (TP). Dostęp poprzez O Posiadłości > Opcje." name="land set landing point" value="19"/>
+ <action_set description="Przywileje pozwalające na zmianę nazwy działki, widoczności w wyszukiwarce, wyboru miejsca lądowania i zmianę ustawień teleportacji (TP)." name="Parcel Identity">
+ <action description="Selekcja opcji 'Pokazuj w szukaniu miejsc' i wybór kategorii" longdescription="Selekcja opcji 'Pokazuj w szukaniu miejsc' i wybór kategorii działek w O działce > Opcje." name="land find places" />
+ <action description="Zmiany nazwy działki, opisu i selekcja 'Treść Moderate'" longdescription="Zmiany nazwy działki, opisu i selekcja 'Treść Moderate'. Dostęp poprzez O działce > Opcje." name="land change identity" />
+ <action description="Wybór miejsca lądowania i ustawienia teleportacji (TP)" longdescription="Na działce Grupy osoba w Funkcji z tym Przywilejem może wybrać miejsce, gdzie teleportujące się osoby będą lądować oraz może ustalić dodatkowe parametry teleportacji (TP). Dostęp poprzez O działce > Opcje." name="land set landing point" />
</action_set>
- <action_set description="Przywileje pozwalające na zmianę opcji Posiadłości takich jak 'Tworzenie Obiektów', 'Edycja Terenu' i zmianę ustawień muzyki & mediów." name="Parcel Settings">
- <action description="Zmiany ustawień muzyki & mediów" longdescription="Zmiany ustawień muzyki & mediów pod O Posiadłości > Media." name="land change media" value="20"/>
- <action description="Selekcja opcji 'Edycja Terenu'" longdescription="Selekcja opcji 'Edycja Terenu'. *UWAGA* O Posiadłości > Opcje > Edycja Terenu pozwala każdemu na formowanie gruntów Twojej Posiadłości oraz na przemieszczanie roślin z Linden Labs. Udzielaj tego Przywileju z rozwagą. Selekcja opcji Edycji Terenu jest dostępna poprzez O Posiadłości > Opcje." name="land edit" value="21"/>
- <action description="Dodatkowe ustawienia O Posiadłości > Opcje" longdescription="Selekcja opcji 'Bezpieczeństwo (brak uszkodzeń)' 'Latanie', opcje dla innych Rezydentów: 'Tworzenie Obiektów'; 'Edycja Terenu', 'Zapamiętywanie Miejsca (LM)', i 'Skrypty' na Posiadłościach Grupy pod O Posiadłości > Opcje." name="land options" value="22"/>
+ <action_set description="Przywileje pozwalające na zmianę opcji działek takich jak 'Tworzenie Obiektów', 'Edycja Terenu' i zmianę ustawień muzyki oraz mediów." name="Parcel Settings">
+ <action description="Zmiany ustawień muzyki oraz mediów" longdescription="Zmiany ustawień muzyki oraz mediów w O działce > Media." name="land change media" />
+ <action description="Selekcja opcji 'Edycja Terenu'" longdescription="Selekcja opcji 'Edycja Terenu'. *UWAGA* O działce > Opcje > Edycja Terenu pozwala każdemu na zmianę kształtu gruntów Twojej działki oraz na przemieszczanie roślin z Linden Lab. Udzielaj tego Przywileju z rozwagą. Selekcja opcji Edycji Terenu jest dostępna poprzez O działce > Opcje." name="land edit" />
+ <action description="Dodatkowe ustawienia O działce > Opcje" longdescription="Selekcja opcji 'Bezpieczeństwo' (brak uszkodzeń), 'Latanie', opcje dla innych Rezydentów: 'Tworzenie Obiektów', 'Edycja Terenu', 'Zapamiętywanie Miejsca (LM)' i 'Skrypty' na działkach Grupy, pod O działce > Opcje." name="land options" />
</action_set>
- <action_set description="Przywileje pozwalające członkom na omijanie ograniczeń na Posiadłościach Grupy." name="Parcel Powers">
- <action description="Pozwól na edycję terenu" longdescription="Członkowie w Funkcji z tym Przywilejem mogą zawsze edytować teren na Posiadłościach Grupy." name="land allow edit land" value="23"/>
- <action description="Pozwól na latanie" longdescription="Członkowie w Funkcji z tym Przywilejem mogą zawsze latać na Posiadłościach Grupy." name="land allow fly" value="24"/>
- <action description="Pozwól na tworzenie obiektów" longdescription="Członkowie w Funkcji z tym Przywilejem mogą zawsze tworzyć obiekty na Posiadłościach Grupy." name="land allow create" value="25"/>
- <action description="Pozwól na zapamiętywanie miejsc (LM)" longdescription="Członkowie w Funkcji z tym Przywilejem mogą zawsze zapamiętywać miejsca (LM) na Posiadłościach Grupy." name="land allow landmark" value="26"/>
- <action description="Pozwól na wybór Miejsca Startu na posiadłościach grupy" longdescription="Członkowie w Funkcji z tym Przywilejem mogą używać menu Świat > Zapamiętaj Miejsce > Miejsce Startu na Posiadłości przypisanej Grupie." name="land allow set home" value="28"/>
- <action description="Pozwól na "Imprezę" na posiadłości grupy." longdescription="Członkowie w funkcji z tym przywilejem mogą wskazać posiadłość grupy jako miejsce imprezy." name="land allow host event" value="41"/>
+ <action_set description="Przywileje pozwalające osobom na omijanie ograniczeń na działkach Grupy." name="Parcel Powers">
+ <action description="Pozwól na edycję terenu" longdescription="Osoby w Funkcji z tym Przywilejem mogą zawsze edytować teren na działkach Grupy." name="land allow edit land" />
+ <action description="Pozwól na latanie" longdescription="Osoby w Funkcji z tym Przywilejem mogą zawsze latać na działkach Grupy." name="land allow fly" />
+ <action description="Pozwól na tworzenie obiektów" longdescription="Osoby w Funkcji z tym Przywilejem mogą zawsze tworzyć obiekty na działkach Grupy." name="land allow create" />
+ <action description="Pozwól na zapamiętywanie miejsc (LM)" longdescription="Osoby w Funkcji z tym Przywilejem mogą zawsze zapamiętywać miejsca (LM) na działkach Grupy." name="land allow landmark" />
+ <action description="Pozwól na wybór Miejsca Startu na działkach grupy" longdescription="Osoby w Funkcji z tym Przywilejem mogą używać opcji Świat > Ustaw Miejsce Startu tu, gdzie stoję - na działce przypisanej Grupie." name="land allow set home" />
+ <action description="Pozwól na "Wydarzenie" na działce grupy." longdescription="Osoby w Funkcji z tym przywilejem mogą wskazać działkę grupy jako miejsce wydarzenia (hosting event)." name="land allow host event" />
</action_set>
- <action_set description="Przywileje pozwalające na dawanie i odbieranie dostępu do Posiadłości Grupy zawierające możliwości unieruchomiania i wyrzucania Rezydentów." name="Parcel Access">
- <action description="Zarządzanie listą dostępu do posiadłości" longdescription="Zarządzanie Listą Dostępu do Posiadłości pod O Posiadłości > Dostęp." name="land manage allowed" value="29"/>
- <action description="Zarządzanie listą usuniętych z posiadłości (Bany)" longdescription="Zarządzanie Listą Dostępu do Posiadłości pod O Posiadłości > Dostęp." name="land manage banned" value="30"/>
- <action description="Selekcja opcji 'Wstęp Płatny'" longdescription="Selekcja opcji 'Wstęp Płatny'; pod O Posiadłości > Dostęp." name="land manage passes" value="31"/>
- <action description="Wyrzucanie i unieruchamianie Rezydentów na posiadłościach" longdescription="Członkowie w Funkcji z tym Przywilejem mogą wpływać na niepożądanych na Posiadłościach Grupy Rezydentów wybierając ich prawym klawiszem myszki i wybierając ';Wyrzuć' albo 'Unieruchom'." name="land admin" value="32"/>
+ <action_set description="Przywileje pozwalające na dawanie i odbieranie dostępu do działki Grupy, zawierające możliwości unieruchamiania i wyrzucania Rezydentów." name="Parcel Access">
+ <action description="Zarządzanie listą dostępu do działki" longdescription="Zarządzanie Listą Dostępu do działki w O działce > Dostęp." name="land manage allowed" />
+ <action description="Zarządzanie listą usuniętych z działki (bany)" longdescription="Zarządzanie listą zbanowanych z działki w O działce > Dostęp." name="land manage banned" />
+ <action description="Selekcja opcji 'Wstęp Płatny'" longdescription="Selekcja opcji 'Wstęp Płatny', w O działce > Dostęp." name="land manage passes" />
+ <action description="Wyrzucanie i unieruchamianie Rezydentów na działkach" longdescription="Osoby w Funkcji z tym Przywilejem mogą wpływać na niepożądanych osobników na działkach Grupy wybierając ich prawym klawiszem myszki i klikając na 'Wyrzuć' albo 'Unieruchom'." name="land admin" />
</action_set>
<action_set description="Przywileje pozwalające na odsyłanie obiektów i przemieszczanie roślin z Linden Lab. Użyteczne przy porządkowaniu i przemieszczaniu roślinności. *UWAGA* Odsyłanie obiektów jest nieodwracalne." name="Parcel Content">
- <action description="Odsyłanie obiektów należących do grupy" longdescription="Odsyłanie obiektów należących do Grupy pod O Posiadłości > Obiekty." name="land return group owned" value="48"/>
- <action description="Odsyłanie obiektów przypisanych do grupy" longdescription="Odsyłanie obiektów przypisanych do Grupy pod O Posiadłości > Obiekty." name="land return group set" value="33"/>
- <action description="Odsyłanie obiektów nie przypisanych do grupy" longdescription="Odsyłanie obiektów nie przypisanych do Grupy pod O Posiadłości > Obiekty." name="land return non group" value="34"/>
- <action description="Ogrodnictwo używając roślin z Linden Lab" longdescription="Możliwość przemieszczenia roślin z Linden Lab. Obiekty te mogą zostać odnalezione w Twojej Szafie, w folderze Biblioteka > Folderze Obiektów lub mogą zostać stworzone dzięki aktywacji Narzędzi Edycji." name="land gardening" value="35"/>
+ <action description="Odsyłanie obiektów należących do grupy" longdescription="Odsyłanie obiektów należących do Grupy, w O działce > Obiekty." name="land return group owned" />
+ <action description="Odsyłanie obiektów przypisanych do grupy" longdescription="Odsyłanie obiektów przypisanych do Grupy, w O działce > Obiekty." name="land return group set" />
+ <action description="Odsyłanie obiektów nieprzypisanych do grupy" longdescription="Odsyłanie obiektów nieprzypisanych do Grupy, w O działce > Obiekty." name="land return non group" />
+ <action description="Zmiana krajobrazu za pomocą roślin z Linden Lab" longdescription="Możliwość przemieszczenia roślin z Linden Lab. Obiekty te mogą zostać odnalezione w Twojej Szafie, w folderze Biblioteka > Obiekty lub mogą zostać stworzone dzięki aktywacji Narzędzi Edycji." name="land gardening" />
</action_set>
- <action_set description="Przywileje pozwalające na odsyłanie obiektów i przemieszczenia roślin z Linden Lab. Użyteczne przy porządkowaniu i przemieszczenia roślinności. *UWAGA* Odsyłanie obiektów jest nieodwracalne." name="Object Management">
- <action description="Przypisywanie obiektów do grupy" longdescription="Przypisywanie obiektów do Grupy w Narzędziach Edycji > Ogólne" name="object deed" value="36"/>
- <action description="Manipulowanie (wklejanie, kopiowanie, modyfikacja) obiektami należącymi do Grupy" longdescription="Manipulowanie (wklejanie, kopiowanie, modyfikacja) obiektami należącymi do Grupy w Narzędziach Edycji > Ogólne" name="object manipulate" value="38"/>
- <action description="Sprzedaż obiektów należących do grupy" longdescription="Sprzedaż obiektów należących do Grupy pod Narzędzia Edycji > Ogólne." name="object set sale" value="39"/>
+ <action_set description="Przywileje pozwalające na przypisywanie, modyfikowanie i sprzedawanie obiektów należących do Grupy. Zmian można dokonywać w menu narzędzi Budowania > Ogólne. Kliknij prawym przyciskiem myszki na obiekcie i wybierz Edytuj, aby zobaczyć odpowiednie opcje." name="Object Management">
+ <action description="Przypisywanie obiektów do grupy" longdescription="Przypisywanie obiektów do Grupy w Narzędziach Edycji > Ogólne" name="object deed" />
+ <action description="Manipulowanie (przemieszczanie, kopiowanie, modyfikacja) obiektami należącymi do Grupy" longdescription="Manipulowanie (przemieszczanie, kopiowanie, modyfikacja) obiektami należącymi do Grupy w Narzędziach Edycji > Ogólne" name="object manipulate" />
+ <action description="Sprzedaż obiektów należących do grupy" longdescription="Sprzedaż obiektów należących do Grupy, w Narzędzia Edycji > Ogólne." name="object set sale" />
</action_set>
<action_set description="Przywileje pozwalające na wybór opłat grupowych, otrzymywanie dochodu i ograniczanie dostępu do historii konta grupy." name="Accounting">
- <action description="Opłaty grupowe i dochód grupowy" longdescription="Członkowie w Funkcji z tym Przywilejem będą automatycznie wnosić opłaty grupowe i będą otrzymywać dochód grupowy. Tzn. będą codziennie otrzymywać część dochodu ze sprzedaży Posiadłości Grupy oraz będą partycypować w kosztach ogłoszeń itp." name="accounting accountable" value="40"/>
+ <action description="Opłaty grupowe i dochód grupowy" longdescription="Osoby w Funkcji z tym Przywilejem będą automatycznie wnosić opłaty grupowe i będą otrzymywać dochód grupowy. To znaczy, że będą codziennie otrzymywać część dochodu ze sprzedaży działki Grupy oraz będą partycypować w kosztach ogłoszeń itp." name="accounting accountable" />
</action_set>
- <action_set description="Przywileje pozwalające na wysyłanie, odbieranie i czytanie Notek Grupy." name="Notices">
- <action description="Wysyłanie notek" longdescription="Członkowie w Funkcji z tym Przywilejem mogą wysyłać Notki wybierając O Grupie > Notek." name="notices send" value="42"/>
- <action description="Odbieranie notek i dostęp do dawniejszych notek" longdescription="Członkowie w Funkcji z tym Przywilejem mogą odbierać nowe i czytać dawniejsze Notki wybierając O Grupie > Notki." name="notices receive" value="43"/>
+ <action_set description="Przywileje pozwalające na wysyłanie, odbieranie i czytanie ogłoszeń Grupy." name="Notices">
+ <action description="Wysyłanie ogłoszeń" longdescription="Osoby w Funkcji z tym Przywilejem mogą wysyłać ogłoszenia, wybierając O Grupie > Ogłoszenia." name="notices send" />
+ <action description="Odbieranie nowych i dostęp do starszych ogłoszeń" longdescription="Osoby w Funkcji z tym Przywilejem mogą odbierać nowe i czytać starsze Ogłoszenia, wybierając O Grupie > Ogłoszenia." name="notices receive" />
</action_set>
- <action_set description="Przywileje kontrolujÄ…ce czat i rozmowy grupowe." name="Chat">
- <action description="Dostęp do czatu grupowego" longdescription="Członkowie w Funkcji z tym Przywilejem mogą uczestniczyć w czacie i rozmowach grupowych." name="join group chat" value="16"/>
- <action description="Dostęp do rozmów grupowych" longdescription="Członkowie w Funkcji z tym Przywilejem mogą uczestniczyć w rozmowach grupowych. UWAGA: Dostęp do Czatu Grupowego jest wymagany dla rozmów grupowych." name="join voice chat" value="27"/>
- <action description="Moderator czatu grupowego" longdescription="Członkowie w Funkcji z tym Przywilejem mogą kontrolować dostęp do czatu i rozmów grupowych." name="moderate group chat" value="37"/>
+ <action_set description="Przywileje kontrolujące czat i głosowe rozmowy grupowe." name="Chat">
+ <action description="Dostęp do czatu grupowego" longdescription="Osoby w Funkcji z tym Przywilejem mogą uczestniczyć w czacie i głosowych rozmowach grupowych." name="join group chat" />
+ <action description="Dostęp do głosowych rozmów grupowych" longdescription="Osoby w Funkcji z tym Przywilejem mogą uczestniczyć w głosowych rozmowach grupowych. UWAGA: Dostęp do Czatu Grupowego (opcja powyżej) jest wymagany dla rozmów grupowych." name="join voice chat" />
+ <action description="Moderator czatu grupowego" longdescription="Osoby w Funkcji z tym Przywilejem mogą kontrolować dostęp do czatu i głosowych rozmów grupowych." name="moderate group chat" />
</action_set>
</role_actions>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
old mode 100755
new mode 100644
index cea903769c1830abd75ac946851b171c08ea6c33..97fc4fcf7a099e3c47d3a8a3115adb39d1a62269
--- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
@@ -1,16 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ubrania" name="appearance panel">
- <string name="No Outfit" value="Bez stroju"/>
- <string name="Unsaved Changes" value="Zmiany niezachowane"/>
- <string name="Now Wearing" value="Obecnie założone..."/>
- <string name="Changing outfits" value="Zmiana stroju"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Stroje" name="appearance panel">
+ <string name="No Outfit" value="Brak stroju" />
+ <string name="Unsaved Changes" value="Zmiany niezachowane" />
+ <string name="Now Wearing" value="Obecnie założone..." />
+ <string name="Changing outfits" value="Zmiana stroju" />
<panel name="panel_currentlook">
- <button label="E" name="editappearance_btn"/>
- <button label="O" name="openoutfit_btn"/>
- <text name="currentlook_status">
- (Status)
- </text>
- <button label="" name="edit_outfit_btn" tool_tip="Edytuj ten strój"/>
+ <button name="edit_outfit_btn" tool_tip="Edytuj ten strój" />
</panel>
- <filter_editor label="PrzeglÄ…daj stroje" name="Filter"/>
+ <filter_editor label="Filtruj stroje" name="Filter" />
+ <button label="Nowy strój" name="newlook_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
old mode 100755
new mode 100644
index 1034a06f1fca18c61feeea7b1500ab8b554b84ec..b1a75f9eb19f0da46f061e01dcda769eb4b332e9
--- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
@@ -1,19 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Rzeczy" name="objects panel">
- <panel label="" name="sidepanel_inventory_panel">
+ <panel name="sidepanel_inventory_panel">
+ <layout_stack name="inventory_layout_stack">
+ <layout_panel name="inbox_layout_panel">
+ <panel name="marketplace_inbox">
+ <string name="InboxLabelWithArg">
+ Odebrane przedmioty ([NUM])
+ </string>
+ <string name="InboxLabelNoArg">
+ Odebrane przedmioty
+ </string>
+ <button label="Odebrane przedmioty" name="inbox_btn" />
+ <text name="inbox_fresh_new_count">
+ [NUM] nowe/y
+ </text>
+ <panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby ich używać">
+ <text name="inbox_inventory_placeholder">
+ Rzeczy kupione na Marketplace będą tu dostarczane.
+ </text>
+ </panel>
+ </panel>
+ </layout_panel>
+ </layout_stack>
<panel name="button_panel">
- <layout_stack name="button_panel_ls">
+ <layout_stack name="button_panel_ls">
<layout_panel name="info_btn_lp">
- <button label="Profil" name="info_btn" tool_tip="Pokaż profil obiektu"/>
+ <button label="Profil" name="info_btn" tool_tip="Pokaż profil obiektu" />
</layout_panel>
<layout_panel name="share_btn_lp">
- <button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy"/>
+ <button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy" />
</layout_panel>
<layout_panel name="shop_btn_lp">
- <button label="Zakupy" name="shop_btn" tool_tip="Otwórz stronę Marketplace"/>
- <button label="Załóż" name="wear_btn" tool_tip="Załóż wybrany strój"/>
- <button label="Odtwarzaj" name="play_btn"/>
- <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj siÄ™ w wybrane miejsce"/>
+ <button label="Zakupy" name="shop_btn" tool_tip="Otwórz stronę Marketplace" />
+ <button label="Załóż" name="wear_btn" tool_tip="Załóż wybrany strój" />
+ <button label="Odtwarzaj" name="play_btn" />
+ <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj siÄ™ w wybrane miejsce" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
old mode 100755
new mode 100644
index 4b3df5cde8d652b7e01c060eda30ba226adb8f02..db048e9ef8e1b218806cd00c332234706dc26b9a
--- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="item properties" title="Profil obiektu">
<panel.string name="unknown">
(nieznany)
</panel.string>
+ <panel.string name="unknown_multiple">
+ (nieznany / wiele)
+ </panel.string>
<panel.string name="public">
(publiczny)
</panel.string>
@@ -12,19 +15,16 @@
<panel.string name="owner_can">
Właściciel może:
</panel.string>
- <panel.string name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </panel.string>
<panel.string name="origin_inventory">
(Szafa)
</panel.string>
<panel.string name="origin_inworld">
- (W Åšwiecie)
+ (W świecie)
</panel.string>
- <text name="title" value="Profil obiektu"/>
- <text name="origin" value="(Szafa)"/>
+ <text name="title" value="Profil obiektu" />
+ <text name="origin" value="(Szafa)" />
<scroll_container name="item_profile_scroll">
- <panel label="" name="item_profile">
+ <panel name="item_profile">
<text name="LabelItemNameTitle">
Nazwa:
</text>
@@ -44,34 +44,34 @@
<text name="perm_modify">
Możesz:
</text>
- <check_box label="Modyfikuje" name="CheckOwnerModify"/>
- <check_box label="Kopiuje" name="CheckOwnerCopy"/>
- <check_box label="Oddaje/ Sprzedaje" name="CheckOwnerTransfer"/>
+ <check_box label="Modyfikacja" name="CheckOwnerModify" />
+ <check_box label="Kopiowanie" name="CheckOwnerCopy" />
+ <check_box label="Transferowanie" name="CheckOwnerTransfer" />
<text name="AnyoneLabel">
Każdy:
</text>
- <check_box label="Kopiuje" name="CheckEveryoneCopy"/>
+ <check_box label="Kopiowanie" name="CheckEveryoneCopy" />
<text name="GroupLabel">
Grupa:
</text>
- <check_box label="Udostępnij" name="CheckShareWithGroup" tool_tip="Pozwól wszystkim członkom ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z roli."/>
+ <check_box label="Udostępnij" name="CheckShareWithGroup" tool_tip="Pozwól wszystkim osobom z ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z funkcji." />
<text name="NextOwnerLabel">
- Następny właściciel:
+ Nast. właściciel:
</text>
- <check_box label="Modyfikuje" name="CheckNextOwnerModify"/>
- <check_box label="Kopiuje" name="CheckNextOwnerCopy"/>
- <check_box label="Sprzedaje/ Oddaje" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/>
+ <check_box label="Modyfikacja" name="CheckNextOwnerModify" />
+ <check_box label="Kopiowanie" name="CheckNextOwnerCopy" />
+ <check_box label="Transferowanie" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddać lub sprzedać ten obiekt" />
</panel>
- <check_box label="Na sprzedaż" name="CheckPurchase"/>
+ <check_box label="Na sprzedaż" name="CheckPurchase" />
<combo_box name="ComboBoxSaleType">
- <combo_box.item label="Kopia" name="Copy"/>
- <combo_box.item label="Zawartość" name="Contents"/>
- <combo_box.item label="Oryginał" name="Original"/>
+ <combo_box.item label="Kopia" name="Copy" />
+ <combo_box.item label="Zawartość" name="Contents" />
+ <combo_box.item label="Oryginał" name="Original" />
</combo_box>
- <spinner label="Cena: L$" name="Edit Cost"/>
+ <spinner name="Edit Cost" label="Cena: L$" />
</panel>
</scroll_container>
<panel name="button_panel">
- <button label="Anuluj" name="cancel_btn"/>
+ <button label="Anuluj" name="cancel_btn" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
old mode 100755
new mode 100644
index 503541a96e7264fd303f1f8bb667d8cdb1fac04d..54997627487e2a051d12519a0b453d99a4ec1053
--- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
@@ -1,67 +1,115 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="object properties" title="Profil Obiektu">
- <panel.string name="text deed continued">Przypisz</panel.string>
- <panel.string name="text deed">Przypisz</panel.string>
- <panel.string name="text modify info 1">Możesz modyfikować ten obiekt</panel.string>
- <panel.string name="text modify info 2">Możesz modyfikować te obiekty</panel.string>
- <panel.string name="text modify info 3">Nie możesz modyfikować tego obiektu</panel.string>
- <panel.string name="text modify info 4">Nie możesz modyfikować tych obiektów</panel.string>
- <panel.string name="text modify warning">Ten obiekt ma części zgrupowane</panel.string>
- <panel.string name="Cost Default">Cena: L$</panel.string>
- <panel.string name="Cost Total">Suma: L$</panel.string>
- <panel.string name="Cost Per Unit">Cena za jednostkÄ™: L$</panel.string>
- <panel.string name="Cost Mixed">Cena mieszana</panel.string>
- <panel.string name="Sale Mixed">Sprzedaż mieszana</panel.string>
- <text name="title" value="Profil Obiektu"/>
- <text name="where" value="(W Åšwiecie)"/>
- <panel label="" name="properties_panel">
- <text name="Name:">Nazwa:</text>
- <text name="Description:">Opis:</text>
- <text name="CreatorNameLabel">Twórca:</text>
- <text name="Owner:">Właściciel:</text>
- <text name="Group_label">Grupa:</text>
- <button name="button set group" tool_tip="Wybierz grupę by udostępnić jej prawa do tego obiektu"/>
- <name_box initial_value="Åadowanie..." name="Group Name Proxy"/>
- <button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Opcja przepisania udostępnia obiektowi takie same prawa jak zostały zaznaczone dla następnego właściciela. Obiekty udostępnione grupie mogą zostać przepisane dla grupy przez oficera grupy."/>
- <text name="label click action">Kliknij by:</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="object properties" title="Profil obiektu">
+ <panel.string name="text deed continued">
+ Przypisz
+ </panel.string>
+ <panel.string name="text deed">
+ Przypisz
+ </panel.string>
+ <panel.string name="text modify info 1">
+ Możesz modyfikować ten obiekt
+ </panel.string>
+ <panel.string name="text modify info 2">
+ Możesz modyfikować te obiekty
+ </panel.string>
+ <panel.string name="text modify info 3">
+ Nie możesz modyfikować tego obiektu
+ </panel.string>
+ <panel.string name="text modify info 4">
+ Nie możesz modyfikować tych obiektów
+ </panel.string>
+ <panel.string name="text modify info 5">
+ Nie możesz modyfikować tego obiektu przez granicę regionu
+ </panel.string>
+ <panel.string name="text modify info 6">
+ Nie możesz modyfikować tych obiektów przez granicę regionu
+ </panel.string>
+ <panel.string name="text modify warning">
+ Ten obiekt ma części zgrupowane
+ </panel.string>
+ <panel.string name="Cost Default">
+ Cena: L$
+ </panel.string>
+ <panel.string name="Cost Total">
+ Suma: L$
+ </panel.string>
+ <panel.string name="Cost Per Unit">
+ Cena za jedn.: L$
+ </panel.string>
+ <panel.string name="Cost Mixed">
+ Cena mieszana
+ </panel.string>
+ <panel.string name="Sale Mixed">
+ Sprzedaż mieszana
+ </panel.string>
+ <text name="title" value="Profil obiektu" />
+ <text name="where" value="(W świecie)" />
+ <panel name="properties_panel">
+ <text name="Name:">
+ Nazwa:
+ </text>
+ <text name="Description:">
+ Opis:
+ </text>
+ <text name="CreatorNameLabel">
+ Twórca:
+ </text>
+ <text name="Owner:">
+ Właściciel:
+ </text>
+ <text name="Group_label">
+ Grupa:
+ </text>
+ <button name="button set group" tool_tip="Wybierz grupę by udostępnić jej prawa do tego obiektu" />
+ <name_box initial_value="Åadowanie..." name="Group Name Proxy" />
+ <button label="Przypisz" label_selected="Przypisz" name="button deed" tool_tip="Opcja przypisania udostępnia obiektowi takie same prawa jak zostały zaznaczone dla następnego właściciela. Obiekty udostępnione grupie mogą zostać przypisane dla grupy przez oficera grupy." />
+ <text name="label click action">
+ Po kliku:
+ </text>
<combo_box name="clickaction">
- <combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/>
- <combo_box.item label="Usiądź na obiekcie" name="Sitonobject"/>
- <combo_box.item label="Kup obiekt" name="Buyobject"/>
- <combo_box.item label="Zapłać obiektowi" name="Payobject"/>
- <combo_box.item label="Otwórz" name="Open"/>
+ <combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)" />
+ <combo_box.item label="Usiądź na obiekcie" name="Sitonobject" />
+ <combo_box.item label="Kup obiekt" name="Buyobject" />
+ <combo_box.item label="Zapłać obiektowi" name="Payobject" />
+ <combo_box.item label="Otwórz" name="Open" />
+ <combo_box.item label="Przybliż" name="Zoom" />
</combo_box>
<panel name="perms_inv">
- <text name="perm_modify">Możesz modyfikować ten obiekt</text>
- <text name="Anyone can:">Każdy:</text>
- <check_box label="Kopiuj" name="checkbox allow everyone copy"/>
- <check_box label="Przesuń" name="checkbox allow everyone move"/>
- <text name="GroupLabel">Grupie:</text>
- <check_box label="Udostępnij" name="checkbox share with group" tool_tip="Udostępnij prawa do modyfikacji tego obiektu wszystkim członkom, którzy posiadają przywilej modyfikacji obiektów grupy. By ograniczyć, przypisz obiekt do grupy."/>
- <text name="NextOwnerLabel">Następny Właściciel:</text>
- <check_box label="Modyfikuj" name="checkbox next owner can modify"/>
- <check_box label="Kopiuj" name="checkbox next owner can copy"/>
- <check_box label="Oddaj" name="checkbox next owner can transfer" tool_tip="Następny właściciel może sprzedać lub oddać ten obiekt"/>
+ <text name="perm_modify">
+ Możesz modyfikować ten obiekt
+ </text>
+ <text name="Anyone can:">
+ Każdy:
+ </text>
+ <check_box label="Kopiowanie" name="checkbox allow everyone copy" />
+ <check_box label="Przesuwanie" name="checkbox allow everyone move" />
+ <text name="GroupLabel">
+ Grupa:
+ </text>
+ <check_box label="Udostępnij" name="checkbox share with group" tool_tip="Pozwól wszystkim osobom z ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z funkcji." />
+ <text name="NextOwnerLabel">
+ Nast. właściciel:
+ </text>
+ <check_box label="Modyfikacja" name="checkbox next owner can modify" />
+ <check_box label="Kopiowanie" name="checkbox next owner can copy" />
+ <check_box label="Transferowanie" name="checkbox next owner can transfer" tool_tip="Następny właściciel może sprzedać lub oddać ten obiekt" />
</panel>
- <check_box label="Na Sprzedaż" name="checkbox for sale"/>
+ <check_box label="Na sprzedaż" name="checkbox for sale" />
<combo_box name="sale type">
- <combo_box.item label="Kopiuj" name="Copy"/>
- <combo_box.item label="Treść" name="Contents"/>
- <combo_box.item label="Oryginał" name="Original"/>
+ <combo_box.item name="Copy" label="Kopia" />
+ <combo_box.item name="Contents" label="Zawartość" />
+ <combo_box.item name="Original" label="Oryginał" />
</combo_box>
- <spinner label="Cena: L$" name="Edit Cost"/>
- <check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij widzialność tego obiektu w wyszukiwarce"/>
- <text name="B:">B:</text>
- <text name="O:">O:</text>
- <text name="G:">G:</text>
- <text name="E:">E:</text>
- <text name="N:">N:</text>
- <text name="F:">F:</text>
+ <spinner name="Edit Cost" label="Cena: L$" />
+ <check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij widzialność tego obiektu w wyszukiwarce" />
+ <text name="pathfinding_attributes_label">
+ Atrybuty odnajd. ścieżek:
+ </text>
</panel>
<panel name="button_panel">
- <button label="Otwórz" name="open_btn"/>
- <button label="Zapłać" name="pay_btn"/>
- <button label="Kup" name="buy_btn"/>
- <button label="Szczegóły" name="details_btn"/>
+ <button label="Otwórz" name="open_btn" />
+ <button label="Zapłać" name="pay_btn" />
+ <button label="Kup" name="buy_btn" />
+ <button label="Szczegóły" name="details_btn" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
old mode 100755
new mode 100644
index 7801d5045708ce52a5648f08d75a4b90ea89c190..dd85f1eb9bcd454cd66b3796f66fff834aa16bbb
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1,17 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
- It is only for those strings which do not belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
- that are returned from one component and may appear in many places-->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<strings>
- <string name="CAPITALIZED_APP_NAME">
- SECOND LIFE
- </string>
<string name="SUPPORT_SITE">
Portal Pomocy Second Life
</string>
<string name="StartupDetectingHardware">
- Wykrywanie dysku twardego...
+ Detekcja konfiguracji sprzętowej...
</string>
<string name="StartupLoading">
Åadowanie [APP_NAME]...
@@ -23,7 +16,41 @@
Inicjowanie bufora danych tekstur...
</string>
<string name="StartupInitializingVFS">
- Inicjowanie VFS...
+ Inicjowanie wirtualnego systemu plików...
+ </string>
+ <string name="StartupRequireDriverUpdate">
+ Nie można zainicjować grafiki. Zaktualizuj sterowniki!
+ </string>
+ <string name="AboutPosition">
+Położenie [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] w [REGION] zlokalizowanym w <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURL: <nolink>[SLURL]</nolink>
+(koordynaty globalne [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
+[SERVER_VERSION]
+[SERVER_RELEASE_NOTES_URL]
+ </string>
+ <string name="AboutSystem">
+Procesor (CPU): [CPU]
+Pamięć (Memory): [MEMORY_MB] MB
+Wersja OS (OS Version): [OS_VERSION]
+Sprzedawca karty graficznej (Graphics Card Vendor): [GRAPHICS_CARD_VENDOR]
+Karta graficzna (Graphics Card): [GRAPHICS_CARD]
+ </string>
+ <string name="AboutDriver">
+ Sterownik karty graficznej Windows (Driver Version): [GRAPHICS_DRIVER_VERSION]
+ </string>
+ <string name="AboutLibs">
+Wersja OpenGL: [OPENGL_VERSION]
+
+Wersja dekodera J2C: [J2C_VERSION]
+Wersja sterownika dźwięku (Audio Driver): [AUDIO_DRIVER_VERSION]
+Wersja LLCEFLib/CEF: [LLCEFLIB_VERSION]
+Wersja serwera głosu (Voice Server): [VOICE_VERSION]
+ </string>
+ <string name="AboutTraffic">
+ Pakiety utracone: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+ </string>
+ <string name="ErrorFetchingServerReleaseNotesURL">
+ BÅ‚Ä…d podczas pobierania informacji o wydaniu.
</string>
<string name="ProgressRestoring">
Przywracanie...
@@ -31,8 +58,11 @@
<string name="ProgressChangingResolution">
Zmiana rozdzielczości...
</string>
+ <string name="Fullbright">
+ Pełna jasność
+ </string>
<string name="LoginInProgress">
- Trwa logowanie. [APP_NAME] Proszę czekać.
+ Trwa logowanie. [APP_NAME] może wydawać się zawieszony. Proszę czekać.
</string>
<string name="LoginInProgressNoFrozen">
Logowanie...
@@ -41,10 +71,10 @@
Autoryzacja
</string>
<string name="LoginMaintenance">
- W trakcie obslugi konta...
+ Przeprowadzanie konserwacji konta...
</string>
<string name="LoginAttempt">
- Poprzednie logowanie nie udalo się. Logowanie, próba numer [NUMBER]
+ Poprzednie logowanie nie udało się. Logowanie ponowne, próba [NUMBER]
</string>
<string name="LoginPrecaching">
Åadowanie Å›wiata...
@@ -65,20 +95,26 @@
Przetwarzanie odpowiedzi...
</string>
<string name="LoginInitializingWorld">
- Inicjacja świata...
+ Inicjalizacja świata...
</string>
<string name="LoginDecodingImages">
Przetwarzanie obrazów...
</string>
<string name="LoginInitializingQuicktime">
- Inicjacja QuickTime...
+ Inicjalizacja QuickTime...
</string>
<string name="LoginQuicktimeNotFound">
- QuickTime nie został znaleziony - inicjacja przerwana.
+ QuickTime nie został znaleziony - inicjalizacja przerwana.
</string>
<string name="LoginQuicktimeOK">
QuickTime zainicjowany.
</string>
+ <string name="LoginRequestSeedCapGrant">
+ Sprawdzanie możliwości regionu...
+ </string>
+ <string name="LoginRetrySeedCapGrant">
+ Sprawdzanie możliwości regionu, próba [NUMBER]...
+ </string>
<string name="LoginWaitingForRegionHandshake">
Oczekiwanie na połączenie z regionem...
</string>
@@ -86,25 +122,25 @@
ÅÄ…czenie z regionem...
</string>
<string name="LoginDownloadingClothing">
- Åadowanie ubrania...
+ Pobieranie ubrania...
</string>
<string name="InvalidCertificate">
- Serwer zwrócił nieważny lub zniekształcony certyfikat. Proszę skontaktuj się z administratorem Grida.
+ Serwer zwrócił nieważny lub zniekształcony certyfikat. Proszę skontaktuj się z administratorem siatki.
</string>
<string name="CertInvalidHostname">
- Nazwa hosta jest nieważna, proszę sprawdź SLURL lub nazwę hosta Grida.
+ Nazwa hosta jest nieważna, proszę sprawdź SLURL lub nazwę hosta siatki.
</string>
<string name="CertExpired">
- Termin ważności certyfikatu zwróconego przez Grid minął. Proszę sprawdzić swój zegar systemowy lub skontaktować się z administratorem Grida.
+ Termin ważności certyfikatu zwróconego przez siatkę minął. Proszę sprawdzić swój zegar systemowy lub skontaktować się z administratorem siatki.
</string>
<string name="CertKeyUsage">
- Certyfikat zwrócony przez serwer nie może być użyty dla SSL. Proszę skontaktuj się z administratorem Grida.
+ Certyfikat zwrócony przez serwer nie może być użyty dla SSL. Proszę skontaktuj się z administratorem siatki.
</string>
<string name="CertBasicConstraints">
- Zbyt wiele certyfikatów w łańcuchu certyfikatów serwera. Proszę skontaktować się z administratorem Grida.
+ Zbyt wiele certyfikatów w łańcuchu certyfikatów serwera. Proszę skontaktować się z administratorem siatki.
</string>
<string name="CertInvalidSignature">
- Podpis certyfikatu zwrócony przez Grid nie mógł zostać zweryfikowany. Proszę skontaktować się z administratorem Grida.
+ Podpis certyfikatu zwrócony przez siatkę nie mógł zostać zweryfikowany. Proszę skontaktować się z administratorem siatki.
</string>
<string name="LoginFailedNoNetwork">
Błąd sieci: Brak połączenia z siecią, sprawdź status swojego połączenia internetowego.
@@ -113,16 +149,149 @@
Logowanie nie powiodło się.
</string>
<string name="Quit">
- Wyłącz program
+ Wyłącz
+ </string>
+ <string name="LoginFailedViewerNotPermitted">
+ Przeglądarka używana przez Ciebie nie ma już dostępu do Second Life. Proszę przejść na poniższą stronę i pobrać nową:
+http://secondlife.com/download
+
+Więcej informacji w naszym FAQ:
+http://secondlife.com/viewer-access-faq
+ </string>
+ <string name="LoginIntermediateOptionalUpdateAvailable">
+ Opcjonalna aktualizacja jest dostępna: [VERSION].
+ </string>
+ <string name="LoginFailedRequiredUpdate">
+ Wymagana aktualizacja: [VERSION].
+ </string>
+ <string name="LoginFailedAlreadyLoggedIn">
+ Ten Rezydent jest już zalogowany.
+ </string>
+ <string name="LoginFailedAuthenticationFailed">
+ Przepraszamy, ale nie możemy Cię zalogować.
+Upewnij się, że wpisano poprawnie:
+ * Login (np. bobsmith12 czy steller.sunshine)
+ * Hasło
+Sprawdź też, czy klawisz Caps Lock nie jest wciśnięty.
+ </string>
+ <string name="LoginFailedPasswordChanged">
+ W celu zwiększenia bezpieczeństwa Twoje hasło zostało zmienione.
+Przejdź na stronę swojego konta: http://secondlife.com/password
+i odpowiedz na pytanie zabezpieczające, aby zresetować hasło.
+Bardzo przepraszamy za utrudnienia.
+ </string>
+ <string name="LoginFailedPasswordReset">
+ Wprowadziliśmy pewne zmiany do systemu, które wymagają zresetowania hasła.
+Przejdź na stronę swojego konta: http://secondlife.com/password
+i odpowiedz na pytanie zabezpieczające, aby zresetować hasło.
+Bardzo przepraszamy za utrudnienia.
+ </string>
+ <string name="LoginFailedEmployeesOnly">
+ Second Life jest tymczasowo niedostępne, bo trwa konserwacja.
+Logować się mogą w tej chwili tylko pracownicy Linden Lab.
+Odwiedź www.secondlife.com/status i śledź wiadomości.
+ </string>
+ <string name="LoginFailedPremiumOnly">
+ Logowanie do Second Life jest tymczasowo ograniczone aby mieć pewność, że osoby już zalogowane nie stracą na wydajności.
+
+Osoby posiadające darmowe konta nie mogą się teraz zalogować, aby ludzie posiadający te płatne mogli to zrobić.
+ </string>
+ <string name="LoginFailedComputerProhibited">
+ Second Life odmawia dostępu temu komputerowi.
+Jeśli myślisz, że to błąd skontaktuj się z
+support@secondlife.com
+ </string>
+ <string name="LoginFailedAcountSuspended">
+ Twoje konto jest niedostępne do
+[TIME] czasu pacyficznego.
+ </string>
+ <string name="LoginFailedAccountDisabled">
+ Nie jesteśmy w stanie na tą chwilę wykonać Twojego żądania.
+Aby uzyskać pomoc skontaktuj się ze wsparciem: http://secondlife.com/support
+Jeśli nie możesz zmienić swojego hasła zadzwoń pod numer (866) 476-9763.
+ </string>
+ <string name="LoginFailedTransformError">
+ Podczas logowania wykryto niespójność danych.
+Skontaktuj siÄ™ z nami: support@secondlife.com
+ </string>
+ <string name="LoginFailedAccountMaintenance">
+ Twoje konto jest w trakcie drobnych konserwacji.
+Nie będzie ono dostępne do
+[TIME] czasu pacyficznego.
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
+ </string>
+ <string name="LoginFailedPendingLogoutFault">
+ Prośba o wylogowanie spotkała się z błędem ze strony symulatora.
+ </string>
+ <string name="LoginFailedPendingLogout">
+ System w tej chwili CiÄ™ wylogowywuje.
+Twoje konto będzie niedostępne do
+[TIME] czasu pacyficznego.
+ </string>
+ <string name="LoginFailedUnableToCreateSession">
+ Nie można utworzyć poprawnej sesji.
+ </string>
+ <string name="LoginFailedUnableToConnectToSimulator">
+ Nie można połączyć się z symulatorem.
+ </string>
+ <string name="LoginFailedRestrictedHours">
+ Twoje konto może się łączyć z Second Life tylko
+pomiędzy [START] i [END] czasu pacyficznego.
+Wróć proszę w tych godzinach.
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
+ </string>
+ <string name="LoginFailedIncorrectParameters">
+ Nieprawidłowe parametry.
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
+ </string>
+ <string name="LoginFailedFirstNameNotAlphanumeric">
+ Parametr imienia musi być alfanumeryczny.
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
+ </string>
+ <string name="LoginFailedLastNameNotAlphanumeric">
+ Parametr nazwiska musi być alfanumeryczny.
+Jeśli myślisz, że to błąd skontaktuj się z support@secondlife.com
+ </string>
+ <string name="LogoutFailedRegionGoingOffline">
+ Region przechodzi w tryb offline.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LogoutFailedAgentNotInRegion">
+ Rezydent nie znajduje siÄ™ w regionie.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LogoutFailedPendingLogin">
+ Region był w trakcie logowania innej sesji.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LogoutFailedLoggingOut">
+ Region był w trakcie wylogowywania poprzedniej sesji.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LogoutFailedStillLoggingOut">
+ Region ciÄ…gle wylogowywuje poprzedniÄ… sesjÄ™.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LogoutSucceeded">
+ Region wylogował ostatnią sesję.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LogoutFailedLogoutBegun">
+ Region rozpoczÄ…Å‚ proces wylogowywania.
+Spróbuj zalogować się ponownie za minutę.
+ </string>
+ <string name="LoginFailedLoggingOutSession">
+ System rozpoczÄ…Å‚ wylogowywanie Twojej ostatniej sesji.
+Spróbuj zalogować się ponownie za minutę.
</string>
<string name="AgentLostConnection">
Ten region może mieć problemy. Sprawdź podłączenie do Internetu.
</string>
<string name="SavingSettings">
- Zachowanie ustawień...
+ Zachowywanie ustawień...
</string>
<string name="LoggingOut">
- Trwa wylogowanie...
+ Wylogowywanie...
</string>
<string name="ShuttingDown">
Zamykanie...
@@ -134,13 +303,97 @@
Region jest niedostępny.
</string>
<string name="TestingDisconnect">
- Nastąpiło rozłączenie testowania klienta
+ Testowanie rozłączenia klienta
+ </string>
+ <string name="SocialFacebookConnecting">
+ ÅÄ…czenie z Facebookiem...
+ </string>
+ <string name="SocialFacebookPosting">
+ Wysyłanie...
+ </string>
+ <string name="SocialFacebookDisconnecting">
+ Rozłączanie z Facebookiem...
+ </string>
+ <string name="SocialFacebookErrorConnecting">
+ Problem z Å‚Ä…czeniem z Facebookiem
+ </string>
+ <string name="SocialFacebookErrorPosting">
+ Problem z wysyłaniem na Facebooka
+ </string>
+ <string name="SocialFacebookErrorDisconnecting">
+ Problem z rozłączaniem z Facebookiem
+ </string>
+ <string name="SocialFlickrConnecting">
+ ÅÄ…czenie z Flickr...
+ </string>
+ <string name="SocialFlickrPosting">
+ Wysyłanie...
+ </string>
+ <string name="SocialFlickrDisconnecting">
+ Rozłączanie z Flickr...
+ </string>
+ <string name="SocialFlickrErrorConnecting">
+ Problem z Å‚Ä…czeniem z Flickr
+ </string>
+ <string name="SocialFlickrErrorPosting">
+ Problem z wysyłaniem na Flickr
+ </string>
+ <string name="SocialFlickrErrorDisconnecting">
+ Problem z rozłączaniem z Flickr
+ </string>
+ <string name="SocialTwitterConnecting">
+ ÅÄ…czenie z Twitterem...
+ </string>
+ <string name="SocialTwitterPosting">
+ Wysyłanie...
+ </string>
+ <string name="SocialTwitterDisconnecting">
+ Rozłączanie z Twitterem...
+ </string>
+ <string name="SocialTwitterErrorConnecting">
+ Problem z Å‚Ä…czeniem z Twitterem
+ </string>
+ <string name="SocialTwitterErrorPosting">
+ Problem z wysyłaniem na Twittera
+ </string>
+ <string name="SocialTwitterErrorDisconnecting">
+ Problem z rozłączaniem z Twittera
+ </string>
+ <string name="BlackAndWhite">
+ Czerń i biel
+ </string>
+ <string name="Colors1970">
+ Kolory lat 1970
+ </string>
+ <string name="Intense">
+ Intensywne
+ </string>
+ <string name="Newspaper">
+ Papier gazetowy
+ </string>
+ <string name="Spotlight">
+ Reflektor
+ </string>
+ <string name="Video">
+ Wideo
+ </string>
+ <string name="Autocontrast">
+ Autokontrast
+ </string>
+ <string name="LensFlare">
+ Flara
+ </string>
+ <string name="Miniature">
+ Miniatura
+ </string>
+ <string name="Toycamera">
+ Zabawkowy aparat
</string>
<string name="TooltipPerson">
Osoba
</string>
<string name="TooltipNoName">
- (brak nazwy)
+ (bez nazwy)
</string>
<string name="TooltipOwner">
Właściciel:
@@ -152,7 +405,7 @@
(Grupa)
</string>
<string name="TooltipForSaleL$">
- Na sprzedaż: L$[AMOUNT]
+ Na sprzedaż: [AMOUNT]L$
</string>
<string name="TooltipFlagGroupBuild">
Budowanie grupowe
@@ -176,53 +429,44 @@
Skrypty zabronione
</string>
<string name="TooltipLand">
- Posiadłość:
+ Działka:
</string>
<string name="TooltipMustSingleDrop">
Tylko pojedynczy obiekt może być tutaj przeciągnięty
</string>
- <string name="TooltipPrice" value="L$[AMOUNT]:"/>
- <string name="TooltipOutboxDragToWorld">
- Nie możesz rezzować obiektów z folderu rzeczy na Marketplace
- </string>
- <string name="TooltipOutboxWorn">
- Nie możesz umieszczać na Marketplace przedmiotów, które masz na sobie założone
- </string>
- <string name="TooltipOutboxFolderLevels">
- Głębokość zagnieżdżonych folderów przekracza [AMOUNT]. Zmniejsz ilość zagdzieżdżeń; Spakuj przedmioty w pudełka, jeśli to pomoże.
- </string>
- <string name="TooltipOutboxTooManyFolders">
- Ilość podfolderów w folderze najwyższego poziomu przekracza [AMOUNT]. Zmniejsz ilość folderów; Spakuj przedmioty w pudełka, jeśli to pomoże.
- </string>
- <string name="TooltipOutboxTooManyObjects">
- Ilość pozycji w folderze najwyższego poziomu przekracza [AMOUNT]. Jeśli chcesz sprzedać więcej, niż [AMOUNT] przedmiotów jako jedną pozycję, to musisz je spakować w pudełka.
- </string>
- <string name="TooltipOutboxTooManyStockItems">
- Ilość przedmiotów w folderze magazynowym przekracza [AMOUNT].
+ <string name="TooltipTooManyWearables">
+ Nie możesz założyć folderu, który zawiera więcej niż [AMOUNT] przedmiotów. Możesz zmienić ten limit w Zaawansowane > Pokaż ustawienia debugowania > WearFolderLimit.
</string>
- <string name="TooltipOutboxCannotDropOnRoot">
- Możesz przenosić foldery lub przedmioty wyłącznie do karty WSZYSTKO. Wybierz teraz tą kartę i spróbuj ponownie.
+ <string name="TooltipPrice" value="[AMOUNT]L$: "/>
+ <string name="TooltipOutboxDragToWorld">
+ Nie możesz rezzować obiektów w skrzynce nadawczej kupca
</string>
<string name="TooltipOutboxNoTransfer">
- Jeden lub kilka z tych obiektów nie może zostać sprzedany / przetransferowany
+ Jeden lub kilka z tych obiektów nie może zostać sprzedany / przetransferowany.
</string>
<string name="TooltipOutboxNotInInventory">
- Marketplace akceptuje tylko przedmioty bezpośrednio z Twojej Szafy.
+ Twoja skrzynka nadawcza kupca akceptuje tylko przedmioty bezpośrednio z Twojej Szafy.
</string>
- <string name="TooltipOutboxLinked">
- Nie możesz sprzedać zlinkowanych folderów lub przedmiotów na Marketplace
+ <string name="TooltipOutboxWorn">
+ Nie możesz umieszczać w skrzynce nadawczej kupca przedmiotów, które masz na sobie założone
</string>
<string name="TooltipOutboxCallingCard">
- Nie możesz umieszczać wizytówek na Marketplace
+ Nie możesz umieszczać wizytówek w skrzynce nadawczej kupca
</string>
- <string name="TooltipOutboxDragActive">
- Nie można przenieść wylistowanego przedmiotu
+ <string name="TooltipOutboxFolderLevels">
+ Głębokość zagnieżdżonych folderów przekracza 3
</string>
- <string name="TooltipOutboxCannotMoveRoot">
- Nie możesz przenieść folderu głównego przedmiotów na Marketplace
+ <string name="TooltipOutboxTooManyFolders">
+ Ilość podfolderów w folderze najwyższego poziomu przekracza 20
</string>
- <string name="TooltipOutboxMixedStock">
- Wszystkie przedmioty w folderze magazynowym muszą mieć ten sam typ i zezwolenia
+ <string name="TooltipOutboxTooManyObjects">
+ Ilość pozycji w folderze najwyższego poziomu przekracza 200
+ </string>
+ <string name="TooltipDragOntoOwnChild">
+ Nie możesz przenieść folderu do jego obiektu podrzędnego
+ </string>
+ <string name="TooltipDragOntoSelf">
+ Nie możesz przenieść folderu do wewnątrz niego samego
</string>
<string name="TooltipHttpUrl">
Kliknij aby zobaczyć zawartość tej strony internetowej
@@ -231,16 +475,16 @@
Kliknij aby zobaczyć szczegóły tego miejsca
</string>
<string name="TooltipAgentUrl">
- Kliknij aby zobaczyc profil Rezydenta
+ Kliknij aby zobaczyć profil Rezydenta
</string>
<string name="TooltipAgentInspect">
Dowiedz się więcej o tym Rezydencie
</string>
<string name="TooltipAgentMute">
- Kliknij aby wyciszyc tego Rezydenta
+ Kliknij aby wyciszyć tego Rezydenta
</string>
<string name="TooltipAgentUnmute">
- Kliknij aby cofnąć zablokowanie tego Rezydenta
+ Kliknij aby cofnąć wyciszenie tego Rezydenta
</string>
<string name="TooltipAgentIM">
Kliknij aby wysłać wiadomość IM do tego Rezydenta
@@ -249,7 +493,7 @@
Kliknij aby zapłacić temu Rezydentowi
</string>
<string name="TooltipAgentOfferTeleport">
- Kliknij aby oferować teleport temu Rezydentowi
+ Kliknij aby zaoferować teleport temu Rezydentowi
</string>
<string name="TooltipAgentRequestFriend">
Kliknij aby wysłać temu Rezydentowi zaproszenie do Znajomych
@@ -258,13 +502,13 @@
Kliknij aby zobaczyć opis tej grupy
</string>
<string name="TooltipEventUrl">
- Klinij aby zobaczyć szczegóły tego wydarzenia
+ Kliknij aby zobaczyć szczegóły tego wydarzenia
</string>
<string name="TooltipClassifiedUrl">
Kliknij aby zobaczyć tę reklamę
</string>
<string name="TooltipParcelUrl">
- Kliknij aby zobaczyć opis tej posiadłości
+ Kliknij aby zobaczyć opis tej działki
</string>
<string name="TooltipTeleportUrl">
Kliknij aby teleportować się do tego miejsca
@@ -276,9 +520,9 @@
Kliknij aby zobaczyć to miejsce na mapie
</string>
<string name="TooltipSLAPP">
- Kliknij aby uruchomić secondlife:// command
+ Kliknij aby uruchomić komendę secondlife://
</string>
- <string name="CurrentURL" value=" Obecny Adres: [CurrentURL]"/>
+ <string name="CurrentURL" value=" Obecny URL: [CurrentURL]"/>
<string name="SLurlLabelTeleport">
Teleportuj do
</string>
@@ -289,22 +533,22 @@
Zablokuj
</string>
<string name="SLappAgentUnmute">
- Cofnij zablokowanie
- </string>
- <string name="SLappAgentIM">
- IM
+ Odblokuj
</string>
<string name="SLappAgentPay">
Zapłać
</string>
<string name="SLappAgentOfferTeleport">
- Teleportuj do
+ Oferta teleportu dla
</string>
<string name="SLappAgentRequestFriend">
Oferta znajomości
</string>
+ <string name="SLappAgentRemoveFriend">
+ Usunięcie znajomego
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
- Zamknij (⌘W)
+ Zamknij (⌘W)
</string>
<string name="BUTTON_CLOSE_WIN">
Zamknij (Ctrl+W)
@@ -313,7 +557,7 @@
Zamknij
</string>
<string name="BUTTON_RESTORE">
- Odzyskaj
+ Przywróć
</string>
<string name="BUTTON_MINIMIZE">
Minimalizuj
@@ -331,19 +575,16 @@
Wyszukiwanie...
</string>
<string name="NoneFound">
- Nie odnaleziono.
+ Nie nie znaleziono.
</string>
<string name="RetrievingData">
- Odzyskiwanie danych...
+ Pobieranie...
</string>
<string name="ReleaseNotes">
- O tej wersji
- </string>
- <string name="RELEASE_NOTES_BASE_URL">
- http://wiki.secondlife.com/wiki/Release_Notes/
+ Informacje o wydaniu
</string>
<string name="LoadingData">
- Åadowanie danych...
+ Wczytywanie...
</string>
<string name="AvatarNameNobody">
(brak danych)
@@ -351,6 +592,9 @@
<string name="AvatarNameWaiting">
(Å‚adowanie)
</string>
+ <string name="AvatarNameMultiple">
+ (kilka)
+ </string>
<string name="GroupNameNone">
(brak danych)
</string>
@@ -358,7 +602,7 @@
Avaline [ORDER]
</string>
<string name="AssetErrorNone">
- OK
+ Brak błędu
</string>
<string name="AssetErrorRequestFailed">
Pobieranie danych: błąd
@@ -409,10 +653,10 @@
ubrania
</string>
<string name="object">
- obiek
+ obiekt
</string>
<string name="note card">
- notatki
+ noty
</string>
<string name="folder">
folder
@@ -436,7 +680,7 @@
zdjęcia
</string>
<string name="lost and found">
- Zgubione i odnalezione
+ Zagubione i odnalezione
</string>
<string name="targa image">
obraz typu targa
@@ -451,26 +695,29 @@
animacja
</string>
<string name="gesture">
- gesturka
+ gest
</string>
<string name="simstate">
- simstate
+ stan sima
</string>
<string name="favorite">
ulubione
</string>
- <string name="symbolic link">
- link
- </string>
<string name="symbolic folder link">
link folderu
</string>
+ <string name="mesh">
+ mesz
+ </string>
<string name="AvatarEditingAppearance">
- (Edycja WyglÄ…d)
+ (Edycja wyglÄ…du)
</string>
<string name="AvatarAway">
Åšpi
</string>
+ <string name="AvatarDoNotDisturb">
+ Zajęty
+ </string>
<string name="AvatarMuted">
Wyciszony
</string>
@@ -550,7 +797,7 @@
Udało się!
</string>
<string name="anim_yoga_float">
- Yoga
+ Joga
</string>
<string name="anim_express_frown">
Grymas
@@ -625,7 +872,7 @@
Smutek
</string>
<string name="anim_salute">
- Pozdrów
+ Salutuj
</string>
<string name="anim_shout">
Krzycz
@@ -681,6 +928,18 @@
<string name="anim_yes_head">
Tak
</string>
+ <string name="multiple_textures">
+ Wiele
+ </string>
+ <string name="use_texture">
+ Użyj tekstury
+ </string>
+ <string name="manip_hint1">
+ Przesuń kursor nad linijkę
+ </string>
+ <string name="manip_hint2">
+ by przyciągać do siatki
+ </string>
<string name="texture_loading">
Åadowanie...
</string>
@@ -688,19 +947,22 @@
Mapa Świata jest niedostępna
</string>
<string name="worldmap_item_tooltip_format">
- [AREA] m² L$[PRICE]
+ [AREA] m² [PRICE]L$ ([SQMPRICE] L$/m²)
</string>
<string name="worldmap_results_none_found">
- Miejsce nieodnalezione.
- </string>
- <string name="Ok">
- OK
+ Miejsce nie zostało odnalezione.
</string>
<string name="Premature end of file">
- Przedwczesna końcówka pliku
+ Przedwczesny koniec pliku
</string>
<string name="ST_NO_JOINT">
- PODSTAWA lub ÅÄ„CZNIK nieodnaleziona/y
+ Nie można znaleźć Podstawy lub Stawu.
+ </string>
+ <string name="NearbyChatTitle">
+ Czat lokalny
+ </string>
+ <string name="NearbyChatLabel">
+ (Czat lokalny)
</string>
<string name="whisper">
szepcze:
@@ -709,13 +971,13 @@
krzyczy:
</string>
<string name="ringing">
- ÅÄ…czenie z rozmowami gÅ‚osem w Åšwiecie...
+ ÅÄ…czenie z serwerem rozmów gÅ‚osowych...
</string>
<string name="connected">
Połączenie uzyskane.
</string>
<string name="unavailable">
- Niestety, rozmowy głosem są niedozwolone w tym miejscu.
+ Niestety, rozmowy głosowe są niedozwolone w tym miejscu.
</string>
<string name="hang_up">
Połączenie rozmowy utracone.
@@ -724,53 +986,76 @@
Przełączanie do pobliskich rozmów głosowych
</string>
<string name="ScriptQuestionCautionChatGranted">
- '[OBJECTNAME]', właściciel: '[OWNERNAME]', położenie: [REGIONNAME] [REGIONPOS], pozwala Ci na: [PERMISSIONS].
+ '[OBJECTNAME]', właściciel: '[OWNERNAME]', położenie: [REGIONNAME] w [REGIONPOS], dostał zezwolenie na: [PERMISSIONS].
</string>
<string name="ScriptQuestionCautionChatDenied">
- '[OBJECTNAME]', właściciel: '[OWNERNAME]', położenie: [REGIONNAME] [REGIONPOS], nie pozwala Ci na: [PERMISSIONS].
+ '[OBJECTNAME]', właściciel: '[OWNERNAME]', położenie: [REGIONNAME] w [REGIONPOS], nie dostał zezwolenia na: [PERMISSIONS].
+ </string>
+ <string name="AdditionalPermissionsRequestHeader">
+ Jeśli zezwolisz na dostęp do konta, to obiekt będzie mógł także:
</string>
<string name="ScriptTakeMoney">
- Zabiera Lindeny (L$) od Ciebie
+ Zabierać Lindeny (L$) od Ciebie
</string>
<string name="ActOnControlInputs">
- Używaj klawiszy sterowania
+ Używać klawiszy sterowania
</string>
<string name="RemapControlInputs">
- Zmień klawisze sterowania
+ Zmienić klawisze sterowania
</string>
<string name="AnimateYourAvatar">
- Animuj Awatara
+ Animować Awatara
</string>
<string name="AttachToYourAvatar">
- Dołącz do Awatara
+ Dołączać do Awatara
</string>
<string name="ReleaseOwnership">
- Usuń prawo własności (zmień na publiczne)
+ Usunąć prawo własności (zmienić na publiczne)
</string>
<string name="LinkAndDelink">
- ÅÄ…cz / rozÅ‚Ä…cz z innymi obiektami
+ ÅÄ…czyć/rozÅ‚Ä…czać z innymi obiektami
</string>
<string name="AddAndRemoveJoints">
- Dodaj / usuń połączenia z innymi obiektami
+ Dodawać/usuwać połączenia z innymi obiektami
</string>
<string name="ChangePermissions">
- Ustaw zezwolenia
+ Zmieniać zezwolenia
</string>
<string name="TrackYourCamera">
- Chodź za kamerą
+ Śledzić kamerę
</string>
<string name="ControlYourCamera">
- Kontroluj kamerÄ™
+ Kontrolować kamerę
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
- <string name="SIM_ACCESS_PG">
- 'General'
+ <string name="TeleportYourAgent">
+ Teleportować Cię
</string>
- <string name="SIM_ACCESS_MATURE">
- 'Moderate'
+ <string name="ManageEstateSilently">
+ Zarządzać Twoimi majątkami bez powiadomień
</string>
- <string name="SIM_ACCESS_ADULT">
- 'Adult'
+ <string name="ChangeYourDefaultAnimations">
+ Zmieniać Twoje domyślne animacje
+ </string>
+ <string name="NotConnected">
+ Brak połączenia
+ </string>
+ <string name="AgentNameSubst">
+ (Ty)
+ </string>
+ <string name="JoinAnExperience">
+ Rozpocznij przygodÄ™
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Wyciszyć powiadomienia o zmianach zezwoleń Majątku
+ </string>
+ <string name="OverrideYourAnimations">
+ Zastąpić animacje Twojego awatara
+ </string>
+ <string name="ScriptReturnObjects">
+ Zwróć przedmioty w swoim imieniu
+ </string>
+ <string name="UnknownScriptPermission">
+ (nieznane)!
</string>
<string name="SIM_ACCESS_DOWN">
Niedostępny
@@ -779,19 +1064,16 @@
Nieznany
</string>
<string name="land_type_unknown">
- (nieznane)
+ (nieznany)
</string>
<string name="Estate / Full Region">
- MajÄ…tek / Region
+ Majątek / Pełny Region
</string>
<string name="Estate / Homestead">
- Estate / Homestead
- </string>
- <string name="Mainland / Homestead">
- Mainland / Homestead
+ MajÄ…tek / Homestead
</string>
<string name="Mainland / Full Region">
- Mainland / Region
+ Mainland / Pełny Region
</string>
<string name="all_files">
Wszystkie pliki
@@ -836,7 +1118,7 @@
Plik RAW
</string>
<string name="compressed_image_files">
- Obrazy skomprensowane
+ Obrazy skompresowane
</string>
<string name="load_files">
Załaduj pliki
@@ -844,11 +1126,17 @@
<string name="choose_the_directory">
Wybierz katalog
</string>
+ <string name="script_files">
+ Skrypty
+ </string>
+ <string name="dictionary_files">
+ SÅ‚owniki
+ </string>
<string name="shape">
Kształt
</string>
<string name="skin">
- Skórka
+ Skóra
</string>
<string name="hair">
WÅ‚osy
@@ -857,7 +1145,7 @@
Oczy
</string>
<string name="shirt">
- Koszulka
+ Koszula
</string>
<string name="pants">
Spodnie
@@ -875,7 +1163,7 @@
Rękawiczki
</string>
<string name="undershirt">
- Podkoszulka
+ Podkoszulek
</string>
<string name="underpants">
Bielizna
@@ -883,9 +1171,6 @@
<string name="skirt">
Spódnica
</string>
- <string name="alpha">
- Ubranie Alpha
- </string>
<string name="tattoo">
Tatuaż
</string>
@@ -893,10 +1178,10 @@
Fizyka
</string>
<string name="invalid">
- niewłaściwa funkcja
+ nieprawidłowy
</string>
<string name="none">
- żadne
+ brak
</string>
<string name="shirt_not_worn">
Koszula nie jest założona
@@ -926,22 +1211,22 @@
Spódnica nie jest założona
</string>
<string name="alpha_not_worn">
- Alpha nie jest założone
+ Alpha nie jest założona
</string>
<string name="tattoo_not_worn">
Tatuaż nie jest założony
</string>
<string name="physics_not_worn">
- Fizyka niezałożona
+ Fizyka nie jest założona
</string>
<string name="invalid_not_worn">
- nieważny
+ nieprawidłowy
</string>
<string name="create_new_shape">
Nowy kształt
</string>
<string name="create_new_skin">
- Nowa skórka
+ Nowa skóra
</string>
<string name="create_new_hair">
Nowe włosy
@@ -983,19 +1268,16 @@
Nowy tatuaż
</string>
<string name="create_new_physics">
- Stwórz nową fizykę
+ NowÄ… fizyka
</string>
<string name="create_new_invalid">
- nieważny
+ nieprawidłowy
</string>
<string name="NewWearable">
Nowa [WEARABLE_ITEM]
</string>
<string name="next">
- Następne
- </string>
- <string name="ok">
- OK
+ Dalej
</string>
<string name="GroupNotifyGroupNotice">
Ogłoszenie grupowe
@@ -1022,7 +1304,7 @@
Oferta teleportacji
</string>
<string name="StartUpNotifications">
- Nowe zawiadomienia zostały wysłane kiedy byłeś/byłaś w trybie oddalenia...
+ Pojawiły się nowe powiadomienia kiedy byłeś/aś z dala od klawiatury...
</string>
<string name="OverflowInfoChannelString">
Masz jeszcze [%d] powiadomień
@@ -1055,151 +1337,119 @@
Wysoka
</string>
<string name="LeaveMouselook">
- Wybierz ESC aby powrócić do trybu widoku normalnego
+ Naciśnij ESC aby powrócić do trybu widoku normalnego
</string>
<string name="InventoryNoMatchingItems">
- Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/all/[SEARCH_TERM] Szukaj].
+ Nie udało Ci się znaleźć tego, czego szukasz? Spróbuj [secondlife:///app/search/all/[SEARCH_TERM] Wyszukiwarki].
</string>
<string name="PlacesNoMatchingItems">
- Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] Szukaj].
+ Nie udało Ci się znaleźć tego, czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] Wyszukiwarki].
</string>
<string name="FavoritesNoMatchingItems">
Przeciągnij landmark tutaj aby dodać go do swoich ulubionych.
</string>
- <string name="MarketplaceNoMatchingItems">
- Niczego nie znaleziono. Sprawdź pisownię i spróbuj ponownie.
- </string>
<string name="InventoryNoTexture">
- Nie posiadasz kopii tej tekstury w Twojej Szafie.
- </string>
- <string name="InventoryMarketplaceError">
- Ta funkcjonalność jest obecnie w fazie Beta. Dodaj proszę swoje imię do tego [http://goo.gl/forms/FCQ7UXkakz formularza Google] (w języku angielskim), jeśli chcesz wziąć udział w programie Beta i pomóc.
- </string>
- <string name="InventoryMarketplaceListingsNoItemsTitle">
- Twój folder przedmiotów na Marketplace jest pusty.
+ Nie posiadasz kopii tej tekstury w swojej Szafie.
</string>
- <string name="InventoryMarketplaceListingsNoItems">
- Przeciągnij foldery do tego obszaru, aby dodać je na listę sprzedaży w [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+ <string name="InventoryInboxNoItems">
+ Przedmioty zakupione na Marketplace pojawią się tutaj. Możesz następnie przeciągnąć je do głównej części Szafy.
</string>
- <string name="Marketplace Validation Warning Stock">
- folder magazynowy musi być zawarty w folderze wersji
+ <string name="InventoryOutboxNotMerchantTitle">
+ Każdy może sprzedawać przedmioty na Marketplace.
</string>
- <string name="Marketplace Validation Error Mixed Stock">
- : Błąd: wszystkie przedmioty w folderze magazynowym muszą mieć ten sam typ i być niekopiowalne
+ <string name="InventoryOutboxNotMerchant">
+ Jeśli chcesz zostać kupcem i sprzedawać przedmioty, to musisz najpierw [[MARKETPLACE_CREATE_STORE_URL] założyć sklep na Marketplace].
</string>
- <string name="Marketplace Validation Error Subfolder In Stock">
- : Błąd: folder magazynowy nie może zawierać podfolderów
+ <string name="InventoryOutboxNoItemsTitle">
+ Twoja skrzynka nadawcza kupca jest pusta.
</string>
- <string name="Marketplace Validation Warning Empty">
- : Uwaga: folder jest pusty
+ <string name="InventoryOutboxNoItems">
+ Przeciągnij foldery do tego obszaru i kliknij "Wyślij na Marketplace", aby dodać je na listę sprzedaży w [[MARKETPLACE_DASHBOARD_URL] Marketplace].
</string>
- <string name="Marketplace Validation Warning Create Stock">
- : Uwaga: tworzÄ™ folder magazynowy
+ <string name="InventoryOutboxInitializingTitle">
+ Inicjalizacja Marketplace.
</string>
- <string name="Marketplace Validation Warning Create Version">
- : Uwaga: tworzÄ™ folder wersji
+ <string name="InventoryOutboxInitializing">
+ Uzyskiwanie dostępu do Twojego konta [[MARKETPLACE_CREATE_STORE_URL] sklepu na Marketplace].
</string>
- <string name="Marketplace Validation Warning Move">
- : Uwaga: przenoszÄ™ przedmioty
+ <string name="InventoryOutboxErrorTitle">
+ Błędy Marketplace.
</string>
- <string name="Marketplace Validation Warning Delete">
- : Uwaga: zawartość folderu przeniesiona do folderu magazynowego, usuwam pusty katalog
+ <string name="InventoryOutboxError">
+ [[MARKETPLACE_CREATE_STORE_URL] Sklep na Marketplace] zwraca błędy.
</string>
- <string name="Marketplace Validation Error Stock Item">
- : Błąd: przedmioty bez praw kopiowania muszą się znajdować w folderze magazynowym
- </string>
- <string name="Marketplace Validation Warning Unwrapped Item">
- : Uwaga: przedmioty muszą się znajdować w folderze wersji
- </string>
- <string name="Marketplace Validation Error">
- : BÅ‚Ä…d:
- </string>
- <string name="Marketplace Validation Warning">
- : Uwaga:
- </string>
- <string name="Marketplace Validation Error Empty Version">
- : Uwaga: folder wersji musi zawierać przynajmniej jedną pozycję
- </string>
- <string name="Marketplace Validation Error Empty Stock">
- : Uwaga: folder magazynowy musi zawierać przynajmniej jedną pozycję
- </string>
- <string name="Marketplace Validation No Error">
- Brak błędów lub ostrzeżeń
- </string>
- <string name="Marketplace Error Prefix">
- BÅ‚Ä…d:
+ <string name="Marketplace Error None">
+ Brak błędów
</string>
<string name="Marketplace Error Not Merchant">
- Przed wysłaniem przedmiotów na Marketplace musisz zostać kupcem (darmowe).
- </string>
- <string name="Marketplace Error Not Accepted">
- Nie można przenieść tego przedmiotu.
+ Błąd: Przed wysłaniem przedmiotów na Marketplace musisz zostać kupcem (darmowe).
</string>
- <string name="Marketplace Error Unsellable Item">
- Ta pozycja nie może być sprzedana na Marketplace.
- </string>
- <string name="MarketplaceNoID">
- no Mkt ID
+ <string name="Marketplace Error Empty Folder">
+ Błąd: Ten folder nie ma zawartości.
</string>
- <string name="MarketplaceLive">
- na liście
+ <string name="Marketplace Error Unassociated Products">
+ Błąd: Ta pozycja nie może zostać załadowana, ponieważ Twoje konto kupca ma zbyt wiele nieprzypisanych przedmiotów. Aby naprawić ten błąd zaloguj się na stronę Marketplace i zmniejsz ilość nieprzypisanych (unassociated) przedmiotów.
</string>
- <string name="MarketplaceActive">
- aktywne
+ <string name="Marketplace Error Object Limit">
+ Błąd: Ta pozycja zawiera zbyt wiele elementów. Umieść przedmioty razem w pudełkach, aby zmniejszyć ich całkowitą liczbę do mniej niż 200.
</string>
- <string name="MarketplaceMax">
- maks
+ <string name="Marketplace Error Folder Depth">
+ Błąd: Ta pozycja zawiera zbyt wiele zagnieżdżonych folderów. Zreorganizuj wszystko tak, aby były obecne maksymalnie 3 poziomy zagnieżdżonych folderów.
</string>
- <string name="MarketplaceStock">
- magazyn
+ <string name="Marketplace Error Unsellable Item">
+ Błąd: Ta pozycja nie może być sprzedana na Marketplace.
</string>
- <string name="MarketplaceNoStock">
- brak w magazynie
+ <string name="Marketplace Error Internal Import">
+ Błąd: Wystąpił problem z tą pozycją. Spróbuj ponownie później.
</string>
- <string name="MarketplaceUpdating">
- aktualizacja...
+ <string name="Open landmarks">
+ Otwórz landmarki
</string>
<string name="Unconstrained">
Swobodny
</string>
- <string name="no_transfer" value=" (brak oddawania)"/>
- <string name="no_modify" value=" (brak modyfikowania)"/>
- <string name="no_copy" value=" (brak kopiowania)"/>
- <string name="worn" value=" (załóż)"/>
- <string name="link" value=" (link)"/>
- <string name="broken_link" value=" (broken_link)"/>
+ <string name="no_transfer" value=" (bez transferowania)"/>
+ <string name="no_modify" value=" (bez modyfikowania)"/>
+ <string name="no_copy" value=" (bez kopiowania)"/>
+ <string name="worn" value=" (założone)"/>
+ <string name="broken_link" value=" (zepsuty_link)"/>
<string name="LoadingContents">
Åadowanie zawartoÅ›ci...
</string>
<string name="NoContents">
Brak zawartości
</string>
- <string name="WornOnAttachmentPoint" value=" (założony na [ATTACHMENT_POINT])"/>
- <string name="AttachmentErrorMessage" value="([ATTACHMENT_ERROR])"/>
- <string name="ActiveGesture" value="[GESLABEL] (aktywne)"/>
- <string name="Chat Message" value="Czat:"/>
- <string name="Sound" value=" Dźwięk :"/>
- <string name="Wait" value=" --- Zaczekaj :"/>
- <string name="AnimFlagStop" value=" Zatrzymaj animacjÄ™ :"/>
- <string name="AnimFlagStart" value=" Rozpocznij animacjÄ™ :"/>
+ <string name="WornOnAttachmentPoint" value=" (założone na [ATTACHMENT_POINT])"/>
+ <string name="ActiveGesture" value="[GESLABEL] (aktywny)"/>
+ <string name="PermYes">
+ Tak
+ </string>
+ <string name="PermNo">
+ Nie
+ </string>
+ <string name="Chat Message" value=" Czat: "/>
+ <string name="Sound" value=" Dźwięk: "/>
+ <string name="Wait" value=" --- Czekaj: "/>
+ <string name="AnimFlagStop" value=" Zatrzymaj animacjÄ™:"/>
+ <string name="AnimFlagStart" value=" Rozpocznij animacjÄ™:"/>
<string name="Wave" value=" Wave"/>
- <string name="GestureActionNone" value="Żadne"/>
+ <string name="GestureActionNone" value="Brak"/>
<string name="HelloAvatar" value=" Witaj, Awatarze!"/>
- <string name="ViewAllGestures" value=" Zobacz wszystkie >>"/>
- <string name="GetMoreGestures" value="Więcej gesturek >>"/>
+ <string name="ViewAllGestures" value="Zobacz wszystkie >>"/>
+ <string name="GetMoreGestures" value="Więcej gestów >>"/>
<string name="Animations" value=" Animacje,"/>
<string name="Calling Cards" value=" Wizytówki,"/>
<string name="Clothing" value=" Ubrania,"/>
- <string name="Gestures" value=" Gesturki,"/>
- <string name="Landmarks" value=" Ulubione miejsca,"/>
- <string name="Notecards" value=" Notki,"/>
+ <string name="Gestures" value=" Gesty,"/>
+ <string name="Landmarks" value=" Landmarki,"/>
+ <string name="Notecards" value=" Noty,"/>
<string name="Objects" value=" Obiekty,"/>
<string name="Scripts" value=" Skrypty,"/>
<string name="Sounds" value=" Dźwięki,"/>
<string name="Textures" value=" Tekstury,"/>
<string name="Snapshots" value=" Zdjęcia,"/>
<string name="No Filters" value="Nie "/>
- <string name="Since Logoff" value=" - od wylogowania siÄ™"/>
+ <string name="Since Logoff" value=" - od wylogowania"/>
<string name="InvFolder My Inventory">
Moja Szafa
</string>
@@ -1258,13 +1508,19 @@
Animacje
</string>
<string name="InvFolder Gestures">
- Gesturki
+ Gesty
</string>
<string name="InvFolder Favorite">
- Moje ulubione
+ Ulubione
</string>
<string name="InvFolder favorite">
- Moje ulubione
+ Ulubione
+ </string>
+ <string name="InvFolder Favorites">
+ Ulubione
+ </string>
+ <string name="InvFolder favorites">
+ Ulubione
</string>
<string name="InvFolder Current Outfit">
Obecny strój
@@ -1278,12 +1534,27 @@
<string name="InvFolder Accessories">
Akcesoria
</string>
+ <string name="InvFolder Meshes">
+ Mesze
+ </string>
+ <string name="InvFolder Received Items">
+ Odebrane przedmioty
+ </string>
+ <string name="InvFolder Merchant Outbox">
+ Skrzynka nadawcza kupca
+ </string>
<string name="InvFolder Friends">
Znajomi
</string>
<string name="InvFolder All">
Wszystkie
</string>
+ <string name="no_attachments">
+ Brak założonych dodatków
+ </string>
+ <string name="Attachments remain">
+ Dodatki ([COUNT] wolnych)
+ </string>
<string name="Buy">
Kup
</string>
@@ -1293,9 +1564,6 @@
<string name="Stone">
Kamień
</string>
- <string name="Metal">
- Metal
- </string>
<string name="Glass">
Szkło
</string>
@@ -1303,7 +1571,7 @@
Drewno
</string>
<string name="Flesh">
- Tkanka
+ Ciało
</string>
<string name="Plastic">
Plastik
@@ -1312,13 +1580,7 @@
Guma
</string>
<string name="Light">
- Lekkie
- </string>
- <string name="KBShift">
- Shift
- </string>
- <string name="KBCtrl">
- Ctrl
+ Jasny
</string>
<string name="Chest">
Klatka piersiowa
@@ -1372,7 +1634,7 @@
Nos
</string>
<string name="R Upper Arm">
- P RamiÄ™
+ P ramiÄ™
</string>
<string name="R Forearm">
P przedramiÄ™
@@ -1405,13 +1667,19 @@
Brzuch
</string>
<string name="Left Pec">
- Lewy Pec
+ Lewa pierÅ›
</string>
<string name="Right Pec">
- Prawy Pec
+ Prawa pierÅ›
+ </string>
+ <string name="Neck">
+ Szyja
+ </string>
+ <string name="Avatar Center">
+ Åšrodek awatara
</string>
<string name="Invalid Attachment">
- Nieważny punkt załącznika
+ Nieprawidłowy punkt dodatku
</string>
<string name="ATTACHMENT_MISSING_ITEM">
BÅ‚Ä…d: brakujÄ…cy przedmiot
@@ -1477,37 +1745,37 @@
[COUNT] dni
</string>
<string name="GroupMembersA">
- [COUNT] członek
+ [COUNT] osoba
</string>
<string name="GroupMembersB">
- [COUNT] członków
+ [COUNT] osób
</string>
<string name="GroupMembersC">
- [COUNT] członków
+ [COUNT] osób
</string>
<string name="AcctTypeResident">
Rezydent
</string>
<string name="AcctTypeTrial">
- Proces
+ Próbne
</string>
<string name="AcctTypeCharterMember">
- Wyróżniony członek
+ Założyciel
</string>
<string name="AcctTypeEmployee">
Pracownik Linden Lab
</string>
<string name="PaymentInfoUsed">
- Dane konta używane
+ Płatności: Dane użyte
</string>
<string name="PaymentInfoOnFile">
- Dane płatnicze na koncie
+ Płatności: Dane znane
</string>
<string name="NoPaymentInfoOnFile">
- Brak danych na koncie
+ Płatności: Dane nieznane
</string>
<string name="AgeVerified">
- Weryfikacja wieku przeprowadzona
+ Zweryfikowany wiekowo
</string>
<string name="NotAgeVerified">
Brak weryfikacji wieku
@@ -1537,7 +1805,10 @@
Prawy dół
</string>
<string name="CompileQueueDownloadedCompiling">
- Pobieranie zakończone, rozpoczęcie kompilacji
+ Pobieranie zakończone, trwa kompilowanie
+ </string>
+ <string name="CompileQueueServiceUnavailable">
+ Usługa kompilacji skryptów nie jest w tej chwili dostępna
</string>
<string name="CompileQueueScriptNotFound">
Skrypt nie został odnaleziony na serwerze.
@@ -1546,43 +1817,43 @@
Problem z pobieraniem
</string>
<string name="CompileQueueInsufficientPermDownload">
- Brak odpowiedniej zgody do pobrania skryptu.
+ Brak uprawnień do pobrania skryptu.
</string>
<string name="CompileQueueInsufficientPermFor">
- Brak odpowiedniej zgody dla
+ Brak uprawnień dla
</string>
<string name="CompileQueueUnknownFailure">
- Nieznany błąd podczas próby pobierania
+ Nieznany błąd podczas pobierania
</string>
<string name="CompileQueueTitle">
Postęp rekompilacji
</string>
<string name="CompileQueueStart">
- rekompiluj
+ Rekompiluj
</string>
<string name="ResetQueueTitle">
- Zresetuj
+ Postęp resetowania
</string>
<string name="ResetQueueStart">
- zresetuj
+ Resetuj
</string>
<string name="RunQueueTitle">
- Ustaw uruchomiaj progres
+ Postęp włączania
</string>
<string name="RunQueueStart">
- ustaw uruchom
+ WÅ‚Ä…cz
</string>
<string name="NotRunQueueTitle">
- Ustaw nie uruchamiaj progres
+ Postęp wyłączania
</string>
<string name="NotRunQueueStart">
- ustaw nie uruchamiaj
+ Wyłącz
</string>
<string name="CompileSuccessful">
- Kompliacja zakończona pomyślnie!
+ Kompilacja zakończona pomyślnie!
</string>
<string name="CompileSuccessfulSaving">
- Komplilacja zakończona pomyślnie, zapisywanie...
+ Kompilacja zakończona pomyślnie, zapisywanie...
</string>
<string name="SaveComplete">
Zapisywanie zakończone.
@@ -1597,40 +1868,43 @@
Obiekt [OBJECT] należący do [OWNER]
</string>
<string name="GroupsNone">
- żadne
+ brak
</string>
- <string name="Group" value=" (groupa)"/>
+ <string name="Group" value=" (grupa)"/>
<string name="Unknown">
(nieznane)
</string>
<string name="SummaryForTheWeek" value="Podsumowanie dla tego tygodnia, poczÄ…wszy od "/>
- <string name="NextStipendDay" value=". Następna wypłata będzie w "/>
- <string name="GroupIndividualShare" value=" Groupa Udziały Indywidualne"/>
- <string name="GroupColumn" value="Grupa"/>
+ <string name="NextStipendDay" value="Następna wypłata będzie w "/>
+ <string name="GroupPlanningDate">
+ [day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc]
+ </string>
+ <string name="GroupIndividualShare" value=" Grupa Udziały Indywidualne"/>
+ <string name="GroupColumn" value=" Grupa"/>
<string name="Balance">
Stan
</string>
<string name="Credits">
- Kredyty
+ Uznania
</string>
<string name="Debits">
- Debet
+ Obciążenia
</string>
<string name="Total">
Suma
</string>
<string name="NoGroupDataFound">
- Brak informacji na temat podanej grupy
+ Brak informacji na temat grupy
</string>
<string name="IMParentEstate">
- parent estate
- </string>
- <string name="IMMainland">
- główny
+ majątek rodziców
</string>
<string name="IMTeen">
dla niepełnoletnich
</string>
+ <string name="Anyone">
+ każdy
+ </string>
<string name="RegionInfoError">
błąd
</string>
@@ -1647,13 +1921,25 @@
Dozwoleni Rezydenci: ([ALLOWEDAGENTS], maks. [MAXACCESS])
</string>
<string name="RegionInfoAllowedGroups">
- Grupy mające dostęp: ([ALLOWEDGROUPS], max [MAXACCESS])
+ Dozwolone Grupy: ([ALLOWEDGROUPS], maks. [MAXACCESS])
+ </string>
+ <string name="RegionInfoEstateManagers">
+ ZarzÄ…dcy MajÄ…tku: ([ESTATEMANAGERS], maks. [MAXMANAGERS])
+ </string>
+ <string name="RegionInfoBannedResidents">
+ Zbanowani Rezydenci: ([BANNEDAGENTS], maks. [MAXBANNED])
+ </string>
+ <string name="RegionInfoListTypeAllowedAgents">
+ Dozwoleni Rezydenci
+ </string>
+ <string name="RegionInfoListTypeBannedAgents">
+ Zbanowani Rezydenci
</string>
<string name="ScriptLimitsParcelScriptMemory">
- Pamięć skryptów Posiadłości
+ Pamięć skryptów działki
</string>
<string name="ScriptLimitsParcelsOwned">
- Posiadłości: [PARCELS]
+ Działki: [PARCELS]
</string>
<string name="ScriptLimitsMemoryUsed">
Pamięć wykorzystana: [COUNT] kb z [MAX] kb; [AVAILABLE] kb pozostało
@@ -1662,7 +1948,7 @@
Pamięć wykorzystana: [COUNT] kb
</string>
<string name="ScriptLimitsParcelScriptURLs">
- Skrypty URL Posiadłości
+ Skrypty URL działki
</string>
<string name="ScriptLimitsURLsUsed">
URL: [COUNT] z [MAX]; [AVAILABLE] dostępne
@@ -1674,7 +1960,7 @@
BÅ‚Ä…d wyszukiwania informacji
</string>
<string name="ScriptLimitsRequestNoParcelSelected">
- Posiadłość nie została wybrana
+ Działka nie została wybrana
</string>
<string name="ScriptLimitsRequestWrongRegion">
Błąd: informacja o skrypcie jest dostępna tylko w obecnym regionie.
@@ -1683,7 +1969,7 @@
Wyszukiwanie informacji...
</string>
<string name="ScriptLimitsRequestDontOwnParcel">
- Nie masz pozwolenia na sprawdzenie pasiadłości.
+ Nie masz pozwolenia na sprawdzenie działki.
</string>
<string name="SITTING_ON">
Usiądź na
@@ -1725,7 +2011,7 @@
Podbródek
</string>
<string name="ATTACH_LEAR">
- Ucho lewe
+ Lewe ucho
</string>
<string name="ATTACH_REAR">
Prawe ucho
@@ -1746,7 +2032,7 @@
Prawe dolne ramiÄ™
</string>
<string name="ATTACH_LUARM">
- Ramię L Górne
+ Lewe górne ramię
</string>
<string name="ATTACH_LLARM">
Lewe dolne ramiÄ™
@@ -1764,7 +2050,7 @@
Biodro lewe
</string>
<string name="ATTACH_LULEG">
- Lewa gorna noga
+ Lewa górna noga
</string>
<string name="ATTACH_LLLEG">
Lewa dolna noga
@@ -1773,10 +2059,10 @@
Brzuch
</string>
<string name="ATTACH_RPEC">
- Prawa klatka
+ Prawa pierÅ›
</string>
<string name="ATTACH_LPEC">
- Lewa klatka
+ Lewa pierÅ›
</string>
<string name="ATTACH_HUD_CENTER_2">
HUD środek 2
@@ -1788,7 +2074,7 @@
HUD środek górny
</string>
<string name="ATTACH_HUD_TOP_LEFT">
- HUD lewa gora
+ HUD lewa góra
</string>
<string name="ATTACH_HUD_CENTER_1">
HUD środek 1
@@ -1802,18 +2088,30 @@
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD prawa dolna strona
</string>
+ <string name="ATTACH_NECK">
+ Szyja
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Åšrodek awatara
+ </string>
<string name="CursorPos">
Linia [LINE], Kolumna [COLUMN]
</string>
<string name="PanelDirCountFound">
[COUNT] odnalezionych
</string>
+ <string name="PanelDirTimeStr">
+ [hour,datetime,slt]:[min,datetime,slt]
+ </string>
<string name="PanelContentsTooltip">
Zawartość obiektu
</string>
<string name="PanelContentsNewScript">
Nowy skrypt
</string>
+ <string name="DoNotDisturbModeResponseDefault">
+ Rezydent, do którego wysłałeś/aś wiadomość prywatną znajduje się w trybie zajętości i nie chce, aby mu przeszkadzano. Oznacza to, iż Twoja wiadomość zostanie zapisana do przejrzenia na później.
+ </string>
<string name="MuteByName">
(Nazwa)
</string>
@@ -1824,7 +2122,7 @@
(Obiekt)
</string>
<string name="MuteGroup">
- (GrupÄ™)
+ (Grupa)
</string>
<string name="MuteExternal">
(Zewnętrzne)
@@ -1833,10 +2131,10 @@
Brak umowy dla tego majÄ…tku.
</string>
<string name="RegionNoCovenantOtherOwner">
- Brak umowy dla tego majątku. Każda posiadłość w tym majątku została sprzedana przez właściciela majątku nie Linden Lab. Skontaktuj się z właścicielem majątku w celu uzuskania szczegółów sprzedaży.
+ Brak umowy dla tego majątku. Działka w tym majątku została sprzedana przez właściciela majątku, a nie przez Linden Lab. Skontaktuj się z właścicielem majątku w celu uzyskania szczegółów sprzedaży.
</string>
- <string name="covenant_last_modified" value="Ostatnio modyfikowano: "/>
- <string name="none_text" value=" (żadne) "/>
+ <string name="covenant_last_modified" value="Ostatnia modyfikacja: "/>
+ <string name="none_text" value=" (brak) "/>
<string name="never_text" value=" (nigdy) "/>
<string name="GroupOwned">
Własność grupy
@@ -1844,6 +2142,12 @@
<string name="Public">
Publiczny
</string>
+ <string name="LocalSettings">
+ Ustawienia lokalne
+ </string>
+ <string name="RegionSettings">
+ Ustawienia regionu
+ </string>
<string name="ClassifiedClicksTxt">
Kliknij: [TELEPORT] teleportuj, [MAP] mapa, [PROFILE] profil
</string>
@@ -1851,7 +2155,7 @@
(zostanie zaktualizowane po publikacji)
</string>
<string name="NoPicksClassifiedsText">
- Nie dodałeś nic do Ulubionych i Reklam. Kliknij na poniższy przycisk Dodaj aby dodać miejsce do Ulubionych lub Reklamy.
+ Nie dodałeś/aś nic do Ulubionych i Reklam. Kliknij na przycisk + poniżej, aby dodać miejsce do Ulubionych lub Reklam.
</string>
<string name="NoAvatarPicksClassifiedsText">
Brak ulubionych miejsc/reklam
@@ -1869,19 +2173,19 @@
Obiekt o nazwie
</string>
<string name="InvOfferOwnedByGroup">
- należacy do grupy
+ należący do grupy
</string>
<string name="InvOfferOwnedByUnknownGroup">
należący do nieznanej grupy
</string>
<string name="InvOfferOwnedBy">
- należy do
+ należący do
</string>
<string name="InvOfferOwnedByUnknownUser">
należący do nieznanego właściciela
</string>
<string name="InvOfferGaveYou">
- oddany Tobie
+ dał Ci
</string>
<string name="InvOfferDecline">
Odrzucono [DESC] od <nolink>[NAME]</nolink>.
@@ -1905,19 +2209,22 @@
zapłać opłatę za wydarzenie
</string>
<string name="GroupMoneyPaidPrizeForEvent">
- zapłać za wydarzenia
+ zapłać nagrodę za wydarzenie
</string>
<string name="GroupMoneyBalance">
Stan
</string>
<string name="GroupMoneyCredits">
- Kredyty
+ Uznania
</string>
<string name="GroupMoneyDebits">
- Debet
+ Obciążenia
+ </string>
+ <string name="GroupMoneyDate">
+ [weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
</string>
<string name="AcquiredItems">
- Zdobyte obiekty
+ Nabyte obiekty
</string>
<string name="Cancel">
Anuluj
@@ -1926,59 +2233,35 @@
Załadowanie [NAME] kosztuje [AMOUNT]L$
</string>
<string name="BuyingCosts">
- Cena zakupu tego wynosi L$ [AMOUNT]
+ Cena zakupu tego wynosi [AMOUNT]L$
</string>
<string name="UnknownFileExtension">
- Nieznane rozszerzenie dla pliku [.%s]
-Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+ Nieznane rozszerzenie pliku .%s
+Oczekiwane .wav, .tga, .bmp, .jpg, .jpeg, lub .bvh
</string>
<string name="MuteObject2">
Zablokuj
</string>
- <string name="AddLandmarkNavBarMenu">
- Dodaj Ulubione Miejsce...
- </string>
- <string name="EditLandmarkNavBarMenu">
- Edytuj Ulubione Miejce...
- </string>
- <string name="accel-mac-control">
- ⌃
- </string>
- <string name="accel-mac-command">
- ⌘
- </string>
- <string name="accel-mac-option">
- ⌥
+ <string name="MuteAvatar">
+ Zablokuj
</string>
- <string name="accel-mac-shift">
- ⇧
+ <string name="UnmuteObject">
+ Odblokuj
</string>
- <string name="accel-win-control">
- Ctrl+
+ <string name="UnmuteAvatar">
+ Odblokuj
</string>
- <string name="accel-win-alt">
- Alt+
+ <string name="AddLandmarkNavBarMenu">
+ Dodaj do Landmarków...
</string>
- <string name="accel-win-shift">
- Shift+
+ <string name="EditLandmarkNavBarMenu">
+ Edytuj Landmarka...
</string>
<string name="FileSaved">
- Zapisane pliki
+ Plik zapisany
</string>
<string name="Receiving">
- Otrzymane
- </string>
- <string name="AM">
- AM
- </string>
- <string name="PM">
- PM
- </string>
- <string name="PST">
- PST
- </string>
- <string name="PDT">
- PDT
+ Odbieranie
</string>
<string name="Direction_Forward">
Do przodu
@@ -1990,7 +2273,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Prawo
</string>
<string name="Direction_Back">
- Wstecz
+ W tył
</string>
<string name="Direction_North">
Północ
@@ -2020,7 +2303,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Wynajem ziemi
</string>
<string name="Property Rental">
- Wynajem Posiadłości
+ Wynajem działek
</string>
<string name="Special Attraction">
Specjalne Oferty
@@ -2035,7 +2318,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Poszukiwane
</string>
<string name="Service">
- Serwis
+ Usługi
</string>
<string name="Personal">
Personalne
@@ -2044,10 +2327,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Żadne
</string>
<string name="Linden Location">
- Linden Lokalizacja
- </string>
- <string name="Adult">
- 'Adult'
+ Lokalizacja Lindenów
</string>
<string name="Arts&Culture">
Sztuka i Kultura
@@ -2089,13 +2369,13 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Ty
</string>
<string name="Multiple Media">
- Multimedia
+ Wiele mediów
</string>
<string name="Play Media">
Uruchom/Zatrzymaj media
</string>
<string name="MBCmdLineError">
- Podczas realizacji podanej komendy, wystąpił błąd.
+ Podczas realizacji podanej komendy wystąpił błąd.
Prosimy odwiedzić stronę internetową: http://wiki.secondlife.com/wiki/Client_parameters
BÅ‚Ä…d:
</string>
@@ -2105,7 +2385,7 @@ BÅ‚Ä…d:
<string name="MBUnableToAccessFile">
Aplikacja [APP_NAME] nie odnalazła poszukiwanego pliku.
-Może być to spowodowane aktywnością kilku kopii oprogramowania w tej samej chwili lub Twój system błędnie odczytuje proces zakończenia dla uruchomionuch aplikacji.
+Może być to spowodowane aktywnością kilku kopii oprogramowania w tej samej chwili lub Twój system błędnie odczytuje proces zakończenia dla uruchomionych aplikacji.
Jeżeli nadal otrzymujesz ten komunikat, uruchom swój komputer ponownie.
Jeżeli problem nadal występuje, proponujemy całkowite odinstalowanie aplikacji [APP_NAME] oraz ponowną jej instalację.
</string>
@@ -2113,7 +2393,7 @@ Jeżeli problem nadal występuje, proponujemy całkowite odinstalowanie aplikacj
BÅ‚Ä…d krytyczny
</string>
<string name="MBRequiresAltiVec">
- Aplikacja [APP_NAME] wymaga procesora z AltiVec (wersja G4 lub starsza).
+ Aplikacja [APP_NAME] wymaga procesora z AltiVec (wersja G4 lub nowsza).
</string>
<string name="MBAlreadyRunning">
Aplikacja [APP_NAME] została już uruchomiona.
@@ -2129,7 +2409,7 @@ Czy chcesz wysłać raport na temat zawieszenia?
</string>
<string name="MBNoDirectX">
Aplikacja [APP_NAME] nie wykryła oprogramowania DirectX 9.0b lub wersji nowszej.
-[APP_NAME] używa oprogramowaniau DirectX w celu wykrycia dysku twardego i/lub nieaktualizowanych dysków twardych, które mogą przyczynić się do obniżenia stabilności, wydajności systemowej oraz zawieszeń. Jeżeli chcesz uruchomić aplikację [APP_NAME] bez problemów, doradzamy korzystanie z uruchomionym oprogramowaniem min. DirectX 9.0b.
+[APP_NAME] używa oprogramowaniu DirectX w celu wykrycia dysku twardego i/lub nieaktualizowanych dysków twardych, które mogą przyczynić się do obniżenia stabilności, wydajności systemowej oraz zawieszeń. Jeżeli chcesz uruchomić aplikację [APP_NAME] bez problemów, doradzamy korzystanie z uruchomionym oprogramowaniem min. DirectX 9.0b.
Czy chcesz kontynuować?
</string>
@@ -2141,42 +2421,42 @@ Czy chcesz kontynuować?
Prosimy o pobranie najnowszej wersji ze strony internetowej: www.secondlife.com.
</string>
<string name="MBRegClassFailed">
- błąd rejestru
+ BÅ‚Ä…d RegisterClass
</string>
<string name="MBError">
BÅ‚Ä…d
</string>
<string name="MBFullScreenErr">
- Nie można uruchomić trybu pełnoekranowego w proporcji [WIDTH] x [HEIGHT].
+ Nie można uruchomić trybu pełnoekranowego w rozdzielczości [WIDTH] x [HEIGHT].
Uruchomione w oknie.
</string>
<string name="MBDestroyWinFailed">
- Błąd w próbie wyłączenia podczas zamykania okna (DestroyWindow() failed)
+ Błąd wyłączania podczas zamykania okna (DestroyWindow() failed)
</string>
<string name="MBShutdownErr">
- Błąd w próbie wyłączenia
+ Błąd wyłączania
</string>
<string name="MBDevContextErr">
Brak możliwości stworzenia zawartości GL dla sterownika
</string>
<string name="MBPixelFmtErr">
- Brak odnalezienia właściwego formatu pikselowego
+ Nie odnaleziono właściwego formatu pikselowego
</string>
<string name="MBPixelFmtDescErr">
- Brak otrzymania formatu pikselowego opisu
+ Nie otrzymano opisu formatu pikselowego
</string>
<string name="MBTrueColorWindow">
Aplikacja [APP_NAME] wymaga ustawienia koloru na (32-bit) do uruchomienia.
-Sprawdź swoje ustawienia dla wyświetlacza i ustaw tryb koloru na 32-bity.
+Ustaw tryb koloru swojego wyświetlacza na 32-bity.
</string>
<string name="MBAlpha">
- Aplikacja [APP_NAME] nie może zostać uruchomiona, ponieważ nie jest możliwe dostanie się na kanał 8 bitowy alpha. Najcześciej jest to spowodowane błędami sterowników karty video.
+ Aplikacja [APP_NAME] nie może zostać uruchomiona, ponieważ nie jest możliwe dostanie się na kanał 8 bitowy alpha. Najczęściej jest to spowodowane błędami sterowników karty video.
Upewnij się, że posiadasz najnowsze aktualizacje sterowników karty video.
-Dodatkowo, sprawdź czy Twój monitor posiada poprawną konfigurację koloru (32-bity) w Panelu Kontroli > Display > Ustawienia.
+Dodatkowo, sprawdź czy Twój monitor posiada poprawną konfigurację koloru (32-bity) w Panel Sterowania > Ekran > Ustawienia.
Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
</string>
<string name="MBPixelFmtSetErr">
- Brak ustawienie formatu pikselowego
+ Nie można ustawić formatu pikselowego
</string>
<string name="MBGLContextErr">
Brak możliwości stworzenia renderowania zawartości GL
@@ -2185,21 +2465,21 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Brak aktywacji renderowania zawartości GL
</string>
<string name="MBVideoDrvErr">
- Aplikacja [APP_NAME] nie może zostać uruchomiona, ponieważ Twoja karta video jest niepoprawnie zainstalowana, nieaktualizowana lub przeznaczona jest dla innego rodzaju dysków twardych. Upewnij się, że Twoja karta video została zaktualizowana poprawnie lub spróbuj zainstalować ponownie.
+ Aplikacja [APP_NAME] nie może zostać uruchomiona, ponieważ sterowniki Twojej karty wideo są niepoprawnie zainstalowane, niezaktualizowane lub przeznaczone dla nieobsługiwanego rodzaju sprzętu. Upewnij się, że Twoja karta wideo została zaktualizowana poprawnie, spróbuj zainstalować sterowniki ponownie.
Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
</string>
<string name="5 O'Clock Shadow">
- Cień o godzinie 5
+ Cień na godzinie 5
</string>
<string name="All White">
- Wszystko białe
+ Wszystko siwe
</string>
<string name="Anime Eyes">
- Animuj oczy
+ Oczy z anime
</string>
<string name="Arced">
- Obrócony
+ Wygięty
</string>
<string name="Arm Length">
Długość ramienia
@@ -2211,7 +2491,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Płatki uszu dołączone
</string>
<string name="Back Fringe">
- Tylnia grzywka
+ Tylna grzywka
</string>
<string name="Baggy">
Wypchane
@@ -2229,7 +2509,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Duży
</string>
<string name="Big Butt">
- Duży pośladek
+ Duże pośladki
</string>
<string name="Big Hair Back">
Duże włosy: z tyłu
@@ -2244,13 +2524,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Duża głowa
</string>
<string name="Big Pectorals">
- Duże mięśnie piersiowe
+ Duże mięśnie
</string>
<string name="Big Spikes">
Duże kolce
</string>
<string name="Black">
- Czarne
+ Czerń
</string>
<string name="Blonde">
Blond
@@ -2271,7 +2551,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Detale ciała
</string>
<string name="Body Fat">
- Zawartość tkanki tłuszczowej
+ Puszystość
</string>
<string name="Body Freckles">
Piegi
@@ -2286,7 +2566,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Szczupłość
</string>
<string name="Bow Legged">
- Bow Legged
+ Pałąkowate nogi
</string>
<string name="Breast Buoyancy">
Jędrność piersi
@@ -2439,16 +2719,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Grawitacja pośladków
</string>
<string name="bustle skirt">
- Bustle Skirt
+ Uniesienie spódnicy
</string>
<string name="no bustle">
- No Bustle
+ Nie unoÅ›
</string>
<string name="more bustle">
- More Bustle
- </string>
- <string name="Chaplin">
- Chaplin
+ Bardziej unoÅ›
</string>
<string name="Cheek Bones">
Kości policzkowe
@@ -2469,13 +2746,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Długość podbródka
</string>
<string name="Chin Heavy">
- Ciężar podbródka
+ Więcej podbródka
</string>
<string name="Chin In">
- Podbródek wewnątrz
+ Podbródek wewn.
</string>
<string name="Chin Out">
- Podbródek zewnętrzny
+ Podbródek zewn.
</string>
<string name="Chin-Neck">
Podwójny podbródek
@@ -2487,7 +2764,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Rozszczepienie
</string>
<string name="Close Set Eyes">
- Oczy blisko ustawione
+ WÄ…ski
</string>
<string name="Closed">
Zamknięte
@@ -2499,13 +2776,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Zamknięte z przodu
</string>
<string name="Closed Left">
- Lewe oko zamknięte
+ Zamknięte z lewej
</string>
<string name="Closed Right">
- Prawe oko zamknięte
+ Zamknięte z prawej
</string>
<string name="Coin Purse">
- Coin Purse
+ Portmonetka
</string>
<string name="Collar Back">
Kołnierz z tyłu
@@ -2520,7 +2797,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Kącik w górę
</string>
<string name="Creased">
- Pognieciony
+ Z fałdami
</string>
<string name="Crooked Nose">
Skrzywienie nosa
@@ -2529,31 +2806,31 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Szeroki rękaw
</string>
<string name="Dark">
- Ciemne
+ Ciemny
</string>
<string name="Dark Green">
- Ciemne zielone
+ Ciemna zieleń
</string>
<string name="Darker">
Ciemniejsze
</string>
<string name="Deep">
- Glębokie
+ Głębokie
</string>
<string name="Default Heels">
Domyślne buty na obcasie
</string>
<string name="Dense">
- Gęstość
+ Gęste
</string>
<string name="Double Chin">
Podwójny podbródek
</string>
<string name="Downturned">
- Downturned
+ Zwrócony w dół
</string>
<string name="Duffle Bag">
- Duffle Bag
+ Torba
</string>
<string name="Ear Angle">
Odstawanie uszu
@@ -2577,10 +2854,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Głębokość osadzenia oczu
</string>
<string name="Eye Lightness">
- Ustawienie jasności oczu
+ Jasność oczu
</string>
<string name="Eye Opening">
- Oczy otwarte
+ Otwarcie oczu
</string>
<string name="Eye Pop">
Różnica w wielkości oczu
@@ -2613,19 +2890,19 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Kredka do oczu
</string>
<string name="Eyeliner Color">
- Kolor kredki do oczu'a
+ Kolor kredki do oczu
</string>
<string name="Eyes Bugged">
Wytrzeszczone oczy
</string>
<string name="Face Shear">
- Usunięcie twarzy
+ Ścięcie twarzy
</string>
<string name="Facial Definition">
Detale twarzy
</string>
<string name="Far Set Eyes">
- Oczy szeroko rozstawione
+ Szeroki
</string>
<string name="Fat Lips">
Grube usta
@@ -2643,7 +2920,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Rozszerzane rękawy
</string>
<string name="Flat">
- Płaskość
+ PÅ‚aski
</string>
<string name="Flat Butt">
Płaskie pośladki
@@ -2661,7 +2938,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Kształt czoła
</string>
<string name="Forehead Heavy">
- Ciężar czoła
+ Więcej czoła
</string>
<string name="Freckles">
Piegi
@@ -2670,7 +2947,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Przednia grzywka
</string>
<string name="Full Back">
- Gęstość włosów po bokach
+ Gęsty tył
</string>
<string name="Full Eyeliner">
Gęsta kredka do oczu
@@ -2685,7 +2962,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Gęste boki
</string>
<string name="Glossy">
- BÅ‚yszczÄ…ce
+ BÅ‚yszczÄ…ca
</string>
<string name="Glove Fingers">
Rękawiczki
@@ -2715,13 +2992,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Grubość włosów
</string>
<string name="Hair Tilt">
- Przes. fryzury
+ Przechylenie
</string>
<string name="Hair Tilted Left">
- Przes. fryzury L
+ W lewo
</string>
<string name="Hair Tilted Right">
- Przes. fryzury P
+ W prawo
</string>
<string name="Hair Volume">
Włosy: objętość
@@ -2730,7 +3007,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Rozmiar dłoni
</string>
<string name="Handlebars">
- Handlebars
+ Kucyki
</string>
<string name="Head Length">
Długość głowy
@@ -2748,13 +3025,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Wysokość obcasa
</string>
<string name="Heel Shape">
- Ksztalt obcasa
+ Kształt obcasa
</string>
<string name="Height">
Wysokość
</string>
<string name="High">
- Wysoka
+ Wysoko
</string>
<string name="High Heels">
Wysokie obcasy
@@ -2777,8 +3054,11 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
<string name="Hip Width">
Szerokość bioder
</string>
+ <string name="Hover">
+ Uniesienie
+ </string>
<string name="In">
- W
+ Wewnętrznie
</string>
<string name="In Shdw Color">
Wewnętrzny kolor cienia
@@ -2841,10 +3121,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Mniej
</string>
<string name="Less Body Fat">
- Mniejsza zawartości tkanki tłuszczowej
+ Mniej tłuszczu
</string>
<string name="Less Curtains">
- Less Curtains
+ Mniejsze kurtynki
</string>
<string name="Less Freckles">
Mniej piegów
@@ -2856,7 +3136,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Mniej ciężaru
</string>
<string name="Less Love">
- Less Love
+ Mniej
</string>
<string name="Less Muscles">
Mniej mięśni
@@ -2865,13 +3145,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Mniej umięśnienia
</string>
<string name="Less Rosy">
- Mniej zaróżowione
+ Mniej
</string>
<string name="Less Round">
- Mniej zaaokrÄ…glone
+ Mniej zaokrÄ…glone
</string>
<string name="Less Saddle">
- Less Saddle
+ Mniej siodłowate
</string>
<string name="Less Square">
Mniej kwadratowe
@@ -2880,16 +3160,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Mniej objętości
</string>
<string name="Less soul">
- Less soul
+ Mniej
</string>
<string name="Lighter">
- Lżejsze
+ Jaśniejsze
</string>
<string name="Lip Cleft">
- Szerokość rozszczepienia górnej wargi
+ Szer. rozszcz. górnej wargi
</string>
<string name="Lip Cleft Depth">
- Głębokość rozszczepienia górnej wargi
+ Gł. rozszcz. górnej wargi
</string>
<string name="Lip Fullness">
Pełne usta
@@ -2916,7 +3196,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Kolor szminki
</string>
<string name="Long">
- Dlugość
+ Długość
</string>
<string name="Long Head">
Długa głowa
@@ -2931,7 +3211,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
DÅ‚ugi kark
</string>
<string name="Long Pigtails">
- DÅ‚ugi warkocz
+ DÅ‚ugie warkocze
</string>
<string name="Long Ponytail">
DÅ‚ugi kucyk
@@ -2940,7 +3220,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Długi tułów
</string>
<string name="Long arms">
- Dlugie ramiona
+ DÅ‚ugie ramiona
</string>
<string name="Loose Pants">
Luźne spodnie
@@ -2952,7 +3232,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Luźne rękawy
</string>
<string name="Love Handles">
- Love Handles
+ Sadełko
</string>
<string name="Low">
Nisko
@@ -2988,16 +3268,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Więcej
</string>
<string name="More Blush">
- Bardziej zarumienione
+ Zarumienione
</string>
<string name="More Body Fat">
- Więcej zawartości tkanki tłuszczowej
+ Więcej tłuszczu
</string>
<string name="More Curtains">
- More Curtains
+ Większe kurtynki
</string>
<string name="More Eyeshadow">
- Ciemniejszy cień oczu
+ Ciemny cień oczu
</string>
<string name="More Freckles">
Więcej piegów
@@ -3012,7 +3292,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Więcej szminki
</string>
<string name="More Love">
- More Love
+ Więcej
</string>
<string name="More Lower Lip">
Więcej dolnej wargi
@@ -3024,19 +3304,19 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Więcej umięśnienia
</string>
<string name="More Rosy">
- Bardziej zaróżowione
+ Więcej
</string>
<string name="More Round">
Więcej zaokrąglenia
</string>
<string name="More Saddle">
- More Saddle
+ Bardziej siodłowate
</string>
<string name="More Sloped">
Bardziej spadziste
</string>
<string name="More Square">
- Więcej kwadratowy
+ Bardziej kwadratowy
</string>
<string name="More Upper Lip">
Więcej górnej wargi
@@ -3048,7 +3328,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Więcej objętości
</string>
<string name="More soul">
- More soul
+ Więcej
</string>
<string name="Moustache">
WÄ…sy
@@ -3066,7 +3346,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Umięśnienie
</string>
<string name="Mutton Chops">
- Mutton Chops
+ Baczki - wÄ…sy
</string>
<string name="Nail Polish">
Lakier na paznokciach
@@ -3099,10 +3379,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Brak rumieńca
</string>
<string name="No Eyeliner">
- Brak kredki do oczu's
+ Brak kredki do oczu
</string>
<string name="No Eyeshadow">
- Brak cienia pod powiekÄ…
+ Brak cienia
</string>
<string name="No Lipgloss">
Brak połysku
@@ -3111,19 +3391,19 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Brak szminki
</string>
<string name="No Part">
- No Part
+ Brak podziału
</string>
<string name="No Polish">
Brak lakieru
</string>
<string name="No Red">
- Brak czerwieni
+ Brak rudego
</string>
<string name="No Spikes">
Brak szpiców
</string>
<string name="No White">
- Brak białego
+ Brak siwego
</string>
<string name="No Wrinkles">
Brak zmarszczek
@@ -3180,7 +3460,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Otwarte z prawej
</string>
<string name="Orange">
- Pomarańczowe
+ Pomarańczowy
</string>
<string name="Out">
Zewnętrznie
@@ -3204,10 +3484,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Przodozgryz górny
</string>
<string name="Package">
- Package
+ Pakunek
</string>
<string name="Painted Nails">
- Pomalowane paznokcie
+ Pomalowane
</string>
<string name="Pale">
Blady
@@ -3228,10 +3508,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Zmarszczki spodni
</string>
<string name="Part">
- Część
+ Podział
</string>
<string name="Part Bangs">
- Część grzywki
+ Podział grzywki
</string>
<string name="Pectorals">
Mięśnie klatki piersiowej
@@ -3240,13 +3520,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Pigment
</string>
<string name="Pigtails">
- Warkocz
+ Warkocze
</string>
<string name="Pink">
- Różowe
+ Róż
</string>
<string name="Pinker">
- Róż
+ Bardziej różowe
</string>
<string name="Platform Height">
Wysokie obcasy
@@ -3255,34 +3535,34 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Szerokie obcasy
</string>
<string name="Pointy">
- Pointy
+ W czubek
</string>
<string name="Pointy Heels">
- Obcasy pointy
+ Obcasy z czubkiem
</string>
<string name="Ponytail">
Kucyk
</string>
<string name="Poofy Skirt">
- Poofy Skirt
+ Szeroka spódnica
</string>
<string name="Pop Left Eye">
- Wybałuszone lewe oko
+ Wybałuszone lewe
</string>
<string name="Pop Right Eye">
- Wybałuszone prawe oko
+ Wybałuszone prawe
</string>
<string name="Puffy">
- Opuchnięty
+ Opuchnięte
</string>
<string name="Puffy Eyelids">
Spuchnięte powieki
</string>
<string name="Rainbow Color">
- Kolor tęczy
+ Kolory tęczy
</string>
<string name="Red Hair">
- Czerwone włosy
+ Rude włosy
</string>
<string name="Regular">
Regularne
@@ -3291,52 +3571,52 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Prawa część
</string>
<string name="Rosy Complexion">
- Kompleksowość różu
+ Różowa cera
</string>
<string name="Round">
ZaokrÄ…glenie
</string>
<string name="Ruddiness">
- Rudowatość
+ Rumieńce
</string>
<string name="Ruddy">
- Rudy
+ Rumiany
</string>
<string name="Rumpled Hair">
Włosy w nieładzie
</string>
<string name="Saddle Bags">
- Saddle Bags
+ TÅ‚uszczyk na nogach
</string>
<string name="Scrawny Leg">
Koścista noga
</string>
<string name="Separate">
- Odzielne
+ Oddzielne
</string>
<string name="Shallow">
PÅ‚ytkie
</string>
<string name="Shear Back">
- Tylne usunięcie włosów
+ Tylne wycięcie włosów
</string>
<string name="Shear Face">
- Usunięcie twarzy
+ Ścięcie twarzy
</string>
<string name="Shear Front">
- Przednie usunięcie włosów
+ Przednie wycięcie włosów
</string>
<string name="Shear Left Up">
- Usunięcie od lewej strony do góry
+ Wycięcie od lewej
</string>
<string name="Shear Right Up">
- Usunięcie od prawej strony do góry
+ Wycięcie od prawej
</string>
<string name="Sheared Back">
- Tylnie usunięcie włosów
+ Wycięty tył
</string>
<string name="Sheared Front">
- Przednie usunięcie włosów
+ Wycięty przód
</string>
<string name="Shift Left">
Przesuń w lewo
@@ -3360,7 +3640,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Wysokość buta
</string>
<string name="Short">
- Krótkie
+ Krótkość
</string>
<string name="Short Arms">
Krótkie ramiona
@@ -3372,7 +3652,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Krótki kark
</string>
<string name="Short Pigtails">
- Krótkie warkoczyki
+ Krótkie warkocze
</string>
<string name="Short Ponytail">
Krótki kucyk
@@ -3456,7 +3736,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Zarost na dolnej wardze
</string>
<string name="Sparse">
- Rzadki
+ Rzadkie
</string>
<string name="Spiked Hair">
Kolczaste włosy
@@ -3477,16 +3757,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Zapadnięte
</string>
<string name="Sunken Chest">
- Zapadnięta klatka piersiowa
+ Zapadnięta klatka
</string>
<string name="Sunken Eyes">
Zapadnięte oczy
</string>
<string name="Sweep Back">
- Sweep Back
+ Zaczesanie w tył
</string>
<string name="Sweep Forward">
- Sweep Forward
+ Zaczesanie w przód
</string>
<string name="Tall">
Wysokość
@@ -3507,7 +3787,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Gruby palec
</string>
<string name="Thin">
- WÄ…ski
+ WÄ…skie
</string>
<string name="Thin Eyebrows">
WÄ…skie brwi
@@ -3525,10 +3805,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Obcisłe rękawy
</string>
<string name="Tight Pants">
- Obciesłe spodnie
+ Obcisłe spodnie
</string>
<string name="Tight Shirt">
- Obcisły podkoszulek
+ Obcisła koszulka
</string>
<string name="Tight Skirt">
Wąska spódnica
@@ -3555,7 +3835,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Nieprzyłączone
</string>
<string name="Uncreased">
- Uncreased
+ Bez fałd
</string>
<string name="Underbite">
Przodozgryz
@@ -3570,25 +3850,25 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Górne policzki
</string>
<string name="Upper Chin Cleft">
- Roszczepienie górnego podbródka
+ Rozszcz. górnego podbr.
</string>
<string name="Upper Eyelid Fold">
Górna powieka
</string>
<string name="Upturned">
- Zadarta
+ Zadarty
</string>
<string name="Very Red">
- Bardzo czerwona
+ Bardzo rude
</string>
<string name="Waist Height">
Wysokość talii
</string>
<string name="Well-Fed">
- Dobrze odżywiony
+ Dobrze odżywione
</string>
<string name="White Hair">
- Białe włosy
+ Siwe włosy
</string>
<string name="Wide">
Szerokie
@@ -3603,7 +3883,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Szerokie usta
</string>
<string name="Wild">
- Dzikość
+ Szalone
</string>
<string name="Wrinkles">
Zmarszczki
@@ -3620,6 +3900,27 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
<string name="LocationCtrlComboBtnTooltip">
Historia odwiedzonych miejsc
</string>
+ <string name="LocationCtrlForSaleTooltip">
+ Kup tą działkę
+ </string>
+ <string name="LocationCtrlVoiceTooltip">
+ Głos niedostępny w tym miejscu
+ </string>
+ <string name="LocationCtrlFlyTooltip">
+ Latanie zabronione
+ </string>
+ <string name="LocationCtrlPushTooltip">
+ Popychanie zabronione
+ </string>
+ <string name="LocationCtrlBuildTooltip">
+ Budowanie/rezzowanie zabronione
+ </string>
+ <string name="LocationCtrlScriptsTooltip">
+ Skrypty niedozwolone
+ </string>
+ <string name="LocationCtrlDamageTooltip">
+ Zdrowie
+ </string>
<string name="LocationCtrlAdultIconTooltip">
Region Adult
</string>
@@ -3627,19 +3928,28 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Region Moderate
</string>
<string name="LocationCtrlGeneralIconTooltip">
- Region
+ Region General
+ </string>
+ <string name="LocationCtrlSeeAVsTooltip">
+ Awatary wewnątrz tej działki nie mogą być widziane lub słyszane przez awatary, które są poza nią
+ </string>
+ <string name="LocationCtrlPathfindingDirtyTooltip">
+ Obiekty poruszające się mogą nie zachowywać się poprawnie, póki region nie zostanie odświeżony.
+ </string>
+ <string name="LocationCtrlPathfindingDisabledTooltip">
+ Odnajdywanie ścieżek jest wyłączone w tym regionie.
</string>
<string name="UpdaterWindowTitle">
- [APP_NAME] Aktualizacja
+ Aktualizacja [APP_NAME]
</string>
<string name="UpdaterNowUpdating">
Pobieranie [APP_NAME]...
</string>
<string name="UpdaterNowInstalling">
- Instalizacja [APP_NAME]...
+ Instalowanie [APP_NAME]...
</string>
<string name="UpdaterUpdatingDescriptive">
- Twoja [APP_NAME] wersja klienta jest aktualizowana do najnowszej wersji. Prosimy o cierpliwość.
+ Twoja wersja klienta [APP_NAME] jest aktualizowana do najnowszej wersji. Prosimy o cierpliwość.
</string>
<string name="UpdaterProgressBarTextWithEllipses">
Pobieranie aktualizacji...
@@ -3672,7 +3982,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
[NAME] pisze...
</string>
<string name="Unnamed">
- (Brak nazwy)
+ (Bez nazwy)
</string>
<string name="IM_moderated_chat_label">
(Moderacja: Komunikacja głosowa wyłączona domyślnie)
@@ -3681,10 +3991,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Czat tekstowy jest nieaktywny dla tej rozmowy.
</string>
<string name="IM_muted_text_label">
- Twój tekst w czacie grupowym został wyłączony przez Moderatora Grupy.
+ Twój czat tekstowy w grupie został wyłączony przez Moderatora Grupy.
</string>
<string name="IM_default_text_label">
- Klknij tutaj by wysłać wiadomość prywatną (IM).
+ Kliknij tutaj by wysłać wiadomość prywatną (IM).
</string>
<string name="IM_to_label">
Do
@@ -3695,6 +4005,15 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
<string name="Saved_message">
(Zapisano [LONG_TIMESTAMP])
</string>
+ <string name="IM_unblock_only_groups_friends">
+ Aby zobaczyć tą wiadomość musisz odznaczyć 'Tylko znajomi i grupy mogą wysyłać mi wiad. prywatne (IM) oraz rozmowy głosowe' w Ustawieniach/Prywatności.
+ </string>
+ <string name="OnlineStatus">
+ dostępny/a
+ </string>
+ <string name="OfflineStatus">
+ niedostępny/a
+ </string>
<string name="answered_call">
Twoja rozmowa głosowa została odebrana
</string>
@@ -3702,7 +4021,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Rozmowa głosowa została rozpoczęta
</string>
<string name="you_joined_call">
- Dołączyłeś/Dołączyłaś do rozmowy głosowej
+ Dołączyłeś/aś do rozmowy głosowej
+ </string>
+ <string name="you_auto_rejected_call-im">
+ Rozmowa głosowa została automatycznie odrzucona, ponieważ Tryb Zajętości był włączony.
</string>
<string name="name_started_call">
[NAME] zaczyna rozmowę głosową
@@ -3716,9 +4038,30 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
<string name="hang_up-im">
Rozmowa głosowa zakończona
</string>
+ <string name="answering-im">
+ ÅÄ…czenie...
+ </string>
+ <string name="conference-title">
+ Konferencja wieloosobowa
+ </string>
<string name="conference-title-incoming">
Konferencja z [AGENT_NAME]
</string>
+ <string name="inventory_item_offered-im">
+ Zaoferowano przedmiot
+ </string>
+ <string name="share_alert">
+ PrzeciÄ…gaj tutaj rzeczy z Szafy
+ </string>
+ <string name="facebook_post_success">
+ Wysłałeś/aś post na Facebooka.
+ </string>
+ <string name="flickr_post_success">
+ Wysłałeś/aś post na Flickr.
+ </string>
+ <string name="twitter_post_success">
+ Wysłałeś/aś post na Twittera.
+ </string>
<string name="no_session_message">
(Sesja IM wygasła)
</string>
@@ -3729,10 +4072,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
[NAME] opuszcza Second Life.
</string>
<string name="invite_message">
- Kliknij na [BUTTON NAME] przycisk by zaakceptować/dołączyć do tej rozmowy.
+ Kliknij na przycisk [BUTTON NAME] by zaakceptować/dołączyć do tej rozmowy.
</string>
<string name="muted_message">
- Zablokowałeś tego Rezydenta. Wysłanie wiadomości automatycznie odblokuje go.
+ Zablokowałeś/aś tego Rezydenta. Wysłanie wiadomości odblokuje go automatycznie.
</string>
<string name="generic">
Błąd zapytania, proszę spróbować później
@@ -3741,22 +4084,22 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Błąd. Spróbuj ponownie za kilka minut.
</string>
<string name="insufficient_perms_error">
- Nie posiadasz praw do kontynuacji.
+ Nie masz wystarczających uprawnień.
</string>
<string name="session_does_not_exist_error">
Ta konferencja jest już zakończona.
</string>
<string name="no_ability_error">
- Nie posiadesz tego przywileju.
+ Nie posiadasz tego przywileju.
</string>
<string name="no_ability">
- Nie posiadesz tego przywileju.
+ Nie posiadasz tego przywileju.
</string>
<string name="not_a_mod_error">
Nie jesteÅ› moderatorem konferencji.
</string>
<string name="muted">
- Moderator grupy wyłączył czat.
+ Moderator grupy wyłączył Twój czat.
</string>
<string name="muted_error">
Moderator wyciszył Cię.
@@ -3765,16 +4108,18 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Nie można dodać nikogo do czatu z [RECIPIENT].
</string>
<string name="message">
- Nie można wysłać Twojej wiadomości do sesji czatu z [RECIPIENT].
+ Wiadomość wysłana do [RECIPIENT] jest ciągle przetwarzana.
+Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pominięta przez serwer.
</string>
<string name="message_session_event">
- Nie można wysłać Twojej wiadomości do sesji czatu z [RECIPIENT].
+ Wiadomość wysłana do [RECIPIENT] jest ciągle przetwarzana.
+Jeśli nie pojawi się w ciągu kilku minut może to oznaczać, że została pominięta przez serwer.
</string>
<string name="mute">
- BÅ‚Ä…d poczas moderacji.
+ BÅ‚Ä…d podczas moderacji.
</string>
<string name="removed">
- Zostałeś usunięty z grupy
+ Zostałeś usunięty/a z grupy
</string>
<string name="removed_from_group">
Usunięto Cię z grupy.
@@ -3789,22 +4134,22 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
[SOURCES] powiedział/a coś nowego
</string>
<string name="session_initialization_timed_out_error">
- Inicjacja sesji wygasła
+ Inicjalizacja sesji wygasła
</string>
- <string name="voice_morphing_url">
- http://secondlife.com/landing/voicemorphing
+ <string name="Home position set.">
+ Ustawiono miejsce startu.
</string>
<string name="paid_you_ldollars">
- [NAME] zapłaciła/zapłacił Tobie [AMOUNT]L$ [REASON].
+ [NAME] zapłacił/a Tobie [AMOUNT]L$ [REASON].
</string>
<string name="paid_you_ldollars_no_reason">
- [NAME] zapłacił/zapłaciła Tobie L$[AMOUNT].
+ [NAME] zapłacił/a Tobie [AMOUNT]L$.
</string>
<string name="you_paid_ldollars">
Zapłacono [NAME] [AMOUNT]L$ [REASON].
</string>
<string name="you_paid_ldollars_no_info">
- Zapłacono L$[AMOUNT].
+ Zapłacono [AMOUNT]L$.
</string>
<string name="you_paid_ldollars_no_reason">
Zapłacono [NAME] [AMOUNT]L$.
@@ -3812,17 +4157,29 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
<string name="you_paid_ldollars_no_name">
Zapłacono [AMOUNT]L$ [REASON].
</string>
+ <string name="you_paid_failure_ldollars">
+ Nie udało się zapłacić [NAME] [AMOUNT]L$ [REASON].
+ </string>
+ <string name="you_paid_failure_ldollars_no_info">
+ Nie udało się zapłacić [AMOUNT]L$.
+ </string>
+ <string name="you_paid_failure_ldollars_no_reason">
+ Nie udało się zapłacić [NAME] [AMOUNT]L$.
+ </string>
+ <string name="you_paid_failure_ldollars_no_name">
+ Nie udało się zapłacić [AMOUNT]L$ [REASON].
+ </string>
<string name="for item">
dla [ITEM]
</string>
<string name="for a parcel of land">
- za Posiadłość
+ za działkę
</string>
<string name="for a land access pass">
- za przepustkę na Posiadłość
+ za przepustkę na działkę
</string>
<string name="for deeding land">
- dla przypisania Posiadłości
+ dla przypisania działki
</string>
<string name="to create a group">
aby stworzyć grupę
@@ -3831,13 +4188,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
aby dołączyć do grupy
</string>
<string name="to upload">
- aby pobrać
+ aby załadować
</string>
<string name="to publish a classified ad">
publikacja reklamy
</string>
<string name="giving">
- Dajesz L$ [AMOUNT]
+ Dajesz [AMOUNT]L$
</string>
<string name="uploading_costs">
Åadowanie kosztuje [AMOUNT]L$
@@ -3846,7 +4203,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
To kosztuje [AMOUNT]L$
</string>
<string name="buying_selected_land">
- Kupno wybranej Posiadłości [AMOUNT]L$
+ Kupno wybranej działki za [AMOUNT]L$
</string>
<string name="this_object_costs">
Ten obiekt kosztuje [AMOUNT]L$
@@ -3864,15 +4221,15 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Obecnie w SL
</string>
<string name="uploading_abuse_report">
- Pobieranie...
-
+ Åadowanie...
+
Raport o Nadużyciu
</string>
<string name="New Shape">
- Nowy ksztalt
+ Nowy kształt
</string>
<string name="New Skin">
- Nowa skórka
+ Nowa skóra
</string>
<string name="New Hair">
Nowe włosy
@@ -3920,13 +4277,13 @@ Raport o Nadużyciu
Nieaktualne ubranie/część ciała
</string>
<string name="New Gesture">
- Nowa gesturka
+ Nowy gest
</string>
<string name="New Script">
Nowy skrypt
</string>
<string name="New Note">
- Stwórz nowe ogłoszenie
+ Nowa notka
</string>
<string name="New Folder">
Nowy folder
@@ -3935,28 +4292,28 @@ Raport o Nadużyciu
Zawartość
</string>
<string name="Gesture">
- Gesturki
+ Gesty
</string>
<string name="Male Gestures">
- Gesturki dla mężczyzn
+ Gesty dla mężczyzn
</string>
<string name="Female Gestures">
- Gesturki dla kobiet
+ Gesty dla kobiet
</string>
<string name="Other Gestures">
- Inne gesturki
+ Inne gesty
</string>
<string name="Speech Gestures">
- Gesturki przemówienia
+ Gesty dźwiękowe
</string>
<string name="Common Gestures">
- Gesturki
+ Gesty
</string>
<string name="Male - Excuse me">
- Mężczyzna - Excuse me
+ Mężczyzna - Ja bardzo przepraszam
</string>
<string name="Male - Get lost">
- Mężczyzna - Get lost
+ Mężczyzna - Znikaj z oczu
</string>
<string name="Male - Blow kiss">
Mężczyzna - Całusek
@@ -3968,7 +4325,7 @@ Raport o Nadużyciu
Mężczyzna - Znudzony
</string>
<string name="Male - Hey">
- Mężczyzna - Hey
+ Mężczyzna - Hej
</string>
<string name="Male - Laugh">
Mężczyzna - Śmiech
@@ -3995,10 +4352,10 @@ Raport o Nadużyciu
Kobieta - Zakłopotana
</string>
<string name="Female - Excuse me">
- Kobieta - Excuse me
+ Kobieta - Ja bardzo przepraszam
</string>
<string name="Female - Get lost">
- Kobieta - Get lost
+ Kobieta - Znikaj z oczu
</string>
<string name="Female - Blow kiss">
Kobieta - Całusek
@@ -4010,22 +4367,22 @@ Raport o Nadużyciu
Kobieta - Znudzona
</string>
<string name="Female - Hey">
- Kobieta - Hey
+ Kobieta - Hej
</string>
<string name="Female - Hey baby">
- Kobieta - Hey baby
+ Kobieta - Hej słonko
</string>
<string name="Female - Laugh">
Kobieta - Åšmiech
</string>
<string name="Female - Looking good">
- Kobieta - Looking good
+ Kobieta - Wygląda nieźle
</string>
<string name="Female - Over here">
- Kobieta - Over here
+ Kobieta - Tutaj
</string>
<string name="Female - Please">
- Kobieta - Please
+ Kobieta - ProszÄ™
</string>
<string name="Female - Repulsed">
Kobieta - Odrzucenie
@@ -4040,20 +4397,19 @@ Raport o Nadużyciu
Kobieta - Wow
</string>
<string name="AvatarBirthDateFormat">
- [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ [day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt]
</string>
<string name="DefaultMimeType">
- żadne/żadne
+ brak/brak
</string>
<string name="texture_load_dimensions_error">
- Nie można załadować zdjęcia większego niż [WIDTH]*[HEIGHT]
+ Nie można załadować obrazów większych niż [WIDTH]*[HEIGHT]
</string>
- <string name="words_separator" value=","/>
<string name="server_is_down">
Pomimo naszych najlepszych starań wystąpił niespodziewany problem.
- Proszę sprawdzić czy na stronie status.secondlifegrid.net nie zostały umieszczone informacje o rozpoznanych problemach serwera.
- Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia firewall.
+Proszę sprawdzić czy na stronie status.secondlifegrid.net nie zostały umieszczone informacje o rozpoznanych problemach serwera.
+Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia firewall.
</string>
<string name="dateTimeWeekdaysNames">
Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota
@@ -4065,19 +4421,13 @@ Raport o Nadużyciu
Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Sierpień:Wrzesień:Październik:Listopad:Grudzień
</string>
<string name="dateTimeMonthShortNames">
- St.:Lt.:Mrz.:Kw.:Maj:Cz.:Lp.:Sie.:Wrz.:Li.:Paź.:Gru.
- </string>
- <string name="dateTimeDayFormat">
- [MDAY]
- </string>
- <string name="dateTimeAM">
- AM
- </string>
- <string name="dateTimePM">
- PM
+ Sty:Lut:Mar:Kwi:Maj:Cze:Lip:Sie:Wrz:Paź:Lis:Gru
</string>
<string name="LocalEstimateUSD">
- US$ [AMOUNT]
+ [AMOUNT] US$
+ </string>
+ <string name="Group Ban">
+ Bany grupowe
</string>
<string name="Membership">
Członkostwo
@@ -4089,40 +4439,40 @@ Raport o Nadużyciu
Status grupy
</string>
<string name="Parcel Management">
- Parcel Management
+ Zarządzanie działką
</string>
<string name="Parcel Identity">
- Parcel Identity
+ Status działki
</string>
<string name="Parcel Settings">
- Parcel Settings
+ Ustawienia działki
</string>
<string name="Parcel Powers">
- Parcel Powers
+ Możliwości działki
</string>
<string name="Parcel Access">
- Dostęp do posiadłości
+ Dostęp do działki
</string>
<string name="Parcel Content">
- Parcel Content
+ Zawartość działki
</string>
<string name="Object Management">
- Object Management
+ ZarzÄ…dzanie obiektami
</string>
<string name="Accounting">
- Accounting
+ Rachunki
</string>
<string name="Notices">
Ogłoszenia
</string>
- <string name="Chat" value=" Czat :">
+ <string name="Chat">
Czat
</string>
<string name="DeleteItems">
- Usuń wybrane obiekty?
+ Usunąć zaznaczone obiekty?
</string>
<string name="DeleteItem">
- Usuń wybrane obiekty?
+ Usunąć zaznaczony obiekt?
</string>
<string name="EmptyOutfitText">
W tym stroju nie ma elementów
@@ -4131,9 +4481,9 @@ Raport o Nadużyciu
Wybierz edytor używając ustawień ExternalEditor.
</string>
<string name="ExternalEditorNotFound">
- Nie odnaleziono zewnętrzego edytora wskazanego przez Ciebie.
+ Nie odnaleziono zewnętrznego edytora wskazanego przez Ciebie.
Spróbuj załączyć ścieżkę do edytora w cytowaniu.
-(np. "/ścieżka do mojego/edytora" "%s")
+(np. "/ścieżka do mojego/edytora" "%s")
</string>
<string name="ExternalEditorCommandParseError">
Błąd w składni komendy zewnętrznego edytora.
@@ -4141,86 +4491,11 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
<string name="ExternalEditorFailedToRun">
Uruchomienie zewnętrznego edytora nie powiodło się.
</string>
- <string name="Esc">
- Esc
- </string>
- <string name="Space">
- Space
- </string>
- <string name="Enter">
- Enter
- </string>
- <string name="Tab">
- Tab
- </string>
- <string name="Ins">
- Ins
- </string>
- <string name="Del">
- Del
- </string>
- <string name="Backsp">
- Backsp
- </string>
- <string name="Shift">
- Shift
- </string>
- <string name="Ctrl">
- Ctrl
- </string>
- <string name="Alt">
- Alt
- </string>
- <string name="CapsLock">
- CapsLock
- </string>
- <string name="Home">
- Miejsce Startu
- </string>
- <string name="End">
- End
- </string>
- <string name="PgUp">
- PgUp
- </string>
- <string name="PgDn">
- PgDn
- </string>
- <string name="F1">
- F1
- </string>
- <string name="F2">
- F2
- </string>
- <string name="F3">
- F3
- </string>
- <string name="F4">
- F4
- </string>
- <string name="F5">
- F5
- </string>
- <string name="F6">
- F6
- </string>
- <string name="F7">
- F7
+ <string name="TranslationFailed">
+ Tłumaczenie nie powiodło się: [REASON]
</string>
- <string name="F8">
- F8
- </string>
- <string name="F9">
- F9
- </string>
- <string name="F10">
- F10
- </string>
- <string name="F11">
- F11
- </string>
- <string name="F12">
- F12
+ <string name="TranslationResponseParseError">
+ Wystąpił błąd podczas przetwarzania odpowiedzi translatora.
</string>
<string name="Add">
Dodaj
@@ -4229,252 +4504,270 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
Odejmij
</string>
<string name="Multiply">
- Mnożenie
+ Pomnóż
</string>
<string name="Divide">
Podziel
</string>
- <string name="PAD_DIVIDE">
- PAD_DIVIDE
+ <string name="BeaconParticle">
+ Emitery czÄ…steczek (niebieski)
</string>
- <string name="PAD_LEFT">
- PAD_LEFT
+ <string name="BeaconPhysical">
+ Emitery fizycznych obiektów (zielony)
</string>
- <string name="PAD_RIGHT">
- PAD_RIGHT
+ <string name="BeaconScripted">
+ Emitery obiektów skryptowanych (czerwony)
</string>
- <string name="PAD_DOWN">
- PAD_DOWN
+ <string name="BeaconScriptedTouch">
+ Emitery obiektów skryptowanych z opcją dotyku (czerwony)
</string>
- <string name="PAD_UP">
- PAD_UP
+ <string name="BeaconSound">
+ Emitery dźwięków (żółty)
</string>
- <string name="PAD_HOME">
- PAD_HOME
+ <string name="BeaconMedia">
+ Emitery mediów (biały)
</string>
- <string name="PAD_END">
- PAD_END
+ <string name="ParticleHiding">
+ Ukryj czÄ…steczki
</string>
- <string name="PAD_PGUP">
- PAD_PGUP
+ <string name="Command_AboutLand_Label">
+ O działce
</string>
- <string name="PAD_PGDN">
- PAD_PGDN
+ <string name="Command_Appearance_Label">
+ WyglÄ…d
</string>
- <string name="PAD_CENTER">
- PAD_CENTER
+ <string name="Command_Avatar_Label">
+ Awatar
</string>
- <string name="PAD_INS">
- PAD_INS
+ <string name="Command_Build_Label">
+ Buduj
</string>
- <string name="PAD_DEL">
- PAD_DEL
+ <string name="Command_Chat_Label">
+ Rozmowy
</string>
- <string name="PAD_Enter">
- PAD_Enter
+ <string name="Command_Conversations_Label">
+ Rozmowy
</string>
- <string name="PAD_BUTTON0">
- PAD_BUTTON0
+ <string name="Command_Compass_Label">
+ Kompas
</string>
- <string name="PAD_BUTTON1">
- PAD_BUTTON1
+ <string name="Command_Destinations_Label">
+ Cele podróży
</string>
- <string name="PAD_BUTTON2">
- PAD_BUTTON2
+ <string name="Command_Gestures_Label">
+ Gesty
</string>
- <string name="PAD_BUTTON3">
- PAD_BUTTON3
+ <string name="Command_HowTo_Label">
+ Samouczek
</string>
- <string name="PAD_BUTTON4">
- PAD_BUTTON4
+ <string name="Command_Inventory_Label">
+ Szafa
</string>
- <string name="PAD_BUTTON5">
- PAD_BUTTON5
+ <string name="Command_Map_Label">
+ Mapa
</string>
- <string name="PAD_BUTTON6">
- PAD_BUTTON6
+ <string name="Command_Marketplace_Label">
+ Marketplace
</string>
- <string name="PAD_BUTTON7">
- PAD_BUTTON7
+ <string name="Command_MiniMap_Label">
+ Minimapa
</string>
- <string name="PAD_BUTTON8">
- PAD_BUTTON8
+ <string name="Command_Move_Label">
+ Ruch
</string>
- <string name="PAD_BUTTON9">
- PAD_BUTTON9
+ <string name="Command_Outbox_Label">
+ Skrzynka nadawcza kupca
</string>
- <string name="PAD_BUTTON10">
- PAD_BUTTON10
+ <string name="Command_People_Label">
+ Ludzie
</string>
- <string name="PAD_BUTTON11">
- PAD_BUTTON11
+ <string name="Command_Picks_Label">
+ Miejsca
</string>
- <string name="PAD_BUTTON12">
- PAD_BUTTON12
+ <string name="Command_Places_Label">
+ Landmarki
</string>
- <string name="PAD_BUTTON13">
- PAD_BUTTON13
+ <string name="Command_Preferences_Label">
+ Preferencje
</string>
- <string name="PAD_BUTTON14">
- PAD_BUTTON14
+ <string name="Command_Profile_Label">
+ Profil
</string>
- <string name="PAD_BUTTON15">
- PAD_BUTTON15
+ <string name="Command_Search_Label">
+ Szukaj
</string>
- <string name="-">
- -
+ <string name="Command_Snapshot_Label">
+ Zdjęcie
</string>
- <string name="=">
- =
+ <string name="Command_Speak_Label">
+ GÅ‚os
</string>
- <string name="`">
- `
+ <string name="Command_View_Label">
+ Kamera
</string>
- <string name=";">
- ;
+ <string name="Command_Voice_Label">
+ Pobliski głos
</string>
- <string name="[">
- [
+ <string name="Command_AboutLand_Tooltip">
+ Informacje o miejscu, które odwiedzasz
</string>
- <string name="]">
- ]
+ <string name="Command_Appearance_Tooltip">
+ Zmień swojego awatara
</string>
- <string name="\">
- \
+ <string name="Command_Avatar_Tooltip">
+ Wybierz kompletnego awatara
</string>
- <string name="0">
- 0
+ <string name="Command_Build_Tooltip">
+ Budowanie obiektów i zmiana terenu
</string>
- <string name="1">
- 1
+ <string name="Command_Chat_Tooltip">
+ Rozmawiaj z ludźmi w pobliżu używając tekstu
</string>
- <string name="2">
- 2
+ <string name="Command_Conversations_Tooltip">
+ Rozmawiaj ze wszystkimi
</string>
- <string name="3">
- 3
+ <string name="Command_Compass_Tooltip">
+ Kompas
</string>
- <string name="4">
- 4
+ <string name="Command_Destinations_Tooltip">
+ Punkty, jakie mogą być interesujące
</string>
- <string name="5">
- 5
+ <string name="Command_Facebook_Tooltip">
+ Wyślij na Facebooka
</string>
- <string name="6">
- 6
+ <string name="Command_Flickr_Tooltip">
+ Wyślij na Flickr
</string>
- <string name="7">
- 7
+ <string name="Command_Gestures_Tooltip">
+ Gesty Twojego awatara
</string>
- <string name="8">
- 8
+ <string name="Command_HowTo_Tooltip">
+ Jak wykonywać zwyczajne rzeczy
</string>
- <string name="9">
- 9
+ <string name="Command_Inventory_Tooltip">
+ Przeglądaj i używaj rzeczy, jakie należą do Ciebie
</string>
- <string name="A">
- A
+ <string name="Command_Map_Tooltip">
+ Mapa świata
</string>
- <string name="B">
- B
+ <string name="Command_Marketplace_Tooltip">
+ Idź na zakupy
</string>
- <string name="C">
- C
+ <string name="Command_MiniMap_Tooltip">
+ Pokaż ludzi w pobliżu
</string>
- <string name="D">
- D
+ <string name="Command_Move_Tooltip">
+ Poruszanie Twoim awatarem
</string>
- <string name="E">
- E
+ <string name="Command_Outbox_Tooltip">
+ Przenieś przedmioty na Marketplace, aby je sprzedać
</string>
- <string name="F">
- F
+ <string name="Command_People_Tooltip">
+ Znajomi, grupy i ludzie w pobliżu
</string>
- <string name="G">
- G
+ <string name="Command_Picks_Tooltip">
+ Miejsca, które są pokazywane jako ulubione w Twoim profilu
</string>
- <string name="H">
- H
+ <string name="Command_Places_Tooltip">
+ Miejsca (landmarki) zapisane przez Ciebie
</string>
- <string name="I">
- I
+ <string name="Command_Preferences_Tooltip">
+ Ustawienia
</string>
- <string name="J">
- J
+ <string name="Command_Profile_Tooltip">
+ Edytuj lub zobacz swój profil
</string>
- <string name="K">
- K
+ <string name="Command_Search_Tooltip">
+ Znajdź miejsca, wydarzenia i ludzi
</string>
- <string name="L">
- L
+ <string name="Command_Snapshot_Tooltip">
+ Zrób zdjęcie
</string>
- <string name="M">
- M
+ <string name="Command_Speak_Tooltip">
+ Rozmawiaj z ludźmi w pobliżu używając mikrofonu
</string>
- <string name="N">
- N
+ <string name="Command_View_Tooltip">
+ Zmiana kÄ…ta patrzenia kamery
</string>
- <string name="O">
- O
+ <string name="Command_Voice_Tooltip">
+ Sterowanie głośnością rozmów oraz ludzi wokół Ciebie
</string>
- <string name="P">
- P
+ <string name="Toolbar_Bottom_Tooltip">
+ obecnie na Twoim dolnym pasku
</string>
- <string name="Q">
- Q
+ <string name="Toolbar_Left_Tooltip">
+ obecnie na Twoim lewym pasku
</string>
- <string name="R">
- R
+ <string name="Toolbar_Right_Tooltip">
+ obecnie na Twoim prawym pasku
</string>
- <string name="S">
- S
+ <string name="Retain%">
+ %Zachowania
</string>
- <string name="T">
- T
+ <string name="Detail">
+ Szczegóły
</string>
- <string name="U">
- U
+ <string name="Better Detail">
+ Więcej szczegółów
</string>
- <string name="V">
- V
+ <string name="Surface">
+ Powierzchnia
</string>
- <string name="W">
- W
+ <string name="Solid">
+ Stałe
</string>
- <string name="X">
- X
+ <string name="Wrap">
+ Zawiń
</string>
- <string name="Y">
- Y
+ <string name="Preview">
+ PodglÄ…d
</string>
- <string name="Z">
- Z
+ <string name="Normal">
+ Normalne
</string>
- <string name="BeaconParticle">
- Podgląd lokalizatorów cząsteczek (niebieski)
+ <string name="Pathfinding_Object_Attr_None">
+ Brak
</string>
- <string name="BeaconPhysical">
- Podgląd lokalizatorów fizycznych obiektów (zielony)
+ <string name="Pathfinding_Object_Attr_Permanent">
+ Wpływ na Navmesh
</string>
- <string name="BeaconScripted">
- Podgląd lokalizatorów obiektów skryptowanych (czerwony)
+ <string name="Pathfinding_Object_Attr_Character">
+ Postać
</string>
- <string name="BeaconScriptedTouch">
- Podgląd lokalizatorów obiektów skryptowanych z opcją dotyku (czerwony)
+ <string name="Pathfinding_Object_Attr_MultiSelect">
+ (Wiele)
</string>
- <string name="BeaconSound">
- Podgląd lokalizatorów dźwięków (żółty)
+ <string name="snapshot_quality_very_low">
+ Bardzo niska
</string>
- <string name="BeaconMedia">
- Podgląd lokalizatorów mediów (biały)
+ <string name="snapshot_quality_low">
+ Niska
</string>
- <string name="ParticleHiding">
- Ukryj czÄ…steczki
+ <string name="snapshot_quality_medium">
+ Åšrednia
</string>
- <string name="Command_MarketplaceListings_Label">
- Marketplace
+ <string name="snapshot_quality_high">
+ Wysoka
+ </string>
+ <string name="snapshot_quality_very_high">
+ Bardzo wysoka
+ </string>
+ <string name="TeleportMaturityExceeded">
+ Rezydent nie może odwiedzić tego regionu.
+ </string>
+ <string name="UserDictionary">
+ [Użytkownika]
+ </string>
+ <string name="logging_calls_disabled_log_empty">
+ Rozmowy nie są zapisywane do dziennika. Jeśli chcesz zacząć je logować wybierz "Zapisywanie: tylko dziennik" lub "Zapisywanie: dziennik i logi rozmów" w Preferencje > Czat.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Rozmowy nie będą więcej zapisywane. Jeśli chcesz kontynuować ich logowanie wybierz "Zapisywanie: tylko dziennik" lub "Zapisywanie: dziennik i logi rozmów" w Preferencje > Czat.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Nie ma zapisanych rozmów. Jeśli skontaktujesz się z kimś, lub ktoś z Tobą, to wpis dziennika pojawi się tutaj.
</string>
- <string name="Command_MarketplaceListings_Tooltip">
- Sprzedaj owoce swojej twórczości
+ <string name="loading_chat_logs">
+ Wczytywanie...
</string>
</strings>
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
old mode 100755
new mode 100644
index 0366c3fdbcf35ebf6c23acf47d67b1a369a407b8..e86255100e9820b395a2ce339f1ddde1ad5c2751
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<teleport_messages>
<message_set name="errors">
<message name="invalid_tport">
@@ -17,10 +17,11 @@ Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
Przepraszamy, ale nie możemy znaleźć miejsca docelowego.
</message>
<message name="timeout_tport">
- Przepraszamy, ale nie udało się przeprowadzić teleportacji. Spróbuj jeszcze raz.
+ Przepraszamy, ale nie udało się przeprowadzić teleportacji.
+Spróbuj jeszcze raz.
</message>
<message name="NoHelpIslandTP">
- Brak możliwości ponownej teleportacji do Welcome Island.
+ Brak możliwości ponownej teleportacji do Welcome Island.
Odwiedź 'Welcome Island Public' by powtórzyć szkolenie.
</message>
<message name="noaccess_tport">
@@ -30,7 +31,7 @@ Odwiedź 'Welcome Island Public' by powtórzyć szkolenie.
Czekamy na Twoje akcesoria. Możesz poczekać kilka minut lub zrobić relog przed następną próbą teleportacji.
</message>
<message name="too_many_uploads_tport">
- Obecnie ten region ma problemy z ładowaniem obiektów, w związku z czym teleportacja bardzo sie opóźnia.
+ Obecnie ten region ma problemy z ładowaniem obiektów, w związku z czym teleportacja bardzo się opóźnia.
Spróbuj jeszcze raz za kilka minut albo teleportuj się do mniej zatłoczonego miejsca.
</message>
<message name="expired_tport">
@@ -46,6 +47,12 @@ Spróbuj jeszcze raz za kilka minut.
<message name="no_inventory_host">
Szafa chwilowo nie działa.
</message>
+ <message name="MustGetAgeRegion">
+ Musisz mieć 18 lat lub więcej, aby wejść do tego regionu.
+ </message>
+ <message name="RegionTPSpecialUsageBlocked">
+ Nie można wejść do tego regionu. '[REGION_NAME]' jest miejscem z grami (Skill Gaming Region) - musisz spełnić określone wymagania, jeśli chcesz go odwiedzić. Aby dowiedzieć się więcej zapoznaj się z [http://wiki.secondlife.com/wiki/Linden_Lab_Official:Skill_Gaming_in_Second_Life Skill Gaming FAQ].
+ </message>
</message_set>
<message_set name="progress">
<message name="sending_dest">
@@ -81,5 +88,8 @@ Spróbuj jeszcze raz za kilka minut.
<message name="requesting">
Start teleportacji...
</message>
+ <message name="pending">
+ Teleport oczekuje...
+ </message>
</message_set>
</teleport_messages>
diff --git a/indra/newview/skins/default/xui/pl/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/pl/widgets/bodyparts_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c93c730cdc2477007680b9289fef88054fa41cd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/bodyparts_list_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<bodyparts_list_item name="wearable_item">
+ <lock_panel name="btn_lock" tool_tip="Nie masz uprawnień do edycji"/>
+ <edit_btn name="btn_edit" tool_tip="Edytuj ten kształt" />
+</bodyparts_list_item>
diff --git a/indra/newview/skins/default/xui/pl/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/pl/widgets/clothing_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..710b3ee34a79cf46d15e9b3778efc5152128f2e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/clothing_list_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<clothing_list_item name="wearable_item">
+ <lock_panel name="btn_lock" tool_tip="Nie masz uprawnień do edycji" />
+ <edit_btn name="btn_edit" tool_tip="Edytuj ten obiekt" />
+</clothing_list_item>
diff --git a/indra/newview/skins/default/xui/pl/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/widgets/deletable_wearable_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0a6783b805657a7108100998006e104dc11b3fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/deletable_wearable_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<deletable_wearable_list_item name="deletable_wearable_item">
+ <delete_btn name="btn_delete" tool_tip="Usuń ze stroju" />
+</deletable_wearable_list_item>
diff --git a/indra/newview/skins/default/xui/pl/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/widgets/dummy_clothing_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01c42da6dcd46c52d4f37d734961dfe751a12550
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/dummy_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<dummy_clothing_list_item name="dummy_clothing_item">
+ <add_btn name="btn_add" tool_tip="Dodaj więcej przedmiotów tego typu" />
+</dummy_clothing_list_item>
diff --git a/indra/newview/skins/default/xui/pl/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/pl/widgets/flat_list_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdd119b138c00e05c515e2112bd7957e3162bb5f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/flat_list_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<flat_list_view>
+ <flat_list_view.no_items_text name="no_items_msg" value="Niczego nie znaleziono" />
+</flat_list_view>
diff --git a/indra/newview/skins/default/xui/pl/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/pl/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..440da97db6540328256a993b4f947726395a35b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_folder>
+ <new_badge label="Nowa" />
+</inbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/pl/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/pl/widgets/inbox_folder_view_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c53de28a251765357e8962ab9a91d92ab4d1397e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/inbox_folder_view_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_item>
+ <new_badge label="Nowa" />
+</inbox_folder_view_item>
diff --git a/indra/newview/skins/default/xui/pl/widgets/name_editor.xml b/indra/newview/skins/default/xui/pl/widgets/name_editor.xml
new file mode 100644
index 0000000000000000000000000000000000000000..19cd1efef7ef399338ddedd585e21cb26c8bf248
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/name_editor.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<name_editor default_text="(pobieranie)"/>
diff --git a/indra/newview/skins/default/xui/pl/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/pl/widgets/panel_camera_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3bac8b616b6110e0ca772dd2e007b1ef6928e1f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/panel_camera_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel_camera_item>
+ <panel_camera_item.text name="picture_name">
+ Tekst
+ </panel_camera_item.text>
+</panel_camera_item>
diff --git a/indra/newview/skins/default/xui/pl/widgets/person_view.xml b/indra/newview/skins/default/xui/pl/widgets/person_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ebe5974d61d12e80c57d499f523ba821f38c02a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/person_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<person_view>
+ <facebook_icon name="facebook_icon" tool_tip="Użytkownik Facebooka" />
+ <permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="Możesz edytować obiekty tego Znajomego" />
+ <permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="Ten Znajomy może edytować, kasować lub wziąć Twoje obiekty" />
+ <permission_map_icon tool_tip="Ten Znajomy może zlokalizować Cię na mapie" name="permission_map_icon" />
+ <permission_online_icon name="permission_online_icon" tool_tip="Ten Znajomy widzi Ciebie kiedy jesteÅ› obecny/a w SL" />
+ <info_btn name="info_btn" tool_tip="Więcej informacji" />
+ <profile_btn name="profile_btn" tool_tip="Zobacz profil" />
+</person_view>
diff --git a/indra/newview/skins/default/xui/pl/widgets/texture_picker.xml b/indra/newview/skins/default/xui/pl/widgets/texture_picker.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc35ac714d71e562075d95bec2010800f7e3b1ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/texture_picker.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<texture_picker name="texture picker">
+ <caption_text label="Wiele" />
+</texture_picker>
diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
old mode 100755
new mode 100644
index 1e2edd7a2fb0ab58cd517795651365ae4eb28e31..65c457f822c067360373a909b462c8e91fff3398
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Info" name="support_panel">
<button label="Copiar" name="copy_btn"/>
+ <button label="Verificar atualizações" name="update_btn"/>
</panel>
<panel label="Créditos" name="credits_panel">
<text name="linden_intro">O Second Life é trazido a você pela Lindens,
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
old mode 100755
new mode 100644
index fee939ab466f83a595d3cb5a5d5e92d8aa603628..ca8cf83e6289eb6b1ca64d9a06280ba3bb65a401
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -10,13 +10,13 @@
"Parcel_R_Dark"
</floater.string>
<floater.string name="Minutes">
- [MINUTES] minutos
+ [MINUTES] min.
</floater.string>
<floater.string name="Minute">
- minuto
+ min.
</floater.string>
<floater.string name="Seconds">
- [SECONDS] segundos
+ [SECONDS] seg.
</floater.string>
<floater.string name="Remaining">
faltam
@@ -451,7 +451,7 @@ MÃdia:
<spinner label="Horas de acesso:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Always Allow" name="AllowedText">
- Residentes permitidos
+ Residentes permitidos ([COUNT])
</text>
<name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/>
<button label="Adicionar" name="add_allowed"/>
@@ -459,7 +459,7 @@ MÃdia:
</panel>
<panel name="Banned_layout_panel">
<text label="Ban" name="BanCheck">
- Residentes banidos
+ Residentes banidos ([COUNT])
</text>
<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])"/>
<button label="Adicionar" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_activeim.xml b/indra/newview/skins/default/xui/pt/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
old mode 100755
new mode 100644
index ca813a8540aff65d5ad8f2b2934881315505b831..63c34578acd925c00e6542e76a5157be872c6cb6
--- a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Adicionar..." name="autoreplace_add_entry"/>
<button label="Remover" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Palavra-chave:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Substituição:
+ </text>
<button label="Salvar entrada" name="autoreplace_save_entry" tool_tip="Salva esta entrada."/>
<button label="Salvar alterações" name="autoreplace_save_changes" tool_tip="Salvar todas as alterações."/>
<button label="Cancelar" name="autoreplace_cancel" tool_tip="Descarta todas as alterações."/>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar.xml b/indra/newview/skins/default/xui/pt/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml
old mode 100755
new mode 100644
index 475d36c119cc3b1bece4b770399833bdbce707ac..9567c75d3ef95183cc39b1dfecf20d797c31e72d
--- a/indra/newview/skins/default/xui/pt/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] empurrou você com um objeto 3D
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_critical.xml b/indra/newview/skins/default/xui/pt/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1d4d168a473a5cc6351e8f66b46f6c6cc350c309
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="EXCLUIR PREDEFINIÇÃO PREF">
+ <string name="title_graphic">
+ Excluir predefinição de gráficos
+ </string>
+ <string name="title_camera">
+ Excluir predefinição de câmera
+ </string>
+ <text name="Preset">
+ Selecionar uma predefinição
+ </text>
+ <button label="Excluir" name="delete"/>
+ <button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_destinations.xml b/indra/newview/skins/default/xui/pt/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_display_name.xml b/indra/newview/skins/default/xui/pt/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml b/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
index 97f8576b169f60297fae0056e5c812b6601c399a..24bc52086332abfd3f2d71886ffb87ea0a4a2a45 100644
--- a/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater title="EXPERIENCE PROFILE">
<floater.string name="empty_slurl">
- (none)
+ (nenhum)
</floater.string>
<floater.string name="maturity_icon_general">
"Parcel_PG_Light"
@@ -46,9 +46,9 @@
<button label="Ignorar" name="forget_btn"/>
<button label="Bloquear" name="block_btn"/>
<text name="privileged">
- Essa experiência está disponÃvel para todos os residentes.
+ Essa experiência está habilitada para todos os residentes.
</text>
- <button label="Denunciar abuso" name="report_btn"/>
+ <button label="Relatar abuso" name="report_btn"/>
</layout_panel>
</layout_stack>
</panel>
@@ -63,7 +63,7 @@
<text name="edit_ContentRating">
Classificação:
</text>
- <icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Aumentar a classificação de maturidade sobre uma experiência redefinirá a permissão para todos os residentes que permitiram a experiência.">
+ <icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Aumentar a classificação de maturidade de uma experiência redefinirá a permissão para todos os residentes que permitiram a experiência.">
<icons_combo_box.item label="Adulto" name="Adult" value="42"/>
<icons_combo_box.item label="Moderado" name="Mature" value="21"/>
<icons_combo_box.item label="Geral" name="PG" value="13"/>
@@ -75,7 +75,7 @@
<button label="Limpar localização" name="clear_btn"/>
<check_box label="Ativar experiência" name="edit_enable_btn" tool_tip=""/>
<check_box label="Ocultar nos resultados de pesquisa" name="edit_private_btn"/>
- <text name="changes" value="As alterações de experiência podem levar vários minutos para ser visualizadas em todas as regiões."/>
+ <text name="changes" value="As alterações de experiência podem levar vários minutos para serem visualizadas em todas as regiões."/>
<button label="Retornar" name="cancel_btn"/>
<button label="Salvar" name="save_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
old mode 100755
new mode 100644
index eeb39583efcb84bc612d653da49fcfc3bbf60f2f..9a7062578ac25af357acc9aea726b26c60140a67
--- a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Correr
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x média" name="2x Average"/>
+ <item label="Máx." name="Max"/>
+ <item label="Máx. recente" name="Recent Max"/>
+ <item label="100ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Hora" name="Time"/>
+ <item label="Número de chamadas" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Pausa" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_font_test.xml b/indra/newview/skins/default/xui/pt/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_how_to.xml b/indra/newview/skins/default/xui/pt/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_import_collada.xml b/indra/newview/skins/default/xui/pt/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 2bb95a5605b182503aa5371e96d8a09cb0fc08f3..3840b54d66ae1dd680199e9da6c9ba6bc191d9d7
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Depois de" name="older"/>
</radio_group>
<spinner label="Horas Atrás" name="spin_hours_ago"/>
+ <text name="label_hours">
+ Horas
+ </text>
<spinner label="Dias Atrás" name="spin_days_ago"/>
+ <text name="label_days">
+ Dias
+ </text>
<button label="Fechar" label_selected="Fechar" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/pt/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e9a4aa0250fa8e62fe615189935a0dce2c273a3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CARREGAR PREDEFINIÇÃO PREF">
+ <string name="title_graphic">
+ Carregar predefinição de gráficos
+ </string>
+ <string name="title_camera">
+ Carregar predefinição de câmera
+ </string>
+ <text name="Preset">
+ Selecionar uma predefinição
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_media_settings.xml b/indra/newview/skins/default/xui/pt/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index bb6113671beda020f6ba16d8a93597d04f2399c3..3beada1fc01f19b5c750ea71d6afeae861c8c2f4
--- a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
@@ -12,16 +12,21 @@
<string name="OutboxInitializing">
Iniciando...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Carregando...
</text>
</panel>
</panel>
- <panel>
- <button label="Enviar para Mercado" name="outbox_import_btn" tool_tip="Enviar para a Frente da loja do meu Mercado"/>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Arraste itens para cá para criar pastas
+ </text>
+ </panel>
+ <button label="Enviar para Mercado" name="outbox_import_btn" tool_tip="Enviar para a frente da minha loja do mercado"/>
</panel>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
old mode 100755
new mode 100644
index 8194278b1632ed6ee6a369fa5a3cfe4e8188f155..35cee93ad1d0030af75d123112abddfe5d047455
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
Materiais LOD não são um subconjunto de modelo de referência.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Alguns corpos fÃsicos excedem as limitações de vértice.
+ </string>
<string name="layer_all">
Tudo
</string>
@@ -93,52 +96,52 @@
<text initial_value="Vértices" name="vertices" value="Vértices"/>
<text initial_value="Alto" name="high_label" value="Alto"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Carregar do arquivo"/>
- <item name="Generate" value="Gerar"/>
+ <item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+ <item label="Gerar" name="Generate" value="Gerar"/>
</combo_box>
<button label="Procurar..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="Limite de triângulos"/>
- <item name="Error Threshold" value="Limite de erro"/>
+ <item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+ <item label="Limite de erro" name="Error Threshold" value="Limite de erro"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Médio" name="medium_label" value="Médio"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Carregar do arquivo"/>
- <item name="Generate" value="Gerar"/>
- <item name="Use LoD above" value="Usar LoD acima"/>
+ <item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+ <item label="Gerar" name="Generate" value="Gerar"/>
+ <item label="Usar LoD acima" name="Use LoD above" value="Usar LoD acima"/>
</combo_box>
<button label="Procurar..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="Limite de triângulos"/>
- <item name="Error Threshold" value="Limite de erro"/>
+ <item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+ <item label="Limite de erro" name="Error Threshold" value="Limite de erro"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Baixo" name="low_label" value="Baixo"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Carregar do arquivo"/>
- <item name="Generate" value="Gerar"/>
- <item name="Use LoD above" value="Usar LoD acima"/>
+ <item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+ <item label="Gerar" name="Generate" value="Gerar"/>
+ <item label="Usar LoD acima" name="Use LoD above" value="Usar LoD acima"/>
</combo_box>
<button label="Procurar..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="Limite de triângulos"/>
- <item name="Error Threshold" value="Limite de erro"/>
+ <item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+ <item label="Limite de erro" name="Error Threshold" value="Limite de erro"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="Mais baixo" name="lowest_label" value="Mais baixo"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Carregar do arquivo"/>
- <item name="Generate" value="Gerar"/>
- <item name="Use LoD above" value="Usar LoD acima"/>
+ <item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+ <item label="Gerar" name="Generate" value="Gerar"/>
+ <item label="Usar LoD acima" name="Use LoD above" value="Usar LoD acima"/>
</combo_box>
<button label="Procurar..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="Limite de triângulos"/>
- <item name="Error Threshold" value="Limite de erro"/>
+ <item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+ <item label="Limite de erro" name="Error Threshold" value="Limite de erro"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/pt/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9a761029e27cfd0ab8d0c0d0617767b8ebbef62
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="AVISOS">
+ <floater.string name="system_tab_title">
+ Sistema ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Transações ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Convites ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Grupo ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ AVISOS
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="Sistema (0)" name="system_notification_list_tab"/>
+ <panel label="Transações (0)" name="transaction_notifications_tab"/>
+ <panel label="Convites (0)" name="group_invite_notifications_tab"/>
+ <panel label="Grupo (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Recolher tudo" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="Painel de lacunas" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Excluir tudo" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_object_weights.xml b/indra/newview/skins/default/xui/pt/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_openobject.xml b/indra/newview/skins/default/xui/pt/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index 05784115e7f2a9be41acd0cec0e95902f787532a..b2030ea4797ddec2b105ad4305303cb9f12c6a25
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[grupo]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Nome" name="name"/>
<scroll_list.columns label="Descrição" name="description"/>
@@ -42,12 +42,12 @@
<button label="Selecionar tudo" name="select_all_objects"/>
<button label="Selecionar nenhum" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
Ações nos personagens selecionados:
</text>
<check_box label="Exibir baliza" name="show_beacon"/>
- <check_box label="Exibir cápsula da fÃsica" name="show_physics_capsule"/>
+ <check_box label="Exibir cápsula fÃsica" name="show_physics_capsule"/>
<button label="Pegar" name="take_objects"/>
<button label="Pegar uma cópia" name="take_copy_objects"/>
<button label="Teletransportar-me até ele" name="teleport_me_to_object" tool_tip="Habilitado apenas quando um personagem é selecionado."/>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index 182f2513e0c6f0e413aae43ef1687fb423cac842..47855656c812987d0575f4a8d21ced4b2e626dab
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Ocorreu um erro durante a geração do caminho.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Status do visualizador
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Status do simulador
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Visualizar" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index e0c60679dd5cc7324adeadd3e885aa05e59c81fb..c41e55992a7f242b1266228483f7d4fb84962f0e
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
Escolher uso do linkset...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Filtrar por:
+ </text>
+ <text name="linksets_name_label">
+ Nome
+ </text>
+ <text name="linksets_desc_label">
+ Descrição
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Filtrar por uso do linkset..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Caminhável" name="filter_by_linkset_use_walkable"/>
@@ -122,7 +131,10 @@
<button label="Selecionar tudo" name="select_all_objects"/>
<button label="Selecionar nenhum" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Ações em linksets selecionados (se um linkset for removido de um mundo, seus atributos podem ser perdidos):
+ </text>
<check_box label="Exibir baliza" name="show_beacon"/>
<button label="Pegar" name="take_objects"/>
<button label="Pegar uma cópia" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="Devolver" name="return_objects"/>
<button label="Excluir" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Edite os atributos de linksets selecionados e pressione o botão para aplicar as alterações
+ </text>
<text name="walkability_coefficients_label">
Possibilidade de caminhar:
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_people.xml b/indra/newview/skins/default/xui/pt/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_perms_default.xml b/indra/newview/skins/default/xui/pt/floater_perms_default.xml
index 762f8320c4e8ed5b9ceff0d0000a97f1596c397e..40659a353add5f0ed3ae1e5f2e1de9a2d89c892a 100644
--- a/indra/newview/skins/default/xui/pt/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/pt/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="PERMISSÕES DE CRIAÇÃO PADRÃO">
- <panel label="Permissões padrão" name="default permissions"/>
+ <panel label="Permissões padrão" name="default permissions">
+ <text name="label_1">
+ Próximo proprietário:
+ </text>
+ <text name="label_2">
+ Copiar
+ </text>
+ <text name="label_3">
+ Modificar
+ </text>
+ <text name="label_4">
+ Transferir
+ </text>
+ <text name="label_5">
+ Dividir com o grupo
+ </text>
+ <text name="label_6">
+ Permitir que qualquer um copie
+ </text>
+ <text name="label_7" tool_tip="Definir permissões padrão para objetos criados">
+ Objetos
+ </text>
+ <text name="label_8" tool_tip="Definir permissões padrão para itens enviados">
+ Envios
+ </text>
+ <text name="label_9" tool_tip="Definir permissões padrão para scripts criados">
+ Scripts
+ </text>
+ <text name="label_10" tool_tip="Definir permissões padrão para anotações criadas">
+ Anotações
+ </text>
+ <text name="label_11" tool_tip="Definir permissões padrão para gestos criados">
+ Gestos
+ </text>
+ <text name="label_12" tool_tip="Definir permissões padrão para roupas ou partes do corpo criadas">
+ Itens de vestuário
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_picks.xml b/indra/newview/skins/default/xui/pt/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_places.xml b/indra/newview/skins/default/xui/pt/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_post_process.xml b/indra/newview/skins/default/xui/pt/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c5e19b2281c47fd1e0c3d8c6d600a450f5f5a811
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PREFERÊNCIAS AVANÇADAS DE GRÃFICOS">
+ <text name="GeneralText">
+ Geral
+ </text>
+ <slider label="Calcular distância:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Máxima quantidade de partÃculas:" name="MaxParticleCount"/>
+ <slider label="Qualidade pós-processamento:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Baixo
+ </text>
+ <text name="AvatarText">
+ Avatar
+ </text>
+ <slider label="Complexidade máxima:" name="IndirectMaxComplexity" tool_tip="Controla o ponto no qual um avatar visualmente complexo é desenhado como avatar de cor sólida"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="Máx. de avatares legÃtimos:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="Detalhe:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ Baixo
+ </text>
+ <slider label="FÃsico:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ Baixo
+ </text>
+ <text name="ShadersText">
+ Hardware
+ </text>
+ <slider label="Memória da textura (MB):" name="GraphicsCardTextureMemory" tool_tip="Quantidade de memória que deve ser alocada para texturas. O padrão é definido pela memória da placa de vÃdeo. Reduzir este valor pode melhorar o desempenho, mas pode deixar as texturas fora de foco."/>
+ <slider label="Raio de distância da neblina:" name="fog"/>
+ <slider label="Gama:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 = brilho padrão, menor = mais brilho)
+ </text>
+ <check_box label="Filtro anisotrópico (mais lento quando ativado)" name="ani"/>
+ <check_box initial_value="true" label="Ativar Vertex Buffer Objects de OpenGL" name="vbo" tool_tip="Ativar isso em hardware moderno melhora o desempenho. Entretanto, hardwares mais antigos normalmente implantam mal os VBOs. A ativação dessa configuração pode travar sua máquina."/>
+ <check_box initial_value="true" label="Habilitar compressão da textura (requer reinÃcio)" name="texture compression" tool_tip="Comprime as texturas na memória de vÃdeo, permitindo o carregamento de texturas de maior resolução em detrimento da qualidade da cor."/>
+ <text name="antialiasing label">
+ Antialiasing:
+ </text>
+ <combo_box label="Antialiasing" name="fsaa">
+ <combo_box.item label="Desativado" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (reinicie para ativar)
+ </text>
+ <slider label="Detalhe de mesh de terreno:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ Baixo
+ </text>
+ <slider label="Ãrvores:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ Baixo
+ </text>
+ <slider label="Objetos:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ Baixo
+ </text>
+ <slider label="Prims flexÃveis:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ Baixo
+ </text>
+ <check_box initial_value="true" label="Ãgua transparente" name="TransparentWater"/>
+ <check_box initial_value="true" label="Mapeamento de relevo e brilho" name="BumpShiny"/>
+ <check_box initial_value="true" label="Luzes locais" name="LocalLights"/>
+ <check_box initial_value="true" label="Sombreamento simples" name="BasicShaders" tool_tip="Desativar essa opção pode evitar o travamento de alguns drivers de placas gráficas"/>
+ <slider label="Detalhes do terreno:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ Baixo
+ </text>
+ <check_box initial_value="true" label="Economia de hardware do avatar" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Vestimenta do avatar" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Reflexos na água:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="MÃnimo" name="0"/>
+ <combo_box.item label="Terreno e árvores" name="1"/>
+ <combo_box.item label="Todos os objetos estáticos" name="2"/>
+ <combo_box.item label="Todos os avatares e objetos" name="3"/>
+ <combo_box.item label="Tudo" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="Tonalidades atmosféricas" name="WindLightUseAtmosShaders"/>
+ <slider label="Céu:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ Baixo
+ </text>
+ <check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Oclusão de ambiente" name="UseSSAO"/>
+ <check_box initial_value="true" label="Profundidade do campo" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ Sombras:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Nenhum" name="0"/>
+ <combo_box.item label="Sol/lua" name="1"/>
+ <combo_box.item label="Sol/lua + projetores" name="2"/>
+ </combo_box>
+ <button label="Redefinir para configurações recomendadas" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/pt/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b9c959488d5201b42e043c0643f4bb7d9c413fad
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="SALVAR PREDEFINIÇÃO PREF">
+ <string name="title_graphic">
+ Salvar predefinição de gráficos
+ </string>
+ <string name="title_camera">
+ Salvar predefinição da câmera
+ </string>
+ <text name="Preset">
+ Digite um nome para a predefinição ou escolha uma predefinição existente.
+ </text>
+ <button label="Salvar" name="save"/>
+ <button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index f4e95bddecf8e51313076e10be37a94d793a9ef2..6571b40c9dd10c72ba9e06e37cc7c9412b501607
--- a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Importar dicionário">
+ <text name="import_dict">
+ Dicionário:
+ </text>
<button label="Procurar" label_selected="Procurar" name="dictionary_path_browse"/>
+ <text name="import_name">
+ Nome:
+ </text>
+ <text name="import_lang">
+ Idioma:
+ </text>
<button label="Importar" name="ok_btn"/>
<button label="Cancelar" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
old mode 100755
new mode 100644
index c4954cb61f28488368674f21ba6717c735ca6ccc..a86e12fd592658484c46468e93b21861fd07b248
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Leia com atenção os Termos do Serviço e a PolÃtica de Privacidade. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar esses termos.
</text>
+ <text name="external_tos_required">
+ Antes de continuar, você precisará visitar my.secondlife.com e fazer login para aceitar os Termos de Serviço. Obrigado!
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_toybox.xml b/indra/newview/skins/default/xui/pt/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/inspect_group.xml b/indra/newview/skins/default/xui/pt/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/language_settings.xml b/indra/newview/skins/default/xui/pt/language_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
old mode 100755
new mode 100644
index 61953f9f786835ab91c6d8f67eb1d8d893f89c32..031f6b605aa560b4fd8b8e0c65911659fbadd3a6
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Mais zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
+ <menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+ <menu_item_check label="Não renderizar" name="DoNotRender"/>
+ <menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
<menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
old mode 100755
new mode 100644
index 1af8d64438cb128ff02a241262de77189557ee1a..e32f9059f52cffa8980aa3053d9226ab21a5e9a7
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="Descartar XML" name="Dump XML"/>
<menu_item_call label="Mais zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
+ <menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+ <menu_item_check label="Não renderizar" name="DoNotRender"/>
+ <menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
<menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_edit.xml b/indra/newview/skins/default/xui/pt/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_favorites.xml b/indra/newview/skins/default/xui/pt/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_group_plus.xml b/indra/newview/skins/default/xui/pt/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_landmark.xml b/indra/newview/skins/default/xui/pt/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
old mode 100755
new mode 100644
index 29dae6292a5004739b3995b3a3502493422b47b8..a65dfddb0512b66084db9f5d853ef55f9d2bf553
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Relatar bug" name="Report Bug"/>
<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Verificar atualizações" name="Check for Updates"/>
</menu>
<menu_item_check label="Exibir menu de depuração" name="Show Debug Menu"/>
<menu label="Depurar" name="Debug">
diff --git a/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml b/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
index 2236df5c873cbf6428471aba93af14a75174820d..0a4af6fbf0c0333987ba29cf2b74828b9e66ae53 100644
--- a/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+ <menu_item_check label="Ordenar por mais recente" name="sort_by_recent"/>
<menu_item_check label="Ordenar por quantidade em estoque stock (baixo a alto)" name="sort_by_stock_amount"/>
<menu_item_check label="Exibir apenas pastas da listagem" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_mini_map.xml b/indra/newview/skins/default/xui/pt/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_navbar.xml b/indra/newview/skins/default/xui/pt/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_picks.xml b/indra/newview/skins/default/xui/pt/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_place.xml b/indra/newview/skins/default/xui/pt/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_toolbars.xml b/indra/newview/skins/default/xui/pt/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_email.xml b/indra/newview/skins/default/xui/pt/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1dbb5cd994c0cdd5a213b3c506e32bf291aa373c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="Escrever email em cliente externo" name="email_open_external"/>
+ <menu_item_call label="Copiar email para área de transferência" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_experience.xml b/indra/newview/skins/default/xui/pt/menu_url_experience.xml
index 1bbc27f26724e9565b45d9c7af5cd1c9b6092726..af7634b0d9f2f327d5f73b6837ab593af27b8044 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_experience.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_experience.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
- <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
+ <menu_item_call label="Copiar SLurl para a área de transferência" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_group.xml b/indra/newview/skins/default/xui/pt/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_http.xml b/indra/newview/skins/default/xui/pt/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_map.xml b/indra/newview/skins/default/xui/pt/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
old mode 100755
new mode 100644
index 3d5d9eccc630109bad4dcd5a93f30dbe4cf42773..2df78c6287bb6fdd2118d3a1c6a7533fff2977cb
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -64,7 +64,7 @@
<menu_item_call label="Foto" name="Take Snapshot"/>
<menu_item_call label="Perfil da região" name="Place Profile"/>
<menu_item_call label="Sobre terrenos" name="About Land"/>
- <menu_item_call label="Região/Propriedade" name="RegionEstate"/>
+ <menu_item_call label="Região/terreno" name="RegionEstate"/>
<menu_item_call label="Meus terrenos..." name="My Land"/>
<menu_item_call label="Comprar este terreno" name="Buy Land"/>
<menu label="Mostrar" name="LandShow">
@@ -180,6 +180,7 @@
<menu_item_call label="Relatar bug" name="Report Bug"/>
<menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Verificar atualizações" name="Check for Updates"/>
</menu>
<menu label="Avançado" name="Advanced">
<menu_item_call label="Recarregar texturas" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
<menu_item_call label="Medidor de lag" name="Lag Meter"/>
<menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/>
<menu_item_call label="EstatÃsticas de carregamento de cena" name="Scene Load Statistics"/>
- <menu_item_check label="Mostrar peso do desenho para avatares" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Exibir informações de complexidade do avatar" name="Avatar Draw Info"/>
</menu>
<menu label="Realces e visibilidade" name="Highlighting and Visibility">
<menu_item_check label="Efeito baliza piscando" name="Cheesy Beacon"/>
@@ -298,8 +299,6 @@
<menu_item_check label="PartÃculas" name="Particles"/>
<menu_item_check label="Junções" name="Joints"/>
<menu_item_check label="Vetores de vento" name="Wind Vectors"/>
- <menu_item_check label="Renderizar complexidade" name="rendercomplexity"/>
- <menu_item_check label="Bytes do anexo" name="attachment bytes"/>
<menu_item_check label="Esculpir" name="Sculpt"/>
<menu label="Densidade da textura" name="Texture Density">
<menu_item_check label="Nenhuma" name="None"/>
@@ -373,7 +372,6 @@
<menu_item_call label="Depurar texturas do avatar" name="Debug Avatar Textures"/>
</menu>
<menu_item_check label="Texturas HTTP" name="HTTP Textures"/>
- <menu_item_check label="Inventário HTTP" name="HTTP Inventory"/>
<menu_item_call label="Habilitar Visual Leak Detector" name="Enable Visual Leak Detector"/>
<menu_item_check label="Console Window on next Run" name="Console Window"/>
<menu label="Configurar nÃvel de registro em log" name="Set Logging Level">
diff --git a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/mime_types_linux.xml b/indra/newview/skins/default/xui/pt/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/mime_types_mac.xml b/indra/newview/skins/default/xui/pt/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
old mode 100755
new mode 100644
index 3a3603307eae6fa99f8142b980ac39b9b3a276f0..cf7400117d6a7c1ef181cad15293ba0eb521f4e4
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -163,6 +163,10 @@ Ocorreu uma falha na inicialização do Marketplace devido a um erro do sistema
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ Para criar sua listagem, consertamos a hierarquia do conteúdo da sua listagem.
+ <usetemplate ignoretext="Avisar-me quando a criação de uma listagem consertar a hierarquia do conteúdo" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Esta ação alterará o conteúdo ativo desta listagem. Deseja continuar?
<usetemplate ignoretext="Confirmar antes de alterar uma listagem ativa no Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -210,11 +214,9 @@ Ocorreu uma falha na inicialização do Marketplace devido a um erro do sistema
Removemos sua listagem porque o estoque está vazio. Você precisa adicionar mais unidades à pasta de estoque para que a listagem seja exibida novamente.
<usetemplate ignoretext="Alertar quando uma listagem não for listada porque a pasta de estoque está vazia" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- Houve um problema com o carregamento do texto para um script devido à seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Houve um problema durante o carregamento do script compilado devido à seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ Removemos sua listagem porque a pasta de versões está vazia. Você precisa adicionar itens à pasta de versões para que a listagem seja exibida novamente.
+ <usetemplate ignoretext="Alertar quando uma listagem não for listada porque a pasta de versões está vazia" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
Falha nos dados de inscrição de animação. Por favor, tente mais tarde.
@@ -319,6 +321,14 @@ Se você não quiser que essas funções sejam concedidas a esse cargo, desative
Você está prestes a expulsar [COUNT] membros do grupo.
<usetemplate ignoretext="Confirmar expulsão de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ Você está prestes a banir [AVATAR_NAME] do grupo.
+ <usetemplate ignoretext="Confirmar o banimento de um participante do grupo" name="okcancelignore" notext="Cancelar" yestext="Banir"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ Você está prestes a banir [COUNT] membros do grupo.
+ <usetemplate ignoretext="Confirmar banimento de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Banir"/>
+ </notification>
<notification name="AttachmentDrop">
Você está prestes a largar seu anexo.
Tem certeza de que quer prosseguir?
@@ -402,7 +412,7 @@ Objetos: [N]
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Devolver"/>
</notification>
<notification name="ReturnAllTopObjects">
- Você tem certeza de que deseja enviar todos os objetos listados de volta aos inventários de seus proprietários?
+ Tem certeza que deseja retornar todos os objetos listados para o inventário do proprietário? Isso retornará TODOS os objetos com script na região!
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Devolver"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -581,16 +591,10 @@ Gostaria de carregar a última versão salva?
(**Aviso** Esta operação não pode ser desfeita).
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
- <notification name="SaveScriptFailReason">
- Houve um problema em salvar um script devido à seguinte razão: [REASON]. Tente salvar novamente o script mais tarde.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
Não foi possÃvel salvar o script pois o objeto em que ele está não pôde ser encontrado.
O objeto pode estar fora de alcance ou ter sido deletado.
</notification>
- <notification name="SaveBytecodeFailReason">
- Houve um problema em salvar uma compilação de script devido a seguinte razão: [REASON]. Por favor, tente salvar novamente o script mais tarde.
- </notification>
<notification name="StartRegionEmpty">
Sua região de partida não está definida.
Digite o nome da região na caixa 'Ponto de partida' ou selecione 'Meu último local' ou 'Minha casa' como ponto de partida.
@@ -603,6 +607,10 @@ O objeto pode estar fora de alcance ou ter sido deletado.
<notification name="CannotDownloadFile">
Não foi possÃvel baixar o arquivo.
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ Você solicitou o download de um arquivo que não tem suporte no [SECOND_LIFE].
+ <usetemplate ignoretext="Avisar-me sobre downloads de arquivos sem suporte" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
Não foi possÃvel escrever o arquivo [[FILE]]
</notification>
@@ -1102,8 +1110,9 @@ Unir os terrenos?
Em geral, essa é uma falha técnica temporária. Personalize e volte a salvar o item novamente dentro de alguns minutos.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Ah não! O [SECOND_LIFE] teve de fechar.
- [MESSAGE]
+ Ah não! Você foi desconectado do [SECOND_LIFE].
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM & bate-papo"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1350,6 +1359,13 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
<ignore name="ignore" text="A roupa está demorando para chegar"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexidade visual] é [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexidade visual] é [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
A instalação do [APP_NAME] está pronta.
@@ -1628,6 +1644,25 @@ O visualizador experimental foi substituÃdo por um visualizador [NEW_CHANNEL];
consulte a informação [[INFO_URL] sobre essa atualização]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ Uma atualização está disponÃvel!
+O download está ocorrendo em segundo plano e reiniciaremos seu visualizador automaticamente para terminar a instalação assim que ele estiver concluÃdo.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ Uma atualização foi baixada. Ela será instalada durante a reinicialização.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ Erro ao verificar atualizações.
+Tente novamente mais tarde.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ Seu visualizador está atualizado!
+Se você estiver muito ansioso para experimentar os novos recursos e correções, consulte a página de visualizadores alternativos. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
Delegar este objeto causará ao grupo:
* Receber os L$ pagos ao objeto
@@ -1731,6 +1766,14 @@ consulte a informação [[INFO_URL] sobre essa atualização]
Você atingiu o limite máximo de grupos. Sai de um grupo para entrar ou criar outro.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ O limite de grupos para as contas básicas é [MAX_BASIC] e para as contas [https://secondlife.com/premium/ premium],
+é [MAX_PREMIUM].
+Se você fizer downgrade de sua conta, precisará ficar abaixo do limite de grupos [MAX_BASIC] antes de entrar em mais.
+
+[https://secondlife.com/my/account/membership.php Faça o upgrade hoje!]
+ <usetemplate name="okbutton" yestext="Fechar"/>
+ </notification>
<notification name="KickUser">
Chutar este residente com qual mensagem?
<form name="form">
@@ -1910,29 +1953,29 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
Remover o gerente da propriedade desta propriedade apenas ou para [ALL_ESTATES]?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
</notification>
- <notification label="Selecionar propriedade" name="EstateAllowedExperienceAdd">
- Adicionar à lista de permitidos apenas para essa propriedade ou para [ALL_ESTATES]?
- <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ <notification label="Selecionar terreno" name="EstateAllowedExperienceAdd">
+ Adicionar à lista de permitidos para esse terreno somente ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
</notification>
- <notification label="Selecionar propriedade" name="EstateAllowedExperienceRemove">
- Remover da lista de permitidos apenas para essa propriedade ou para [ALL_ESTATES]?
- <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ <notification label="Selecionar terreno" name="EstateAllowedExperienceRemove">
+ Remover da lista de permitidos para esse terreno somente ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
</notification>
- <notification label="Selecionar propriedade" name="EstateBlockedExperienceAdd">
- Adicionar à lista de bloqueados dessa propriedade apenas ou de [ALL_ESTATES]?
- <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ <notification label="Selecionar terreno" name="EstateBlockedExperienceAdd">
+ Adicionar à lista de bloqueados desse terreno somente ou de [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
</notification>
- <notification label="Selecionar propriedade" name="EstateBlockedExperienceRemove">
- Remover da lista de bloqueados para essa propriedade somente ou para [ALL_ESTATES]?
- <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ <notification label="Selecionar terreno" name="EstateBlockedExperienceRemove">
+ Remover da lista de bloqueados para esse terreno somente ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
</notification>
- <notification label="Selecionar propriedade" name="EstateTrustedExperienceAdd">
- Adicionar à lista-chave dessa propriedade apenas ou de [ALL_ESTATES]?
- <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ <notification label="Selecionar terreno" name="EstateTrustedExperienceAdd">
+ Adicionar à lista-chave desse terreno somente ou de [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
</notification>
- <notification label="Selecionar propriedade" name="EstateTrustedExperienceRemove">
- Remover da lista-chave para essa propriedade somente ou para [ALL_ESTATES]?
- <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+ <notification label="Selecionar terreno" name="EstateTrustedExperienceRemove">
+ Remover da lista-chave para esse terreno somente ou para [ALL_ESTATES]?
+ <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
</notification>
<notification label="Confirmar expulsão" name="EstateKickUser">
Expulsar [EVIL_USER] desta propriedade?
@@ -2241,6 +2284,10 @@ Mover para o inventário o(s) item(s)?
Confirme que você deseja pagar L$[AMOUNT] a [TARGET].
<usetemplate ignoretext="Confirmar antes de pagar (somas acima de L$Â 200)" name="okcancelignore" notext="Cancelar" yestext="Pagar"/>
</notification>
+ <notification name="PayObjectFailed">
+ Falha no pagamento: objeto não encontrado.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Não há itens neste objeto que você está autorizado a copiar.
</notification>
@@ -2272,10 +2319,9 @@ Não é possÃvel desfazer essa ação.
[QUESTION]
<usetemplate ignoretext="Confirmar antes de excluir" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- Use esta ferramenta para denunciar infrações dos [http://secondlife.com/corporate/tos.php Termos do Serviço] e das [http://secondlife.com/corporate/cs.php Normas da Comunidade].
-
-Todas as denúncias de abuso são investigadas e resolvidas.
+ <notification name="ConfirmUnlink">
+ Essa é uma seleção ampla com linksets. Se você desvinculá-la, pode não ser possÃvel vinculá-la novamente. Como precaução, pode ser interessante fazer cópias dos linksets no seu inventário.
+ <usetemplate ignoretext="Confirmar quando desvincular um linkset" name="okcancelignore" notext="Cancelar" yestext="Desvincular"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, selecione uma categoria para a reportagem deste abuso.
@@ -2980,13 +3026,13 @@ OK?
<notification name="TeleportedHomeExperienceRemoved">
Você foi teletransportado da região [region_name] por remover a experiência secondlife:///app/experience/[public_id]/profile e não tem mais permissão na região.
<form name="form">
- <ignore name="ignore" text="Ejetar da região por remover uma experiência"/>
+ <ignore name="ignore" text="Ejetado da região por remover uma experiência"/>
</form>
</notification>
<notification name="TrustedExperienceEntry">
- Você recebeu permissão para a região [region_name] ao participar da experiência-chave secondlife:///app/experience/[public_id]/profile Remover essa experiência pode ejetá-lo da região.
+ Você recebeu permissão para a região [region_name] ao participar da experiência-chave secondlife:///app/experience/[public_id]/profile e remover essa experiência pode ejetá-lo da região.
<form name="form">
- <ignore name="ignore" text="Permitido em uma região devido a uma experiência"/>
+ <ignore name="ignore" text="Permitido em uma região por uma experiência"/>
</form>
</notification>
<notification name="TrustedExperiencesAvailable">
@@ -2994,13 +3040,13 @@ OK?
[EXPERIENCE_LIST]
-Outras experiências chave podem estar disponÃveis.
+Outras experiências-chave podem estar disponÃveis.
</notification>
<notification name="ExperienceEvent">
Um objeto foi permitido para [EventType] pelo secondlife:///app/experience/[public_id]/profile experience.
Proprietário: secondlife:///app/agent/[OwnerID]/inspect
- Nome do objeto: [ObjectName]
- Nome do Terreno: [ParcelName]
+ Nome do objeto: [ObjectName]
+ Nome da parcela: [ParcelName]
</notification>
<notification name="ExperienceEventAttachment">
Um anexo teve permissão para executar [EventType] pelo secondlife:///app/experience/[public_id]/profile experience.
@@ -3011,9 +3057,9 @@ Outras experiências chave podem estar disponÃveis.
[EXPERIENCE]
-Quando a permissão for dada, você não irá mais visualizar essa mensagem novamente a não ser que seja revogada do perfil de experiência.
+Após a permissão ser concedida, você não verá essa mensagem novamente para essa experiência, a menos que ela seja revogada do perfil da experiência.
-Os scripts associados a essa experiência serão capazes de realizar o seguinte nas regiões onde a experiência esteja ativa:
+Os scripts associados a essa experiência poderão realizar o seguinte nas regiões onde a experiência esteja ativa:
[QUESTIONS]Isso está bem?
<form name="form">
@@ -3200,6 +3246,12 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
<notification name="AttachmentSaved">
Anexo salvo.
</notification>
+ <notification name="PresetNotSaved">
+ Erro ao salvar predefinição [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Erro ao excluir a predefinição [NAME].
+ </notification>
<notification name="UnableToFindHelpTopic">
Nenhum tópico de ajuda foi encontrado com relação a este elemento.
</notification>
@@ -3232,9 +3284,8 @@ O botão será exibido quando houver espaço suficente.
Selecione os residentes com quem compartilhar.
</notification>
<notification name="MeshUploadError">
- [LABEL] não foi carregado: [MESSAGE] [IDENTIFIER]
-
-Mais detalhes no log.
+ Falha no envio de [LABEL]: [MESSAGE] [IDENTIFIER]
+[DETAILS]Consulte SecondLife.log para obter mais detalhes
</notification>
<notification name="MeshUploadPermError">
Erro ao solicitar permissões de upload de mesh.
diff --git a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_info.xml b/indra/newview/skins/default/xui/pt/panel_experience_info.xml
index 7fad25dad6b6fabcab623e7419860ca20749d565..f5aed0657fccc7b7b1298f41d8eb90c00ddb6ac7 100644
--- a/indra/newview/skins/default/xui/pt/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_experience_info.xml
@@ -19,7 +19,7 @@
</layout_panel>
<layout_panel name="marketplace panel">
<text name="Location">
- Loja do Marketplace
+ Loja do Mercado
</text>
<text name="LocationTextText">
qualquer lugar
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notify.xml b/indra/newview/skins/default/xui/pt/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
old mode 100755
new mode 100644
index dbf8e4fa527c6e769d687503fe3b18f0f3b77c59..6bc6e775b1c8ed096621005d0d449858914c01b2
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] itens [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ Recuperados [ITEM_COUNT] itens [FILTER]
+ </panel.string>
<text name="ItemcountText">
Itens:
</text>
@@ -16,7 +19,7 @@
</tab_container>
<layout_stack name="bottom_panel">
<layout_panel name="options_gear_btn_panel">
- <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+ <menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
</layout_panel>
<layout_panel name="add_btn_panel">
<button name="add_btn" tool_tip="Adicionar novo item"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
old mode 100755
new mode 100644
index 205fd6b97dd4d09ecfed74f3c74a7705ce3dfbb0..fce170110e800a0e4557c763f62b5910fb5232ba
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -18,6 +18,7 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
+ <string name="GroupCountWithInfo" value="Você pertence a [COUNT] grupos e pode entrar em mais [REMAINING]. [secondlife:/// Quer mais?]"/>
<tab_container name="tabs">
<panel label="PROXIMIDADE" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_pick_info.xml b/indra/newview/skins/default/xui/pt/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 3ea592a9577e71a4bfa454fa4efb331bd9724a5a..15340a9a5fae6027ac776adf6a8527e9d8cd5b66
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="Permitir vários visualizadores" name="allow_multiple_viewer_check"/>
<check_box label="Mostrar grade selecionada ao entrar" name="show_grid_selection_check"/>
<check_box label="Exibir menu avançado" name="show_advanced_menu_check"/>
- <check_box label="Exibir menu desenvolvedor" name="show_develop_menu_check"/>
+ <check_box label="Exibir menu de desenvolvimento" name="show_develop_menu_check"/>
<button label="Permissões de criação padrão" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 89f1e076479fddb758d341dde452bbfdeed0e2f6..f3de404ef71e27b5d45847e2297ef737ea113128
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Oferta de inventário" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ Salvar:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Log e transcrições" name="log_and_transcripts" value="2"/>
+ <item label="Apenas log" name="log_only" value="1"/>
+ <item label="Sem log ou transcrição" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="Limpar registro..." name="clear_log"/>
<button label="Excluir transcrições..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ Localização:
+ </text>
<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
</panel>
<button label="Tradução..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 756e345cb8c437909537a9fdc677728132bd1199..4d3fb89b37ff9e946a5fff0d3219143025462ef8
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,15 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Gráficos" name="Display panel">
+ <text name="preset_text">
+ (nenhum)
+ </text>
<text name="QualitySpeed">
Qualidade e velocidade:
</text>
- <text name="FasterText">
- Mais
-rápido
- </text>
- <text name="BetterText">
- Melhor
- </text>
<text name="ShadersPrefText">
Baixo
</text>
@@ -22,94 +18,18 @@ rápido
<text name="ShadersPrefText4">
Ultra
</text>
- <panel label="CustomGraphics" name="CustomGraphics Panel">
- <text name="ShadersText">
- Sombreadores:
- </text>
- <check_box initial_value="true" label="Ãgua transparente" name="TransparentWater"/>
- <check_box initial_value="true" label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
- <check_box initial_value="true" label="Luzes locais" name="LocalLights"/>
- <check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/>
- <check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
- <check_box initial_value="true" label="Oclusão ambiental" name="UseSSAO"/>
- <check_box initial_value="true" label="Profundidade" name="UseDoF"/>
- <text name="shadows_label">
- Sombras:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Nenhum" name="0"/>
- <combo_box.item label="Sol/Lua" name="1"/>
- <combo_box.item label="Sol/Lua + Projetores" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Reflexo de água:
- </text>
- <combo_box initial_value="true" label="Reflexos de Ãgua" name="Reflections">
- <combo_box.item label="MÃnimo" name="0"/>
- <combo_box.item label="Terreno e árvores" name="1"/>
- <combo_box.item label="Objetos estáticos" name="2"/>
- <combo_box.item label="Avatares e objetos" name="3"/>
- <combo_box.item label="Tudo" name="4"/>
- </combo_box>
- <slider label="FÃsico do avatar:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Baixo
- </text>
- <slider label="Distancia de desenho:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Contador máx. de partÃculas:" name="MaxParticleCount"/>
- <slider label="Máx. de avatares legÃtimos:" name="MaxNumberAvatarDrawn"/>
- <slider label="Qualidade de Pós-processamento:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Detalhes de Malha:
- </text>
- <slider label=" Objetos:" name="ObjectMeshDetail"/>
- <slider label=" Primitivas Flexiveis:" name="FlexibleMeshDetail"/>
- <slider label=" Ãrvores:" name="TreeMeshDetail"/>
- <slider label=" Avatares:" name="AvatarMeshDetail"/>
- <slider label=" Terreno:" name="TerrainMeshDetail"/>
- <slider label=" Céu:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Baixo
- </text>
- <text name="ObjectMeshDetailText">
- Baixo
- </text>
- <text name="FlexibleMeshDetailText">
- Baixo
- </text>
- <text name="TreeMeshDetailText">
- Baixo
- </text>
- <text name="AvatarMeshDetailText">
- Baixo
- </text>
- <text name="TerrainMeshDetailText">
- Baixo
- </text>
- <text name="SkyMeshDetailText">
- Baixo
- </text>
- <text name="AvatarRenderingText">
- Renderização do avatar:
- </text>
- <check_box initial_value="true" label="Atributos do Avatar" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Melhoria de Hardware" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Vestimenta do Avatar" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- Detalhe do Terreno:
- </text>
- <radio_group left_delta="45" name="TerrainDetailRadio">
- <radio_item label="Baixo" name="0"/>
- <radio_item label="Alto" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Aplicar" label_selected="Aplicar" name="Apply"/>
- <button label="Redefinir" left="110" name="Defaults"/>
- <button label="Avançado" name="Advanced"/>
- <button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ Mais
+rápido
+ </text>
+ <text name="BetterText">
+ Melhor
+ </text>
+ <check_box initial_value="true" label="Tonalidades atmosféricas" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
+ <button label="Salvar configurações como predefinição..." name="PrefSaveButton"/>
+ <button label="Carregar predefinição..." name="PrefLoadButton"/>
+ <button label="Excluir predefinição..." name="PrefDeleteButton"/>
+ <button label="Redefinir para configurações recomendadas" left="110" name="Defaults"/>
+ <button label="Configurações avançadas..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
old mode 100755
new mode 100644
index 87f2a9bc8fa175ddfdd21f7016c927d8f8f7ef15..6308d133bba13a33d1427741d15d747cfd5cbfa0
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="Usar meu navegador (Chrome, Firefox, IE) para todos os links" name="internal" tool_tip="Use o navegador padrão do sistema para consultar a ajuda, abrir links da web etc. Uso em tela inteira não recomendado." value="0"/>
<radio_item label="Usar o navegador incorporado somente para links do SecondLife" name="external" tool_tip="Usar o navegador padrão do sistema para consultar a ajuda, abrir links da web etc. O navegador incorporado será usado somente para os links da LindenLab/SecondLife." value="1"/>
+ <radio_item label="Usar navegador incorporado para todos os links" name="external_all" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. A nova janela é aberta dentro do [APP_NAME]." value="2"/>
</radio_group>
<check_box initial_value="true" label="Habilitar plugins" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Aceitar cookies" name="cookies_enabled"/>
<check_box initial_value="true" label="Habilitar Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Ativar pop-ups no navegador de mÃdia" name="media_popup_enabled"/>
<text name="Software updates:">
Atualizações de software:
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="Instalar automaticamente" name="Install_automatically"/>
- <combo_box.item label="Baixar e instalar atualizações manualmente" name="Install_manual"/>
+ <combo_box.item label="Baixarei e instalarei as atualizações manualmente" name="Install_manual"/>
</combo_box>
<check_box label="Disposto a atualizar para candidatos da versão" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b7dab5b8ff138c341d6f620a9fd02bc34bf94cf3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ Predefinições de gráficos
+ </text>
+ <button label="Abrir preferências de gráficos" name="open_prefs_btn" tool_tip="Mostrar preferências de gráficos"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 9e07b6772f26c149a930691e70e7ee0d2902efcd..f2d24e0c0e696f765af887fd760897c5ac4b0903
--- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
@@ -45,11 +45,8 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="URL da mÃdia"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
- <icon name="media_whitelist_flag" tool_tip="Lista ativada"/>
- </layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Navegação segura"/>
+ <layout_panel name="media_address_url_icons_wl">
+ <icon name="media_whitelist_flag" tool_tip="Lista de aceitação ativada"/>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_region_experiences.xml b/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
index c7e252cd6f1995c6d39db8b67d6ce2f08d47c6b7..c9378d373ec49cb5ad24c3b514f5352150e461eb 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
@@ -3,31 +3,31 @@
<panel.string name="trusted_estate_text">
Qualquer experiência pode ser chave.
-Experiências-chave têm permissão para serem executadas nessa propriedade.
+Experiências-chave têm permissão para serem executadas nesse terreno.
-Além disso, se a propriedade não permitir acesso público, os residentes participantes de qualquer experiência-chave podem entrar e permanecer na propriedade, desde que estejam na experiência-chave.
+Além disso, se a propriedade não permitir acesso público, os residentes participantes de qualquer experiência-chave podem entrar e permanecer no terreno, desde que estejam na experiência-chave.
</panel.string>
<panel.string name="allowed_estate_text">
Somente experiências dentro do terreno podem ser permitidas.
-Experiências permitidas têm permissão para ser executadas nessa propriedade.
+Experiências permitidas têm permissão para ser executadas nesse terreno.
</panel.string>
<panel.string name="blocked_estate_text">
Somente experiências dentro da grade podem ser bloqueadas.
-É possÃvel que as experiências bloqueadas não sejam executadas nessa propriedade.
+É possÃvel que as experiências bloqueadas não sejam executadas nesse terreno.
</panel.string>
<panel.string name="estate_caption">
- Mudar as opções desta guia afeta todas as regiões desta propriedade.
+ Mudar as configurações desta guia afeta todas as regiões deste terreno.
</panel.string>
<panel.string name="allowed_parcel_text">
Somente experiências dentro do terreno podem ser permitidas.
-Experiências permitidas têm permissão para ser executadas nesse terreno se não estiverem bloqueadas pela propriedade.
+Experiências permitidas têm permissão para ser executadas nesse terreno se não estiverem bloqueadas pela parcela.
</panel.string>
<panel.string name="blocked_parcel_text">
Qualquer experiência de residente pode ser bloqueada.
-É possÃvel que as experiências bloqueadas não sejam executadas neste terreno.
+É possÃvel que as experiências bloqueadas não sejam executadas nesta parcela.
</panel.string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index b038c628bc290ccd0f4ac3c8a7778f8533ed42a0..f3357026d5489a31b7cd15bab02214b88aaa8aef
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
Salvar uma imagem em seu inventário custa L$[UPLOAD_COST]. Para salvar sua imagem como uma textura, selecione um dos formatos quadrados.
</text>
<combo_box label="Resolução" name="texture_size_combo">
- <combo_box.item label="Janela atual" name="CurrentWindow"/>
+ <combo_box.item label="Janela ativa (512x512)" name="CurrentWindow"/>
<combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/>
<combo_box.item label="Médio (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
index 03da89dd3bc79484c78e741edafad2f3e5d8cc20..f051432998e659c9f17cf1e9de8fd05e65bd0ebc 100644
--- a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Materiais" name="Materials"/>
<combo_box.item label="MÃdia" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="Textura (difusa)" name="Texture (diffuse)"/>
- <combo_box.item label="Relevo (normal)" name="Bumpiness (normal)"/>
- <combo_box.item label="Brilho (especular)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="Textura (difusa)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="Relevo (normal)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="Brilho (especular)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="Textura" name="texture control" tool_tip="Selecionar imagem"/>
<text name="label alphamode">
Modo alpha
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
old mode 100755
new mode 100644
index 8d5bc061f99ce828725d86f161afe9150c128005..1475df10c1c76765eb5c5ff90f3035bda4e3a275
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -66,7 +66,7 @@
<action description="Enviar aviso" longdescription="Membros que exercem cargos com esta função podem enviar avisos na seção Avisos." name="notices send" value="42"/>
<action description="Receber novos avisos e ver os anteriores" longdescription="Membros que exercem cargos com esta função podem receber e ler avisos antigos na seção Avisos." name="notices receive" value="43"/>
</action_set>
- <action_set description="Estas funções incluem o poder de modificar as experiências desse grupo." name="experience_tools_experience">
+ <action_set description="Estas habilidades incluem o poder de modificar as experiências desse grupo." name="experience_tools_experience">
<action description="Administrador de experiência" longdescription="Os membros em uma função com essa permissão podem editar os metadados de uma experiência." name="experience admin" value="49"/>
<action description="Colaborador de experiência" longdescription="Os membros em uma função com essa permissão podem contribuir com scripts para uma experiência." name="experience contributor" value="50"/>
</action_set>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
old mode 100755
new mode 100644
index 3eef691d8daa74e36cf8fea2b44ef873c665fe9d..50bb9b7e669891b0a0c99c90a7ad87706d6d2867
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -29,12 +29,9 @@
Falha na inicialização dos gráficos. Atualize seu driver gráfico!
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [Notas da versão]]
</string>
- <string name="AboutCompiler">
- ConstruÃdo com [COMPILER] versão [COMPILER_VERSION]
- </string>
<string name="AboutPosition">
Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURL: <nolink>[SLURL]</nolink>
@@ -53,12 +50,11 @@ Placa gráfica: [GRAPHICS_CARD]
Versão do driver de vÃdeo Windows: [GRAPHICS_CARD_VENDOR]
</string>
<string name="AboutLibs">
- Versão OpenGL: [OPENGL_VERSION]
+ Versão do OpenGL: [OPENGL_VERSION]
-Versão libcurl: [LIBCURL_VERSION]
-Versão J2C Decoder: [J2C_VERSION]
+Versão do J2C Decoder: [J2C_VERSION]
Versão do driver de áudio: [AUDIO_DRIVER_VERSION]
-Versão Qt Webkit: [QT_WEBKIT_VERSION]
+Versão de LLCEFLib/CEF: [LLCEFLIB_VERSION]
Versão do servidor de voz: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -169,6 +165,12 @@ Versão do servidor de voz: [VOICE_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Grade principal do Second Life (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Grade de teste beta do Second Life (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -405,6 +407,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
Você não pode usar uma pasta que contenha mais de [AMOUNT] itens. Você pode mudar esse limite em Avançado > Mostrar configurações de depuração > WearFolderLimit.
</string>
<string name="TooltipPrice" value="L$[AMOUNT]"/>
+ <string name="TooltipSLIcon">
+ Isso contém um link para uma página no domÃnio oficial do SecondLife.com ou LindenLab.com.
+ </string>
<string name="TooltipOutboxDragToWorld">
Não é possÃvel fazer rez de itens da pasta Listagens do Marketplace
</string>
@@ -424,7 +429,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
O número de itens de estoque excede [AMOUNT].
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Você pode soltar somente itens ou pastas na aba TUDO. Selecione essa aba e mova seus itens ou pastas novamente.
+ Você pode soltar somente itens ou pastas na aba TUDO ou NÃO ASSOCIADOS. Selecione uma dessas abas e mova seus itens ou pastas novamente.
</string>
<string name="TooltipOutboxNoTransfer">
Um ou mais objetos não podem ser vendidos ou transferidos
@@ -508,6 +513,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
Clique para ativar no secondlife:// comando
</string>
<string name="CurrentURL" value="URL atual: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Clique para escrever um email
+ </string>
<string name="SLurlLabelTeleport">
Teletransportar para
</string>
@@ -1027,7 +1035,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="AgentNameSubst">
(Você)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Suprimir alertas ao gerenciar listas de acesso ao terreno
</string>
@@ -1800,6 +1808,21 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="TodayOld">
Cadastrado hoje
</string>
+ <string name="av_render_everyone_now">
+ Agora, todos podem te ver.
+ </string>
+ <string name="av_render_not_everyone">
+ Sua renderização pode não acontecer para todos ao seu redor.
+ </string>
+ <string name="av_render_over_half">
+ Sua renderização pode não acontecer para metade das pessoas ao seu redor.
+ </string>
+ <string name="av_render_most_of">
+ Sua renderização pode não acontecer para a maioria das pessoas ao seu redor.
+ </string>
+ <string name="av_render_anyone">
+ Sua renderização pode não acontecer para ninguém ao seu redor.
+ </string>
<string name="AgeYearsA">
[COUNT] ano
</string>
@@ -1917,6 +1940,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="CompileQueueUnknownFailure">
Falha desconhecida para download
</string>
+ <string name="CompileNoExperiencePerm">
+ Pulando script [SCRIPT] com experiência [EXPERIENCE]
+ </string>
<string name="CompileQueueTitle">
Progresso do recompilamento
</string>
@@ -1962,9 +1988,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="GroupsNone">
nenhum
</string>
- <string name="CompileNoExperiencePerm">
- Pulando script [SCRIPT] com experiência [EXPERIENCE]
- </string>
<string name="Group" value="(grupo)"/>
<string name="Unknown">
(Desconhecido)
@@ -5250,18 +5273,6 @@ Tente colocar o caminho do editor entre aspas.
<string name="UserDictionary">
[Usuário]
</string>
- <string name="logging_calls_disabled_log_empty">
- As conversas não estão sendo registradas. Para começar a manter um registro, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo.
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo.
- </string>
- <string name="logging_calls_enabled_log_empty">
- Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
- </string>
- <string name="loading_chat_logs">
- Carregando...
- </string>
<string name="experience_tools_experience">
Experiência
</string>
@@ -5281,16 +5292,16 @@ Tente colocar o caminho do editor entre aspas.
PERMITIDO
</string>
<string name="Blocked_Experiences_Tab">
- BLOQUEADA
+ BLOQUEADO
</string>
<string name="Contrib_Experiences_Tab">
COLABORADOR
</string>
<string name="Admin_Experiences_Tab">
- ADMIN
+ ADMINISTRADOR
</string>
<string name="Recent_Experiences_Tab">
- RECENTES
+ RECENTE
</string>
<string name="Owned_Experiences_Tab">
PRÓPRIAS
@@ -5302,7 +5313,7 @@ Tente colocar o caminho do editor entre aspas.
assumir seus controles
</string>
<string name="ExperiencePermission3">
- botão animações no seu avatar
+ acionar animações no seu avatar
</string>
<string name="ExperiencePermission4">
anexar ao avatar
@@ -5326,7 +5337,7 @@ Tente colocar o caminho do editor entre aspas.
Assumir o controle
</string>
<string name="ExperiencePermissionShort3">
- Botão animações
+ Acionar animações
</string>
<string name="ExperiencePermissionShort4">
Anexar
@@ -5335,7 +5346,7 @@ Tente colocar o caminho do editor entre aspas.
Rastrear câmera
</string>
<string name="ExperiencePermissionShort10">
- Câmera de controle
+ Controlar câmera
</string>
<string name="ExperiencePermissionShort11">
Teletransportar
@@ -5343,4 +5354,37 @@ Tente colocar o caminho do editor entre aspas.
<string name="ExperiencePermissionShort12">
Autorização
</string>
+ <string name="logging_calls_disabled_log_empty">
+ As conversas não estão sendo registradas. Para começar a manter um registro, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
+ </string>
+ <string name="loading_chat_logs">
+ Carregando...
+ </string>
+ <string name="preset_combo_label">
+ -Lista vazia-
+ </string>
+ <string name="Default">
+ Padrão
+ </string>
+ <string name="none_paren_cap">
+ (nenhum)
+ </string>
+ <string name="no_limit">
+ Sem limite
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ A forma fÃsica contém triângulos muito pequenos. Tente simplificar o modelo fÃsico.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ A forma fÃsica contém dados de confirmação ruins. Tente consertar o modelo fÃsico.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ A forma fÃsica não tem a versão correta. Defina a versão correta para o modelo fÃsico.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/pt/xui_version.xml b/indra/newview/skins/default/xui/pt/xui_version.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_aaa.xml b/indra/newview/skins/default/xui/ru/floater_aaa.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
old mode 100755
new mode 100644
index 0f75856a9182fd839d9d2d4de83b136a5ff6970a..ee9f82847d10856766b00020e4297383edfd7485
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Данные" name="support_panel">
<button label="Копировать в буфер обмена" name="copy_btn"/>
+ <button label="Проверить наличие обновлений" name="update_btn"/>
</panel>
<panel label="Создатели" name="credits_panel">
<text name="linden_intro">Игра Second Life разработана лабораторией Lindens,
diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
old mode 100755
new mode 100644
index 86428da3ef9639e230be84260d805ef2fe5e0379..28d5ff6ab96e9b2d47c0068ba84193310516f2a1
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -13,7 +13,7 @@
[MINUTES] мин
</floater.string>
<floater.string name="Minute">
- минута
+ мин
</floater.string>
<floater.string name="Seconds">
[SECONDS] Ñ
@@ -446,7 +446,7 @@
<spinner label="ЧаÑÑ‹ доÑтупа:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Ð’Ñегда разрешено" name="AllowedText">
- Допущенные жители
+ Допущенные жители ([COUNT])
</text>
<name_list name="AccessList" tool_tip="([LISTED] в ÑпиÑке, [MAX] макÑимум)"/>
<button label="Добавить" name="add_allowed"/>
@@ -454,7 +454,7 @@
</panel>
<panel name="Banned_layout_panel">
<text label="Бан" name="BanCheck">
- Забаненные жители
+ Забаненные жители ([COUNT])
</text>
<name_list name="BannedList" tool_tip="([LISTED] в ÑпиÑке, [MAX] макÑимум)"/>
<button label="Добавить" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_activeim.xml b/indra/newview/skins/default/xui/ru/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
old mode 100755
new mode 100644
index 6827931e5d510f74a37f4f18de24349ddb0aef71..4bc7593790d35a96f2e361e9e11f3be73e4ebbd9
--- a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Добавить..." name="autoreplace_add_entry"/>
<button label="Удалить" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Ключевое Ñлово:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ Замена:
+ </text>
<button label="Сохранить запиÑÑŒ" name="autoreplace_save_entry" tool_tip="Сохранить Ñту запиÑÑŒ."/>
<button label="Сохранить изменениÑ" name="autoreplace_save_changes" tool_tip="Сохранить вÑе изменениÑ."/>
<button label="Отмена" name="autoreplace_cancel" tool_tip="Отменить вÑе изменениÑ."/>
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar.xml b/indra/newview/skins/default/xui/ru/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_beacons.xml b/indra/newview/skins/default/xui/ru/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_build_options.xml b/indra/newview/skins/default/xui/ru/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_bumps.xml b/indra/newview/skins/default/xui/ru/floater_bumps.xml
old mode 100755
new mode 100644
index f81f72829014473be355c280876315f29ea4a64a..ce21920b2a8ad1345f725f01f811bfa1d67fd719
--- a/indra/newview/skins/default/xui/ru/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] ударил Ð²Ð°Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑким объектом
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_land.xml b/indra/newview/skins/default/xui/ru/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_object.xml b/indra/newview/skins/default/xui/ru/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_choose_group.xml b/indra/newview/skins/default/xui/ru/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_color_picker.xml b/indra/newview/skins/default/xui/ru/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_critical.xml b/indra/newview/skins/default/xui/ru/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1b66f05171bf91e142574b65217768ff5117141
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="УДÐЛИТЬ ПРЕСЕТ">
+ <string name="title_graphic">
+ Удалить преÑет графики
+ </string>
+ <string name="title_camera">
+ Удалить преÑет камеры
+ </string>
+ <text name="Preset">
+ Выберите преÑет
+ </text>
+ <button label="Удалить" name="delete"/>
+ <button label="Отмена" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_display_name.xml b/indra/newview/skins/default/xui/ru/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_event.xml b/indra/newview/skins/default/xui/ru/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
index c72d8b59b9fd55c80742aa3a66771dc5b2218a1c..62c33f3b2ee5309553148f75d9b75b09a7909a5d 100644
--- a/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
@@ -57,7 +57,7 @@
<panel name="edit_panel_experience_info">
<scroll_container name="edit_xp_scroll">
<panel name="edit_scrolling_panel">
- <text name="edit_experience_title_label" value="Ðазвание:"/>
+ <text name="edit_experience_title_label" value="ИмÑ:"/>
<text name="edit_experience_desc_label" value="ОпиÑание:"/>
<button label="Группа" name="Group_btn"/>
<text name="edit_ContentRating">
diff --git a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
old mode 100755
new mode 100644
index 20936b8494fff4a843401ee6c1891b798a1c0d26..fc750402e4523fdf9127f9fe4b9cd5d3e6feb622
--- a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Бег
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2 x Ñреднее" name="2x Average"/>
+ <item label="МакÑимум" name="Max"/>
+ <item label="ПоÑледний макÑимум" name="Recent Max"/>
+ <item label="100 мÑ" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="ВремÑ" name="Time"/>
+ <item label="КоличеÑтво звонков" name="Number of Calls"/>
+ <item label="Гц" name="Hz"/>
+ </combo_box>
<button label="Пауза" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_font_test.xml b/indra/newview/skins/default/xui/ru/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_gesture.xml b/indra/newview/skins/default/xui/ru/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_god_tools.xml b/indra/newview/skins/default/xui/ru/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_help_browser.xml b/indra/newview/skins/default/xui/ru/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_how_to.xml b/indra/newview/skins/default/xui/ru/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_hud.xml b/indra/newview/skins/default/xui/ru/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_image_preview.xml b/indra/newview/skins/default/xui/ru/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_import_collada.xml b/indra/newview/skins/default/xui/ru/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_inspect.xml b/indra/newview/skins/default/xui/ru/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index aa0184fe349560c5b4677263df8812587450c1d5..40d96bb33116c4e2112ed85d9744d37e9a22e3a3
--- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Старше, чем" name="older"/>
</radio_group>
<spinner label="ЧаÑов назад" name="spin_hours_ago"/>
+ <text name="label_hours">
+ ЧаÑÑ‹
+ </text>
<spinner label="Дней назад" name="spin_days_ago"/>
+ <text name="label_days">
+ Дни
+ </text>
<button label="Закрыть" label_selected="Закрыть" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ru/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba1c463d1865b336b07721636598468c9f75cc4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="ЗÐГРУЗИТЬ ПРЕСЕТ">
+ <string name="title_graphic">
+ Загрузить преÑет графики
+ </string>
+ <string name="title_camera">
+ Загрузить преÑет камеры
+ </string>
+ <text name="Preset">
+ Выберите преÑет
+ </text>
+ <button label="OK" name="ok"/>
+ <button label="Отмена" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_map.xml b/indra/newview/skins/default/xui/ru/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_media_browser.xml b/indra/newview/skins/default/xui/ru/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_media_settings.xml b/indra/newview/skins/default/xui/ru/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index 332fa3b82fc383c9e5ee348da53a8e3211de271d..1d3ff3f5ed8743537037fbd4fbdfa60cf9ee87f1
--- a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
ИнициализациÑ...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Загрузка...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ ПеретаÑкивайте предметы Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð°Ð¿Ð¾Ðº
+ </text>
+ </panel>
<button label="Отправить в торговый центр" name="outbox_import_btn" tool_tip="Ð’Ñ‹Ñтавить на витрину моего магазина"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
old mode 100755
new mode 100644
index 0c6d41b4efa654ec9e0ee3f17fefd082d2cf9dfc..d660dd97b5fcf34b12d8a16b86df7766dd53e1c3
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
Материалы ÑƒÑ€Ð¾Ð²Ð½Ñ Ð´ÐµÑ‚Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸ не входÑÑ‚ в Ñталонную модель.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… физичеÑких оболочек превышен лимит вершин.
+ </string>
<string name="layer_all">
Ð’Ñе
</string>
@@ -93,52 +96,52 @@
<text initial_value="Вершины" name="vertices" value="Вершины"/>
<text initial_value="Ð’Ñ‹Ñокий" name="high_label" value="Ð’Ñ‹Ñокий"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Загрузка из файла"/>
- <item name="Generate" value="Создать"/>
+ <item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+ <item label="Создать" name="Generate" value="Создать"/>
</combo_box>
<button label="Обзор..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="Предельное чиÑло треугольников"/>
- <item name="Error Threshold" value="Порог ошибки"/>
+ <item label="Предельное чиÑло треугольников" name="Triangle Limit" value="Предельное чиÑло треугольников"/>
+ <item label="Порог ошибки" name="Error Threshold" value="Порог ошибки"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Средний" name="medium_label" value="Средний"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Загрузка из файла"/>
- <item name="Generate" value="Создать"/>
- <item name="Use LoD above" value="ИÑпользовать УД выше"/>
+ <item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+ <item label="Создать" name="Generate" value="Создать"/>
+ <item label="ИÑпользовать УД выше" name="Use LoD above" value="ИÑпользовать УД выше"/>
</combo_box>
<button label="Обзор..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="Предельное чиÑло треугольников"/>
- <item name="Error Threshold" value="Порог ошибки"/>
+ <item label="Предельное чиÑло треугольников" name="Triangle Limit" value="Предельное чиÑло треугольников"/>
+ <item label="Порог ошибки" name="Error Threshold" value="Порог ошибки"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Ðизкий" name="low_label" value="Ðизкий"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Загрузка из файла"/>
- <item name="Generate" value="Создать"/>
- <item name="Use LoD above" value="ИÑпользовать УД выше"/>
+ <item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+ <item label="Создать" name="Generate" value="Создать"/>
+ <item label="ИÑпользовать УД выше" name="Use LoD above" value="ИÑпользовать УД выше"/>
</combo_box>
<button label="Обзор..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="Предельное чиÑло треугольников"/>
- <item name="Error Threshold" value="Порог ошибки"/>
+ <item label="Предельное чиÑло треугольников" name="Triangle Limit" value="Предельное чиÑло треугольников"/>
+ <item label="Порог ошибки" name="Error Threshold" value="Порог ошибки"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="Самый низкий" name="lowest_label" value="Самый низкий"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Загрузка из файла"/>
- <item name="Generate" value="Создать"/>
- <item name="Use LoD above" value="ИÑпользовать УД выше"/>
+ <item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+ <item label="Создать" name="Generate" value="Создать"/>
+ <item label="ИÑпользовать УД выше" name="Use LoD above" value="ИÑпользовать УД выше"/>
</combo_box>
<button label="Обзор..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="Предельное чиÑло треугольников"/>
- <item name="Error Threshold" value="Порог ошибки"/>
+ <item label="Предельное чиÑло треугольников" name="Triangle Limit" value="Предельное чиÑло треугольников"/>
+ <item label="Порог ошибки" name="Error Threshold" value="Порог ошибки"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_moveview.xml b/indra/newview/skins/default/xui/ru/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_mute_object.xml b/indra/newview/skins/default/xui/ru/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_notification.xml b/indra/newview/skins/default/xui/ru/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ru/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..88225f7c1d45596787c1909c977c88c9654ba8bb
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="УВЕДОМЛЕÐИЯ">
+ <floater.string name="system_tab_title">
+ СиÑтема ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Транзакции ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Группа ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ УВЕДОМЛЕÐИЯ
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="СиÑтема (0)" name="system_notification_list_tab"/>
+ <panel label="Транзакции (0)" name="transaction_notifications_tab"/>
+ <panel label="ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ (0)" name="group_invite_notifications_tab"/>
+ <panel label="Группа (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Свернуть вÑе" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="Панель интервалов" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Удалить вÑе" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_object_weights.xml b/indra/newview/skins/default/xui/ru/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_openobject.xml b/indra/newview/skins/default/xui/ru/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index ce7ffc3d20d9ee68be316efd044b5104d3d32aa9..6476091e3b908ddc8639f05e1670813a6cbe5c56
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[группа]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="ИмÑ" name="name"/>
<scroll_list.columns label="ОпиÑание" name="description"/>
@@ -42,7 +42,7 @@
<button label="Выбрать вÑе" name="select_all_objects"/>
<button label="Отменить выбор" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
ДейÑÑ‚Ð²Ð¸Ñ Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼Ð¸ перÑонажами:
</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index fa72df04fdc1e15d4326b55cba5b49fa1c4bd771..9c95e7101515dd70553fea7a0590863d92f164db
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Ошибка при Ñоздании пути.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñервера
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Вид" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index db100fa4155ffa84c2ec94603a4f7e6f50927d16..debefd5f4a5ea9270a099c26a233bc157490dd3a
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
Выберите Ñтепень иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð² ÑвÑзей...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Фильтр:
+ </text>
+ <text name="linksets_name_label">
+ ИмÑ
+ </text>
+ <text name="linksets_desc_label">
+ ОпиÑание
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Фильтр по Ñтепени иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð² ÑвÑзей..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Проходимое меÑто" name="filter_by_linkset_use_walkable"/>
@@ -101,7 +110,7 @@
<combo_box.item label="Перемещаемый фантом" name="filter_by_linkset_use_dynamic_phantom"/>
</combo_box>
<button label="Применить" name="apply_filters"/>
- <button label="ЧиÑто" name="clear_filters"/>
+ <button label="ОчиÑтить" name="clear_filters"/>
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Ð˜Ð¼Ñ (корневой примитив)" name="name"/>
<scroll_list.columns label="ОпиÑание (корневой примитив)" name="description"/>
@@ -122,7 +131,10 @@
<button label="Выбрать вÑе" name="select_all_objects"/>
<button label="Отменить выбор" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ ДейÑÑ‚Ð²Ð¸Ñ Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼Ð¸ наборами ÑвÑзей (еÑли атрибут удалÑетÑÑ Ð¸Ð· мира, его атрибуты могут быть утрачены):
+ </text>
<check_box label="Показать метку" name="show_beacon"/>
<button label="ВзÑÑ‚ÑŒ" name="take_objects"/>
<button label="Сделать копию" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="Возврат" name="return_objects"/>
<button label="Удалить" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Измените атрибуты выбранных наборов ÑвÑзей и нажмите кнопку, чтобы применить изменениÑ
+ </text>
<text name="walkability_coefficients_label">
ПроходимоÑÑ‚ÑŒ:
</text>
@@ -145,7 +160,7 @@
<text name="edit_c_label">
C
</text>
- <line_editor name="edit_c_value" tool_tip="ПроходимоÑÑ‚ÑŒ Ð´Ð»Ñ Ð¿ÐµÑ€Ñонажей типа C. Пример перÑонажа – механизм."/>
+ <line_editor name="edit_c_value" tool_tip="ПроходимоÑÑ‚ÑŒ Ð´Ð»Ñ Ð¿ÐµÑ€Ñонажей типа C. Пример перÑонажа – механизм."/>
<text name="edit_d_label">
D
</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_pay.xml b/indra/newview/skins/default/xui/ru/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/indra/newview/skins/default/xui/ru/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_people.xml b/indra/newview/skins/default/xui/ru/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_perms_default.xml b/indra/newview/skins/default/xui/ru/floater_perms_default.xml
index 3a88788712069a49ce226eace5f75502a845cf5d..a33c6b40b60b46e74506936f25a9fd4a8b00794a 100644
--- a/indra/newview/skins/default/xui/ru/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ru/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="СТÐÐДÐРТÐЫЕ Ð ÐЗРЕШЕÐИЯ ÐРСОЗДÐÐИЕ">
- <panel label="Стандартные разрешениÑ" name="default permissions"/>
+ <panel label="Стандартные разрешениÑ" name="default permissions">
+ <text name="label_1">
+ Следующий владелец:
+ </text>
+ <text name="label_2">
+ Копировать
+ </text>
+ <text name="label_3">
+ ИзменÑÑ‚ÑŒ
+ </text>
+ <text name="label_4">
+ Передать
+ </text>
+ <text name="label_5">
+ ПоделитьÑÑ Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð¹
+ </text>
+ <text name="label_6">
+ Разрешить вÑем копировать
+ </text>
+ <text name="label_7" tool_tip="Задайте Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²">
+ Объекты
+ </text>
+ <text name="label_8" tool_tip="Задайте Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°ÐµÐ¼Ñ‹Ñ… вещей">
+ Переданное
+ </text>
+ <text name="label_9" tool_tip="Задайте Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñкриптов">
+ Скрипты
+ </text>
+ <text name="label_10" tool_tip="Задайте Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð·Ð°Ð¼ÐµÑ‚Ð¾Ðº">
+ Заметки
+ </text>
+ <text name="label_11" tool_tip="Задайте Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¶ÐµÑтов">
+ ЖеÑÑ‚Ñ‹
+ </text>
+ <text name="label_12" tool_tip="Задайте Ñтандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð´ÐµÐ¶Ð´Ñ‹ или чаÑтей тела">
+ ÐоÑимые вещи
+ </text>
+ </panel>
<button label="OK" label_selected="OK" name="ok"/>
<button label="Отмена" label_selected="Отмена" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_picks.xml b/indra/newview/skins/default/xui/ru/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_places.xml b/indra/newview/skins/default/xui/ru/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_post_process.xml b/indra/newview/skins/default/xui/ru/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..05a02df83e736c7a6f77d862dccc60dc9198b018
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="ДОПОЛÐИТЕЛЬÐЫЕ ÐÐСТРОЙКИ ГРÐФИКИ">
+ <text name="GeneralText">
+ Общие
+ </text>
+ <slider label="ДальноÑÑ‚ÑŒ отриÑовки:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ м
+ </text>
+ <slider label="МакÑ. количеÑтво чаÑтиц:" name="MaxParticleCount"/>
+ <slider label="КачеÑтво поÑтобработки:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Ðизкое
+ </text>
+ <text name="AvatarText">
+ Ðватар
+ </text>
+ <slider label="МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ ÑложноÑÑ‚ÑŒ:" name="IndirectMaxComplexity" tool_tip="Указывает раÑÑтоÑние, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ визуально Ñложный аватар риÑуетÑÑ ÐºÐ°Ðº мармеладный мишка"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="МакÑ. кол-во объемных:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="ДетализациÑ:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ ÐизкаÑ
+ </text>
+ <slider label="Физика:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ ÐизкаÑ
+ </text>
+ <text name="ShadersText">
+ Ðппаратура
+ </text>
+ <slider label="ПамÑÑ‚ÑŒ Ð´Ð»Ñ Ñ‚ÐµÐºÑтур (МБ):" name="GraphicsCardTextureMemory" tool_tip="Объем памÑти, отводимый Ð´Ð»Ñ Ñ‚ÐµÐºÑтур. По умолчанию – объем памÑти видеокарты. Уменьшение поможет увеличить производительноÑÑ‚ÑŒ, но текÑтуры могут Ñтать размытыми."/>
+ <slider label="ДиÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Ñ‚ÑƒÐ¼Ð°Ð½Ð°:" name="fog"/>
+ <slider label="Гамма:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (чем меньше, тем Ñрче, 0 – ÑркоÑÑ‚ÑŒ по умолчанию)
+ </text>
+ <check_box label="ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ (медленнее, еÑли включено)" name="ani"/>
+ <check_box initial_value="true" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение Ñтого параметра на Ñовременном оборудовании даÑÑ‚ увеличение производительноÑти. Однако на Ñтаром оборудовании Ñто может привеÑти к Ñбою приложениÑ."/>
+ <check_box initial_value="true" label="Разрешить Ñжатие текÑтур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текÑтур в видеопамÑти, что позволÑет загружать текÑтуры большего размера за Ñчет некоторого Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‡ÐµÑтва цвета."/>
+ <text name="antialiasing label">
+ Сглаживание:
+ </text>
+ <combo_box label="Сглаживание" name="fsaa">
+ <combo_box.item label="Выключено" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк)
+ </text>
+ <slider label="Ð”ÐµÑ‚Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¼ÐµÑˆÐ°:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ ÐизкаÑ
+ </text>
+ <slider label="ДеревьÑ:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ ÐизкаÑ
+ </text>
+ <slider label="Объекты:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ ÐизкаÑ
+ </text>
+ <slider label="Гибкие примитивы:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ ÐизкаÑ
+ </text>
+ <check_box initial_value="true" label="ПрозрачноÑÑ‚ÑŒ воды" name="TransparentWater"/>
+ <check_box initial_value="true" label="РельефноÑÑ‚ÑŒ и ÑиÑние" name="BumpShiny"/>
+ <check_box initial_value="true" label="Локальный Ñвет" name="LocalLights"/>
+ <check_box initial_value="true" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение Ñтого параметра может предотвратить завиÑание некоторых видеокарт"/>
+ <slider label="Ландшафт:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ ÐизкаÑ
+ </text>
+ <check_box initial_value="true" label="ÐÐ¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ñовка аватаров" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Одежда аватара" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Вода отражает:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="Минимум" name="0"/>
+ <combo_box.item label="Ландшафт и деревьÑ" name="1"/>
+ <combo_box.item label="Ð’Ñе Ñтатичные объекты" name="2"/>
+ <combo_box.item label="Ð’Ñе аватары и объекты" name="3"/>
+ <combo_box.item label="Ð’Ñе" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="ÐтмоÑферные шейдеры" name="WindLightUseAtmosShaders"/>
+ <slider label="Ðебо:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ ÐизкаÑ
+ </text>
+ <check_box initial_value="true" label="РаÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ оÑвещениÑ" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Объемный Ñвет" name="UseSSAO"/>
+ <check_box initial_value="true" label="Глубина полÑ" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ Тени:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Ðет" name="0"/>
+ <combo_box.item label="Солнце/луна" name="1"/>
+ <combo_box.item label="Солнце/луна + оÑветители" name="2"/>
+ </combo_box>
+ <button label="Вернуть рекомендуемые наÑтройки" name="Defaults"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Отмена" label_selected="Отмена" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_region_info.xml b/indra/newview/skins/default/xui/ru/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ru/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea981f44751c79680c207dd087a1004b776f6be0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="СОХРÐÐИТЬ ПРЕСЕТ">
+ <string name="title_graphic">
+ Сохранить преÑет графики
+ </string>
+ <string name="title_camera">
+ Сохранить преÑет камеры
+ </string>
+ <text name="Preset">
+ Введите Ð¸Ð¼Ñ Ð¿Ñ€ÐµÑета или выберите ÑущеÑтвующий преÑет.
+ </text>
+ <button label="Сохранить" name="save"/>
+ <button label="Отмена" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug.xml b/indra/newview/skins/default/xui/ru/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_script_limits.xml b/indra/newview/skins/default/xui/ru/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_script_preview.xml b/indra/newview/skins/default/xui/ru/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_script_queue.xml b/indra/newview/skins/default/xui/ru/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_script_search.xml b/indra/newview/skins/default/xui/ru/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_search.xml b/indra/newview/skins/default/xui/ru/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_select_key.xml b/indra/newview/skins/default/xui/ru/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_sell_land.xml b/indra/newview/skins/default/xui/ru/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index a01866db73a934a980aaadd27e1e70f469a6aee4..d6e414fb2b3dc3e6d7667dcfee040f1cd9fc0362
--- a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Импорт ÑловарÑ">
+ <text name="import_dict">
+ Словарь:
+ </text>
<button label="Обзор" label_selected="Обзор" name="dictionary_path_browse"/>
+ <text name="import_name">
+ ИмÑ:
+ </text>
+ <text name="import_lang">
+ Язык:
+ </text>
<button label="Импорт" name="ok_btn"/>
<button label="Отмена" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_sys_well.xml b/indra/newview/skins/default/xui/ru/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_telehub.xml b/indra/newview/skins/default/xui/ru/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_top_objects.xml b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml
old mode 100755
new mode 100644
index bd72f6b30872e82c1ae2bf41b3a7f6dc76023769..adadcc88f31ffa822ab054c8f93fb221d698676e
--- a/indra/newview/skins/default/xui/ru/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Внимательно прочитайте ПользовательÑкое Ñоглашение и Политику конфиденциальноÑти. Ð”Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° в [SECOND_LIFE] вы должны ÑоглаÑитьÑÑ Ñ ÑƒÑловиÑми ÑоглашениÑ.
</text>
+ <text name="external_tos_required">
+ Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¹Ð´Ð¸Ñ‚Ðµ на Ñайт my.secondlife.com, войдите и примите УÑÐ»Ð¾Ð²Ð¸Ñ Ð¾Ð±ÑлуживаниÑ. СпаÑибо!
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_toybox.xml b/indra/newview/skins/default/xui/ru/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_url_entry.xml b/indra/newview/skins/default/xui/ru/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_web_content.xml b/indra/newview/skins/default/xui/ru/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/floater_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/inspect_avatar.xml b/indra/newview/skins/default/xui/ru/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/inspect_group.xml b/indra/newview/skins/default/xui/ru/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/inspect_object.xml b/indra/newview/skins/default/xui/ru/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
old mode 100755
new mode 100644
index 76acb32a6415b947b6abeb36ecd11bbb88def584..bd1ed8d1fa2d4f96faf6ff9b9b2334a4cd62cb6b
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Приблизить" name="Zoom In"/>
<menu_item_call label="Заплатить" name="Pay..."/>
<menu_item_call label="Профиль объекта" name="Object Inspect"/>
+ <menu_item_check label="ÐžÐ±Ñ‹Ñ‡Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка" name="RenderNormally"/>
+ <menu_item_check label="Ðе риÑовать" name="DoNotRender"/>
+ <menu_item_check label="ÐŸÐ¾Ð»Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка" name="AlwaysRenderFully"/>
<menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
old mode 100755
new mode 100644
index dfe3c2e7011bde1477c7d64f9c02f569f731be12..74f1a396581b5f21de8c1c7e6b96b47973c387d7
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="Вывод XML" name="Dump XML"/>
<menu_item_call label="Приблизить" name="Zoom In"/>
<menu_item_call label="Заплатить" name="Pay..."/>
+ <menu_item_check label="ÐžÐ±Ñ‹Ñ‡Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка" name="RenderNormally"/>
+ <menu_item_check label="Ðе риÑовать" name="DoNotRender"/>
+ <menu_item_check label="ÐŸÐ¾Ð»Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка" name="AlwaysRenderFully"/>
<menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_edit.xml b/indra/newview/skins/default/xui/ru/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_favorites.xml b/indra/newview/skins/default/xui/ru/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_group_plus.xml b/indra/newview/skins/default/xui/ru/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_landmark.xml b/indra/newview/skins/default/xui/ru/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
old mode 100755
new mode 100644
index 885f6195b6ec4cce3b9c62af6070a2f167c7e80b..2deab04d81df64602abd4761a8ef396a2132e01d
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Проверить наличие обновлений" name="Check for Updates"/>
</menu>
<menu_item_check label="Показать меню отладки" name="Show Debug Menu"/>
<menu label="Отладка" name="Debug">
diff --git a/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
index b299c8202f9db741b6dee730dc8131012382510e..01c20a81c11b7c65f732da66789e539693b8444a 100644
--- a/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+ <menu_item_check label="Сортировать по времени" name="sort_by_recent"/>
<menu_item_check label="Сортировать по объему запаÑов (от малых к большим)" name="sort_by_stock_amount"/>
<menu_item_check label="Показывать только папки ÑпиÑков" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_navbar.xml b/indra/newview/skins/default/xui/ru/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_list.xml b/indra/newview/skins/default/xui/ru/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_picks.xml b/indra/newview/skins/default/xui/ru/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_place.xml b/indra/newview/skins/default/xui/ru/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_slurl.xml b/indra/newview/skins/default/xui/ru/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_text_editor.xml b/indra/newview/skins/default/xui/ru/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_toolbars.xml b/indra/newview/skins/default/xui/ru/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_email.xml b/indra/newview/skins/default/xui/ru/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f32743c7a36f3e1374fddc4902396a703f596c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="ÐапиÑать пиÑьмо во внешней программе" name="email_open_external"/>
+ <menu_item_call label="Копировать пиÑьмо в буфер обмена" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_group.xml b/indra/newview/skins/default/xui/ru/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_http.xml b/indra/newview/skins/default/xui/ru/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_map.xml b/indra/newview/skins/default/xui/ru/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
old mode 100755
new mode 100644
index d22ca845f994737de2b178e622dbb212169b0da2..2044844c588b56aa8f1d56d7aee76919ce835f50
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -177,6 +177,7 @@
<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
<menu_item_call label="СтолкновениÑ, толчки и удары" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="Проверить наличие обновлений" name="Check for Updates"/>
</menu>
<menu label="Дополнительно" name="Advanced">
<menu_item_call label="Обновить текÑтуры" name="Rebake Texture"/>
@@ -190,7 +191,7 @@
<menu_item_call label="Запаздывание" name="Lag Meter"/>
<menu_item_check label="СтатиÑтика" name="Statistics Bar"/>
<menu_item_call label="СтатиÑтика загрузки Ñцен" name="Scene Load Statistics"/>
- <menu_item_check label="Показать Ð²ÐµÑ Ð¾Ñ‚Ñ€Ð¸Ñовки Ð´Ð»Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€Ð¾Ð²" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Показывать информацию о ÑложноÑти аватара" name="Avatar Draw Info"/>
</menu>
<menu label="ПодÑветка и видимоÑÑ‚ÑŒ" name="Highlighting and Visibility">
<menu_item_check label="Мигающий маÑк" name="Cheesy Beacon"/>
@@ -313,8 +314,6 @@
<menu_item_check label="СуÑтавы" name="Joints"/>
<menu_item_check label="Лучи" name="Raycast"/>
<menu_item_check label="ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚Ñ€Ð°" name="Wind Vectors"/>
- <menu_item_check label="СложноÑÑ‚ÑŒ визуализации" name="rendercomplexity"/>
- <menu_item_check label="Байты приÑоединениÑ" name="attachment bytes"/>
<menu_item_check label="Лепка" name="Sculpt"/>
<menu label="ПлотноÑÑ‚ÑŒ текÑтуры" name="Texture Density">
<menu_item_check label="Ðет" name="None"/>
@@ -420,13 +419,11 @@
<menu_item_check label="Отладка видимоÑти перÑонажа" name="Debug Character Vis"/>
<menu_item_check label="Показать Ñкелет" name="Show Collision Skeleton"/>
<menu_item_check label="Отобразить дейÑтвие агента" name="Display Agent Target"/>
- -->
<menu_item_call label="Вывод приÑоединений" name="Dump Attachments"/>
<menu_item_call label="Отладка текÑтур аватара" name="Debug Avatar Textures"/>
<menu_item_call label="Вывод локальных текÑтур" name="Dump Local Textures"/>
</menu>
<menu_item_check label="ТекÑтуры HTTP" name="HTTP Textures"/>
- <menu_item_check label="Инвентарь HTTP" name="HTTP Inventory"/>
<menu_item_call label="Сжатие изображений" name="Compress Images"/>
<menu_item_call label="Включить Visual Leak Detector" name="Enable Visual Leak Detector"/>
<menu_item_check label="Вывод минидампа при отладке" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/mime_types_linux.xml b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/mime_types_mac.xml b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
old mode 100755
new mode 100644
index 7b024926e29050d78a13c237be43f69ec080bd1f..fabc0645251eeff2b3608312ec99bb7a18b6545b
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -164,6 +164,10 @@
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑпиÑка была иÑправлена Ð¸ÐµÑ€Ð°Ñ€Ñ…Ð¸Ñ ÐµÐ³Ð¾ Ñодержимого.
+ <usetemplate ignoretext="Предупреждать об иÑправлении иерархии Ñодержимого при Ñоздании ÑпиÑка" name="okignore" yestext="OK"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Ðто дейÑтвие вызовет изменение активного Ñодержимого данного ÑпиÑка. Продолжить?
<usetemplate ignoretext="Подтверждать Ñмену активного ÑпиÑка в торговом центре" name="okcancelignore" notext="Отмена" yestext="OK"/>
@@ -211,11 +215,9 @@
ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑпиÑка прекращена, так как папка запаÑов пуÑта. Добавьте предметы в папку запаÑов, чтобы опубликовать ÑпиÑок Ñнова.
<usetemplate ignoretext="Оповещать о неудавшейÑÑ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸ ÑпиÑка из-за того, что папка запаÑов пуÑта" name="okignore" yestext="OK"/>
</notification>
- <notification name="CompileQueueSaveText">
- Ошибка при передаче текÑта Ñкрипта по Ñледующей причине: [REASON]. Повторите попытку позже.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Ошибка при передаче Ñкомпилированного Ñкрипта по Ñледующей причине: [REASON]. Повторите попытку позже.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑпиÑка прекращена, так как папка верÑии пуÑта. Добавьте предметы в папку верÑии, чтобы опубликовать ÑпиÑок Ñнова.
+ <usetemplate ignoretext="Оповещать о неудавшейÑÑ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸ ÑпиÑка из-за того, что папка верÑии пуÑта" name="okignore" yestext="OK"/>
</notification>
<notification name="WriteAnimationFail">
Ошибка при запиÑи данных анимации. Повторите попытку позже.
@@ -320,6 +322,14 @@
Ð’Ñ‹ ÑобираетеÑÑŒ иÑключить [COUNT] учаÑтников из группы.
<usetemplate ignoretext="Подтвердите иÑключение учаÑтников из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ Ð’Ñ‹ ÑобираетеÑÑŒ запретить игроку [AVATAR_NAME] доÑтуп в группу.
+ <usetemplate ignoretext="Подтвердите запрет доÑтупа учаÑтника в группу" name="okcancelignore" notext="Отмена" yestext="Бан"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ Ð’Ñ‹ ÑобираетеÑÑŒ запретить [COUNT] учаÑтникам доÑтуп в группу.
+ <usetemplate ignoretext="Подтвердите запрет доÑтупа учаÑтникам в группу" name="okcancelignore" notext="Отмена" yestext="Бан"/>
+ </notification>
<notification name="AttachmentDrop">
Ð’Ñ‹ ÑобираетеÑÑŒ ÑброÑить Ñвое приÑоединение.
Продолжить?
@@ -404,7 +414,7 @@
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
<notification name="ReturnAllTopObjects">
- Ð’Ñ‹ дейÑтвительно хотите вернуть вÑе объекты из ÑпиÑка в инвентарь их владельцев?
+ Ð’Ñ‹ дейÑтвительно хотите вернуть вÑе объекты из ÑпиÑка в инвентарь их владельцев? Будут возвращены ВСЕ Ñкриптовые объекты в регионе!
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -587,16 +597,10 @@
(**Предупреждение** Ðту операцию Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ.)
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
- <notification name="SaveScriptFailReason">
- Ошибка при Ñохранении Ñкрипта по Ñледующей причине: [REASON]. Попробуйте Ñохранить Ñкрипт через некоторое времÑ.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
Ðе удалоÑÑŒ Ñохранить Ñкрипт: не найден объект, в котором он находитÑÑ.
Возможно, объект находитÑÑ Ð²Ð½Ðµ допуÑтимого диапазона или удален.
</notification>
- <notification name="SaveBytecodeFailReason">
- Ошибка при Ñохранении Ñкомпилированного Ñкрипта по Ñледующей причине: [REASON]. Попробуйте Ñохранить Ñкрипт через некоторое времÑ.
- </notification>
<notification name="StartRegionEmpty">
Ваш Ñтартовый регион не определен.
Введите название региона в поле «МеÑто Ñтарта» или выберите в качеÑтве меÑта Ñтарта «Мое поÑледнее меÑто» или «Мой дом».
@@ -609,6 +613,10 @@
<notification name="CannotDownloadFile">
Ðевозможно загрузить файл
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ Ð’Ñ‹ запроÑили загрузку файла, который не поддерживаетÑÑ Ð² [SECOND_LIFE].
+ <usetemplate ignoretext="Предупреждать о загрузке неподдерживаемых файлов" name="okignore" yestext="OK"/>
+ </notification>
<notification name="CannotWriteFile">
Ðевозможно запиÑать файл [[FILE]]
</notification>
@@ -1108,8 +1116,9 @@
Обычно Ñто Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ°. ИÑправьте наÑтройки и Ñохраните одежду Ñнова через неÑколько минут.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Черт! Ð’Ð°Ñ Ð²Ñ‹ÐºÐ¸Ð½ÑƒÐ»Ð¾ из [SECOND_LIFE]
- [MESSAGE]
+ Черт! Ð’Ð°Ñ Ð²Ñ‹ÐºÐ¸Ð½ÑƒÐ»Ð¾ из [SECOND_LIFE].
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Выйти" yestext="ПроÑмотреть IM и чат"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1357,6 +1366,13 @@
<ignore name="ignore" text="Загрузка одежды занимает значительное времÑ"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Ð²Ð¸Ð·ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ ÑложноÑÑ‚ÑŒ]: [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Ð²Ð¸Ð·ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ ÑложноÑÑ‚ÑŒ]: [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
УÑтановка [APP_NAME] завершена.
@@ -1636,6 +1652,25 @@ http://secondlife.com/download.
Ñм. [[INFO_URL] Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ñтом обновлении]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ ПоÑвилоÑÑŒ обновление!
+Оно ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ Ð² фоновом режиме и, как только будет готово, вам будет предложено перезапуÑтить клиент Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ ÑƒÑтановки.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ Обновление загружено. Оно будет уÑтановлено поÑле перезапуÑка.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ При поиÑке обновлений произошла ошибка.
+Повторите попытку позже.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ Ваш клиент уже обновлен!
+ЕÑли вы хотите немедленно иÑпробовать наши новейшие функции и иÑправлениÑ, обратитеÑÑŒ на Ñтраницу «Ðльтернативные клиенты»: http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeedObjectToGroup">
Ð’ результате передачи Ñтого объекта группа:
* Получит L$ в уплату за объект
@@ -1740,6 +1775,14 @@ http://secondlife.com/download.
ДоÑтигнуто макÑимальное количеÑтво групп. Выйдите из другой группы, прежде чем вÑтупать в Ñту или Ñоздавать новую группу.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupLimitInfo">
+ МакÑимальное чиÑло групп Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð³Ð¾ аккаунта ÑоÑтавлÑет [MAX_BASIC],
+а Ð´Ð»Ñ [https://secondlife.com/premium/ премиум]-аккаунта – [MAX_PREMIUM].
+Чтобы вÑтупать в новые группы поÑле возврата к базовому аккаунту, вам придетÑÑ Ð²Ñ‹Ð¹Ñ‚Ð¸ из чаÑти групп, чтобы их общее чиÑло было меньше [MAX_BASIC].
+
+[https://secondlife.com/my/account/membership.php Перейдите на премиум-членÑтво!]
+ <usetemplate name="okbutton" yestext="Закрыть"/>
+ </notification>
<notification name="KickUser">
ВыброÑить Ñтого Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ Ñообщением?
<form name="form">
@@ -1939,7 +1982,7 @@ http://secondlife.com/download.
<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
</notification>
<notification label="Выбрать землевладение" name="EstateTrustedExperienceRemove">
- Удалить из ключевой ÑпиÑок только Ð´Ð»Ñ Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð´Ð»Ñ [ALL_ESTATES]?
+ Удалить из ключевого ÑпиÑка только Ñтого Ð·ÐµÐ¼Ð»ÐµÐ²Ð»Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ [ALL_ESTATES]?
<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Ð”Ð»Ñ Ð²Ñех землевладений" yestext="Ð”Ð»Ñ Ñтого землевладениÑ"/>
</notification>
<notification label="Подтвердить выбраÑывание" name="EstateKickUser">
@@ -2248,6 +2291,10 @@ http://secondlife.com/download.
Подтвердите оплату L$[AMOUNT] Ð´Ð»Ñ [TARGET].
<usetemplate ignoretext="Подтверждать перед оплатой (Ð´Ð»Ñ Ñумм более L$200)" name="okcancelignore" notext="Отмена" yestext="Оплатить"/>
</notification>
+ <notification name="PayObjectFailed">
+ Ðе удалоÑÑŒ выполнить оплату: объект не найден.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Ð’ Ñтом объекте нет вещей, которые вам разрешено копировать.
</notification>
@@ -2279,10 +2326,9 @@ http://secondlife.com/download.
[QUESTION]
<usetemplate ignoretext="Подтверждать перед удалением предметов" name="okcancelignore" notext="Отмена" yestext="OK"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- Ðтот инÑтрумент Ñлужит Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ нарушениÑÑ… [http://secondlife.com/corporate/tos.php ПользовательÑкого ÑоглашениÑ] и [http://secondlife.com/corporate/cs.php Ñтандартов ÑообщеÑтва].
-
-Ð’Ñе нарушениÑ, о которых поÑтупили такие уведомлениÑ, раÑÑледуютÑÑ Ð¸ уÑтранÑÑŽÑ‚ÑÑ.
+ <notification name="ConfirmUnlink">
+ Ðто большое выделение Ñ Ð½Ð°Ð±Ð¾Ñ€Ð°Ð¼Ð¸ ÑвÑзей. ЕÑли разъединить его, повторное Ñоединение может отказатьÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼. Ð’ качеÑтве меры предоÑторожноÑти попробуйте Ñкопировать наборы ÑвÑзей в инвентарь.
+ <usetemplate ignoretext="Подтверждать при разъединении набора ÑвÑзей" name="okcancelignore" notext="Отмена" yestext="Разъединить"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Выберите категорию Ð´Ð»Ñ Ñтого ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ нарушении.
@@ -2980,7 +3026,7 @@ http://secondlife.com/download.
Ðередактируемое поле «[field]» игнорируетÑÑ Ð¿Ñ€Ð¸ обновлении Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ.
</notification>
<notification name="RestrictedToOwnerExperienceProfileMessage">
- ИгнорируютÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² поле «[field]», которые может вноÑить только владелец приключениÑ.
+ Ð’ поле «[field]» игнорируютÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, которые может вноÑить только владелец приключениÑ.
</notification>
<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
Ð’Ñ‹ не можете уÑтанавливать Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¹Ñ‚Ð¸Ð½Ð³ зрелоÑти выше, чем у владельца.
@@ -2989,7 +3035,7 @@ http://secondlife.com/download.
Следующие уÑÐ»Ð¾Ð²Ð¸Ñ Ð½Ðµ допуÑкают обновление Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¸ (или) опиÑÐ°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ: [extra_info]
</notification>
<notification name="TeleportedHomeExperienceRemoved">
- Ð’Ñ‹ были телепортированы из региона [region_name] за удаление Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ secondlife:///app/experience/[public_id]/profile. Вам больше не разрешено пребывание в Ñтом регионе.
+ Ð’Ñ‹ были телепортированы из региона [region_name] за удаление Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ secondlife:///app/experience/[public_id]/profile. Вам больше Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€ÐµÐ±Ñ‹Ð²Ð°Ñ‚ÑŒ в Ñтом регионе.
<form name="form">
<ignore name="ignore" text="Выброшен из региона за удаление приключениÑ"/>
</form>
@@ -3005,7 +3051,7 @@ http://secondlife.com/download.
[EXPERIENCE_LIST]
-Могут быть доÑтупны Ñледующие ключевые приключениÑ.
+Могут быть доÑтупны другие ключевые приключениÑ.
</notification>
<notification name="ExperienceEvent">
Разрешен объект Ð´Ð»Ñ ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ [EventType] приключением secondlife:///app/experience/[public_id]/profile.
@@ -3018,9 +3064,9 @@ http://secondlife.com/download.
Владелец: secondlife:///app/agent/[OwnerID]/inspect
</notification>
<notification name="ScriptQuestionExperience">
- Объект «<nolink>[OBJECTNAME]</nolink>», владелец которого – «[NAME]», требует вашего учаÑÑ‚Ð¸Ñ Ð² приключении [GRID_WIDE]:
+ Объекту «<nolink>[OBJECTNAME]</nolink>», владелец которого – «[NAME]», требуетÑÑ Ð²Ð°ÑˆÐµ учаÑтие в приключении [GRID_WIDE]:
-[EXPERIENCE]
+[ПРИКЛЮЧЕÐИЕ]
ПоÑле Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ñто Ñообщение больше не будет отображатьÑÑ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ приключениÑ, пока оно не будет отозвано из Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ.
@@ -3211,6 +3257,12 @@ http://secondlife.com/download.
<notification name="AttachmentSaved">
ПриÑоединение Ñохранено.
</notification>
+ <notification name="PresetNotSaved">
+ Ошибка при Ñохранении преÑета [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Ошибка при удалении преÑета [NAME].
+ </notification>
<notification name="UnableToFindHelpTopic">
Ðевозможно найти раздел Ñправки Ð´Ð»Ñ Ñтого Ñлемента.
</notification>
@@ -3243,9 +3295,8 @@ http://secondlife.com/download.
Выберите жителей, чтобы поделитьÑÑ Ñ Ð½Ð¸Ð¼Ð¸.
</notification>
<notification name="MeshUploadError">
- Ðе удалоÑÑŒ передать [LABEL]: [MESSAGE] [IDENTIFIER]
-
-ПодробноÑти Ñм. в файле журнала.
+ Ðе удалоÑÑŒ передать [LABEL]: [MESSAGE] [IDENTIFIER]
+[DETAILS]ПодробноÑти Ñм. в файле SecondLife.log
</notification>
<notification name="MeshUploadPermError">
Ошибка при запроÑе разрешений на передачу меша.
diff --git a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_chat_header.xml b/indra/newview/skins/default/xui/ru/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_classified_info.xml b/indra/newview/skins/default/xui/ru/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
index fdf3ec818851b7c4ef00d62968f66c6274f9889a..e57687069c8107489db5eb01a69d6e47b7b54889 100644
--- a/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
@@ -19,7 +19,7 @@
СпиÑок приключений
</text>
<scroll_list name="experience_list">
- <columns label="Ðазвание" name="experience_name"/>
+ <columns label="ИмÑ" name="experience_name"/>
</scroll_list>
<button label="Добавить..." name="btn_add"/>
<button label="Удалить" name="btn_remove"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_search.xml b/indra/newview/skins/default/xui/ru/panel_experience_search.xml
index 38d047f509f7f2bfcdbd0136c259ca2bb7ffce93..47c5dc37b6d119a045cee13819dcc60e69338fda 100644
--- a/indra/newview/skins/default/xui/ru/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/ru/panel_experience_search.xml
@@ -22,14 +22,14 @@
"Parcel_R_Light"
</string>
<panel name="search_panel">
- <button label="Перейти" name="find"/>
+ <button label="Ðачать" name="find"/>
<icons_combo_box label="Умеренный" name="maturity">
<icons_combo_box.item label="Ð”Ð»Ñ Ð²Ð·Ñ€Ð¾Ñлых" name="Adult" value="42"/>
<icons_combo_box.item label="Умеренный" name="Mature" value="21"/>
<icons_combo_box.item label="Общий" name="PG" value="13"/>
</icons_combo_box>
<scroll_list name="search_results">
- <columns label="Ðазвание" name="experience_name"/>
+ <columns label="ИмÑ" name="experience_name"/>
<columns label="Владелец" name="owner"/>
</scroll_list>
<button label="OK" label_selected="OK" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_notices.xml b/indra/newview/skins/default/xui/ru/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_notify.xml b/indra/newview/skins/default/xui/ru/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_group_roles.xml b/indra/newview/skins/default/xui/ru/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_instant_message.xml b/indra/newview/skins/default/xui/ru/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_landmarks.xml b/indra/newview/skins/default/xui/ru/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
old mode 100755
new mode 100644
index 80a67371af8c8e44277c925431b71adaaede8eca..93deba6d6bd4cd7757fae7be4dbf353f921da8f0
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] вещей [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ Извлечено [ITEM_COUNT] вещей [FILTER]
+ </panel.string>
<text name="ItemcountText">
Вещи:
</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_me.xml b/indra/newview/skins/default/xui/ru/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
old mode 100755
new mode 100644
index 9606f0aec134c5a8ba8296c0b8a48dc800863682..0fdc06fb327cab3f492356640a080da2034ea8c3
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -18,6 +18,7 @@
<string name="no_groups_msg" value="Ищете группу, чтобы приÑоединитьÑÑ Ðº ней? ВоÑпользуйтеÑÑŒ [secondlife:///app/search/groups поиÑком]."/>
<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетÑгивание – обзор)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортациÑ, shift+перетÑгивание – обзор)"/>
+ <string name="GroupCountWithInfo" value="Ð’Ñ‹ входите в [COUNT] групп и можете приÑоединитьÑÑ ÐµÑ‰Ðµ к [REMAINING]. [secondlife:/// Хотите еще?]"/>
<tab_container name="tabs">
<panel label="РЯДОМ" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ru/panel_pick_info.xml b/indra/newview/skins/default/xui/ru/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_picks.xml b/indra/newview/skins/default/xui/ru/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_place_profile.xml b/indra/newview/skins/default/xui/ru/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_places.xml b/indra/newview/skins/default/xui/ru/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 90743646fd5a48c42cb2e7b229d93ad5814a462a..88bcc224143dcc49e2166c94f72613dca09fa735
--- a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="Разрешить работу неÑкольких клиентов" name="allow_multiple_viewer_check"/>
<check_box label="Выбор Ñетки при входе" name="show_grid_selection_check"/>
<check_box label="Показывать раÑширенное меню" name="show_advanced_menu_check"/>
- <check_box label="Показывать меню разработчика" name="show_develop_menu_check"/>
+ <check_box label="Показать меню разработчика" name="show_develop_menu_check"/>
<button label="Стандартные Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð½Ð° Ñоздание" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
old mode 100755
new mode 100644
index 914426c91e38a8af378faeb35389b1b8335fcd5a..4d651c25448bf8fd754cfbf3cb2c65957193e2d2
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Предложение инвентарÑ" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ СохранÑÑ‚ÑŒ:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Журнал и запиÑи" name="log_and_transcripts" value="2"/>
+ <item label="Только журнал" name="log_only" value="1"/>
+ <item label="Ðи журнал, ни запиÑи" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="ОчиÑтить журнал..." name="clear_log"/>
<button label="Удалить запиÑи..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ МеÑто:
+ </text>
<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
</panel>
<button label="Перевод..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index c93955fcdce648ec9f775d7771832c9f8a2e82e6..31c9b2135d4aef5f44273869d599e5d77109b3be
--- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Графика" name="Display panel">
+ <text name="preset_text">
+ (нет)
+ </text>
<text name="QualitySpeed">
КачеÑтво и ÑкороÑÑ‚ÑŒ:
</text>
- <text name="FasterText">
- БыÑтрее
- </text>
- <text name="BetterText">
- КачеÑтвенней
- </text>
<text name="ShadersPrefText">
Ðизко
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
Ультра
</text>
- <panel label="Выбор графики" name="CustomGraphics Panel">
- <text name="ShadersText">
- Шейдеры:
- </text>
- <check_box initial_value="true" label="ПрозрачноÑÑ‚ÑŒ воды" name="TransparentWater"/>
- <check_box initial_value="true" label="РельефноÑÑ‚ÑŒ и ÑиÑние" name="BumpShiny"/>
- <check_box initial_value="true" label="Локальный Ñвет" name="LocalLights"/>
- <check_box initial_value="true" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение Ñтого параметра может предотвратить завиÑание некоторых видеокарт"/>
- <check_box initial_value="true" label="ÐтмоÑферные шейдеры" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="РаÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ оÑвещениÑ" name="UseLightShaders"/>
- <check_box initial_value="true" label="Объемный Ñвет" name="UseSSAO"/>
- <check_box initial_value="true" label="Глубина полÑ" name="UseDoF"/>
- <text name="shadows_label">
- Тени:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Ðет" name="0"/>
- <combo_box.item label="Солнце/луна" name="1"/>
- <combo_box.item label="Солнце/луна + оÑветители" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Вода отражает:
- </text>
- <combo_box name="Reflections">
- <combo_box.item label="Минимум" name="0"/>
- <combo_box.item label="Ландшафт и деревьÑ" name="1"/>
- <combo_box.item label="Ð’Ñе Ñтатичные объекты" name="2"/>
- <combo_box.item label="Ð’Ñе аватары и объекты" name="3"/>
- <combo_box.item label="Ð’Ñе" name="4"/>
- </combo_box>
- <slider label="Физика аватара:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Ðизко
- </text>
- <slider label="ДальноÑÑ‚ÑŒ отриÑовки:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- м
- </text>
- <slider label="МакÑ. количеÑтво чаÑтиц:" name="MaxParticleCount"/>
- <slider label="МакÑ. количеÑтво 3D-аватаров:" name="MaxNumberAvatarDrawn"/>
- <slider label="КачеÑтво поÑтобработки:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Ð”ÐµÑ‚Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¼ÐµÑˆÐ°:
- </text>
- <slider label="Объекты:" name="ObjectMeshDetail"/>
- <slider label="Гибкие примитивы:" name="FlexibleMeshDetail"/>
- <slider label="ДеревьÑ:" name="TreeMeshDetail"/>
- <slider label="Ðватары:" name="AvatarMeshDetail"/>
- <slider label="Ландшафт:" name="TerrainMeshDetail"/>
- <slider label="Ðебо:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Ðизко
- </text>
- <text name="ObjectMeshDetailText">
- Ðизко
- </text>
- <text name="FlexibleMeshDetailText">
- Ðизко
- </text>
- <text name="TreeMeshDetailText">
- Ðизко
- </text>
- <text name="AvatarMeshDetailText">
- Ðизко
- </text>
- <text name="TerrainMeshDetailText">
- Ðизко
- </text>
- <text name="SkyMeshDetailText">
- Ðизко
- </text>
- <text name="AvatarRenderingText">
- ОтриÑовка аватара:
- </text>
- <check_box initial_value="true" label="ПлоÑкие аватары" name="AvatarImpostors"/>
- <check_box initial_value="true" label="ÐÐ¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ñовка" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Одежда аватара" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- Ландшафт:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="Грубо" name="0"/>
- <radio_item label="Детально" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Применить" label_selected="Применить" name="Apply"/>
- <button label="СброÑ" name="Defaults"/>
- <button label="Дополнительно" name="Advanced"/>
- <button label="Ðппаратура" label_selected="Ðппаратура" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ БыÑтрее
+ </text>
+ <text name="BetterText">
+ КачеÑтвенней
+ </text>
+ <check_box initial_value="true" label="ÐтмоÑферные шейдеры" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="РаÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ оÑвещениÑ" name="UseLightShaders"/>
+ <button label="Сохранить наÑтройки как преÑет..." name="PrefSaveButton"/>
+ <button label="Загрузить преÑет..." name="PrefLoadButton"/>
+ <button label="Удалить преÑет..." name="PrefDeleteButton"/>
+ <button label="Вернуть рекомендуемые наÑтройки" name="Defaults"/>
+ <button label="РаÑширенные наÑтройки..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
old mode 100755
new mode 100644
index d00f58dbfffc8044eb311ead4527d128710e4b85..fd13abbe27029a2617ac2d8979048a39b26cdd66
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="ИÑпользовать мой браузер (Chrome, Firefox, IE) Ð´Ð»Ñ Ð²Ñех ÑÑылок" name="internal" tool_tip="Будет иÑпользоватьÑÑ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€, заданный в ÑиÑтеме по умолчанию. Ðе рекомендуетÑÑ, еÑли [APP_NAME] работает в полноÑкранном режиме." value="0"/>
<radio_item label="ИÑпользовать вÑтроенный браузер только Ð´Ð»Ñ ÑÑылок Second Life" name="external" tool_tip="Стандартный браузер ÑиÑтемы будет иÑпользоватьÑÑ Ð´Ð»Ñ Ñправки, ÑÑылок Интернета и Ñ‚.д. Ð’Ñтроенный браузер будет иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÑÑылок LindenLab/SecondLife." value="1"/>
+ <radio_item label="ИÑпользовать вÑтроенный браузер Ð´Ð»Ñ Ð²Ñех ÑÑылок" name="external_all" tool_tip="Ð”Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñправки, ÑÑылок на веб-Ñтраницы и Ñ‚. д. будет иÑпользоватьÑÑ Ð²Ñтроенный браузер. Ðтот браузер открываетÑÑ ÐºÐ°Ðº новое окно в [APP_NAME]." value="2"/>
</radio_group>
<check_box initial_value="true" label="Разрешить плагины" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Принимать файлы cookie" name="cookies_enabled"/>
<check_box initial_value="true" label="Разрешить Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Разрешить вÑплывающие окна" name="media_popup_enabled"/>
<text name="Software updates:">
ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐŸÐž:
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="УÑтанавливать автоматичеÑки" name="Install_automatically"/>
- <combo_box.item label="Загружать и уÑтанавливать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ" name="Install_manual"/>
+ <combo_box.item label="Я буду загружать и уÑтанавливать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ" name="Install_manual"/>
</combo_box>
<check_box label="УÑтанавливать бета-верÑии" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8cac14dcf6548f00e23555ab561c12351e576043
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ ПреÑеты графики
+ </text>
+ <button label="Открыть параметры графики" name="open_prefs_btn" tool_tip="Открыть наÑтройки графики"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 76bb6518e9d99960c07e2d4e6eb72999ddb56730..a08d99d0e6b572542ff3ddf3589fefc596d31689
--- a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
@@ -57,12 +57,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="СÑылка на медиа"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="Включен белый ÑпиÑок"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="БезопаÑный проÑмотр"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_region_environment.xml b/indra/newview/skins/default/xui/ru/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_region_experiences.xml b/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
index 4fd70b56506887653afdb2619739fdf77da54aee..f777fe33781c4ad9aae8797a67bc0a6f767e6cb3 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
@@ -5,7 +5,7 @@
У ключевых приключений еÑÑ‚ÑŒ разрешение на запуÑк в Ñтом землевладении.
-Кроме того, еÑли в землевладении не разрешен публичный доÑтуп, то жители, учаÑтвующие в любом ключевом приключении, могут входить в землевладение и оÑтаватьÑÑ Ð² нем до тех пор, пока они находÑÑ‚ÑÑ Ð² ключевом приключении.
+Кроме того, еÑли к землевладению не разрешен публичный доÑтуп, то жители, учаÑтвующие в любом ключевом приключении, могут входить в землевладение и оÑтаватьÑÑ Ð² нем до тех пор, пока они находÑÑ‚ÑÑ Ð² ключевом приключении.
</panel.string>
<panel.string name="allowed_estate_text">
Могут быть разрешены только приключениÑ, привÑзанные к земле.
diff --git a/indra/newview/skins/default/xui/ru/panel_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index adc612dfd82db96e584a1e206d833a618a942cde..f07e12e0ed6628038f5c5ee55b3ccd880c3bf6a8
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
Сохранение Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² инвентаре Ñтоит L$[UPLOAD_COST]. Чтобы Ñохранить его как текÑтуру, выберите один из квадратных форматов.
</text>
<combo_box label="Размер" name="texture_size_combo">
- <combo_box.item label="Текущее окно" name="CurrentWindow"/>
+ <combo_box.item label="Текущее окно (512x512)" name="CurrentWindow"/>
<combo_box.item label="Маленький (128x128)" name="Small(128x128)"/>
<combo_box.item label="Средний (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Большой (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
index 1abf7294871501fe3eaf95a51cdce12b11fe4c6b..def12d3cdbce9bef901cf73a9a3d4d14cf9962b3 100644
--- a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Материалы" name="Materials"/>
<combo_box.item label="Медиа" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="ТекÑтура (раÑÑеÑннаÑ)" name="Texture (diffuse)"/>
- <combo_box.item label="ШероховатоÑÑ‚ÑŒ (обычнаÑ)" name="Bumpiness (normal)"/>
- <combo_box.item label="БлеÑк (зеркальный)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="ТекÑтура (раÑÑеÑннаÑ)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="ШероховатоÑÑ‚ÑŒ (обычнаÑ)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="БлеÑк (зеркальный)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="ТекÑтура" name="texture control" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
<text name="label alphamode">
Ðльфа-режим
diff --git a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/panel_world_map.xml b/indra/newview/skins/default/xui/ru/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
old mode 100755
new mode 100644
index 18ae20223020b2303d9a62d88bb5217ed2920f65..04bb55c965b3cef71a0d57a02962f0711d92a9d3
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -38,12 +38,9 @@
Ошибка инициализации графики. Обновите графичеÑкий драйвер!
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">
- ИÑпользован компилÑтор [COMPILER], верÑÐ¸Ñ [COMPILER_VERSION]
- </string>
<string name="AboutPosition">
Ð’Ñ‹ в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», раÑположенном на <nolink>[HOSTNAME]</nolink> ([HOSTIP])
SLURL: <nolink>[SLURL]</nolink>
@@ -64,10 +61,9 @@ SLURL: <nolink>[SLURL]</nolink>
<string name="AboutLibs">
ВерÑÐ¸Ñ OpenGL: [OPENGL_VERSION]
-ВерÑÐ¸Ñ libcurl: [LIBCURL_VERSION]
ВерÑÐ¸Ñ Ð´ÐµÐºÐ¾Ð´ÐµÑ€Ð° J2C: [J2C_VERSION]
ВерÑÐ¸Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° звука: [AUDIO_DRIVER_VERSION]
-ВерÑÐ¸Ñ Qt Webkit: [QT_WEBKIT_VERSION]
+ВерÑÐ¸Ñ LLCEFLib/CEF: [LLCEFLIB_VERSION]
ВерÑÐ¸Ñ Ð³Ð¾Ð»Ð¾Ñового Ñервера: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -178,6 +174,12 @@ SLURL: <nolink>[SLURL]</nolink>
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ ОÑÐ½Ð¾Ð²Ð½Ð°Ñ Ñетка Second Life (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Сетка Second Life Ð´Ð»Ñ Ð±ÐµÑ‚Ð°-теÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -453,6 +455,9 @@ support@secondlife.com.
ÐÐµÐ»ÑŒÐ·Ñ Ð½Ð¾Ñить папку, Ñодержащую более [AMOUNT] вещей. Ðто ограничение можно изменить в меню «Дополнительно > ÐаÑтройки отладки > WearFolderLimit.
</string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+ <string name="TooltipSLIcon">
+ Ðта ÑÑылка ведет на Ñтраницу официального домена SecondLife.com или LindenLab.com.
+ </string>
<string name="TooltipOutboxDragToWorld">
ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ предметы из папки ÑпиÑков товаров торгового центра
</string>
@@ -472,7 +477,7 @@ support@secondlife.com.
КоличеÑтво предметов не может превышать [AMOUNT].
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Можно перетаÑкивать предметы или папки только на вкладку «ВСЕ». Выберите Ñту вкладку и перемеÑтите предметы или папки Ñнова.
+ Можно перетаÑкивать предметы или папки только на вкладку «ВСЕ» или «ÐЕСВЯЗÐÐÐЫЕ». Выберите одну из Ñтих вкладок и перемеÑтите предметы или папки Ñнова.
</string>
<string name="TooltipOutboxNoTransfer">
ЧаÑÑ‚ÑŒ Ñтих объектов Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð°Ñ‚ÑŒ или передать
@@ -556,6 +561,9 @@ support@secondlife.com.
Щелкните, чтобы выполнить команду secondlife://
</string>
<string name="CurrentURL" value="Текущий URL-адреÑ: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Щелкните, чтобы напиÑать пиÑьмо
+ </string>
<string name="SLurlLabelTeleport">
ТелепортироватьÑÑ Ð²
</string>
@@ -1078,7 +1086,7 @@ support@secondlife.com.
<string name="AgentNameSubst">
(Ð’Ñ‹)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Отключить Ð¸Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ управлении ÑпиÑками доÑтупа к землевладениÑм
</string>
@@ -1857,6 +1865,21 @@ support@secondlife.com.
<string name="TodayOld">
СегоднÑ
</string>
+ <string name="av_render_everyone_now">
+ Теперь вÑе могут видеть ваÑ.
+ </string>
+ <string name="av_render_not_everyone">
+ Ð’Ñе окружающие учаÑтники не могут отриÑовать ваÑ.
+ </string>
+ <string name="av_render_over_half">
+ Более половины окружающих учаÑтников не могут отриÑовать ваÑ.
+ </string>
+ <string name="av_render_most_of">
+ БольшинÑтво окружающих учаÑтников не может отриÑовать ваÑ.
+ </string>
+ <string name="av_render_anyone">
+ Ðикто из окружающих учаÑтников не может отриÑовать ваÑ.
+ </string>
<string name="AgeYearsA">
[COUNT] год
</string>
@@ -1974,6 +1997,9 @@ support@secondlife.com.
<string name="CompileQueueUnknownFailure">
ÐеизвеÑтный Ñбой загрузки
</string>
+ <string name="CompileNoExperiencePerm">
+ ПропуÑк Ñкрипта [SCRIPT] Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÐµÐ¼ [EXPERIENCE].
+ </string>
<string name="CompileQueueTitle">
Ход повторной компилÑции
</string>
@@ -2019,9 +2045,6 @@ support@secondlife.com.
<string name="GroupsNone">
нет
</string>
- <string name="CompileNoExperiencePerm">
- ПропуÑк Ñкрипта [SCRIPT] Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÐµÐ¼ [EXPERIENCE].
- </string>
<string name="Group" value="(группа)"/>
<string name="Unknown">
(ÐеизвеÑтно)
@@ -5392,18 +5415,6 @@ support@secondlife.com.
<string name="UserDictionary">
[Пользователь]
</string>
- <string name="logging_calls_disabled_log_empty">
- Разговоры не запиÑываютÑÑ. Чтобы начать запиÑÑŒ разговора, в меню «ÐаÑтройки > Чат» выберите «СохранÑÑ‚ÑŒ: только журнал» или «СохранÑÑ‚ÑŒ: журнал и запиÑи».
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- Разговоры больше не будут запиÑыватьÑÑ. Чтобы воÑÑтановить запиÑÑŒ разговора, в меню «ÐаÑтройки > Чат» выберите «СохранÑÑ‚ÑŒ: только журнал» или «СохранÑÑ‚ÑŒ: журнал и запиÑи».
- </string>
- <string name="logging_calls_enabled_log_empty">
- Ðет зарегиÑтрированных разговоров. ЕÑли вы обратитеÑÑŒ к кому-то или наоборот, в журнале поÑвитÑÑ Ð½Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ.
- </string>
- <string name="loading_chat_logs">
- Загрузка...
- </string>
<string name="experience_tools_experience">
Приключение
</string>
@@ -5459,7 +5470,7 @@ support@secondlife.com.
телепортировать ваÑ
</string>
<string name="ExperiencePermission12">
- автоматичеÑки принимать Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ
+ автоматичеÑки принимать Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ
</string>
<string name="ExperiencePermissionShortUnknown">
выполнил неизвеÑтную операцию: [Permission]
@@ -5485,4 +5496,37 @@ support@secondlife.com.
<string name="ExperiencePermissionShort12">
Разрешение
</string>
+ <string name="logging_calls_disabled_log_empty">
+ Разговоры не запиÑываютÑÑ. Чтобы начать запиÑÑŒ разговора, в меню «ÐаÑтройки > Чат» выберите «СохранÑÑ‚ÑŒ: только журнал» или «СохранÑÑ‚ÑŒ: журнал и запиÑи».
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Разговоры больше не будут запиÑыватьÑÑ. Чтобы воÑÑтановить запиÑÑŒ разговора, в меню «ÐаÑтройки > Чат» выберите «СохранÑÑ‚ÑŒ: только журнал» или «СохранÑÑ‚ÑŒ: журнал и запиÑи».
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Ðет зарегиÑтрированных разговоров. ЕÑли вы обратитеÑÑŒ к кому-то или наоборот, в журнале поÑвитÑÑ Ð½Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ.
+ </string>
+ <string name="loading_chat_logs">
+ Загрузка...
+ </string>
+ <string name="preset_combo_label">
+ -ПуÑтой ÑпиÑок-
+ </string>
+ <string name="Default">
+ По умолчанию
+ </string>
+ <string name="none_paren_cap">
+ (нет)
+ </string>
+ <string name="no_limit">
+ Без ограничений
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ ФизичеÑÐºÐ°Ñ Ñ„Ð¾Ñ€Ð¼Ð° Ñодержит Ñлишком маленькие треугольники. Попробуйте упроÑтить физичеÑкую модель.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ ФизичеÑÐºÐ°Ñ Ñ„Ð¾Ñ€Ð¼Ð° Ñодержит неправильные данные подтверждениÑ. Попробуйте иÑправить физичеÑкую модель.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ У физичеÑкой формы нет правильной верÑии. Задайте правильную верÑию Ð´Ð»Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкой модели.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_aaa.xml b/indra/newview/skins/default/xui/tr/floater_aaa.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
old mode 100755
new mode 100644
index 7034de64c9eb2c279569a420d15f8135785e4513..b91575954b3dc01b12c853b36b4a7aaae0e54233
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="Bilgi" name="support_panel">
<button label="Panoya Kopyala" name="copy_btn"/>
+ <button label="Güncellemeleri kontrol et" name="update_btn"/>
</panel>
<panel label="Katkıda Bulunanlar" name="credits_panel">
<text name="linden_intro">Second Life, Lindens tarafından geliştirilmiştir ve
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
old mode 100755
new mode 100644
index 090e135b3b589285e9353b28334eeb5513879dd2..e4d38361ca0762049de0e0d6e24093f16ad9f173
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -10,13 +10,13 @@
"Parcel_R_Dark"
</floater.string>
<floater.string name="Minutes">
- [MINUTES] dakika
+ [MINUTES] dak.
</floater.string>
<floater.string name="Minute">
- dakika
+ dak.
</floater.string>
<floater.string name="Seconds">
- [SECONDS] saniye
+ [SECONDS] sn.
</floater.string>
<floater.string name="Remaining">
kaldı
@@ -446,7 +446,7 @@ Sadece büyük parseller aramada görünür.
<spinner label="EriÅŸim saatleri:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Her Zaman Ä°zin Ver" name="AllowedText">
- Ä°zin Verilen Sakinler
+ Ä°zin Verilen Sakinler ([COUNT])
</text>
<name_list name="AccessList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
<button label="Ekle" name="add_allowed"/>
@@ -454,7 +454,7 @@ Sadece büyük parseller aramada görünür.
</panel>
<panel name="Banned_layout_panel">
<text label="Yasakla" name="BanCheck">
- Yasaklı Sakinler
+ Yasaklı Sakinler ([COUNT])
</text>
<name_list name="BannedList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
<button label="Ekle" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_activeim.xml b/indra/newview/skins/default/xui/tr/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_auction.xml b/indra/newview/skins/default/xui/tr/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
old mode 100755
new mode 100644
index e52e05dc614020a1f38c61949096154ec0348b8f..feb50054dfad7a93cd6cd167e6a5906d7060251a
--- a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="Ekle..." name="autoreplace_add_entry"/>
<button label="Kaldır" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ Anahtar kelime:
+ </text>
+ <text name="autoreplace_replacement_txt">
+ DeÄŸiÅŸtirme:
+ </text>
<button label="GiriÅŸi Kaydet" name="autoreplace_save_entry" tool_tip="Bu giriÅŸi kaydet."/>
<button label="Değişiklikleri Kaydet" name="autoreplace_save_changes" tool_tip="Tüm değişiklikleri kaydet."/>
<button label="İptal" name="autoreplace_cancel" tool_tip="Tüm değişiklikleri iptal et."/>
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar.xml b/indra/newview/skins/default/xui/tr/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_beacons.xml b/indra/newview/skins/default/xui/tr/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_build_options.xml b/indra/newview/skins/default/xui/tr/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_bumps.xml b/indra/newview/skins/default/xui/tr/floater_bumps.xml
old mode 100755
new mode 100644
index 06ae3a2ec3b16eba2972f5d28c5a1f56aa279b29..c4d08b89a4bceeda50e1e3bb790c725373933b8a
--- a/indra/newview/skins/default/xui/tr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/tr/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] fiziki bir nesneyle size vurdu
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_land.xml b/indra/newview/skins/default/xui/tr/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_object.xml b/indra/newview/skins/default/xui/tr/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_camera.xml b/indra/newview/skins/default/xui/tr/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_choose_group.xml b/indra/newview/skins/default/xui/tr/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_color_picker.xml b/indra/newview/skins/default/xui/tr/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_critical.xml b/indra/newview/skins/default/xui/tr/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..30bef80d06113e027aff855443d454e00c1e94d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="TERCİHLİ ÖN AYARI SİL">
+ <string name="title_graphic">
+ Grafik Ön Ayarını Sil
+ </string>
+ <string name="title_camera">
+ Kamera Ön Ayarını Sil
+ </string>
+ <text name="Preset">
+ Bir ön ayar seçin
+ </text>
+ <button label="Sil" name="delete"/>
+ <button label="Ä°ptal" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_destinations.xml b/indra/newview/skins/default/xui/tr/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_display_name.xml b/indra/newview/skins/default/xui/tr/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_event.xml b/indra/newview/skins/default/xui/tr/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml b/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
index 641d61b8f3aed17bc8ab4ea4a61585b5609e50a3..6858faf7bf2d5af6537b58b99c538c3c3253e82f 100644
--- a/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
@@ -33,7 +33,7 @@
</layout_panel>
<layout_panel>
<text name="Owner">
- Sahip:
+ Sahibi:
</text>
</layout_panel>
<layout_panel name="group_panel">
diff --git a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
old mode 100755
new mode 100644
index 5736bda45eb66ff50d5d3bc150f6193e23ace531..5d187671435e82cb25abeb8579851d96b04b930c
--- a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
KoÅŸ
</string>
+ <combo_box name="time_scale_combo">
+ <item label="Ortalamanın 2 katı" name="2x Average"/>
+ <item label="Maks." name="Max"/>
+ <item label="En Güncel Maks." name="Recent Max"/>
+ <item label="100ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Süre" name="Time"/>
+ <item label="Arama Sayısı" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Duraklat" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_font_test.xml b/indra/newview/skins/default/xui/tr/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_gesture.xml b/indra/newview/skins/default/xui/tr/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_god_tools.xml b/indra/newview/skins/default/xui/tr/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_help_browser.xml b/indra/newview/skins/default/xui/tr/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_how_to.xml b/indra/newview/skins/default/xui/tr/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_hud.xml b/indra/newview/skins/default/xui/tr/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_image_preview.xml b/indra/newview/skins/default/xui/tr/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_import_collada.xml b/indra/newview/skins/default/xui/tr/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_inspect.xml b/indra/newview/skins/default/xui/tr/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 35f30f47cc66e83f6492b3616313fc02f4f643f7..8ced76cef10ac41310daf463c090f0eb78d2419a
--- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="Åžundan daha eski:" name="older"/>
</radio_group>
<spinner label="Saat Önce" name="spin_hours_ago"/>
+ <text name="label_hours">
+ Saat
+ </text>
<spinner label="Gün Önce" name="spin_days_ago"/>
+ <text name="label_days">
+ Gün
+ </text>
<button label="Kapat" label_selected="Kapat" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_joystick.xml b/indra/newview/skins/default/xui/tr/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/tr/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..418a77a5cb83b3cb9cbb10edf68be49a1357088e
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="TERCİHLİ ÖN AYARI YÜKLE">
+ <string name="title_graphic">
+ Grafik Ön Ayarını Yükle
+ </string>
+ <string name="title_camera">
+ Kamera Ön Ayarını Yükle
+ </string>
+ <text name="Preset">
+ Bir ön ayar seçin
+ </text>
+ <button label="Tamam" name="ok"/>
+ <button label="Ä°ptal" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_map.xml b/indra/newview/skins/default/xui/tr/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_media_browser.xml b/indra/newview/skins/default/xui/tr/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_media_settings.xml b/indra/newview/skins/default/xui/tr/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index 325d1d9ed97a28b841dfb48f8cd5dc5c82dc34b1..e5643f3bf645add1dac156fc8deb29a300f962a1
--- a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
Başlatılıyor...
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Yükleniyor...
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ Klasör oluşturmak için öğeleri buraya sürükleyin
+ </text>
+ </panel>
<button label="Pazaryerine Gönder" name="outbox_import_btn" tool_tip="Pazaryeri Vitrinime Gönder"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
old mode 100755
new mode 100644
index c00cadd3bd30a775544add54f372172095b386a4..29a56bae7e95271443c3b9b1b99d2ef43e332bca
--- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
Ayrıntı seviyesi malzemeleri, referans modelin bir alt kümesi değil.
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ Bazı fiziksel gövdeler vertex limitlerini aşıyor.
+ </string>
<string name="layer_all">
Tümü
</string>
@@ -93,52 +96,52 @@
<text initial_value="Köşeler" name="vertices" value="Köşeler"/>
<text initial_value="Yüksek" name="high_label" value="Yüksek"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="Dosyadan yükle"/>
- <item name="Generate" value="OluÅŸtur"/>
+ <item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+ <item label="OluÅŸtur" name="Generate" value="OluÅŸtur"/>
</combo_box>
<button label="Gözat..." name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="Üçgen Limiti"/>
- <item name="Error Threshold" value="Hata EÅŸiÄŸi"/>
+ <item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+ <item label="Hata EÅŸiÄŸi" name="Error Threshold" value="Hata EÅŸiÄŸi"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="Orta" name="medium_label" value="Orta"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="Dosyadan yükle"/>
- <item name="Generate" value="OluÅŸtur"/>
- <item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+ <item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+ <item label="OluÅŸtur" name="Generate" value="OluÅŸtur"/>
+ <item label="Yukarıdaki ayrıntı seviyesini kullan" name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
</combo_box>
<button label="Gözat..." name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="Üçgen Limiti"/>
- <item name="Error Threshold" value="Hata EÅŸiÄŸi"/>
+ <item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+ <item label="Hata EÅŸiÄŸi" name="Error Threshold" value="Hata EÅŸiÄŸi"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="Düşük" name="low_label" value="Düşük"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="Dosyadan yükle"/>
- <item name="Generate" value="OluÅŸtur"/>
- <item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+ <item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+ <item label="OluÅŸtur" name="Generate" value="OluÅŸtur"/>
+ <item label="Yukarıdaki ayrıntı seviyesini kullan" name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
</combo_box>
<button label="Gözat..." name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="Üçgen Limiti"/>
- <item name="Error Threshold" value="Hata EÅŸiÄŸi"/>
+ <item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+ <item label="Hata EÅŸiÄŸi" name="Error Threshold" value="Hata EÅŸiÄŸi"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="En Düşük" name="lowest_label" value="En Düşük"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="Dosyadan yükle"/>
- <item name="Generate" value="OluÅŸtur"/>
- <item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+ <item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+ <item label="OluÅŸtur" name="Generate" value="OluÅŸtur"/>
+ <item label="Yukarıdaki ayrıntı seviyesini kullan" name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
</combo_box>
<button label="Gözat..." name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="Üçgen Limiti"/>
- <item name="Error Threshold" value="Hata EÅŸiÄŸi"/>
+ <item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+ <item label="Hata EÅŸiÄŸi" name="Error Threshold" value="Hata EÅŸiÄŸi"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_moveview.xml b/indra/newview/skins/default/xui/tr/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_mute_object.xml b/indra/newview/skins/default/xui/tr/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_notification.xml b/indra/newview/skins/default/xui/tr/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/tr/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..87398e7fc5a0d38822e5c9629764b086e211f76f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="BÄ°LDÄ°RÄ°MLER">
+ <floater.string name="system_tab_title">
+ Sistem ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Ä°ÅŸlemler ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Davetler ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Grup ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ BÄ°LDÄ°RÄ°MLER
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="Sistem (0)" name="system_notification_list_tab"/>
+ <panel label="Ä°ÅŸlemler (0)" name="transaction_notifications_tab"/>
+ <panel label="Davetler (0)" name="group_invite_notifications_tab"/>
+ <panel label="Grup (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Tümünü daralt" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="BoÅŸluk Paneli" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Tümünü sil" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_object_weights.xml b/indra/newview/skins/default/xui/tr/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_openobject.xml b/indra/newview/skins/default/xui/tr/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index f38d8c84c6dd49a3a0ad4b388390bc8e6f2cd834..4f2e078426128c2d34d95912e00b0c62634a91f9
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[grup]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="Ad" name="name"/>
<scroll_list.columns label="Açıklama" name="description"/>
@@ -42,7 +42,7 @@
<button label="Tümünü seç" name="select_all_objects"/>
<button label="Hiçbirini seçme" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
Seçilen karakterler üzerinde eylemler:
</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index 6eecc7fb776e233c624f655e0bb075e24fb80ad0..072f96427340136f58303a5a6f67314ada4a023c
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
Yol oluşturma sırasında bir hata meydana geldi.
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ Görüntüleyici durumu
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ Simülatör durumu
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="Görünüm" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 2e416c93119806013e5472ade24bcad4a78f469e..31be1b7ab1d81fe35a0bd3f5a0f469ce5a3ecb6f
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
Bağlantı kümesi kullanımını seç...
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ Şuna göre filtrele:
+ </text>
+ <text name="linksets_name_label">
+ Ad
+ </text>
+ <text name="linksets_desc_label">
+ Açıklama
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="Bağlantı kümesi kullanımına göre filtrele..." name="filter_by_linkset_use_none"/>
<combo_box.item label="Yürüyebilir" name="filter_by_linkset_use_walkable"/>
@@ -122,7 +131,10 @@
<button label="Tümünü seç" name="select_all_objects"/>
<button label="Hiçbirini seçme" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ Seçilen bağlantı kümeleri üzerindeki işlemler (bir bağlantı kümesi dünyadan çıkarılırsa, özellikleri de kaybolabilir)
+ </text>
<check_box label="İşareti göster" name="show_beacon"/>
<button label="Al" name="take_objects"/>
<button label="Kopya al" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="Ä°ade Et" name="return_objects"/>
<button label="Sil" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ Seçili bağlantı kümelerinin özelliklerini düzenleyin ve değişiklikleri uygulamak için düğmeye basın
+ </text>
<text name="walkability_coefficients_label">
Yürüyebilirlik:
</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_pay.xml b/indra/newview/skins/default/xui/tr/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/indra/newview/skins/default/xui/tr/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_people.xml b/indra/newview/skins/default/xui/tr/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_perms_default.xml b/indra/newview/skins/default/xui/tr/floater_perms_default.xml
index 2f371c056c27b7de63c78efd222dbd5b14ae2461..9691b678f2470e60f8d852985b995f4f6a223d82 100644
--- a/indra/newview/skins/default/xui/tr/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/tr/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="VARSAYILAN OLUÅžTURMA Ä°ZÄ°NLERÄ°">
- <panel label="Varsayılan İzinler" name="default permissions"/>
+ <panel label="Varsayılan İzinler" name="default permissions">
+ <text name="label_1">
+ Sonraki sahip:
+ </text>
+ <text name="label_2">
+ Kopyala
+ </text>
+ <text name="label_3">
+ DeÄŸiÅŸtir
+ </text>
+ <text name="label_4">
+ Aktar
+ </text>
+ <text name="label_5">
+ Grupla paylaÅŸ
+ </text>
+ <text name="label_6">
+ Herkese kopyalama izni ver
+ </text>
+ <text name="label_7" tool_tip="Nesneler oluşturulduğunda varsayılan izinleri ayarla">
+ Nesneler
+ </text>
+ <text name="label_8" tool_tip="Karşıya yüklenen öğeler için varsayılan izinleri ayarla">
+ Karşıya Yüklemeler
+ </text>
+ <text name="label_9" tool_tip="Komut dosyaları oluşturulduğunda varsayılan izinleri ayarla">
+ Komut Dosyaları
+ </text>
+ <text name="label_10" tool_tip="Not kartları oluşturulduğunda varsayılan izinleri ayarla">
+ Not kartları
+ </text>
+ <text name="label_11" tool_tip="Mimikler oluşturulduğunda varsayılan izinleri ayarla">
+ Mimikler
+ </text>
+ <text name="label_12" tool_tip="Giysi ya da Vücut Parçaları oluşturulduğunda varsayılan izinleri ayarla">
+ Giyilebilir öğeler
+ </text>
+ </panel>
<button label="Tamam" label_selected="Tamam" name="ok"/>
<button label="Ä°ptal" label_selected="Ä°ptal" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_places.xml b/indra/newview/skins/default/xui/tr/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_post_process.xml b/indra/newview/skins/default/xui/tr/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences.xml b/indra/newview/skins/default/xui/tr/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..53938117fde29ca6fb0e5f0bd4d1a7f1f073a689
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="GELÄ°ÅžMÄ°Åž GRAFÄ°K TERCÄ°HLERÄ°">
+ <text name="GeneralText">
+ Genel
+ </text>
+ <slider label="Çizme mesafesi:" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Maks. parçacık sayısı:" name="MaxParticleCount"/>
+ <slider label="Son iÅŸleme kalitesi:" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ Düşük
+ </text>
+ <text name="AvatarText">
+ Avatar
+ </text>
+ <slider label="Maksimum karmaşıklık:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık yapıdaki bir avatarın hangi noktada jelibon gibi tek renkli olarak çizileceğini kontrol eder"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="Düşük grafik özellikli olmayan maks. avatar sayısı:" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="Ayrıntı:" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ Düşük
+ </text>
+ <slider label="Fizik:" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ Düşük
+ </text>
+ <text name="ShadersText">
+ Donanım
+ </text>
+ <slider label="Doku Belleği (MB):" name="GraphicsCardTextureMemory" tool_tip="Dokular için tahsis edilecek bellek miktarı. Varsayılan değer video kartı belleğidir. Bu değerin küçültülmesi performansı artırabilir, ama ayrıca dokuları bulanıklaştırabilir."/>
+ <slider label="Sis Mesafe Oranı:" name="fog"/>
+ <slider label="Gama:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (0 = varsayılan parlaklık, düşük = daha parlak)
+ </text>
+ <check_box label="Anisotropik Filtreleme (etkinken daha yavaÅŸ)" name="ani"/>
+ <check_box initial_value="true" label="OpenGL Vertex Tampon Nesnelerini Etkinleştir" name="vbo" tool_tip="Modern donanımlarda bunun etkinleştirilmesi performans artışı sağlar. Ancak, eski donanımlardaki VBO uygulamaları yetersizdir ve etkinleştirildiğinde bilgisayarınız çökebilir."/>
+ <check_box initial_value="true" label="Doku Sıkıştırmasını Etkinleştir (yeniden başlatma gerektirir)" name="texture compression" tool_tip="Video bellekteki dokuları sıkıştırır, renk kalitesinde bazı kayıplar olmasına karşın daha yüksek çözünürlükte dokuların yüklenmesine imkan tanır."/>
+ <text name="antialiasing label">
+ Antialiasing:
+ </text>
+ <combo_box label="Antialiasing" name="fsaa">
+ <combo_box.item label="Devre dışı" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ (yeniden baÅŸlatma gerektirir)
+ </text>
+ <slider label="Yüzey Ağ Ayrıntısı:" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ Düşük
+ </text>
+ <slider label="Ağaçlar:" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ Düşük
+ </text>
+ <slider label="Nesneler:" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ Düşük
+ </text>
+ <slider label="Esnek primler:" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ Düşük
+ </text>
+ <check_box initial_value="true" label="Saydam Su" name="TransparentWater"/>
+ <check_box initial_value="true" label="Tümsek eşleme ve parlaklık" name="BumpShiny"/>
+ <check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
+ <check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
+ <slider label="Yüzey Ayrıntısı:" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ Düşük
+ </text>
+ <check_box initial_value="true" label="Avatarı Donanım ile kaplama" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="Avatar giysisi" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ Su Yansımaları:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="Minimal" name="0"/>
+ <combo_box.item label="Yüzey ve ağaçlar" name="1"/>
+ <combo_box.item label="Tüm statik nesneler" name="2"/>
+ <combo_box.item label="Tüm avatarlar ve nesneler" name="3"/>
+ <combo_box.item label="Her ÅŸey" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
+ <slider label="Gökyüzü:" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ Düşük
+ </text>
+ <check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Ortam Emilimi" name="UseSSAO"/>
+ <check_box initial_value="true" label="Alan DerinliÄŸi" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ Gölgeler:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Yok" name="0"/>
+ <combo_box.item label="Güneş/Ay" name="1"/>
+ <combo_box.item label="Güneş/Ay + Projektörler" name="2"/>
+ </combo_box>
+ <button label="Önerilen ayarlara dön" name="Defaults"/>
+ <button label="Tamam" label_selected="Tamam" name="OK"/>
+ <button label="Ä°ptal" label_selected="Ä°ptal" name="Cancel"/>
+ <check_box label="AvatarMaksKarmaşıklığıİşleme" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_region_info.xml b/indra/newview/skins/default/xui/tr/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/tr/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69aa232093ced6483a9e62ba48212c8f8a7fa8f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="TERCİHLİ ÖN AYAR OLARAK KAYDET">
+ <string name="title_graphic">
+ Grafik Ön Ayarı Olarak Kaydet
+ </string>
+ <string name="title_camera">
+ Kamera Ön Ayarı Olarak Kaydet
+ </string>
+ <text name="Preset">
+ Ön ayar için bir ad girin veya mevcut bir ön ayarı seçin.
+ </text>
+ <button label="Kaydet" name="save"/>
+ <button label="Ä°ptal" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug.xml b/indra/newview/skins/default/xui/tr/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_script_limits.xml b/indra/newview/skins/default/xui/tr/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_script_preview.xml b/indra/newview/skins/default/xui/tr/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_script_queue.xml b/indra/newview/skins/default/xui/tr/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_script_search.xml b/indra/newview/skins/default/xui/tr/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_search.xml b/indra/newview/skins/default/xui/tr/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_select_key.xml b/indra/newview/skins/default/xui/tr/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_sell_land.xml b/indra/newview/skins/default/xui/tr/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_snapshot.xml b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index ded71cad4009e16223690ac18322f085ab052080..9ab0ea261304d58158f53e42fab658b590374cc2
--- a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="Sözlüğü İçeri Aktar">
+ <text name="import_dict">
+ Sözlük:
+ </text>
<button label="Gözat" label_selected="Gözat" name="dictionary_path_browse"/>
+ <text name="import_name">
+ Ad:
+ </text>
+ <text name="import_lang">
+ Dil:
+ </text>
<button label="İçeri Aktar" name="ok_btn"/>
<button label="Ä°ptal" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_sys_well.xml b/indra/newview/skins/default/xui/tr/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_telehub.xml b/indra/newview/skins/default/xui/tr/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_top_objects.xml b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml
old mode 100755
new mode 100644
index 7ff0001ddd56370735c8388e4b968bf992e8e002..87beb5476f714d438d2dc2ce7f32532ec8c0a816
--- a/indra/newview/skins/default/xui/tr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
Aşağıdaki Hizmet Koşullarını ve Gizlilik Politikasını dikkatle okuyun. [SECOND_LIFE]'ta oturum açmaya devam etmek için anlaşmayı kabul etmelisiniz.
</text>
+ <text name="external_tos_required">
+ Devam etmeden önce my.secondlife.com adresine gitmeniz ve oturum açarak Hizmet Şartlarını kabul etmeniz gerekiyor. Teşekkürler!
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_toybox.xml b/indra/newview/skins/default/xui/tr/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_url_entry.xml b/indra/newview/skins/default/xui/tr/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_web_content.xml b/indra/newview/skins/default/xui/tr/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/floater_world_map.xml b/indra/newview/skins/default/xui/tr/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/inspect_avatar.xml b/indra/newview/skins/default/xui/tr/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/inspect_group.xml b/indra/newview/skins/default/xui/tr/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/inspect_object.xml b/indra/newview/skins/default/xui/tr/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
old mode 100755
new mode 100644
index 0cb233a6578306277d6dac4b9c5e89d3f462806b..8a669a28f7e7ba92b4d2743c56986c0f6be94d86
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="Yakınlaştır" name="Zoom In"/>
<menu_item_call label="Öde" name="Pay..."/>
<menu_item_call label="Nesne Profili" name="Object Inspect"/>
+ <menu_item_check label="Normal Olarak Ä°ÅŸle" name="RenderNormally"/>
+ <menu_item_check label="Ä°ÅŸleme" name="DoNotRender"/>
+ <menu_item_check label="Tam Olarak Ä°ÅŸle" name="AlwaysRenderFully"/>
<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
old mode 100755
new mode 100644
index 0da328a89464224da8de9476b3eaa4cd7299258c..e4ba3a56167bae34569c6a25b4eb862f67e526f4
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
<menu_item_call label="Yakınlaştır" name="Zoom In"/>
<menu_item_call label="Öde" name="Pay..."/>
+ <menu_item_check label="Normal Olarak Ä°ÅŸle" name="RenderNormally"/>
+ <menu_item_check label="Ä°ÅŸleme" name="DoNotRender"/>
+ <menu_item_check label="Tam Olarak Ä°ÅŸle" name="AlwaysRenderFully"/>
<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_edit.xml b/indra/newview/skins/default/xui/tr/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_favorites.xml b/indra/newview/skins/default/xui/tr/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_group_plus.xml b/indra/newview/skins/default/xui/tr/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_landmark.xml b/indra/newview/skins/default/xui/tr/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
old mode 100755
new mode 100644
index ecd29370a5e62958af2def198d87f36a0dac7c29..a9406357786850afd13ba48d21220b1ccaeea840
--- a/indra/newview/skins/default/xui/tr/menu_login.xml
+++ b/indra/newview/skins/default/xui/tr/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="[SECOND_LIFE] Bloklar" name="Second Life Blogs"/>
<menu_item_call label="Hata Bildir" name="Report Bug"/>
<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
+ <menu_item_call label="Güncellemeleri Kontrol Et" name="Check for Updates"/>
</menu>
<menu_item_check label="Hata Ayıklama Menüsünü Göster" name="Show Debug Menu"/>
<menu label="Hata ayıkla" name="Debug">
diff --git a/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml b/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
index c114f50c921edfd5be593d74cb8f05fed9d37dc1..11ef36ceb42ac4189cc842f55e26ccce0c6fdd10 100644
--- a/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+ <menu_item_check label="En son yapılana göre sırala" name="sort_by_recent"/>
<menu_item_check label="Stok miktarına göre sırala (düşükten yükseğe)" name="sort_by_stock_amount"/>
<menu_item_check label="Sadece ilan klasörlerini göster" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_mini_map.xml b/indra/newview/skins/default/xui/tr/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_navbar.xml b/indra/newview/skins/default/xui/tr/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_list.xml b/indra/newview/skins/default/xui/tr/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_picks.xml b/indra/newview/skins/default/xui/tr/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_place.xml b/indra/newview/skins/default/xui/tr/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_slurl.xml b/indra/newview/skins/default/xui/tr/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_text_editor.xml b/indra/newview/skins/default/xui/tr/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_toolbars.xml b/indra/newview/skins/default/xui/tr/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_email.xml b/indra/newview/skins/default/xui/tr/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0d1b366d1af1bcfa7ea0148e780406e77e495c6a
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="Harici bir istemciyi kullanarak e-posta oluÅŸtur" name="email_open_external"/>
+ <menu_item_call label="E-postayı panoya kopyala" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_group.xml b/indra/newview/skins/default/xui/tr/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_http.xml b/indra/newview/skins/default/xui/tr/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_map.xml b/indra/newview/skins/default/xui/tr/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
old mode 100755
new mode 100644
index cea57011dd5164f4ad3e2ef298871a22291d4eab..324e549a757a048fe87ee00a6f67f7649de5affa
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -178,6 +178,7 @@
<menu_item_call label="Hata Bildir" name="Report Bug"/>
<menu_item_call label="Toslamalar, Ä°tmeler ve Vurmalar" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
+ <menu_item_call label="Güncellemeleri Kontrol Et" name="Check for Updates"/>
</menu>
<menu label="GeliÅŸmiÅŸ" name="Advanced">
<menu_item_call label="Dokuları Tekrar Kaydet" name="Rebake Texture"/>
@@ -191,7 +192,7 @@
<menu_item_call label="Gecikme Ölçer" name="Lag Meter"/>
<menu_item_check label="İstatistik Çubuğu" name="Statistics Bar"/>
<menu_item_call label="Sahne Yükleme İstatistikleri" name="Scene Load Statistics"/>
- <menu_item_check label="Avatarlar İçin Çizim Ağırlığını Göster" name="Avatar Rendering Cost"/>
+ <menu_item_check label="Avatarın karmaşıklık bilgisini göster" name="Avatar Draw Info"/>
</menu>
<menu label="Vurgulama ve Görünürlük" name="Highlighting and Visibility">
<menu_item_check label="Yanıp Sönen İşaret" name="Cheesy Beacon"/>
@@ -314,8 +315,6 @@
<menu_item_check label="Eklemler" name="Joints"/>
<menu_item_check label="Işın Yayını" name="Raycast"/>
<menu_item_check label="Rüzgar Vektörleri" name="Wind Vectors"/>
- <menu_item_check label="İşleme Karmaşıklığı" name="rendercomplexity"/>
- <menu_item_check label="Aksesuar Bayt Büyüklüğü" name="attachment bytes"/>
<menu_item_check label="Åžekillendir" name="Sculpt"/>
<menu label="Doku YoÄŸunluÄŸu" name="Texture Density">
<menu_item_check label="Yok" name="None"/>
@@ -421,13 +420,11 @@
<menu_item_check label="Debug Character Vis" name="Debug Character Vis"/>
<menu_item_check label="Çarpışma İskeletini Göster" name="Show Collision Skeleton"/>
<menu_item_check label="Aracı Hedefini Göster" name="Display Agent Target"/>
- -->
<menu_item_call label="Aksesuarların Dökümünü Al" name="Dump Attachments"/>
<menu_item_call label="Avatar Dokuları İçin Hata Ayıklama" name="Debug Avatar Textures"/>
<menu_item_call label="Yerel Dokuların Dökümünü Al" name="Dump Local Textures"/>
</menu>
<menu_item_check label="HTTP Dokuları" name="HTTP Textures"/>
- <menu_item_check label="HTTP Envanteri" name="HTTP Inventory"/>
<menu_item_call label="Görüntüleri Sıkıştır" name="Compress Images"/>
<menu_item_call label="Visual Leak Detector'ı Etkinleştir" name="Enable Visual Leak Detector"/>
<menu_item_check label="Mini Döküm Dosyası Hata Ayıklama Çıktısı" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/mime_types.xml b/indra/newview/skins/default/xui/tr/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/mime_types_linux.xml b/indra/newview/skins/default/xui/tr/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/mime_types_mac.xml b/indra/newview/skins/default/xui/tr/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
old mode 100755
new mode 100644
index 9875399b34ff395616482314f8582ed348da547c..a982dc03ed29aec39d20bd18bb74800a77bec0a9
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -164,6 +164,10 @@ Bir sistem veya ağ hatası nedeniyle Pazaryeri başlatılamadı. Daha sonra te
"[ERROR_CODE]"
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ İlanınızı oluşturmak için, ilan içeriklerinizin hiyerarşisini düzelttik.
+ <usetemplate ignoretext="Bir ilan oluşturmanın içeriğin hiyerarşisini değiştireceği konusunda beni uyar" name="okignore" yestext="Tamam"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
Bu eylem, bu ilanın etkin içeriğini değiştirecek. Devam etmek istiyor musunuz?
<usetemplate ignoretext="Pazaryerindeki etkin bir ilanı değiştirmek istediğimde doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
@@ -211,11 +215,9 @@ Bu öğeyi Pazaryeri üzerinde düzenlemek için [[URL] buraya tıklayın].
Stok boş olduğu için ilanınızı yayından kaldırdık. İlanı yeniden yayınlamak için stok klasörüne daha fazla birim eklemeniz gerekir.
<usetemplate ignoretext="Bir ilan, stok klasörü boş olduğu için listeden kaldırılınca uyar" name="okignore" yestext="Tamam"/>
</notification>
- <notification name="CompileQueueSaveText">
- Aşağıdaki nedenden dolayı, bir komut dosyası için metin karşıya yüklenirken bir sorun oluştu: [REASON]. Lütfen daha sonra tekrar deneyin.
- </notification>
- <notification name="CompileQueueSaveBytecode">
- Aşağıdaki nedenden dolayı, derlenen komut dosyası karşıya yüklenirken bir sorun oluştu: [REASON]. Lütfen daha sonra tekrar deneyin.
+ <notification name="AlertMerchantVersionFolderEmpty">
+ Sürüm klasörü boş olduğu için ilanınızı yayından kaldırdık. İlanı yeniden yayınlamak için sürüm klasörüne daha fazla birim eklemeniz gerekir.
+ <usetemplate ignoretext="Bir ilan, sürüm klasörü boş olduğu için listeden kaldırılınca uyar" name="okignore" yestext="Tamam"/>
</notification>
<notification name="WriteAnimationFail">
Animasyon verileri yazılırken bir sorun oluştu. Lütfen daha sonra tekrar deneyin.
@@ -320,6 +322,14 @@ Bu yeteneklerin artık bu rolde bulunmasını istemiyorsanız, onları hemen dev
Gruptan [COUNT] üyeyi çıkarmak üzeresiniz.
<usetemplate ignoretext="Gruptan birden çok üyenin çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ [AVATAR_NAME] adlı üyeyi grubun yasaklı listesine eklemek üzeresiniz.
+ <usetemplate ignoretext="Bir katılımcının grubun yasaklı listesine eklenmesini doğrulayın" name="okcancelignore" notext="İptal" yestext="Yasakla"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ [COUNT] üyeyi grubun yasaklı listesine eklemek üzeresiniz.
+ <usetemplate ignoretext="Gruptan birden çok üyenin yasaklanmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Yasakla"/>
+ </notification>
<notification name="AttachmentDrop">
Aksesuarınızı çıkarmak üzeresiniz.
Devam etmek istediÄŸinize emin misiniz?
@@ -404,7 +414,7 @@ Nesneler: [N]
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
<notification name="ReturnAllTopObjects">
- Listelenen tüm nesneleri kendi sahiplerinin envanterlerine iade etmek istediğinize emin misiniz?
+ Listedeki tüm nesneleri kendi sahiplerinin envanterlerine iade etmek istediğinize emin misiniz? Bu, bölgedeki TÜM komut dosyalı nesneleri iade edecektir.
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -587,16 +597,10 @@ Sunucunun son kaydedilmiş sürümünü yüklemek ister misiniz?
(**Uyarı** Bu işlem geri alınamaz.)
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
- <notification name="SaveScriptFailReason">
- Aşağıdaki nedenden dolayı, komut dosyası kaydedilirken bir sorun oluştu: [REASON]. Lütfen komut dosyasını kaydetmeyi daha sonra tekrar deneyin.
- </notification>
<notification name="SaveScriptFailObjectNotFound">
İçinde olduğu nesne bulunamadığından komut dosyası kaydedilemiyor.
Nesne aralık dışında ya da silinmiş olabilir.
</notification>
- <notification name="SaveBytecodeFailReason">
- Aşağıdaki nedenden dolayı, derlenen komut dosyası kaydedilirken bir sorun oluştu: [REASON]. Lütfen komut dosyasını kaydetmeyi daha sonra tekrar deneyin.
- </notification>
<notification name="StartRegionEmpty">
Başlangıç Bölgeniz tanımlanmamış.
Lütfen Başlangıç Konumu kutusuna Bölge adını yazın ya da Son Bulunduğum Konum veya Ana Konumumu Başlangıç Konumu olarak seçin.
@@ -609,6 +613,10 @@ Nesne aralık dışında ya da silinmiş olabilir.
<notification name="CannotDownloadFile">
Dosya karşıdan yüklenemiyor.
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ [SECOND_LIFE] içinde desteklenmeyen bir dosya indirmeyi talep ettiniz.
+ <usetemplate ignoretext="Desteklenmeyen dosya indirme işlemleri hakkında uyar" name="okignore" yestext="Tamam"/>
+ </notification>
<notification name="CannotWriteFile">
[[FILE]] dosyası yazılamıyor.
</notification>
@@ -1109,7 +1117,8 @@ Bu genellikle geçici bir arızadır. Lütfen giyilebilir öğeyi birkaç dakika
</notification>
<notification name="YouHaveBeenLoggedOut">
Üzgünüz. [SECOND_LIFE] oturumunuz kapandı.
- [MESSAGE]
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Çık" yestext="Anlık İleti ve Sohbeti Görüntüle"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1357,6 +1366,13 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz.
<ignore name="ignore" text="Giysilerin karşıdan yüklenmesi uzun zaman alıyor"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Görsel karmaşıklık] seviyeniz: [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Görsel karmaşıklık] seviyeniz: [AGENT_COMPLEXITY].
+ </notification>
<notification name="FirstRun">
[APP_NAME] yüklemesi tamamlandı.
@@ -1636,6 +1652,25 @@ Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ Bir güncelleme mevcut.
+Şu anda arkaplanda indiriliyor ve hazır olduğunda yüklemeyi bitirmek için görüntüleyicinizi yeniden başlatmanız için sizi uyaracağız.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ Bir güncelleme indirildi. Yeniden başlatma sırasında yüklenecek.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ Güncelleme kontrolü yapılırken bir hata oluştu.
+Lütfen daha sonra tekrar deneyin.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ Görüntüleyiciniz güncel.
+En yeni özellikleri ve düzeltmeleri görmek için sabırsızlanıyorsanız Alternatif Görüntüleyici sayfasına göz atın. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="DeedObjectToGroup">
Bu nesnenin devredilmesi grubun şunu yapmasına sebep olacak:
* Nesneye ödenen L$'nı almasına
@@ -1740,6 +1775,14 @@ Gruptan ayrılmak istiyor musunuz?
Maksimum grup sayısına eriştiniz. Lütfen yeni bir gruba katılmadan ya da yeni bir grup oluşturmadan önce grupların bazılarından ayrılın.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="GroupLimitInfo">
+ Temel hesaplar için grup limiti [MAX_BASIC], [https://secondlife.com/premium/ özel] hesaplar
+içinse [MAX_PREMIUM] olarak belirlenmiştir.
+Hesabınızı indirgediyseniz, daha fazla gruba katılmak için önce grup sayınızı [MAX_BASIC] grubun altına düşürmelisiniz.
+
+[https://secondlife.com/my/account/membership.php Şimdi yükselt!]
+ <usetemplate name="okbutton" yestext="Kapat"/>
+ </notification>
<notification name="KickUser">
Bu Sakin hangi iletiyle çıkarılsın?
<form name="form">
@@ -1939,7 +1982,7 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
</notification>
<notification label="Gayrimenkul seç" name="EstateTrustedExperienceRemove">
- Yalnızca bu gayrimenkul için mi anahtar listesine çıkarılsın, yoksa [ALL_ESTATES] için mi?
+ Yalnızca bu gayrimenkul için mi anahtar listesinden çıkarılsın, yoksa [ALL_ESTATES] için mi?
<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
</notification>
<notification label="Çıkarmayı Onayla" name="EstateKickUser">
@@ -2248,6 +2291,10 @@ Envanter öğesi/öğeleri taşınsın mı?
[TARGET] hedefine [AMOUNT]L$ ödemek istediğinizi doğrulayın.
<usetemplate ignoretext="Ödeme yapılmadan önce doğrulama iste (200L$ üzerinde tutarlar için)" name="okcancelignore" notext="İptal" yestext="Öde"/>
</notification>
+ <notification name="PayObjectFailed">
+ Ödeme başarısız: nesne bulunamadı.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Bu nesne içinde kopyalama izniniz olan bir öğe yok.
</notification>
@@ -2279,10 +2326,9 @@ Bu eylemi geri alamazsınız.
[QUESTION]
<usetemplate ignoretext="Öğeleri silmeden önce doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- [http://secondlife.com/corporate/tos.php Hizmet Sözleşmesi] ve [http://secondlife.com/corporate/cs.php Topluluk Standartları] ihlallerini bildirmek için bu aracı kullanın.
-
-Bildirilen tüm kötüye kullanımlar incelenir ve çözüme ulaştırılır.
+ <notification name="ConfirmUnlink">
+ Bu, geniş bir bağlantı kümeleri seçimi. Bağlantıyı kaldırırsanız tekrar bağlayamayabilirsiniz. Tedbiren, envanterinizdeki bağlantı kümelerinin bir kopyasını almayı isteyebilirsiniz.
+ <usetemplate ignoretext="Bir bağlantı kümesinin bağının kaldırılmasını onayla" name="okcancelignore" notext="İptal" yestext="Bağlantıyı Kopar"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
Lütfen bu kötüye kullanım bildirimi için bir kategori seçin.
@@ -3211,6 +3257,12 @@ Güvenliğiniz için birkaç saniye engellenecek.
<notification name="AttachmentSaved">
Aksesuar kaydedildi.
</notification>
+ <notification name="PresetNotSaved">
+ [NAME] ön ayarı kaydedilirken hata oluştu.
+ </notification>
+ <notification name="PresetNotDeleted">
+ [NAME] ön ayarı silinirken hata oluştu.
+ </notification>
<notification name="UnableToFindHelpTopic">
Bu öğe için yardım başlığı bulunamıyor.
</notification>
@@ -3243,9 +3295,8 @@ Yeterli yer olduğunda düğme gösterilecek.
Paylaşılacak sakinleri seç.
</notification>
<notification name="MeshUploadError">
- [LABEL] karşıya yüklenemedi: [MESSAGE] [IDENTIFIER]
-
-Ayrıntılar için günlük dosyasına bakın.
+ [LABEL] karşıya yüklenemedi: [MESSAGE] [IDENTIFIER]
+[DETAILS]Ayrıntılar için bkz. SecondLife.log
</notification>
<notification name="MeshUploadPermError">
Karşıya örgü yükleme izinleri talep edilirken hata oluştu.
diff --git a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_chat_header.xml b/indra/newview/skins/default/xui/tr/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_classified_info.xml b/indra/newview/skins/default/xui/tr/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_info.xml b/indra/newview/skins/default/xui/tr/panel_experience_info.xml
index 0bce4fea8f9e1f0239390ea852358fc3d52c6982..bbe2ab0dd5c674f3311b9781ee7535b9fd9e524b 100644
--- a/indra/newview/skins/default/xui/tr/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/tr/panel_experience_info.xml
@@ -14,7 +14,7 @@
<text name="LocationTextText">
bir yer
</text>
- <button label="Işınla" name="teleport_btn"/>
+ <button label="Işınlama" name="teleport_btn"/>
<button label="Harita" name="map_btn"/>
</layout_panel>
<layout_panel name="marketplace panel">
@@ -33,7 +33,7 @@
YetiÅŸkin
</text>
<text name="Owner">
- Sahip:
+ Sahibi:
</text>
<text name="OwnerText">
Kyle
diff --git a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_notices.xml b/indra/newview/skins/default/xui/tr/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_notify.xml b/indra/newview/skins/default/xui/tr/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_instant_message.xml b/indra/newview/skins/default/xui/tr/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_landmarks.xml b/indra/newview/skins/default/xui/tr/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
old mode 100755
new mode 100644
index c69fb39130cf084df9957fccd2639ad0cd65481a..0761f0531d594f0f07e33240110682b037f248b8
--- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] Öge [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ Alınan [ITEM_COUNT] Öğe [FILTER]
+ </panel.string>
<text name="ItemcountText">
Ögeler:
</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
old mode 100755
new mode 100644
index b499ec830768aa0a4bfcaf6e3d9a202a9de5164e..29ca4772fd33aea3650fe6e44ff66af24d1e9b49
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -18,6 +18,7 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
+ <string name="GroupCountWithInfo" value="[COUNT] gruba üyesiniz, daha [REMAINING] gruba üye olabilirsiniz. [secondlife:/// Daha fazlasını mı istiyorsunuz?]"/>
<tab_container name="tabs">
<panel label="YAKIN" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/tr/panel_pick_info.xml b/indra/newview/skins/default/xui/tr/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_picks.xml b/indra/newview/skins/default/xui/tr/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_place_profile.xml b/indra/newview/skins/default/xui/tr/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_places.xml b/indra/newview/skins/default/xui/tr/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
old mode 100755
new mode 100644
index 82c7b87c9a4601b4b30707f2503336e9c0692f8c..c3ac198d08a2572cf2573c462e6d5eedd1ec671a
--- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
<check_box label="Birden Çok Görüntüleyiciye İzin Ver" name="allow_multiple_viewer_check"/>
<check_box label="Oturum açarken Ağ Seçimini göster" name="show_grid_selection_check"/>
<check_box label="Gelişmiş Menüyü Göster" name="show_advanced_menu_check"/>
- <check_box label="Geliştirici Menüsünü Göster" name="show_develop_menu_check"/>
+ <check_box label="Geliştirme Menüsünü Göster" name="show_develop_menu_check"/>
<button label="Varsayılan Oluşturma İzinleri" name="default_creation_permissions"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
old mode 100755
new mode 100644
index d46f3e08ccb0eae83f08a632799b91dfad00e14c..6a00d06e7e341d2fc1cd52ca4861667a2b716807
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="Envanter teklifi" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ Kaydet:
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="Günlük ve dökümler" name="log_and_transcripts" value="2"/>
+ <item label="Sadece günlük" name="log_only" value="1"/>
+ <item label="Günlük veya döküm yok" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="Günlüğü temizle..." name="clear_log"/>
<button label="Dökümleri sil..." name="delete_transcripts"/>
+ <text name="log_location_label">
+ Konum:
+ </text>
<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
</panel>
<button label="Çeviri..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 25c9e966c77c6894ad02606a1485f3b9ce02477c..13984c2792d804dde8b6498bc210a24202af86fa
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Grafikler" name="Display panel">
- <text name="QualitySpeed">
- Kalite ve hız:
- </text>
- <text name="FasterText">
- Daha hızlı
+ <text name="preset_text">
+ (Hiçbiri)
</text>
- <text name="BetterText">
- Daha iyi
+ <text name="QualitySpeed">
+ Kalite & hız:
</text>
<text name="ShadersPrefText">
Düşük
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
Ultra
</text>
- <panel label="ÖzelGrafikler" name="CustomGraphics Panel">
- <text name="ShadersText">
- Gölgelendiriciler:
- </text>
- <check_box initial_value="true" label="Saydam Su" name="TransparentWater"/>
- <check_box initial_value="true" label="Tümsek eşleme ve parlaklık" name="BumpShiny"/>
- <check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
- <check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
- <check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
- <check_box initial_value="true" label="Ortam Gölgeleme" name="UseSSAO"/>
- <check_box initial_value="true" label="Alan DerinliÄŸi" name="UseDoF"/>
- <text name="shadows_label">
- Gölgeler:
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="Hiçbiri" name="0"/>
- <combo_box.item label="Güneş/Ay" name="1"/>
- <combo_box.item label="Güneş/Ay + Projektörler" name="2"/>
- </combo_box>
- <text name="reflection_label">
- Su Yansımaları:
- </text>
- <combo_box name="Reflections">
- <combo_box.item label="Minimal" name="0"/>
- <combo_box.item label="Yüzey ve ağaçlar" name="1"/>
- <combo_box.item label="Tüm statik nesneler" name="2"/>
- <combo_box.item label="Tüm avatarlar ve nesneler" name="3"/>
- <combo_box.item label="Her ÅŸey" name="4"/>
- </combo_box>
- <slider label="Avatar Fzk. Özlk.:" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- Düşük
- </text>
- <slider label="Mesafeyi çiz:" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Maks. parçacık sayısı:" name="MaxParticleCount"/>
- <slider label="Düşük gr. özl. olmayan mks. avatar:" name="MaxNumberAvatarDrawn"/>
- <slider label="Son iÅŸleme kalitesi:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Örgü detayı:
- </text>
- <slider label="Nesneler:" name="ObjectMeshDetail"/>
- <slider label="Esnek primler:" name="FlexibleMeshDetail"/>
- <slider label="Ağaçlar:" name="TreeMeshDetail"/>
- <slider label="Avatarlar:" name="AvatarMeshDetail"/>
- <slider label="Yüzey:" name="TerrainMeshDetail"/>
- <slider label="Gökyüzü:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Düşük
- </text>
- <text name="ObjectMeshDetailText">
- Düşük
- </text>
- <text name="FlexibleMeshDetailText">
- Düşük
- </text>
- <text name="TreeMeshDetailText">
- Düşük
- </text>
- <text name="AvatarMeshDetailText">
- Düşük
- </text>
- <text name="TerrainMeshDetailText">
- Düşük
- </text>
- <text name="SkyMeshDetailText">
- Düşük
- </text>
- <text name="AvatarRenderingText">
- Avatar Ä°ÅŸleme:
- </text>
- <check_box initial_value="true" label="Düşük grafik özellikli avatarlar" name="AvatarImpostors"/>
- <check_box initial_value="true" label="Donanım ile kaplama" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="Avatar giysisi" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- Yüzey detayı:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="Düşük" name="0"/>
- <radio_item label="Yüksek" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="Uygula" label_selected="Uygula" name="Apply"/>
- <button label="Sıfırla" name="Defaults"/>
- <button label="GeliÅŸmiÅŸ" name="Advanced"/>
- <button label="Donanım" label_selected="Donanım" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ Daha hızlı
+ </text>
+ <text name="BetterText">
+ Daha iyi
+ </text>
+ <check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
+ <button label="Ayarları ön ayar olarak kaydet..." name="PrefSaveButton"/>
+ <button label="Ön ayarı yükle..." name="PrefLoadButton"/>
+ <button label="Ön ayarı sil..." name="PrefDeleteButton"/>
+ <button label="Önerilen ayarlara dön" name="Defaults"/>
+ <button label="GeliÅŸmiÅŸ Ayarlar..." name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
old mode 100755
new mode 100644
index acb20595f73947fb5795d2deac36b1d398a4646b..8f74c8ef7e75484ab7dcdc53c341b0add1925790
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="Tüm bağlantılar için kendi tarayıcımı kullan (Chrome, Firefox, IE)" name="internal" tool_tip="Yardım, web bağlantıları vb. için sistemin varsayılan web tarayıcısını kullanın. Tam ekran çalıştırılıyorsa tavsiye edilmez." value="0"/>
<radio_item label="Yerleşik tarayıcıyı yalnızca Second Life bağlantıları için kullan" name="external" tool_tip="Yardım, web bağlantıları vb. için sistemin varsayılan web tarayıcısını kullanın. Yerleşik tarayıcı yalnızca LindenLab/SecondLife bağlantıları için kullanılır." value="1"/>
+ <radio_item label="Tüm bağlantılar için yerleşik tarayıcıyı kullan" name="external_all" tool_tip="Yardım, web bağlantıları vs. için dahili web tarayıcısını kullanın. Bu tarayıcı [APP_NAME] içerisinde yeni bir pencere olarak açılır." value="2"/>
</radio_group>
<check_box initial_value="true" label="Eklentileri etkinleÅŸtir" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="Çerezleri kabul et" name="cookies_enabled"/>
<check_box initial_value="true" label="Javascript'i etkinleÅŸtir" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="Ortam tarayıcısı açılır pencerelerini etkinleştir" name="media_popup_enabled"/>
<text name="Software updates:">
Yazılım güncelleştirmeleri:
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="Otomatik olarak kurulsun" name="Install_automatically"/>
- <combo_box.item label="Güncelleştirmeler manuel olarak karşıdan yüklensin ve kurulsun" name="Install_manual"/>
+ <combo_box.item label="Güncellemeleri manuel olarak indirip yükleyeceğim" name="Install_manual"/>
</combo_box>
<check_box label="Sürüm adaylarına güncelleme yapmaya gönüllü" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f27565655133bcc6366ea397a1f079fa8aa95be
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ Grafik Ön Ayarları
+ </text>
+ <button label="Grafik Tercihlerini Aç" name="open_prefs_btn" tool_tip="Grafik tercihlerini getir"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 0433d0345038cf2623637fddc300be00b9d3c072..5d54c1771c65d054c1dcc1c2aae1d73236735e60
--- a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
@@ -57,12 +57,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="Ortam URL'si"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="Beyaz Liste etkin"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="Güvenli Tarama"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_region_general.xml b/indra/newview/skins/default/xui/tr/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index 160cba870014866c860ba6b7eec4668bbd059df7..be5940c4b9aab459fc3a69124736b8e469d6e771
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
Bir görüntüyü envanterinize kaydetmenin maliyeti L$[UPLOAD_COST] olur. Görüntünüzü bir doku olarak kaydetmek için kare formatlardan birini seçin.
</text>
<combo_box label="Çözünürlük" name="texture_size_combo">
- <combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
+ <combo_box.item label="Mevcut Pencere(512x512)" name="CurrentWindow"/>
<combo_box.item label="Küçük (128x128)" name="Small(128x128)"/>
<combo_box.item label="Orta (256x256)" name="Medium(256x256)"/>
<combo_box.item label="Büyük (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
index 2ce7c9c11f09481dab2016b0b5ebd71ebb9b1701..9760c7f9f7a77ac8499078314f74bda48d97060e 100644
--- a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="Malzemeler" name="Materials"/>
<combo_box.item label="Ortam" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="Doku (yayılmış)" name="Texture (diffuse)"/>
- <combo_box.item label="Yumruluk (normal)" name="Bumpiness (normal)"/>
- <combo_box.item label="Parıldama (yansıtan)" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="Doku (yayılmış)" name="Texture (diffuse)" value="0"/>
+ <radio_item label="Yumruluk (normal)" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="Parıldama (yansıtan)" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="Doku" name="texture control" tool_tip="Bir resim seçmek için tıklayın"/>
<text name="label alphamode">
Alfa modu
diff --git a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/panel_world_map.xml b/indra/newview/skins/default/xui/tr/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
old mode 100755
new mode 100644
index 80fe2b39862bf41eec7bfab1589f55b5834e1dc0..67c91979077000c144bdf046e796b288f005c63d
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -38,12 +38,9 @@
Grafik başlatma başarılamadı. Lütfen grafik sürücünüzü güncelleştirin!
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [Sürüm Notları]]
</string>
- <string name="AboutCompiler">
- [COMPILER] [COMPILER_VERSION] sürümü ile oluşturuldu
- </string>
<string name="AboutPosition">
<nolink>[HOSTNAME]</nolink> ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
SLURL: <nolink>[SLURL]</nolink>
@@ -64,10 +61,9 @@ Grafik Kartı: [GRAPHICS_CARD]
<string name="AboutLibs">
OpenGL Sürümü: [OPENGL_VERSION]
-libcurl Sürümü: [LIBCURL_VERSION]
J2C Kod Çözücü Sürümü: [J2C_VERSION]
Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION]
-Qt Web Kit Sürümü: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF Sürümü: [LLCEFLIB_VERSION]
Ses Sunucusu Sürümü: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -178,6 +174,12 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ Second Life Ana Ağı (Agni)
+ </string>
+ <string name="AditiGridLabel">
+ Second Life Beta Test Ağı (Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -453,6 +455,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
[AMOUNT] öğeden fazlasını içeren bir klasörü kullanamazsınız. Bu limiti Gelişmiş > Hata Ayıklama Ayarlarını Göster > KullanılabilirKlasörLimiti öğesinden değiştirebilirsiniz.
</string>
<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+ <string name="TooltipSLIcon">
+ Bu bağlantı, resmi SecondLife.com ya da LindenLab.com etki alanındaki bir sayfaya gider.
+ </string>
<string name="TooltipOutboxDragToWorld">
Pazaryeri İlanları klasöründen öğe oluşturamazsınız
</string>
@@ -472,7 +477,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
Stok öğelerinin sayısı [AMOUNT] değerini geçiyor.
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- Öğeleri veya klasörleri sadece TÜMÜ sekmesine bırakabilirsiniz. Lütfen bu sekmeyi seçin ve öğelerinizi ya da klasörlerinizi yeniden taşıyın.
+ Öğeleri veya klasörleri sadece TÜMÜ ya da İLİŞKİLENDİRİLMEMİŞ sekmesine bırakabilirsiniz. Lütfen bu sekmelerden birini seçin ve öğelerinizi ya da klasörlerinizi taşıyın.
</string>
<string name="TooltipOutboxNoTransfer">
Bu nesnelerden bir veya daha fazlası satılamaz veya aktarılamaz
@@ -556,6 +561,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
secondlife:// komutunu çalıştırmak için tıklayın
</string>
<string name="CurrentURL" value="Geçerli URL: [CurrentURL]"/>
+ <string name="TooltipEmail">
+ Bir e-posta oluşturmak için tıklayın
+ </string>
<string name="SLurlLabelTeleport">
Şuraya ışınla:
</string>
@@ -1078,7 +1086,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="AgentNameSubst">
(Siz)
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
Gayri menkul erişim listelerini yönetirken uyarıları bastır
</string>
@@ -1857,6 +1865,21 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="TodayOld">
Bugün katıldı
</string>
+ <string name="av_render_everyone_now">
+ Artık herkes sizi görebilir.
+ </string>
+ <string name="av_render_not_everyone">
+ Çevrenizdeki herkes sizi işleyemeyebilir.
+ </string>
+ <string name="av_render_over_half">
+ Çevrenizdeki kişilerin yarıdan fazlası sizi işleyemeyebilir.
+ </string>
+ <string name="av_render_most_of">
+ Çevrenizdeki çoğu kişi sizi işleyemeyebilir.
+ </string>
+ <string name="av_render_anyone">
+ Çevrenizdeki kimse sizi işleyemeyebilir.
+ </string>
<string name="AgeYearsA">
[COUNT] yıl
</string>
@@ -1974,6 +1997,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="CompileQueueUnknownFailure">
Karşıdan yüklerken bilinmeyen hata
</string>
+ <string name="CompileNoExperiencePerm">
+ [SCRIPT] komut dizisi [EXPERIENCE] deneyimiyle atlanıyor.
+ </string>
<string name="CompileQueueTitle">
Tekrar Derleme Ä°lerlemesi
</string>
@@ -2019,9 +2045,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="GroupsNone">
hiçbiri
</string>
- <string name="CompileNoExperiencePerm">
- [SCRIPT] komut dizisi [EXPERIENCE] deneyimiyle atlanıyor.
- </string>
<string name="Group" value="(grup)"/>
<string name="Unknown">
(Bilinmiyor)
@@ -5387,18 +5410,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="UserDictionary">
[User]
</string>
- <string name="logging_calls_disabled_log_empty">
- Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın.
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın.
- </string>
- <string name="logging_calls_enabled_log_empty">
- Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
- </string>
- <string name="loading_chat_logs">
- Yükleniyor...
- </string>
<string name="experience_tools_experience">
Deneyim
</string>
@@ -5475,9 +5486,42 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
Kamera Kontrolü
</string>
<string name="ExperiencePermissionShort11">
- Işınla
+ Işınlama
</string>
<string name="ExperiencePermissionShort12">
Ä°zin
</string>
+ <string name="logging_calls_disabled_log_empty">
+ Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın.
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın.
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
+ </string>
+ <string name="loading_chat_logs">
+ Yükleniyor...
+ </string>
+ <string name="preset_combo_label">
+ -BoÅŸ liste-
+ </string>
+ <string name="Default">
+ Varsayılan
+ </string>
+ <string name="none_paren_cap">
+ (Hiçbiri)
+ </string>
+ <string name="no_limit">
+ Sınırsız
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ Fiziksel görünüm çok küçük üçgenler içeriyor. Fiziksel modeli basitleştirmeye çalışın.
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ Fiziksel şekil geçersiz doğrulama verileri içeriyor. Fiziksel modeli düzeltmeye çalışın.
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ Fiziksel şekil doğru sürüme sahip değil. Fiziksel model için doğru sürümü ayarlayın.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
old mode 100755
new mode 100644
index 250cbe67e0109d16d691a25c6402583078010a24..9f6b4421a9a6b993e1f4e084c44f92696caa6ce8
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -3,6 +3,7 @@
<tab_container name="about_tab">
<panel label="資訊" name="support_panel">
<button label="覆製到剪貼簿" name="copy_btn"/>
+ <button label="查詢是å¦æœ‰æ›´æ–°ç‰ˆ" name="update_btn"/>
</panel>
<panel label="貸記" name="credits_panel">
<text name="linden_intro">Second Life 由以下的 Linden 家æ—å¸¶çµ¦ä½ ï¼š
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
old mode 100755
new mode 100644
index a9d95e5b9b37e8d68d3fa70906420b61f8f67af2..489ea61c72faac79b1217387886f52b9b802bb9e
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -13,7 +13,7 @@
[MINUTES] 分é˜
</floater.string>
<floater.string name="Minute">
- 分é˜
+ 分
</floater.string>
<floater.string name="Seconds">
[SECONDS] 秒
@@ -446,7 +446,7 @@
<spinner label="出入時間：" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="æ°¸é å…許" name="AllowedText">
- å…許的居民
+ å…許的居民 ([COUNT])
</text>
<name_list name="AccessList" tool_tip="（已列入 [LISTED]，最多å¯åˆ— [MAX]）"/>
<button label="æ·»åŠ " name="add_allowed"/>
@@ -454,7 +454,7 @@
</panel>
<panel name="Banned_layout_panel">
<text label="ç¦æ¢" name="BanCheck">
- 被å°éŽ–çš„å±…æ°‘
+ 被å°éŽ–çš„å±…æ°‘ ([COUNT])
</text>
<name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多å¯åˆ— [MAX]）"/>
<button label="æ·»åŠ " name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
old mode 100755
new mode 100644
index 4ee07e629594f92202674d3c3698bbb0c7e4819a..ee031edb2d8c96f0c2a449c1a36a0b33b4f020a2
--- a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
@@ -13,6 +13,12 @@
</scroll_list>
<button label="æ·»åŠ ..." name="autoreplace_add_entry"/>
<button label="移除" name="autoreplace_delete_entry"/>
+ <text name="autoreplace_keyword_txt">
+ é—œéµå—：
+ </text>
+ <text name="autoreplace_replacement_txt">
+ å–代文å—：
+ </text>
<button label="儲å˜é …ç›®" name="autoreplace_save_entry" tool_tip="儲å˜æ¤é …目。"/>
<button label="儲å˜è®Šæ›´" name="autoreplace_save_changes" tool_tip="儲å˜æ‰€æœ‰è®Šæ›´ã€‚"/>
<button label="å–消" name="autoreplace_cancel" tool_tip="放棄所有變更。"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
old mode 100755
new mode 100644
index 2d76a9f8313619f871cd925c60bbcdf4ec4b6569..d6bdec61b77303ea236a77135fb42209d6b2a724
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -19,6 +19,6 @@
[TIME] [NAME] 以物ç†ç‰©ä»¶æ“Šä¸ä½
</floater.string>
<floater.string name="timeStr">
- [[hour,datetime,slt]:[min,datetime,slt]]
+ [[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
</floater.string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f7dd4c81458dc68e52ef4b19a5ef33008c86c9f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="刪除å好é è¨">
+ <string name="title_graphic">
+ 刪除顯åƒé è¨
+ </string>
+ <string name="title_camera">
+ 刪除æ”影機é è¨
+ </string>
+ <text name="Preset">
+ é¸æ“‡ä¸€å€‹é è¨
+ </text>
+ <button label="刪除" name="delete"/>
+ <button label="å–消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
index 4d2b3331d7daebe33de3dcd8037dae219b253a9f..62e4165c5cd1d68ce63616bfd68cd31d2ee47d68 100644
--- a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
@@ -66,7 +66,7 @@
<icons_combo_box label="é©åº¦æˆäºº" name="edit_ContentRatingText" tool_tip="æå‡é«”驗的內容分級將會é‡è¨æ‰€æœ‰å·²å…許該體驗的居民的權é™ã€‚">
<icons_combo_box.item label="完全æˆäºº" name="Adult" value="42"/>
<icons_combo_box.item label="é©åº¦æˆäºº" name="Mature" value="21"/>
- <icons_combo_box.item label="一般" name="PG" value="13"/>
+ <icons_combo_box.item label="普級" name="PG" value="13"/>
</icons_combo_box>
<text name="edit_Location">
ä½ç½®ï¼š
diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
old mode 100755
new mode 100644
index 871849305c2bf20aa429e44eac26f62cc36c071a..be8a824eedf8057d57571592fe667578f43f7399
--- a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
è·‘æ¥
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x å¹³å‡å€¼" name="2x Average"/>
+ <item label="最大值" name="Max"/>
+ <item label="最近的最大值" name="Recent Max"/>
+ <item label="100毫秒" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="時間" name="Time"/>
+ <item label="通話次數" name="Number of Calls"/>
+ <item label="赫茲" name="Hz"/>
+ </combo_box>
<button label="æš«åœ" name="pause_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
old mode 100755
new mode 100644
index 51dc73d9712ca01f002ce228087bf117201707d4..d4dfd835d10e524cdacc2b07a196139e22539fb3
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
<radio_item label="æ—©æ–¼" name="older"/>
</radio_group>
<spinner label="å°æ™‚å‰" name="spin_hours_ago"/>
+ <text name="label_hours">
+ å°æ™‚
+ </text>
<spinner label="天å‰" name="spin_days_ago"/>
+ <text name="label_days">
+ æ—¥
+ </text>
<button label="關閉" label_selected="關閉" name="Close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..42eb6c292dbf0b1fff2547b9ece116951c5815fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="載入å好é è¨">
+ <string name="title_graphic">
+ 載入顯åƒé è¨
+ </string>
+ <string name="title_camera">
+ 載入æ”影機é è¨
+ </string>
+ <text name="Preset">
+ é¸æ“‡ä¸€å€‹é è¨
+ </text>
+ <button label="確定" name="ok"/>
+ <button label="å–消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
old mode 100755
new mode 100644
index 6b6126c8e0c6b23016ac18f2f1b43d9189953775..e6a70a77248c9d52dc4e10c06cd827434270255e
--- a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
<string name="OutboxInitializing">
æ£åœ¨åˆå§‹åŒ–…
</string>
- <panel label="">
- <panel>
+ <panel label="" name="panel_1">
+ <panel name="panel_2">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
- 載入ä¸...
+ 載入ä¸â€¦
</text>
</panel>
</panel>
- <panel>
+ <panel name="panel_3">
+ <panel name="outbox_generic_drag_target">
+ <text name="text_1">
+ æŠŠç‰©é …æ‹–æ›³åˆ°é€™è£¡ï¼Œå¯å»ºç«‹è³‡æ–™å¤¾
+ </text>
+ </panel>
<button label="é€å¾€ç¬¬äºŒäººç”Ÿè³¼ç‰©å¸‚集" name="outbox_import_btn" tool_tip="推到我第二人生購物市集的店é¢"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
old mode 100755
new mode 100644
index 22b3d3b06527b4a29a4d0581ea754a77fc589955..817b1af88dc998c85f5e822e62f3b257a71a123a
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -55,6 +55,9 @@
<string name="mesh_status_invalid_material_list">
細節層次æ料並éžåƒè€ƒæ¨¡åž‹çš„å集åˆã€‚
</string>
+ <string name="phys_status_vertex_limit_exceeded">
+ 有些具體殼é¢è¶…å‡ºé ‚é»žé™åˆ¶ã€‚
+ </string>
<string name="layer_all">
全部
</string>
@@ -93,52 +96,52 @@
<text initial_value="é ‚é»ž" name="vertices" value="é ‚é»ž"/>
<text initial_value="高" name="high_label" value="高"/>
<combo_box name="lod_source_high">
- <item name="Load from file" value="從檔案載入"/>
- <item name="Generate" value="產生"/>
+ <item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+ <item label="產生" name="Generate" value="產生"/>
</combo_box>
<button label="ç€è¦½â€¦" name="lod_browse_high"/>
<combo_box name="lod_mode_high">
- <item name="Triangle Limit" value="三角形上é™"/>
- <item name="Error Threshold" value="錯誤門檻"/>
+ <item label="三角形上é™" name="Triangle Limit" value="三角形上é™"/>
+ <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/>
</combo_box>
<text initial_value="0" name="high_triangles" value="0"/>
<text initial_value="0" name="high_vertices" value="0"/>
<text initial_value="ä¸" name="medium_label" value="ä¸"/>
<combo_box name="lod_source_medium">
- <item name="Load from file" value="從檔案載入"/>
- <item name="Generate" value="產生"/>
- <item name="Use LoD above" value="以上使用低階細節"/>
+ <item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+ <item label="產生" name="Generate" value="產生"/>
+ <item label="以上使用低階細節" name="Use LoD above" value="以上使用低階細節"/>
</combo_box>
<button label="ç€è¦½â€¦" name="lod_browse_medium"/>
<combo_box name="lod_mode_medium">
- <item name="Triangle Limit" value="三角形上é™"/>
- <item name="Error Threshold" value="錯誤門檻"/>
+ <item label="三角形上é™" name="Triangle Limit" value="三角形上é™"/>
+ <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/>
</combo_box>
<text initial_value="0" name="medium_triangles" value="0"/>
<text initial_value="0" name="medium_vertices" value="0"/>
<text initial_value="低" name="low_label" value="低"/>
<combo_box name="lod_source_low">
- <item name="Load from file" value="從檔案載入"/>
- <item name="Generate" value="產生"/>
- <item name="Use LoD above" value="以上使用低階細節"/>
+ <item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+ <item label="產生" name="Generate" value="產生"/>
+ <item label="以上使用低階細節" name="Use LoD above" value="以上使用低階細節"/>
</combo_box>
<button label="ç€è¦½â€¦" name="lod_browse_low"/>
<combo_box name="lod_mode_low">
- <item name="Triangle Limit" value="三角形上é™"/>
- <item name="Error Threshold" value="錯誤門檻"/>
+ <item label="三角形上é™" name="Triangle Limit" value="三角形上é™"/>
+ <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/>
</combo_box>
<text initial_value="0" name="low_triangles" value="0"/>
<text initial_value="0" name="low_vertices" value="0"/>
<text initial_value="最低" name="lowest_label" value="最低"/>
<combo_box name="lod_source_lowest">
- <item name="Load from file" value="從檔案載入"/>
- <item name="Generate" value="產生"/>
- <item name="Use LoD above" value="以上使用低階細節"/>
+ <item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+ <item label="產生" name="Generate" value="產生"/>
+ <item label="以上使用低階細節" name="Use LoD above" value="以上使用低階細節"/>
</combo_box>
<button label="ç€è¦½â€¦" name="lod_browse_lowest"/>
<combo_box name="lod_mode_lowest">
- <item name="Triangle Limit" value="三角形上é™"/>
- <item name="Error Threshold" value="錯誤門檻"/>
+ <item label="三角形上é™" name="Triangle Limit" value="三角形上é™"/>
+ <item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/>
</combo_box>
<text initial_value="0" name="lowest_triangles" value="0"/>
<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d1b89a4267a5f8281307d0a1a87cfc87bc7e5d2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="通知">
+ <floater.string name="system_tab_title">
+ 系統：([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ 交易：([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ 邀請：([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ 群組：([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ 通知
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="系統 (0)" name="system_notification_list_tab"/>
+ <panel label="交易 (0)" name="transaction_notifications_tab"/>
+ <panel label="邀請 (0)" name="group_invite_notifications_tab"/>
+ <panel label="群組 (0)" name="group_notice_notifications_tab"/>
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="全部摺疊" name="collapse_all_button"/>
+ </layout_panel>
+ <layout_panel name="GapLayoutPanel">
+ <panel label="空隙欄" name="GapPanel"/>
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="全部刪除" name="delete_all_button"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
old mode 100755
new mode 100644
index e6971d111fc8f9651e32a6ad1b69082c7896d76f..e04166c589928784e9375d8678dd3689071078e1
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
<floater.string name="character_owner_group">
[group]
</floater.string>
- <panel>
+ <panel name="pathfinding_chars_main">
<scroll_list name="objects_scroll_list">
<scroll_list.columns label="å稱" name="name"/>
<scroll_list.columns label="æè¿°" name="description"/>
@@ -42,7 +42,7 @@
<button label="å…¨é¸" name="select_all_objects"/>
<button label="全都ä¸é¸" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_chars_actions">
<text name="actions_label">
所é¸è§’色所採動作：
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
old mode 100755
new mode 100644
index be009b54d88e38a44ad18deac2a6b52f8d051163..7cd1094a05e80248960925c1a311e7f8914e454c
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
<floater.string name="pathing_error">
產生路徑時出錯。
</floater.string>
+ <panel name="pathfinding_console_main">
+ <text name="viewer_status_label">
+ ç€è¦½å™¨ç‹€æ…‹
+ </text>
+ </panel>
+ <panel name="pathfinding_console_simulator">
+ <text name="simulator_status_label">
+ 模擬器狀態
+ </text>
+ </panel>
<tab_container name="view_test_tab_container">
<panel label="視角" name="view_panel">
<text name="show_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
old mode 100755
new mode 100644
index 22e5d2e8462e3aa58decfe1659207645625d865f..71278b7ce60d0faf9c13923d11b11d81edc517cd
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
<floater.string name="linkset_choose_use">
é¸æ“‡è¯çµé›†çš„使用…
</floater.string>
- <panel>
+ <panel name="pathfinding_linksets_main">
+ <text name="linksets_filter_label">
+ éŽæ¿¾æ–¹å¼ï¼š
+ </text>
+ <text name="linksets_name_label">
+ å稱
+ </text>
+ <text name="linksets_desc_label">
+ æè¿°
+ </text>
<combo_box name="filter_by_linkset_use">
<combo_box.item label="按è¯çµé›†çš„使用來éŽæ¿¾â€¦" name="filter_by_linkset_use_none"/>
<combo_box.item label="å¯è¡Œèµ°çš„" name="filter_by_linkset_use_walkable"/>
@@ -122,7 +131,10 @@
<button label="å…¨é¸" name="select_all_objects"/>
<button label="全都ä¸é¸" name="select_none_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_actions">
+ <text name="linksets_actions_label">
+ å°æ‰€é¸è¯çµé›†æŽ¡å–的動作（如果連çµé›†å¾žè™›æ“¬ä¸–界移除，其屬性æ會éºå¤±ï¼‰ï¼š
+ </text>
<check_box label="顯示指標" name="show_beacon"/>
<button label="å–å¾—" name="take_objects"/>
<button label="æ‹¿å–副本" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
<button label="退回" name="return_objects"/>
<button label="刪除" name="delete_objects"/>
</panel>
- <panel>
+ <panel name="pathfinding_linksets_attributes">
+ <text name="linksets_attributes_label">
+ 編輯所é¸è¯çµé›†çš„屬性，並按按鈕啟用變更
+ </text>
<text name="walkability_coefficients_label">
å¯è¡Œèµ°æ€§ï¼š
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_perms_default.xml b/indra/newview/skins/default/xui/zh/floater_perms_default.xml
index 78696be48268a22c07f99e379ee0ea8ada8c2571..d4706d8d87a9ea91808dfc94383c73c9a9845996 100644
--- a/indra/newview/skins/default/xui/zh/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perms_default.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="perms default" title="é è¨çš„創建權é™">
- <panel label="é è¨çš„權é™" name="default permissions"/>
+ <panel label="é è¨çš„權é™" name="default permissions">
+ <text name="label_1">
+ 下一個所有人：
+ </text>
+ <text name="label_2">
+ 複製
+ </text>
+ <text name="label_3">
+ 修改
+ </text>
+ <text name="label_4">
+ 轉移
+ </text>
+ <text name="label_5">
+ 與群組分享
+ </text>
+ <text name="label_6">
+ å…許任何人覆製
+ </text>
+ <text name="label_7" tool_tip="è¨å®šé è¨æ¬Šé™æ±ºå®šä½•æ™‚建立物件">
+ 物件
+ </text>
+ <text name="label_8" tool_tip="è¨å®šå·²ä¸Šå‚³ç‰©é …çš„é è¨æ¬Šé™">
+ 上傳內容
+ </text>
+ <text name="label_9" tool_tip="è¨å®šé è¨æ¬Šé™æ±ºå®šä½•æ™‚建立腳本">
+ 腳本
+ </text>
+ <text name="label_10" tool_tip="è¨å®šé è¨æ¬Šé™æ±ºå®šä½•æ™‚建立記事å¡">
+ 記事å¡
+ </text>
+ <text name="label_11" tool_tip="è¨å®šé è¨æ¬Šé™æ±ºå®šä½•æ™‚建立姿勢">
+ 姿勢
+ </text>
+ <text name="label_12" tool_tip="è¨å®šé è¨æ¬Šé™æ±ºå®šä½•æ™‚建立æœè£æˆ–身體部ä½">
+ å¯ç©¿è£æ‰®
+ </text>
+ </panel>
<button label="確定" label_selected="確定" name="ok"/>
<button label="å–消" label_selected="å–消" name="cancel"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f9c2fe47e7d86590b63cdd7c7c3b5effef891888
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="進階顯åƒå好è¨å®š">
+ <text name="GeneralText">
+ 一般
+ </text>
+ <slider label="æ繪è·é›¢ï¼š" name="DrawDistance"/>
+ <text name="DrawDistanceMeterText2">
+ 公尺
+ </text>
+ <slider label="最大粒å效果數é‡ï¼š" name="MaxParticleCount"/>
+ <slider label="後處ç†å“質：" name="RenderPostProcess"/>
+ <text name="PostProcessText">
+ 低
+ </text>
+ <text name="AvatarText">
+ 化身
+ </text>
+ <slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈åƒç‚ºã€Œå–®è‰²è»Ÿç³–娃娃ã€"/>
+ <text name="IndirectMaxComplexityText">
+ 0
+ </text>
+ <slider label="éžå‡å†’化身數目上é™ï¼š" name="IndirectMaxNonImpostors"/>
+ <text name="IndirectMaxNonImpostorsText">
+ 0
+ </text>
+ <slider label="細節：" name="AvatarMeshDetail"/>
+ <text name="AvatarMeshDetailText">
+ 低
+ </text>
+ <slider label="身體物ç†ï¼š" name="AvatarPhysicsDetail"/>
+ <text name="AvatarPhysicsDetailText">
+ 低
+ </text>
+ <text name="ShadersText">
+ 硬體
+ </text>
+ <slider label="æ質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="é…置給æ質使用的記憶體é‡ã€‚ é è¨ç‚ºé¡¯åƒå¡è¨˜æ†¶é«”。 é™ä½Žæ¤å€¼å¯ä»¥æå‡æ•ˆèƒ½ï¼Œä½†æ質也會變模糊。"/>
+ <slider label="霧è·é›¢æ¯”率：" name="fog"/>
+ <slider label="伽瑪值：" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ （0 = é è¨äº®åº¦ï¼›å€¼è¶Šå° = 亮度越高）
+ </text>
+ <check_box label="å„å‘異性éŽæ¿¾ï¼ˆè‹¥å•Ÿç”¨æœƒè®Šæ…¢ï¼‰" name="ani"/>
+ <check_box initial_value="true" label="啟用 OpenGL é ‚é»žç·©è¡ç‰©ä»¶(VBO)" name="vbo" tool_tip="在較新硬體上啟用，å¯æå‡æ•ˆèƒ½ã€‚ 但是，較舊硬體的 VBO 實作ä¸ä½³ï¼Œè‹¥å•Ÿç”¨å¯èƒ½å°Žè‡´ç•¶æ©Ÿã€‚"/>
+ <check_box initial_value="true" label="啟用æè³ªå£“ç¸®ï¼ˆé ˆé‡æ–°å•Ÿå‹•ï¼‰" name="texture compression" tool_tip="在影片記憶體ä¸å£“縮æ質，讓高解æžåº¦æ質å¯ä»¥è¼‰å…¥ï¼Œä½†è‰²å½©å“質ç¨å·®ã€‚"/>
+ <text name="antialiasing label">
+ 消除鋸齒：
+ </text>
+ <combo_box label="消除鋸齒" name="fsaa">
+ <combo_box.item label="å·²åœç”¨" name="FSAADisabled"/>
+ <combo_box.item label="2x" name="2x"/>
+ <combo_box.item label="4x" name="4x"/>
+ <combo_box.item label="8x" name="8x"/>
+ <combo_box.item label="16x" name="16x"/>
+ </combo_box>
+ <text name="antialiasing restart">
+ ï¼ˆé ˆé‡æ–°å•Ÿå‹•ï¼‰
+ </text>
+ <slider label="地形網é¢ç´°ç¯€ï¼š" name="TerrainMeshDetail"/>
+ <text name="TerrainMeshDetailText">
+ 低
+ </text>
+ <slider label="樹木：" name="TreeMeshDetail"/>
+ <text name="TreeMeshDetailText">
+ 低
+ </text>
+ <slider label="物件：" name="ObjectMeshDetail"/>
+ <text name="ObjectMeshDetailText">
+ 低
+ </text>
+ <slider label="彈性幾何元件：" name="FlexibleMeshDetail"/>
+ <text name="FlexibleMeshDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="清澈é€æ˜Žçš„æ°´" name="TransparentWater"/>
+ <check_box initial_value="true" label="å‡¹å‡¸æ˜ å°„èˆ‡å…‰æ¾¤æ•ˆæžœ" name="BumpShiny"/>
+ <check_box initial_value="true" label="本地光線" name="LocalLights"/>
+ <check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉æ¤ä¸€é¸é …å¯èƒ½é¿å…部分顯示å¡é©…動程å¼æ毀當機"/>
+ <slider label="地形細節：" name="TerrainDetail"/>
+ <text name="TerrainDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="硬體化身æ›è†š" name="AvatarVertexProgram"/>
+ <check_box initial_value="true" label="化身衣æœ" name="AvatarCloth"/>
+ <text name="ReflectionsText">
+ æ°´æ–‡å射：
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="最å°" name="0"/>
+ <combo_box.item label="地形與樹木" name="1"/>
+ <combo_box.item label="全部éœæ…‹ç‰©ä»¶" name="2"/>
+ <combo_box.item label="全部化身與物件" name="3"/>
+ <combo_box.item label="一切" name="4"/>
+ </combo_box>
+ <check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
+ <slider label="天空：" name="SkyMeshDetail"/>
+ <text name="SkyMeshDetailText">
+ 低
+ </text>
+ <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
+ <check_box initial_value="true" label="環境光é®è”½" name="UseSSAO"/>
+ <check_box initial_value="true" label="景深" name="UseDoF"/>
+ <text name="RenderShadowDetailText">
+ 陰影：
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="ç„¡" name="0"/>
+ <combo_box.item label="日 / 月" name="1"/>
+ <combo_box.item label="日 / 月 + 投影物" name="2"/>
+ </combo_box>
+ <button label="é‡è¨ç‚ºæˆ‘們建è°çš„è¨å®š" name="Defaults"/>
+ <button label="確定" label_selected="確定" name="OK"/>
+ <button label="å–消" label_selected="å–消" name="Cancel"/>
+ <check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a3c95940ca3e15faf035f2da6005b5e34575b71
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="儲å˜å好é è¨">
+ <string name="title_graphic">
+ 儲å˜é¡¯ç¤ºé è¨
+ </string>
+ <string name="title_camera">
+ 儲å˜æ”影機é è¨
+ </string>
+ <text name="Preset">
+ 輸入é è¨å稱，或é¸æ“‡ä¸€çµ„ç¾æœ‰é è¨ã€‚
+ </text>
+ <button label="儲å˜" name="save"/>
+ <button label="å–消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
old mode 100755
new mode 100644
index 6094a3bbce4a93b291d7232d0a4b88e950e2df72..bb4ebcdf2175162e8a7e8349507698e06b5599f2
--- a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="spellcheck_import" title="匯入å—å…¸">
+ <text name="import_dict">
+ å—典：
+ </text>
<button label="ç€è¦½" label_selected="ç€è¦½" name="dictionary_path_browse"/>
+ <text name="import_name">
+ å稱：
+ </text>
+ <text name="import_lang">
+ 語言：
+ </text>
<button label="匯入" name="ok_btn"/>
<button label="å–消" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
old mode 100755
new mode 100644
index 3da9445a5508514eb455ab77965b10a8fb3e4054..c86cc3057d0e3dc18516cca9049dc48226b57387
--- a/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -12,4 +12,7 @@
<text name="tos_heading">
請仔細閱讀以下æœå‹™æ¢æ¬¾åŠéš±ç§æ”¿ç–。 繼續登入 [SECOND_LIFE] å‰ï¼Œä½ å¿…é ˆåŒæ„æ¢æ¬¾ã€‚
</text>
+ <text name="external_tos_required">
+ ä½ éœ€å…ˆç™»å…¥ my.secondlife.com åŒæ„æœå‹™æ¢æ¬¾ï¼Œæ‰å¯ç¹¼çºŒã€‚ è¬è¬ä½ ï¼
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
old mode 100755
new mode 100644
index 41b34096272fba6d3ab0cbc7d33a666a1a862e53..ace1302250d19bb8f0ba6a3a16098a61951a4c12
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -15,5 +15,8 @@
<menu_item_call label="放大" name="Zoom In"/>
<menu_item_call label="支付" name="Pay..."/>
<menu_item_call label="物件檔案" name="Object Inspect"/>
+ <menu_item_check label="æ£å¸¸å‘ˆåƒ" name="RenderNormally"/>
+ <menu_item_check label="ä¸è¦å‘ˆåƒ" name="DoNotRender"/>
+ <menu_item_check label="完全呈åƒ" name="AlwaysRenderFully"/>
<menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
old mode 100755
new mode 100644
index dc035bafa03aeec377a8c053c222fd9b03738e90..0e0d1cc3d2c31dc0ffd63cdd5e01e7e653904af2
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -14,5 +14,8 @@
<menu_item_call label="å‚¾å° XML" name="Dump XML"/>
<menu_item_call label="放大" name="Zoom In"/>
<menu_item_call label="支付" name="Pay..."/>
+ <menu_item_check label="æ£å¸¸å‘ˆåƒ" name="RenderNormally"/>
+ <menu_item_check label="ä¸è¦å‘ˆåƒ" name="DoNotRender"/>
+ <menu_item_check label="完全呈åƒ" name="AlwaysRenderFully"/>
<menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
old mode 100755
new mode 100644
index 4a1e2f436489e9d15d04c3acf080acc2c9c5fdf9..7ef9240e830946eb250e5a8e9f33d15d2f35686b
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -15,6 +15,7 @@
<menu_item_call label="[SECOND_LIFE] 部è½æ ¼" name="Second Life Blogs"/>
<menu_item_call label="å›žå ±éŒ¯èª¤" name="Report Bug"/>
<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="查詢是å¦æœ‰æ–°ç‰ˆ" name="Check for Updates"/>
</menu>
<menu_item_check label="顯示除錯é¸å–®" name="Show Debug Menu"/>
<menu label="除錯" name="Debug">
diff --git a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
index 5396b2a8664bbde752e064dcf10590aa737e4643..a2f520d6edd3316ebab0d91b8e0acb090ab0e2c9 100644
--- a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="menu_marketplace_sort">
+ <menu_item_check label="ä¾å稱排åº" name="sort_by_name"/>
+ <menu_item_check label="ä¾æœ€è¿‘時間排åº" name="sort_by_recent"/>
<menu_item_check label="按å˜é‡æŽ’åºï¼ˆç”±å°‘到多）" name="sort_by_stock_amount"/>
<menu_item_check label="åªé¡¯ç¤ºåˆŠç™»è³‡æ–™å¤¾" name="show_only_listing_folders"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_email.xml b/indra/newview/skins/default/xui/zh/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9db99a2b6df52de101a20b0ce6c3e0fc3640bd69
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+ <menu_item_call label="用外部客戶程å¼ç·¨çº‚電郵" name="email_open_external"/>
+ <menu_item_call label="複製電郵到剪貼簿" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
old mode 100755
new mode 100644
index 9572ad49d3f23ba4a9c83d9b631f148952c74a5c..41590d60c70e8cf000977baec747e1cff4f319ae
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -178,6 +178,7 @@
<menu_item_call label="å›žå ±è‡èŸ²" name="Report Bug"/>
<menu_item_call label="碰撞ã€æŽ¨æ“ 與打擊" name="Bumps, Pushes &amp; Hits"/>
<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
+ <menu_item_call label="查詢是å¦æœ‰æ–°ç‰ˆ" name="Check for Updates"/>
</menu>
<menu label="進階" name="Advanced">
<menu_item_call label="é‡æ–°ç”¢å‡ºæ質" name="Rebake Texture"/>
@@ -191,7 +192,7 @@
<menu_item_call label="Lag 測é‡å™¨" name="Lag Meter"/>
<menu_item_check label="統計列" name="Statistics Bar"/>
<menu_item_call label="å ´æ™¯è² è¼‰çµ±è¨ˆè³‡æ–™" name="Scene Load Statistics"/>
- <menu_item_check label="顯示化身的繪製é‡é‡" name="Avatar Rendering Cost"/>
+ <menu_item_check label="顯示化身複雜度資訊" name="Avatar Draw Info"/>
</menu>
<menu label="高亮顯示與å¯è¦‹åº¦" name="Highlighting and Visibility">
<menu_item_check label="Cheesy 指標" name="Cheesy Beacon"/>
@@ -314,8 +315,6 @@
<menu_item_check label="接點" name="Joints"/>
<menu_item_check label="光線投射" name="Raycast"/>
<menu_item_check label="風力å‘é‡" name="Wind Vectors"/>
- <menu_item_check label="繪出複雜度" name="rendercomplexity"/>
- <menu_item_check label="附件ä½å…ƒçµ„" name="attachment bytes"/>
<menu_item_check label="雕刻" name="Sculpt"/>
<menu label="æ質密度" name="Texture Density">
<menu_item_check label="ç„¡" name="None"/>
@@ -421,13 +420,11 @@
<menu_item_check label="除錯å—å…ƒå¯è¦‹æ€§" name="Debug Character Vis"/>
<menu_item_check label="顯示碰撞骨架" name="Show Collision Skeleton"/>
<menu_item_check label="顯示用戶目標" name="Display Agent Target"/>
- -->
<menu_item_call label="傾å°é™„件" name="Dump Attachments"/>
<menu_item_call label="除錯化身æ質" name="Debug Avatar Textures"/>
<menu_item_call label="傾å°æœ¬åœ°æ質" name="Dump Local Textures"/>
</menu>
<menu_item_check label="HTTP æ質" name="HTTP Textures"/>
- <menu_item_check label="HTTP 收ç´å€" name="HTTP Inventory"/>
<menu_item_call label="壓縮圖åƒ" name="Compress Images"/>
<menu_item_call label="啟用記憶體洩æ¼è¦–覺åµæ¸¬å™¨" name="Enable Visual Leak Detector"/>
<menu_item_check label="輸出除錯å°åž‹å‚¾å°" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
old mode 100755
new mode 100644
index 371f5d9b3947d19370365fc16cd0ccd8c1f0cf01..3f08496a6826984d56d809869a7f4bb6bfdc4f8f
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -164,6 +164,10 @@
'[ERROR_CODE]'
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="MerchantForceValidateListing">
+ ç‚ºèƒ½å»ºç«‹ä½ çš„åˆŠç™»å…§å®¹ï¼Œæˆ‘å€‘ä¿®æ£äº†ä½ 刊登內容的層級架構。
+ <usetemplate ignoretext="如果建立新的刊登時會修動內容物的層級架構，給我æ醒" name="okignore" yestext="確定"/>
+ </notification>
<notification name="ConfirmMerchantActiveChange">
這個動作會改變æ¤åˆŠç™»çš„內容。 ä½ ç¢ºå®šè¦ç¹¼çºŒå—Žï¼Ÿ
<usetemplate ignoretext="在我變更 Marketplace çš„ä¸€é …åˆŠç™»å…§å®¹ä¹‹å‰ï¼Œå…ˆè·Ÿæˆ‘確èª" name="okcancelignore" notext="å–消" yestext="確定"/>
@@ -211,11 +215,9 @@
å› ç‚ºå˜é‡çˆ²é›¶ï¼Œæˆ‘å€‘å·²ç¶“æŠŠä½ çš„åˆŠç™»ç‰©ä¸‹æž¶ã€‚ ä½ è‹¥å¸Œæœ›é‡æ–°åˆŠç™»ï¼Œå¿…é ˆå…ˆå¢žåŠ å˜é‡ã€‚
<usetemplate ignoretext="é™é‡è³‡æ–™å¤¾å¦‚æžœæˆç©ºã€å°Žè‡´åˆŠç™»ç‰©ä¸‹æž¶ï¼Œå‘ŠçŸ¥æˆ‘" name="okignore" yestext="確定"/>
</notification>
- <notification name="CompileQueueSaveText">
- 上傳腳本文å—時出å•é¡Œï¼ŒåŽŸå› ：[REASON]。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
- </notification>
- <notification name="CompileQueueSaveBytecode">
- 上傳已編è¯è…³æœ¬æ™‚出å•é¡Œï¼ŒåŽŸå› ：[REASON]。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
+ <notification name="AlertMerchantVersionFolderEmpty">
+ å› ç‚ºç‰ˆæœ¬è³‡æ–™å¤¾æ˜¯ç©ºçš„ï¼Œæˆ‘å€‘å·²ç¶“æŠŠä½ çš„åˆŠç™»ç‰©ä¸‹æž¶ã€‚ ä½ è‹¥å¸Œæœ›é‡æ–°åˆŠç™»ï¼Œå¿…é ˆå…ˆæ–°å¢žç‰©é …åˆ°è©²ç‰ˆæœ¬è³‡æ–™å¤¾ã€‚
+ <usetemplate ignoretext="版本資料夾如果æˆç©ºã€å°Žè‡´åˆŠç™»ç‰©ä¸‹æž¶ï¼Œå‘ŠçŸ¥æˆ‘" name="okignore" yestext="確定"/>
</notification>
<notification name="WriteAnimationFail">
寫入動作資料時出錯。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
@@ -320,6 +322,14 @@
ä½ å³å°‡æŠŠ [COUNT] 個人踢出群組。
<usetemplate ignoretext="確定將多人踢出群組" name="okcancelignore" notext="å–消" yestext="踢出"/>
</notification>
+ <notification name="BanGroupMemberWarning">
+ ä½ å³å°‡ç¦æ¢[AVATAR_NAME]留在群組。
+ <usetemplate ignoretext="確定ç¦æ¢æŸäººç•™åœ¨ç¾¤çµ„" name="okcancelignore" notext="å–消" yestext="ç¦æ¢"/>
+ </notification>
+ <notification name="BanGroupMembersWarning">
+ ä½ å³å°‡ç¦æ¢[COUNT]個人留在群組。
+ <usetemplate ignoretext="確定è¦ç¦æ¢å¤šåæˆå“¡çºŒç•™æ¤ç¾¤çµ„" name="okcancelignore" notext="å–消" yestext="ç¦æ¢"/>
+ </notification>
<notification name="AttachmentDrop">
ä½ å³å°‡å¸é™¤ä½ 的附件。
ä½ ç¢ºå®šä½ è¦ç¹¼çºŒï¼Ÿ
@@ -404,7 +414,7 @@
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
<notification name="ReturnAllTopObjects">
- ä½ ç¢ºå®šè¦å°‡æ‰€åˆ—的所有物件é€è¿”其所有人的收ç´å€ï¼Ÿ
+ ä½ ç¢ºå®šè¦å°‡æ‰€åˆ—的所有物件é€è¿”其所有人的收ç´å€ï¼Ÿ 這將é€å›žé€™å€‹åœ°å€å…¨éƒ¨çš„腳本物件ï¼
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
<notification name="DisableAllTopObjects">
@@ -587,16 +597,10 @@
（*è¦å‘Š* 這動作無法還原。）
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
- <notification name="SaveScriptFailReason">
- 儲å˜è…³æœ¬æ™‚出å•é¡Œï¼ŒåŽŸå› ：[REASON]。 è«‹ç¨å¾Œå†å˜—試儲å˜è…³æœ¬ã€‚
- </notification>
<notification name="SaveScriptFailObjectNotFound">
無法儲å˜è…³æœ¬ï¼Œæ‰¾ä¸åˆ°å®ƒæ‰€å±¬çš„物件。
該物件å¯èƒ½è¶…出範åœæˆ–已被刪除。
</notification>
- <notification name="SaveBytecodeFailReason">
- 儲å˜ç·¨è¯è…³æœ¬æ™‚出å•é¡Œï¼ŒåŽŸå› ：[REASON]。 è«‹ç¨å¾Œå†å˜—試儲å˜è…³æœ¬ã€‚
- </notification>
<notification name="StartRegionEmpty">
ä½ çš„èµ·å§‹åœ°å€å°šæœªå®šç¾©ã€‚
請在「開始ä½ç½®ã€æ¡†è£¡è¼¸å…¥å€åŸŸå，或é¸æ“‡ã€Œæˆ‘上一次ä½ç½®ã€æˆ–「我的家ã€ä½œç‚ºé–‹å§‹ä½ç½®ã€‚
@@ -609,6 +613,10 @@
<notification name="CannotDownloadFile">
無法下載檔案
</notification>
+ <notification label="" name="MediaFileDownloadUnsupported">
+ ä½ è¦æ±‚下載檔案，在 [SECOND_LIFE] 裡未支æ´é€™å‹•ä½œã€‚
+ <usetemplate ignoretext="如果下載的檔案ä¸å—支æ´ï¼Œçµ¦æˆ‘æ醒" name="okignore" yestext="確定"/>
+ </notification>
<notification name="CannotWriteFile">
無法寫入檔案 [[FILE]]
</notification>
@@ -1108,8 +1116,9 @@
這異常狀æ³é€šå¸¸åªæ˜¯æš«æ™‚的。 è«‹ç¨å¾…幾分é˜å¾Œï¼Œå†è‡ªè¨‚並儲å˜å¯ç©¿è£æ‰®ã€‚
</notification>
<notification name="YouHaveBeenLoggedOut">
- ç³Ÿç³•ï¼ ä½ å·²è¢«ç™»å‡º [SECOND_LIFE]
- [MESSAGE]
+ ç³Ÿç³•ï¼ ä½ å·²è¢«ç™»å‡º [SECOND_LIFE]。
+
+[MESSAGE]
<usetemplate name="okcancelbuttons" notext="çµæŸé€€å‡º" yestext="察看 IM å’ŒèŠå¤©å…§å®¹"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1350,6 +1359,13 @@
<ignore name="ignore" text="æœè£èŠ±å¤ªå¤šæ™‚間下載"/>
</form>
</notification>
+ <notification name="RegionAndAgentComplexity">
+ ä½ çš„[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。
+[OVERLIMIT_MSG]
+ </notification>
+ <notification name="AgentComplexity">
+ ä½ çš„[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。
+ </notification>
<notification name="FirstRun">
[APP_NAME] 安è£å®Œæˆã€‚
@@ -1626,6 +1642,25 @@ SHA1 指紋：[MD5_DIGEST]
åƒè¦‹[[INFO_URL] 介紹æ¤æ›´æ–°ç‰ˆçš„資訊]
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="UpdateDownloadInProgress">
+ 有更新版本ï¼
+æ£åœ¨èƒŒæ™¯ä¸‹è¼‰ä¸ï¼Œä¸€å®Œæˆä¸‹è¼‰æˆ‘å€‘æœƒé€šçŸ¥ä½ é‡å•Ÿç€è¦½å™¨ä»¥ä¾¿å®‰è£ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="UpdateDownloadComplete">
+ 一個更新版本已經下載完畢。 é‡å•Ÿæ™‚將會安è£ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="UpdateCheckError">
+ 查詢是å¦æœ‰æ›´æ–°æ™‚出錯。
+è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="UpdateViewerUpToDate">
+ ä½ çš„ç€è¦½å™¨å·²æ˜¯æœ€æ–°ç‰ˆï¼
+å¦‚æžœä½ æ€¥æ¬²è©¦ç”¨æœ€æ–°çš„åŠŸèƒ½å’Œä¿®è£œï¼Œè«‹å…‰è‡¨ã€Œæ›¿ä»£ç€è¦½å™¨ã€ç¶²é ：http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers。
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="DeedObjectToGroup">
讓渡æ¤ç‰©ä»¶å°‡å¯è®“這個群組：
* 收å–付給æ¤ç‰©ä»¶çš„ L$
@@ -1730,6 +1765,13 @@ SHA1 指紋：[MD5_DIGEST]
ä½ å·²é”å¯åŒæ™‚åŠ å…¥çš„ç¾¤çµ„æ•¸ä¸Šé™ã€‚ 請先離開æŸäº›ç¾¤çµ„å†åŠ 入或新建新群組。
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="GroupLimitInfo">
+ 基本帳戶的群組é™åˆ¶æ˜¯[MAX_BASIC]，[https://secondlife.com/premium/ 付費]帳戶則是[MAX_PREMIUM]。
+å¦‚æžœä½ æŠŠå¸³æˆ¶é™ç´šï¼Œä½ å¿…é ˆå…ˆä½Žæ–¼[MAX_BASIC]的群組é™åˆ¶ï¼Œæ‰å¯å†åŠ 入更多群組。
+
+[https://secondlife.com/my/account/membership.php ç¾åœ¨å°±å‡ç´šï¼]
+ <usetemplate name="okbutton" yestext="關閉"/>
+ </notification>
<notification name="KickUser">
踢出這個居民並留給他什麼訊æ¯ï¼Ÿ
<form name="form">
@@ -1930,7 +1972,7 @@ SHA1 指紋：[MD5_DIGEST]
<usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="å…¨éƒ¨é ˜åœ°" yestext="é€™å€‹é ˜åœ°"/>
</notification>
<notification label="é¸æ“‡é ˜åœ°" name="EstateTrustedExperienceRemove">
- 僅é‡å°é€™å€‹é ˜åœ°æˆ–é‡å° [ALL_ESTATES] 將它從金鑰清單ä¸ç§»é™¤ï¼Ÿ
+ 僅é‡å°é€™å€‹é ˜åœ°ï¼Œé‚„是é‡å° [ALL_ESTATES] 將它從金鑰清單ä¸ç§»é™¤ï¼Ÿ
<usetemplate canceltext="å–消" name="yesnocancelbuttons" notext="å…¨éƒ¨é ˜åœ°" yestext="é€™å€‹é ˜åœ°"/>
</notification>
<notification label="確èªè¸¢å‡º" name="EstateKickUser">
@@ -2239,6 +2281,10 @@ SHA1 指紋：[MD5_DIGEST]
確èªä½ 真è¦æ”¯ä»˜ L$[AMOUNT] 給 [TARGET]。
<usetemplate ignoretext="付款å‰è·Ÿæˆ‘確èªï¼ˆè¶…éŽ L$200 的總é¡ï¼‰" name="okcancelignore" notext="å–消" yestext="支付"/>
</notification>
+ <notification name="PayObjectFailed">
+ 付款失敗：找ä¸åˆ°ç‰©ä»¶ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
這物件ä¸æ²’æœ‰ä»»ä½•å‡†è¨±ä½ è¤‡è£½çš„ç‰©é …ã€‚
</notification>
@@ -2270,10 +2316,9 @@ SHA1 指紋：[MD5_DIGEST]
[QUESTION]
<usetemplate ignoretext="刪除物å“å‰ç¢ºèª" name="okcancelignore" notext="å–消" yestext="確定"/>
</notification>
- <notification name="HelpReportAbuseEmailLL">
- ä½¿ç”¨é€™å€‹å·¥å…·èˆ‰å ±ä»»ä½•é•å[http://secondlife.com/corporate/tos.php æœå‹™æ¢æ¬¾]å’Œ[http://secondlife.com/corporate/cs.php 社群準則]的情事。
-
-æ‰€æœ‰èˆ‰å ±çš„é•è¦äº‹ä»¶éƒ½æœ‰äººèª¿æŸ¥ï¼ŒåŠ 以解決。
+ <notification name="ConfirmUnlink">
+ 這是一組包å«è¯çµé›†çš„巨大é¸å–é …ã€‚ ä¸€æ—¦ä½ å–消它的è¯çµï¼Œå¾ˆå¯èƒ½ä¸èƒ½å†é‡æ–°è¯çµã€‚ 為防è¬ä¸€ï¼Œå»ºè°ä½ 把è¯çµé›†è¤‡è£½åˆ°æ”¶ç´å€ã€‚
+ <usetemplate ignoretext="å–消è¯çµé›†è¯çµæ™‚，跟我確èª" name="okcancelignore" notext="å–消" yestext="å–消è¯çµ"/>
</notification>
<notification name="HelpReportAbuseSelectCategory">
è«‹é¸æ“‡é©åˆé€™æ¬¡é•è¦èˆ‰å ±çš„類別。
@@ -3201,6 +3246,12 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="AttachmentSaved">
附件已儲å˜ã€‚
</notification>
+ <notification name="PresetNotSaved">
+ 儲å˜é è¨å稱[NAME]時出錯。
+ </notification>
+ <notification name="PresetNotDeleted">
+ 刪除é è¨å稱[NAME]時出錯。
+ </notification>
<notification name="UnableToFindHelpTopic">
找ä¸åˆ°é€™å€‹å…ƒä»¶çš„幫助主題。
</notification>
@@ -3233,9 +3284,8 @@ SHA1 指紋：[MD5_DIGEST]
é¸å–è¦åˆ†äº«çš„居民。
</notification>
<notification name="MeshUploadError">
- [LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER]
-
-詳見記錄檔。
+ [LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER]
+[DETAILS]詳情見 SecondLife.log
</notification>
<notification name="MeshUploadPermError">
請求網é¢ä¸Šå‚³æ¬Šé™æ™‚出錯。
diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_search.xml b/indra/newview/skins/default/xui/zh/panel_experience_search.xml
index 9b0145748ed2f9fcf79679badd32fdb4a02e5e62..25b15d03ab606a7b6a583bbc21f64ef2a3a6bd07 100644
--- a/indra/newview/skins/default/xui/zh/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/zh/panel_experience_search.xml
@@ -26,7 +26,7 @@
<icons_combo_box label="é©åº¦æˆäºº" name="maturity">
<icons_combo_box.item label="完全æˆäºº" name="Adult" value="42"/>
<icons_combo_box.item label="é©åº¦æˆäºº" name="Mature" value="21"/>
- <icons_combo_box.item label="一般" name="PG" value="13"/>
+ <icons_combo_box.item label="普級" name="PG" value="13"/>
</icons_combo_box>
<scroll_list name="search_results">
<columns label="å稱" name="experience_name"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
old mode 100755
new mode 100644
index 0ad3d8506d00d20ccf335357b61e11767d522fa0..476527615874d148a62847667b1d7c7603ac7d4f
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -6,6 +6,9 @@
<panel.string name="ItemcountCompleted">
[ITEM_COUNT] ç‰©å“ [FILTER]
</panel.string>
+ <panel.string name="ItemcountUnknown">
+ å·²å–å¾— [ITEM_COUNT] ç‰©å“ [FILTER]
+ </panel.string>
<text name="ItemcountText">
物å“：
</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
old mode 100755
new mode 100644
index da5918d55341125dcd8a8b359c323b7887661ef0..b0e60218cf3971f78e99b5d8ca595f44e9efe28d
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -18,6 +18,7 @@
<string name="no_groups_msg" value="è¦å°‹æ‰¾ç¾¤çµ„è€ƒæ…®åŠ å…¥å—Žï¼Ÿ 請試試[secondlife:///app/search/groups æœå°‹]。"/>
<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift éµæ‹–曳來平移）"/>
<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳é€ï¼ŒæŒ‰ä¸‹ shift éµæ‹–曳來平移）"/>
+ <string name="GroupCountWithInfo" value="ä½ ç›®å‰å±¬æ–¼ [COUNT] 個群組，å¯å†åŠ å…¥ [REMAINING] 個。 [secondlife:/// 想è¦æ›´å¤šï¼Ÿ]"/>
<tab_container name="tabs">
<panel label="附近" name="nearby_panel">
<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_message.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
old mode 100755
new mode 100644
index b5cdddc252f3929daaba6e850707cac17d80c70b..57add4f9d6509b59b0e02368ba5bbd6cf1beacc8
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
<check_box label="收ç´ç‰©å“è´ˆé€" name="inventory_offer"/>
</panel>
<panel name="log_settings">
+ <text name="logging_label">
+ 儲å˜ï¼š
+ </text>
+ <combo_box name="conversation_log_combo">
+ <item label="活動記錄和交談記錄" name="log_and_transcripts" value="2"/>
+ <item label="僅活動記錄" name="log_only" value="1"/>
+ <item label="沒有活動記錄或交談記錄" name="no_log_or_transcript" value="0"/>
+ </combo_box>
<button label="清空記錄…" name="clear_log"/>
<button label="刪除交談內容記錄…" name="delete_transcripts"/>
+ <text name="log_location_label">
+ ä½ç½®ï¼š
+ </text>
<button label="ç€è¦½â€¦" label_selected="ç€è¦½" name="log_path_button"/>
</panel>
<button label="ç¿»è¯â€¦" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
old mode 100755
new mode 100644
index 2311eb99a75438f317448f677f341e3f26ca2544..8c4d2f9c1824f172cd0e2d435df60fe5c88ea0fe
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="顯åƒ" name="Display panel">
+ <text name="preset_text">
+ （無）
+ </text>
<text name="QualitySpeed">
å“質與速度：
</text>
- <text name="FasterText">
- 最快
- </text>
- <text name="BetterText">
- 最佳
- </text>
<text name="ShadersPrefText">
低
</text>
@@ -21,94 +18,17 @@
<text name="ShadersPrefText4">
超高
</text>
- <panel label="自訂圖形" name="CustomGraphics Panel">
- <text name="ShadersText">
- 著色器：
- </text>
- <check_box initial_value="true" label="清澈é€æ˜Žçš„æ°´" name="TransparentWater"/>
- <check_box initial_value="true" label="å‡¹å‡¸æ˜ å°„èˆ‡å…‰æ¾¤æ•ˆæžœ" name="BumpShiny"/>
- <check_box initial_value="true" label="本地光線" name="LocalLights"/>
- <check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉æ¤ä¸€é¸é …å¯èƒ½é¿å…部分顯示å¡é©…動程å¼æ毀當機"/>
- <check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
- <check_box initial_value="true" label="環境光é®è”½" name="UseSSAO"/>
- <check_box initial_value="true" label="景深" name="UseDoF"/>
- <text name="shadows_label">
- 陰影：
- </text>
- <combo_box name="ShadowDetail">
- <combo_box.item label="ç„¡" name="0"/>
- <combo_box.item label="日 / 月" name="1"/>
- <combo_box.item label="日 / 月 + 投影物" name="2"/>
- </combo_box>
- <text name="reflection_label">
- æ°´æ–‡å射：
- </text>
- <combo_box name="Reflections">
- <combo_box.item label="最å°" name="0"/>
- <combo_box.item label="地形與樹木" name="1"/>
- <combo_box.item label="全部éœæ…‹ç‰©ä»¶" name="2"/>
- <combo_box.item label="全部化身與物件" name="3"/>
- <combo_box.item label="一切" name="4"/>
- </combo_box>
- <slider label="化身物ç†ï¼š" name="AvatarPhysicsDetail"/>
- <text name="AvatarPhysicsDetailText">
- 低
- </text>
- <slider label="æ繪è·é›¢ï¼š" name="DrawDistance"/>
- <text name="DrawDistanceMeterText2">
- 公尺
- </text>
- <slider label="最大粒å效果數é‡ï¼š" name="MaxParticleCount"/>
- <slider label="éžå‡å†’化身上é™ï¼š" name="MaxNumberAvatarDrawn"/>
- <slider label="後處ç†å“質：" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- 網é¢ç´°ç¯€ï¼š
- </text>
- <slider label="物件：" name="ObjectMeshDetail"/>
- <slider label="彈性幾何元件：" name="FlexibleMeshDetail"/>
- <slider label="樹木：" name="TreeMeshDetail"/>
- <slider label="化身：" name="AvatarMeshDetail"/>
- <slider label="地形：" name="TerrainMeshDetail"/>
- <slider label="天空：" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- 低
- </text>
- <text name="ObjectMeshDetailText">
- 低
- </text>
- <text name="FlexibleMeshDetailText">
- 低
- </text>
- <text name="TreeMeshDetailText">
- 低
- </text>
- <text name="AvatarMeshDetailText">
- 低
- </text>
- <text name="TerrainMeshDetailText">
- 低
- </text>
- <text name="SkyMeshDetailText">
- 低
- </text>
- <text name="AvatarRenderingText">
- 化身呈åƒï¼š
- </text>
- <check_box initial_value="true" label="化身å‡å†’者" name="AvatarImpostors"/>
- <check_box initial_value="true" label="硬體æ›è†š" name="AvatarVertexProgram"/>
- <check_box initial_value="true" label="化身衣æœ" name="AvatarCloth"/>
- <text name="TerrainDetailText">
- 地形細節：
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item label="低" name="0"/>
- <radio_item label="高" name="2"/>
- </radio_group>
- -->
- </panel>
- <button label="套用" label_selected="套用" name="Apply"/>
- <button label="é‡è¨" name="Defaults"/>
- <button label="進階" name="Advanced"/>
- <button label="硬體" label_selected="硬體" name="GraphicsHardwareButton"/>
+ <text name="FasterText">
+ 最快
+ </text>
+ <text name="BetterText">
+ 最佳
+ </text>
+ <check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
+ <button label="å°‡è¨å®šå˜ç‚ºé è¨å€¼ …" name="PrefSaveButton"/>
+ <button label="載入é è¨..." name="PrefLoadButton"/>
+ <button label="刪除自訂é…置…" name="PrefDeleteButton"/>
+ <button label="é‡è¨ç‚ºæˆ‘們建è°çš„è¨å®š" name="Defaults"/>
+ <button label="進階è¨å®šâ€¦" name="AdvancedSettings"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
old mode 100755
new mode 100644
index fcbed76d493b489176d60017eb9ec4b6c1674a11..942bd27140fa77857850b5488eab66f7a771dbd4
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
<radio_group name="preferred_browser_behavior">
<radio_item label="所有連çµéƒ½ç”¨æˆ‘的網é ç€è¦½å™¨ï¼ˆä¾‹å¦‚ Chromeã€Firefoxã€IE）開啟" name="internal" tool_tip="使用系統é è¨çš„ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é 。全螢幕模å¼ä¸‹ä¸å»ºè°é€™éº¼åšã€‚" value="0"/>
<radio_item label="僅在開啟第二人生連çµæ™‚使用內建ç€è¦½å™¨" name="external" tool_tip="使用系統é è¨çš„ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é 。僅在開啟 LindenLab/SecondLife 的連çµæ™‚æ‰æœƒä½¿ç”¨å…§å»ºç€è¦½å™¨ã€‚" value="1"/>
+ <radio_item label="用內建ç€è¦½å™¨é–‹å•Ÿæ‰€æœ‰é€£çµ" name="external_all" tool_tip="使用內建的ç€è¦½å™¨ç€è¦½å¹«åŠ©ï¼Œé–‹å•Ÿç¶²é 。該ç€è¦½å™¨å°‡é€éŽ [APP_NAME] 開啟新視窗。" value="2"/>
</radio_group>
<check_box initial_value="true" label="啟用外掛" name="browser_plugins_enabled"/>
<check_box initial_value="true" label="æŽ¥å— cookies" name="cookies_enabled"/>
<check_box initial_value="true" label="啟用 Javascript" name="browser_javascript_enabled"/>
- <check_box initial_value="false" label="啟用媒體ç€è¦½çš„çªé¡¯å¼è¦–窗" name="media_popup_enabled"/>
<text name="Software updates:">
軟體更新：
</text>
<combo_box name="updater_service_combobox">
<combo_box.item label="自動安è£" name="Install_automatically"/>
- <combo_box.item label="手動下載åŠå®‰è£" name="Install_manual"/>
+ <combo_box.item label="讓我自己手動下載並安è£" name="Install_manual"/>
</combo_box>
<check_box label="願æ„在更新時æ¶å…ˆè©¦ç”¨é‡‹å‡ºå€™é¸ç‰ˆ" name="update_willing_to_test"/>
<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd2cbfdd5a23d198cf816b84541bb0bca9b84005
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+ <text name="Graphic Presets">
+ 顯åƒé è¨
+ </text>
+ <button label="開啟顯åƒå好è¨å®š" name="open_prefs_btn" tool_tip="打開顯åƒå好è¨å®š"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
old mode 100755
new mode 100644
index 09043311da73f02ccf723ac25f503422131ef302..39d0aa959364a421cb8201c0069402828c82aa19
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
@@ -57,12 +57,9 @@
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="媒體網å€"/>
<layout_stack name="media_address_url_icons">
- <layout_panel>
+ <layout_panel name="media_address_url_icons_wl">
<icon name="media_whitelist_flag" tool_tip="白å單已啟用"/>
</layout_panel>
- <layout_panel>
- <icon name="media_secure_lock_flag" tool_tip="åŠ å¯†çš„ç€è¦½"/>
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
old mode 100755
new mode 100644
index 9c45c54a5edf24292ffc16f8a4b8f16eb0a473ca..094bf019b4344cac0fc2df8c998be2e725df8ad9
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
將圖åƒå„²å˜åˆ°æ”¶ç´å€çš„費用為 L$[UPLOAD_COST]。 è‹¥è¦å°‡åœ–åƒå˜ç‚ºæ質，請é¸æ“‡ä¸€å€‹æ£æ–¹æ ¼å¼ã€‚
</text>
<combo_box label="解æžåº¦" name="texture_size_combo">
- <combo_box.item label="ç›®å‰è¦–窗" name="CurrentWindow"/>
+ <combo_box.item label="ç›®å‰è¦–窗(512x512)" name="CurrentWindow"/>
<combo_box.item label="å°ï¼ˆ128x128）" name="Small(128x128)"/>
<combo_box.item label="ä¸ï¼ˆ256x256）" name="Medium(256x256)"/>
<combo_box.item label="大（512x512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
index 5ea6d818c73453f4af2a44bb2b68ce8e9849243c..03f83693d6b90ab6163ae29f0d728c70b94feaf0 100644
--- a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
@@ -21,11 +21,11 @@
<combo_box.item label="ææ–™" name="Materials"/>
<combo_box.item label="媒體" name="Media"/>
</combo_box>
- <combo_box name="combobox mattype">
- <combo_box.item label="æ質（漫å射圖）" name="Texture (diffuse)"/>
- <combo_box.item label="凹凸度（æ£äº¤ï¼‰" name="Bumpiness (normal)"/>
- <combo_box.item label="閃亮度（é¡å光）" name="Shininess (specular)"/>
- </combo_box>
+ <radio_group name="radio_material_type">
+ <radio_item label="æ質（漫å射圖）" name="Texture (diffuse)" value="0"/>
+ <radio_item label="凹凸度（æ£äº¤ï¼‰" name="Bumpiness (normal)" value="1"/>
+ <radio_item label="閃亮度（é¡å光）" name="Shininess (specular)" value="2"/>
+ </radio_group>
<texture_picker label="æ質" name="texture control" tool_tip="點按以挑é¸åœ–片"/>
<text name="label alphamode">
åŠé€æ˜Žæ¨¡å¼
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
old mode 100755
new mode 100644
index 6493864b923a416069ca82d6b7406e21e965bb02..2ce310b2244755206af16492e10eeda7525fcf98
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -38,12 +38,9 @@
顯åƒåˆå§‹åŒ–失敗。 è«‹æ›´æ–°ä½ çš„é¡¯åƒå¡é©…動程å¼ï¼
</string>
<string name="AboutHeader">
- [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+ [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">
- 以 [COMPILER_VERSION] 版本 [COMPILER] 建置
- </string>
<string name="AboutPosition">
ä½ çš„æ–¹ä½æ˜¯ [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地å€å：[REGION]，主機：<nolink>[HOSTNAME]</nolink> ([HOSTIP])
第二人生URL：<nolink>[SLURL]</nolink>
@@ -64,10 +61,9 @@
<string name="AboutLibs">
OpenGL 版本：[OPENGL_VERSION]
-libcurl 版本： [LIBCURL_VERSION]
J2C 解碼器版本： [J2C_VERSION]
音效驅動程å¼ç‰ˆæœ¬ï¼š [AUDIO_DRIVER_VERSION]
-Qt Webkit 版本： [QT_WEBKIT_VERSION]
+LLCEFLib/CEF版本：[LLCEFLIB_VERSION]
語音伺æœå™¨ç‰ˆæœ¬ï¼š [VOICE_VERSION]
</string>
<string name="AboutTraffic">
@@ -178,6 +174,12 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION]
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="AgniGridLabel">
+ 第二人生主è¦ç¶²æ ¼(Agni)
+ </string>
+ <string name="AditiGridLabel">
+ 第二人生Betaç‰ˆæ¸¬è©¦ç¶²æ ¼(Aditi)
+ </string>
<string name="ViewerDownloadURL">
http://secondlife.com/download
</string>
@@ -448,6 +450,9 @@ http://secondlife.com/viewer-access-faq
ä½ ä¸èƒ½å°å«è¶…éŽ [AMOUNT] å€‹ç‰©é …çš„è³‡æ–™å¤¾ä½œç©¿æˆ´å‹•ä½œã€‚ 欲變更æ¤ä¸Šé™ï¼Œå¯åˆ°ã€Œé€²éšŽã€>「顯示除錯è¨å®šã€>「WearFolderLimitã€ã€‚
</string>
<string name="TooltipPrice" value="L$[AMOUNT]："/>
+ <string name="TooltipSLIcon">
+ 這將連çµåˆ°ä½æ–¼SecondLife.com或LindenLab.com官方網域的一個網é 。
+ </string>
<string name="TooltipOutboxDragToWorld">
ä½ ä¸èƒ½å¾ž Marketplace 的刊登資料夾產生物件。
</string>
@@ -467,7 +472,7 @@ http://secondlife.com/viewer-access-faq
é™é‡ç‰©ä»¶æ•¸ç›®è¶…éŽ [AMOUNT]。
</string>
<string name="TooltipOutboxCannotDropOnRoot">
- ä½ åªèƒ½æŠŠç‰©é …或資料夾拖放到「所有ã€(ALL)é 籤 è«‹é¸å–該é 籤，å†ç§»å‹•ä½ çš„ç‰©é …æˆ–è³‡æ–™å¤¾ã€‚
+ ä½ åªèƒ½æŠŠç‰©é …或資料夾拖放到所有(ALL)或已å–消è¯çµ(UNASSOCIATED)é 籤。 è«‹é¸å–å…¶ä¸ä¸€å€‹é 籤，å†ç§»å‹•ä½ çš„ç‰©é …æˆ–è³‡æ–™å¤¾ã€‚
</string>
<string name="TooltipOutboxNoTransfer">
至少一個物件無法出售或轉移
@@ -551,6 +556,9 @@ http://secondlife.com/viewer-access-faq
點按以執行 secondlife:// 指令
</string>
<string name="CurrentURL" value="ç›®å‰ç¶²å€ï¼š[CurrentURL]"/>
+ <string name="TooltipEmail">
+ 點按一下å¯ç·¨å¯«é›»éƒµ
+ </string>
<string name="SLurlLabelTeleport">
瞬間傳é€åˆ°
</string>
@@ -1073,7 +1081,7 @@ http://secondlife.com/viewer-access-faq
<string name="AgentNameSubst">
ï¼ˆä½ ï¼‰
</string>
- <string name="JoinAnExperience"/><!-- intentionally blank -->
+ <string name="JoinAnExperience"/>
<string name="SilentlyManageEstateAccess">
管ç†é ˜å‡ºå…¥è¨±å¯å單時，ä¸é¡¯ç¤ºè¦ç¤º
</string>
@@ -1852,6 +1860,21 @@ http://secondlife.com/viewer-access-faq
<string name="TodayOld">
ä»Šæ—¥å‰›åŠ å…¥
</string>
+ <string name="av_render_everyone_now">
+ ç¾åœ¨æ¯å€‹äººéƒ½èƒ½çœ‹è¦‹ä½ 了。
+ </string>
+ <string name="av_render_not_everyone">
+ ä½ æ怕ä¸èƒ½å‘ˆåƒçµ¦ä½ 周é的所有人。
+ </string>
+ <string name="av_render_over_half">
+ ä½ æ怕ä¸èƒ½å‘ˆåƒçµ¦ä½ 周é一åŠä»¥ä¸Šçš„人。
+ </string>
+ <string name="av_render_most_of">
+ ä½ æ怕ä¸èƒ½å‘ˆåƒçµ¦ä½ 周é大部分的人。
+ </string>
+ <string name="av_render_anyone">
+ ä½ æ怕ä¸èƒ½å‘ˆåƒçµ¦ä½ 周é的任何人。
+ </string>
<string name="AgeYearsA">
[COUNT] å¹´
</string>
@@ -1969,6 +1992,9 @@ http://secondlife.com/viewer-access-faq
<string name="CompileQueueUnknownFailure">
ä¸‹è¼‰å¤±æ•—ï¼ŒåŽŸå› ä¸æ˜Ž
</string>
+ <string name="CompileNoExperiencePerm">
+ ç•¥éŽé«”é©— [EXPERIENCE] 的腳本 [SCRIPT]。
+ </string>
<string name="CompileQueueTitle">
é‡æ–°ç·¨è¯é€²åº¦
</string>
@@ -2014,9 +2040,6 @@ http://secondlife.com/viewer-access-faq
<string name="GroupsNone">
ç„¡
</string>
- <string name="CompileNoExperiencePerm">
- ç•¥éŽé«”é©— [EXPERIENCE] 的腳本 [SCRIPT]。
- </string>
<string name="Group" value="（群組）"/>
<string name="Unknown">
（未知）
@@ -5384,18 +5407,6 @@ http://secondlife.com/viewer-access-faq
<string name="UserDictionary">
[User]
</string>
- <string name="logging_calls_disabled_log_empty">
- 交談未留記錄。 若想開始留記錄，請到「å好è¨å®š > èŠå¤©ã€ï¼Œé¸æ“‡ã€Œå„²å˜ï¼šåªç•™æ·å²è¨˜éŒ„ã€æˆ–「儲å˜ï¼šæ·å²è¨˜éŒ„兼交談內容ã€ã€‚
- </string>
- <string name="logging_calls_disabled_log_not_empty">
- å°‡ä¸å†ç‚ºäº¤è«‡ç•™è¨˜éŒ„。 若想æ¢å¾©ç•™å˜è¨˜éŒ„，請到「å好è¨å®š > èŠå¤©ã€ï¼Œé¸æ“‡ã€Œå„²å˜ï¼šåªç•™æ·å²è¨˜éŒ„ã€æˆ–「儲å˜ï¼šæ·å²è¨˜éŒ„兼交談內容ã€ã€‚
- </string>
- <string name="logging_calls_enabled_log_empty">
- ç›®å‰æ²’有交談記錄。 åœ¨ä½ è¯çµ¡æŸäººæˆ–æŸäººè¯çµ¡ä½ 之後，這裡將留å˜è¨˜éŒ„。
- </string>
- <string name="loading_chat_logs">
- 載入ä¸â€¦
- </string>
<string name="experience_tools_experience">
體驗
</string>
@@ -5477,4 +5488,37 @@ http://secondlife.com/viewer-access-faq
<string name="ExperiencePermissionShort12">
權é™
</string>
+ <string name="logging_calls_disabled_log_empty">
+ 交談未留記錄。 若想開始留記錄，請到「å好è¨å®š > èŠå¤©ã€ï¼Œé¸æ“‡ã€Œå„²å˜ï¼šåªç•™æ·å²è¨˜éŒ„ã€æˆ–「儲å˜ï¼šæ·å²è¨˜éŒ„兼交談內容ã€ã€‚
+ </string>
+ <string name="logging_calls_disabled_log_not_empty">
+ å°‡ä¸å†ç‚ºäº¤è«‡ç•™è¨˜éŒ„。 若想æ¢å¾©ç•™å˜è¨˜éŒ„，請到「å好è¨å®š > èŠå¤©ã€ï¼Œé¸æ“‡ã€Œå„²å˜ï¼šåªç•™æ·å²è¨˜éŒ„ã€æˆ–「儲å˜ï¼šæ·å²è¨˜éŒ„兼交談內容ã€ã€‚
+ </string>
+ <string name="logging_calls_enabled_log_empty">
+ ç›®å‰æ²’有交談記錄。 åœ¨ä½ è¯çµ¡æŸäººæˆ–æŸäººè¯çµ¡ä½ 之後，這裡將留å˜è¨˜éŒ„。
+ </string>
+ <string name="loading_chat_logs">
+ 載入ä¸â€¦
+ </string>
+ <string name="preset_combo_label">
+ -空白清單-
+ </string>
+ <string name="Default">
+ é è¨
+ </string>
+ <string name="none_paren_cap">
+ （無）
+ </string>
+ <string name="no_limit">
+ 無上é™
+ </string>
+ <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+ 該物ç†å½¢ç‹€åŒ…å«å¤ªå°çš„三角形。 請試著簡化該物ç†æ¨¡åž‹ã€‚
+ </string>
+ <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+ 該物ç†å½¢ç‹€åŒ…å«å£žçš„確èªè³‡æ–™ã€‚ 請試著修æ£è©²ç‰©ç†æ¨¡åž‹ã€‚
+ </string>
+ <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+ 物ç†å½¢ç‹€çš„版本ä¸æ£ç¢ºã€‚ è«‹è¨æˆæ£ç¢ºçš„物ç†æ¨¡åž‹ç‰ˆæœ¬ã€‚
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/gpus_results.txt b/indra/newview/tests/gpus_results.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/gpus_seen.txt b/indra/newview/tests/gpus_seen.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llglslshader_stub.cpp b/indra/newview/tests/llglslshader_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llhttpretrypolicy_test.cpp b/indra/newview/tests/llhttpretrypolicy_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llpipeline_stub.cpp b/indra/newview/tests/llpipeline_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llsky_stub.cpp b/indra/newview/tests/llsky_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/lltextureinfo_test.cpp b/indra/newview/tests/lltextureinfo_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/lltextureinfodetails_test.cpp b/indra/newview/tests/lltextureinfodetails_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/lltexturestatsuploader_test.cpp b/indra/newview/tests/lltexturestatsuploader_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llviewershadermgr_stub.cpp b/indra/newview/tests/llviewershadermgr_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llwlanimator_stub.cpp b/indra/newview/tests/llwlanimator_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llwldaycycle_stub.cpp b/indra/newview/tests/llwldaycycle_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llwlparammanager_test.cpp b/indra/newview/tests/llwlparammanager_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llwlparamset_stub.cpp b/indra/newview/tests/llwlparamset_stub.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tests/llxmlrpclistener_test.cpp b/indra/newview/tests/llxmlrpclistener_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/tr.lproj/language.txt b/indra/newview/tr.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/uk.lproj/language.txt b/indra/newview/uk.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/newview/zh-Hans.lproj/language.txt b/indra/newview/zh-Hans.lproj/language.txt
old mode 100755
new mode 100644
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
old mode 100755
new mode 100644
index 8bde5bda639aa879d76c4d29c8d8fe492829aab6..8344cead57c32a8f80a01bea1a3f284b2fb11c52
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -10,7 +10,6 @@ include(LLMath)
include(LLMessage)
include(LLVFS)
include(LLXML)
-include(LScript)
include(Linking)
include(Tut)
include(LLAddBuildTest)
@@ -49,7 +48,6 @@ set(test_SOURCE_FILES
llpermissions_tut.cpp
llpipeutil.cpp
llsaleinfo_tut.cpp
- llscriptresource_tut.cpp
llsdmessagebuilder_tut.cpp
llsdmessagereader_tut.cpp
llsd_new_tut.cpp
diff --git a/indra/test/blowfish.digits.txt b/indra/test/blowfish.digits.txt
old mode 100755
new mode 100644
diff --git a/indra/test/catch_and_store_what_in.h b/indra/test/catch_and_store_what_in.h
old mode 100755
new mode 100644
diff --git a/indra/test/debug.h b/indra/test/debug.h
old mode 100755
new mode 100644
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llassetuploadqueue_tut.cpp b/indra/test/llassetuploadqueue_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lldoubledispatch_tut.cpp b/indra/test/lldoubledispatch_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llevents_tut.cpp b/indra/test/llevents_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llhttpdate_tut.cpp b/indra/test/llhttpdate_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llhttpnode_tut.cpp b/indra/test/llhttpnode_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llpipeutil.cpp b/indra/test/llpipeutil.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llpipeutil.h b/indra/test/llpipeutil.h
old mode 100755
new mode 100644
diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llscriptresource_tut.cpp b/indra/test/llscriptresource_tut.cpp
deleted file mode 100755
index 7a3b824e6d577e850e7eed444dbee40bf8495986..0000000000000000000000000000000000000000
--- a/indra/test/llscriptresource_tut.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * @file llscriptresource_tut.cpp
- * @brief Test LLScriptResource
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-//#include <tut/tut.h>
-#include "linden_common.h"
-
-#include "lltut.h"
-
-#include "llscriptresource.h"
-#include "llscriptresourceconsumer.h"
-#include "llscriptresourcepool.h"
-
-class TestConsumer : public LLScriptResourceConsumer
-{
-public:
- TestConsumer()
- : mUsedURLs(0)
- { }
-
- // LLScriptResourceConsumer interface:
- S32 getUsedPublicURLs() const
- {
- return mUsedURLs;
- }
-
- // Test details:
- S32 mUsedURLs;
-};
-
-
-namespace tut
-{
- class LLScriptResourceTestData
- {
- };
-
- typedef test_group<LLScriptResourceTestData> LLScriptResourceTestGroup;
- typedef LLScriptResourceTestGroup::object LLScriptResourceTestObject;
- LLScriptResourceTestGroup scriptResourceTestGroup("scriptResource");
-
- template<> template<>
- void LLScriptResourceTestObject::test<1>()
- {
- LLScriptResource resource;
- U32 total = 42;
-
- resource.setTotal(total);
- ensure_equals("Verify set/get total", resource.getTotal(), total);
- ensure_equals("Verify all resources are initially available",resource.getAvailable(),total);
-
- // Requesting too many, releasing non-allocated
- ensure("Request total + 1 resources should fail",!resource.request(total + 1));
- ensure_equals("Verify all resources available after failed request",resource.getAvailable(),total);
-
- ensure("Releasing resources when none allocated should fail",!resource.release());
- ensure_equals("All resources should be available after failed release",resource.getAvailable(),total);
-
- ensure("Request one resource", resource.request());
- ensure_equals("Verify available resources after successful request",resource.getAvailable(),total - 1);
-
- // Is this right? Or should we release all used resources if we try to release more than are currently used?
- ensure("Release more resources than allocated",!resource.release(2));
- ensure_equals("Verify resource availability after failed release",resource.getAvailable(),total - 1);
-
- ensure("Release a resource",resource.release());
- ensure_equals("Verify all resources available after successful release",resource.getAvailable(),total);
- }
-
-
- template<> template<>
- void LLScriptResourceTestObject::test<2>()
- {
- LLScriptResource resource;
- U32 total = 42;
-
- resource.setTotal(total);
-
- S32 resources_to_request = 30;
- ensure("Get multiple resources resources",resource.request(resources_to_request));
- ensure_equals("Verify available resources is correct after request of multiple resources",resource.getAvailable(), total - resources_to_request);
-
- S32 resources_to_release = (resources_to_request / 2);
- ensure("Release some resources",resource.release(resources_to_release));
-
- S32 expected_available = (total - resources_to_request + resources_to_release);
- ensure_equals("Verify available resources after release of some resources",resource.getAvailable(), expected_available);
-
- resources_to_release = (resources_to_request - resources_to_release);
- ensure("Release remaining resources",resource.release(resources_to_release));
-
- ensure_equals("Verify available resources after release of remaining resources",resource.getAvailable(), total);
- }
-
- template<> template<>
- void LLScriptResourceTestObject::test<3>()
- {
- LLScriptResource resource;
-
- U32 total = 42;
- resource.setTotal(total);
-
- ensure("Request all resources",resource.request(total));
-
- U32 low_total = 10;
- ensure("Release all resources",resource.release(total));
- ensure_equals("Verify all resources available after releasing",resource.getAvailable(),total);
-
- resource.setTotal(low_total);
- ensure_equals("Verify low total resources are available after set",resource.getAvailable(),low_total);
- }
-
-
- template<> template<>
- void LLScriptResourceTestObject::test<4>()
- {
- S32 big_resource_total = 100;
- S32 small_resource_total = 10;
- LLScriptResourcePool big_pool;
- big_pool.getPublicURLResource().setTotal(big_resource_total);
- LLScriptResourcePool small_pool;
- small_pool.getPublicURLResource().setTotal(small_resource_total);
-
- TestConsumer consumer;
- LLScriptResourcePool& initial_pool = consumer.getScriptResourcePool();
- ensure("Initial resource pool is 'null'.", (&initial_pool == &LLScriptResourcePool::null));
-
- consumer.switchScriptResourcePools(big_pool);
- LLScriptResourcePool& get_pool = consumer.getScriptResourcePool();
- ensure("Get resource that was set.", (&big_pool == &get_pool));
-
- ensure_equals("No public urls in use yet.", consumer.getUsedPublicURLs(),0);
-
- S32 request_urls = 5;
- consumer.mUsedURLs = request_urls;
- consumer.getScriptResourcePool().getPublicURLResource().request(request_urls);
-
- ensure_equals("Available urls on big_pool is 5 less than total.",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
- ensure("Switching from big pool to small pool",
- consumer.switchScriptResourcePools(small_pool));
-
- ensure_equals("All resources available to big pool again",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total);
-
- ensure_equals("Available urls on small pool is 5 less than total.",
- small_pool.getPublicURLResource().getAvailable(), small_resource_total - request_urls);
-
- ensure("Switching from small pool to big pool",
- consumer.switchScriptResourcePools(big_pool));
-
- consumer.getScriptResourcePool().getPublicURLResource().release(request_urls);
-
- request_urls = 50; // Too many for the small_pool
-
- consumer.mUsedURLs = request_urls;
- consumer.getScriptResourcePool().getPublicURLResource().request(request_urls);
-
- // Verify big pool has them
- ensure_equals("Available urls on big pool is 50 less than total.",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
- // Verify can't switch to small_pool
- ensure("Switching to small pool with too many resources",
- !consumer.switchScriptResourcePools(small_pool));
-
- // Verify big pool still accounting for used resources
- ensure_equals("Available urls on big_pool is still 50 less than total.",
- big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
- // Verify small pool still has all resources available.
- ensure_equals("All resources in small pool are still available.",
- small_pool.getPublicURLResource().getAvailable(), small_resource_total);
- }
-}
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llsdtraits.h b/indra/test/llsdtraits.h
old mode 100755
new mode 100644
diff --git a/indra/test/llsdutil_tut.cpp b/indra/test/llsdutil_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llservicebuilder_tut.cpp b/indra/test/llservicebuilder_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltimestampcache_tut.cpp b/indra/test/lltimestampcache_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltranscode_tut.cpp b/indra/test/lltranscode_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/lltut.h b/indra/test/lltut.h
old mode 100755
new mode 100644
diff --git a/indra/test/lluserrelations_tut.cpp b/indra/test/lluserrelations_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/llxorcipher_tut.cpp b/indra/test/llxorcipher_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/mock_http_client.cpp b/indra/test/mock_http_client.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/mock_http_client.h b/indra/test/mock_http_client.h
old mode 100755
new mode 100644
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
old mode 100755
new mode 100644
diff --git a/indra/test/prim_linkability_tut.cpp b/indra/test/prim_linkability_tut.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
old mode 100755
new mode 100644
diff --git a/indra/test/test.h b/indra/test/test.h
old mode 100755
new mode 100644
diff --git a/indra/tools/vstool/README.txt b/indra/tools/vstool/README.txt
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/login/lllogin.h b/indra/viewer_components/login/lllogin.h
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdatechecker.h b/indra/viewer_components/updater/llupdatechecker.h
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdatedownloader.h b/indra/viewer_components/updater/llupdatedownloader.h
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdateinstaller.h b/indra/viewer_components/updater/llupdateinstaller.h
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h
old mode 100755
new mode 100644
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/StdAfx.cpp b/indra/win_crash_logger/StdAfx.cpp
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/StdAfx.h b/indra/win_crash_logger/StdAfx.h
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/ll_icon.ico b/indra/win_crash_logger/ll_icon.ico
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/resource.h b/indra/win_crash_logger/resource.h
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/win_crash_logger.h b/indra/win_crash_logger/win_crash_logger.h
old mode 100755
new mode 100644
diff --git a/indra/win_crash_logger/win_crash_logger.ico b/indra/win_crash_logger/win_crash_logger.ico
old mode 100755
new mode 100644
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index 4e66cf9ed442dc6f21be6875b4e8d8a096a47a67..928d340b69b3976e04d65f8b55df77c20483bcc2 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -91,3 +91,4 @@ def autobuild(*args):
print copyright[pkg]
else:
sys.exit("No copyright for %s" % pkg)
+ print ''