diff --git a/.gitattributes b/.gitattributes
index 05fb0913ce..dd1e93a156 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,10 +20,15 @@ indra/tools/vstool/* -text
*.db2 binary
*.llm binary
*.ttf binary
+*.nib binary
# Executables
*.dll binary
*.exe binary
+# Normalization disabled
+VivoxAUP.txt -text
+FILES_ARE_UNICODE_UTF-16LE.txt -text
+
# Windows Manifest files
*.manifest text eol=crlf
diff --git a/README_BUILD_FIRESTORM_WINDOWS.txt b/README_BUILD_FIRESTORM_WINDOWS.txt
index ae44a9e200..5596119399 100755
--- a/README_BUILD_FIRESTORM_WINDOWS.txt
+++ b/README_BUILD_FIRESTORM_WINDOWS.txt
@@ -1,54 +1,54 @@
-Before you start configuring your Windows build system, be aware of our tested configurations:
- Memory: You will need at least 2GB RAM, 4GB strongly recommended.
- CPU: Multiple CPUs are strongly recommended.
- A build can take over an hour.
- Visual Studio 2013 Community Edition.
-
-Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help
-compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may
-receive much less help. http://wiki.secondlife.com/wiki/Visual_Studio_2013_Viewer_Builds
-
-If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself.
-If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into:
-
- c:\cygwin\opt\firestorm
-
-If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to
-point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild
-instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev
-mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use
-"ReleaseFS_open" instead. This will perform the same build, using OpenJpeg instead of KDU.
-
-
-To build Firestorm:
-
-Open a CMD shell and navigating to your firestorm code repo:
-
- autobuild build -c ReleaseFS
-
-Other build targets you may use are:
-
- ReleaseFS (includes KDU, FMOD)
- ReleaseFS_open (no KDU, no FMOD)
- RelWithDebInfoFS_open (no KDU, no FMOD)
-
-Other examples:
- autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure
- autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure
- autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel
-
- autobuild build -c ReleaseFS --no-configure # default quick rebuild
-
-If you want to set custom configuration, do this in the configure step separately from build, then run "autobuild
-build -c ReleaseFS --no-configure" as a secondary step.
-
-If you want to build the 64bit version, add the parameter -A 64 to the autobuild commands, e.g.:
- autobuild configure -A 64 -c ReleaseFS
- autobuild build -A 64 -c ReleaseFS --no-configure
-
-
-Logs:
- Look for logs in build-vc120-32/logs for 32bit builds and build-vc120-64/logs for 64bit
-
-Output:
- Look for output in build-vc120-32/newview/Release for 32bit builds and build-vc120-64/newview/Release for 64bit
+Before you start configuring your Windows build system, be aware of our tested configurations:
+ Memory: You will need at least 2GB RAM, 4GB strongly recommended.
+ CPU: Multiple CPUs are strongly recommended.
+ A build can take over an hour.
+ Visual Studio 2013 Community Edition.
+
+Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help
+compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may
+receive much less help. http://wiki.secondlife.com/wiki/Visual_Studio_2013_Viewer_Builds
+
+If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself.
+If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into:
+
+ c:\cygwin\opt\firestorm
+
+If you're a community builder, you'll need to build these libraries yourself, then change your autobuild.xml file to
+point to your own versions, or create a different autobuild.xml with your customizations, and use this with autobuild
+instead of our default autobuild.xml There are some examples of how to build FMOD on the LL Wiki and opensource-dev
+mailing list. We've created a non-KDU build target to make this easier. Everywhere you see "ReleaseFS" below, use
+"ReleaseFS_open" instead. This will perform the same build, using OpenJpeg instead of KDU.
+
+
+To build Firestorm:
+
+Open a CMD shell and navigating to your firestorm code repo:
+
+ autobuild build -c ReleaseFS
+
+Other build targets you may use are:
+
+ ReleaseFS (includes KDU, FMOD)
+ ReleaseFS_open (no KDU, no FMOD)
+ RelWithDebInfoFS_open (no KDU, no FMOD)
+
+Other examples:
+ autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure
+ autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure
+ autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel
+
+ autobuild build -c ReleaseFS --no-configure # default quick rebuild
+
+If you want to set custom configuration, do this in the configure step separately from build, then run "autobuild
+build -c ReleaseFS --no-configure" as a secondary step.
+
+If you want to build the 64bit version, add the parameter -A 64 to the autobuild commands, e.g.:
+ autobuild configure -A 64 -c ReleaseFS
+ autobuild build -A 64 -c ReleaseFS --no-configure
+
+
+Logs:
+ Look for logs in build-vc120-32/logs for 32bit builds and build-vc120-64/logs for 64bit
+
+Output:
+ Look for output in build-vc120-32/newview/Release for 32bit builds and build-vc120-64/newview/Release for 64bit
diff --git a/indra/newview/fonts/SourceCodePro-license.txt b/indra/newview/fonts/SourceCodePro-license.txt
index d154618a7d..1177330426 100755
--- a/indra/newview/fonts/SourceCodePro-license.txt
+++ b/indra/newview/fonts/SourceCodePro-license.txt
@@ -1,93 +1,93 @@
-Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/indra/newview/fsdiscordkey.h.in b/indra/newview/fsdiscordkey.h.in
index 269745e453..c0454f1e3d 100644
--- a/indra/newview/fsdiscordkey.h.in
+++ b/indra/newview/fsdiscordkey.h.in
@@ -1,4 +1,4 @@
-// THIS FILE IS AUTOGENERATED BY THE BUILD PROCESS
-// You can either set the keys in Variables.cmake or at the autobuild command
-
+// THIS FILE IS AUTOGENERATED BY THE BUILD PROCESS
+// You can either set the keys in Variables.cmake or at the autobuild command
+
#define DISCORD_API_KEY "@DDISCORD_API_KEY@"
\ No newline at end of file
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 396fbbd586..5f6003c69b 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -666,10 +666,10 @@ void LLFace::renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wirefram
}
else
{
- // Don't use fixed functions when using shader renderer; found by Drake Arconis
- if (!LLGLSLShader::sNoFixedFunction)
- {
- //
+ // Don't use fixed functions when using shader renderer; found by Drake Arconis
+ if (!LLGLSLShader::sNoFixedFunction)
+ {
+ //
LLGLEnable fog(GL_FOG);
glFogi(GL_FOG_MODE, GL_LINEAR);
float d = (LLViewerCamera::getInstance()->getPointOfInterest() - LLViewerCamera::getInstance()->getOrigin()).magVec();
@@ -677,9 +677,9 @@ void LLFace::renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wirefram
glFogf(GL_FOG_START, d);
glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
glFogfv(GL_FOG_COLOR, fogCol.mV);
- // Don't use fixed functions when using shader renderer; found by Drake Arconis
- }
- //
+ // Don't use fixed functions when using shader renderer; found by Drake Arconis
+ }
+ //
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
{
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index f169e72ac7..e102e25269 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -125,49 +125,49 @@ void LLSkinningUtil::scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin
}
// Per frame SkinningMatrix Caching
-//void LLSkinningUtil::initSkinningMatrixPalette(
-// LLMatrix4* mat,
-// S32 count,
-// const LLMeshSkinInfo* skin,
-// LLVOAvatar *avatar)
-//{
-// initJointNums(const_cast(skin), avatar);
-// for (U32 j = 0; j < count; ++j)
-// {
-// LLJoint *joint = avatar->getJoint(skin->mJointNums[j]);
-// if (joint)
-// {
-//#define MAT_USE_SSE
-//#ifdef MAT_USE_SSE
-// LLMatrix4a bind, world, res;
-// bind.loadu(skin->mInvBindMatrix[j]);
-// world.loadu(joint->getWorldMatrix());
-// matMul(bind, world, res);
-// memcpy(mat[j].mMatrix, res.mMatrix, 16 * sizeof(float));
-//#else
-// mat[j] = skin->mInvBindMatrix[j];
-// mat[j] *= joint->getWorldMatrix();
-//#endif
-// }
-// else
-// {
-// mat[j] = skin->mInvBindMatrix[j];
-// // This shouldn't happen - in mesh upload, skinned
-// // rendering should be disabled unless all joints are
-// // valid. In other cases of skinned rendering, invalid
-// // joints should already have been removed during scrubInvalidJoints().
-// LL_WARNS_ONCE("Avatar") << avatar->getFullname()
-// << " rigged to invalid joint name " << skin->mJointNames[j]
-// << " num " << skin->mJointNums[j] << LL_ENDL;
-// LL_WARNS_ONCE("Avatar") << avatar->getFullname()
-// << " avatar build state: isBuilt() " << avatar->isBuilt()
-// << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
-//#if 0
-// dump_avatar_and_skin_state("initSkinningMatrixPalette joint not found", avatar, skin);
-//#endif
-// }
-// }
-//}
+//void LLSkinningUtil::initSkinningMatrixPalette(
+// LLMatrix4* mat,
+// S32 count,
+// const LLMeshSkinInfo* skin,
+// LLVOAvatar *avatar)
+//{
+// initJointNums(const_cast(skin), avatar);
+// for (U32 j = 0; j < count; ++j)
+// {
+// LLJoint *joint = avatar->getJoint(skin->mJointNums[j]);
+// if (joint)
+// {
+//#define MAT_USE_SSE
+//#ifdef MAT_USE_SSE
+// LLMatrix4a bind, world, res;
+// bind.loadu(skin->mInvBindMatrix[j]);
+// world.loadu(joint->getWorldMatrix());
+// matMul(bind, world, res);
+// memcpy(mat[j].mMatrix, res.mMatrix, 16 * sizeof(float));
+//#else
+// mat[j] = skin->mInvBindMatrix[j];
+// mat[j] *= joint->getWorldMatrix();
+//#endif
+// }
+// else
+// {
+// mat[j] = skin->mInvBindMatrix[j];
+// // This shouldn't happen - in mesh upload, skinned
+// // rendering should be disabled unless all joints are
+// // valid. In other cases of skinned rendering, invalid
+// // joints should already have been removed during scrubInvalidJoints().
+// LL_WARNS_ONCE("Avatar") << avatar->getFullname()
+// << " rigged to invalid joint name " << skin->mJointNames[j]
+// << " num " << skin->mJointNums[j] << LL_ENDL;
+// LL_WARNS_ONCE("Avatar") << avatar->getFullname()
+// << " avatar build state: isBuilt() " << avatar->isBuilt()
+// << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
+//#if 0
+// dump_avatar_and_skin_state("initSkinningMatrixPalette joint not found", avatar, skin);
+//#endif
+// }
+// }
+//}
#ifndef LL_RELEASE_FOR_DOWNLOAD
static LLTrace::BlockTimerStatHandle FTM_SKINNING_INIT("Init Skinning Mats");
@@ -201,17 +201,17 @@ void LLSkinningUtil::initSkinningMatrixPalette(
else
{
mat[j].loadu(skin->mInvBindMatrix[j]);
- // This shouldn't happen - in mesh upload, skinned
- // rendering should be disabled unless all joints are
- // valid. In other cases of skinned rendering, invalid
+ // This shouldn't happen - in mesh upload, skinned
+ // rendering should be disabled unless all joints are
+ // valid. In other cases of skinned rendering, invalid
// joints should already have been removed during scrubInvalidJoints().
- // Beq note - Oct 2018 Animesh - Many rigged meshes still fail here. ('mElbowLeeft' typo in the rigging data)
- LL_WARNS_ONCE("Avatar") << avatar->getFullname()
- << " rigged to invalid joint name " << skin->mJointNames[j]
- << " num " << skin->mJointNums[j] << LL_ENDL;
- LL_WARNS_ONCE("Avatar") << avatar->getFullname()
- << " avatar build state: isBuilt() " << avatar->isBuilt()
- << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
+ // Beq note - Oct 2018 Animesh - Many rigged meshes still fail here. ('mElbowLeeft' typo in the rigging data)
+ LL_WARNS_ONCE("Avatar") << avatar->getFullname()
+ << " rigged to invalid joint name " << skin->mJointNames[j]
+ << " num " << skin->mJointNums[j] << LL_ENDL;
+ LL_WARNS_ONCE("Avatar") << avatar->getFullname()
+ << " avatar build state: isBuilt() " << avatar->isBuilt()
+ << " mInitFlags " << avatar->mInitFlags << LL_ENDL;
}
//LL_DEBUGS("Skinning") << "[" << avatar->getFullname() << "] joint(" << skin->mJointNames[j] << ") matices bind(" << bind << ") world(" << world << ")" << LL_ENDL;
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 7848475042..aea73efc07 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -473,8 +473,8 @@ void LLViewerAssetStorage::assetRequestCoro(
LL_WARNS_ONCE("ViewerAsset") << "region " << gAgent.getRegion() << " mViewerAssetUrl " << mViewerAssetUrl << LL_ENDL;
}
// FIRE-23657 [OPENSIM] Update the Viewer Asset Url irrespective of previous setting (Fix provided by Liru Færs)
- // if (mViewerAssetUrl.empty() && gAgent.getRegion())
- if (gAgent.getRegion())
+ // if (mViewerAssetUrl.empty() && gAgent.getRegion())
+ if (gAgent.getRegion())
//
{
mViewerAssetUrl = gAgent.getRegion()->getViewerAssetUrl();
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index fcc4763aad..9467a138f0 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -79,7 +79,7 @@ class LLViewerMedia: public LLSingleton
public:
// String to get/set media autoplay in gSavedSettings
- static const char* AUTO_PLAY_MEDIA_SETTING;
+ static const char* AUTO_PLAY_MEDIA_SETTING;
static const char* SHOW_MEDIA_ON_OTHERS_SETTING;
static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING;
static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING;
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml
index 214ddbee57..f6f8d5dbac 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_timezone.xml
@@ -1,39 +1,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml
index 868fa3f68a..ecc11fcd95 100644
--- a/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/fr/panel_experience_list_editor.xml
@@ -1,14 +1,14 @@
-
-
- Chargement...
- Exp. autorisées :
- Exp. bloquées :
- Exp. de premier plan :
- (vide)
- Liste des expériences
-
-
-
-
-
-
+
+
+ Chargement...
+ Exp. autorisées :
+ Exp. bloquées :
+ Exp. de premier plan :
+ (vide)
+ Liste des expériences
+
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_profile_web.xml b/indra/newview/skins/default/xui/fr/panel_fs_profile_web.xml
index 7d7e9ec909..770cd298ac 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_profile_web.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_profile_web.xml
@@ -1,12 +1,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index a552a2bd77..bd902d0942 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,29 +1,29 @@
-
-
- Le terrain dans cette rĂ©gion peut ĂȘtre revendu.
- Le terrain dans cette rĂ©gion ne peut ĂȘtre revendu.
- Le terrain dans cette rĂ©gion peut ĂȘtre fusionnĂ© ou subdivisĂ©.
- Le terrain dans cette rĂ©gion ne peut ĂȘtre fusionnĂ© ou subdivisĂ©.
- Domaine
- Nom :
- Continent
- Propriétaire :
- (Aucun)
- RĂšglement :
- DerniĂšre modification le Wed Dec 31 16:00:00 1969
- Il n'y a aucun rÚglement rédigé pour ce domaine.
-
- Les modifications apportées au rÚglement seront affichées sur tous les terrains de ce domaine.
- Faire glisser une note pour modifier le rĂšglement de ce domaine.
- Région
- Nom :
- Erica
- Type :
- Continental / Résidentiel
- Classification :
- Adulte
- Revente :
- Le terrain dans cette rĂ©gion ne peut ĂȘtre revendu.
- Subdivision :
- Le terrain dans cette rĂ©gion ne peut ĂȘtre fusionnĂ©/subdivisĂ©.
-
+
+
+ Le terrain dans cette rĂ©gion peut ĂȘtre revendu.
+ Le terrain dans cette rĂ©gion ne peut ĂȘtre revendu.
+ Le terrain dans cette rĂ©gion peut ĂȘtre fusionnĂ© ou subdivisĂ©.
+ Le terrain dans cette rĂ©gion ne peut ĂȘtre fusionnĂ© ou subdivisĂ©.
+ Domaine
+ Nom :
+ Continent
+ Propriétaire :
+ (Aucun)
+ RĂšglement :
+ DerniĂšre modification le Wed Dec 31 16:00:00 1969
+ Il n'y a aucun rÚglement rédigé pour ce domaine.
+
+ Les modifications apportées au rÚglement seront affichées sur tous les terrains de ce domaine.
+ Faire glisser une note pour modifier le rĂšglement de ce domaine.
+ Région
+ Nom :
+ Erica
+ Type :
+ Continental / Résidentiel
+ Classification :
+ Adulte
+ Revente :
+ Le terrain dans cette rĂ©gion ne peut ĂȘtre revendu.
+ Subdivision :
+ Le terrain dans cette rĂ©gion ne peut ĂȘtre fusionnĂ©/subdivisĂ©.
+
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 0729c6426e..1e3fd64637 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -1,25 +1,25 @@
-
-
- Région :
- inconnue
-
-
-
-
- Renvoi d'objet
- Propriétaire :
- (aucun)
-
- Options :
-
-
-
-
-
-
-
- Secondes :
-
-
-
-
+
+
+ Région :
+ inconnue
+
+
+
+
+ Renvoi d'objet
+ Propriétaire :
+ (aucun)
+
+ Options :
+
+
+
+
+
+
+
+ Secondes :
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
index ab7261d48e..9609620011 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
@@ -1,21 +1,21 @@
-
-
- Sélectionnez les paramétrages aquatiques et le cycle temporel que vous souhaiteriez que vos visiteurs voient.
-
-
-
-
-
- Paramétrage aquatique
-
- Cycle Jour / Nuit
-
-
-
-
-
-
-
-
-
-
+
+
+ Sélectionnez les paramétrages aquatiques et le cycle temporel que vous souhaiteriez que vos visiteurs voient.
+
+
+
+
+
+ Paramétrage aquatique
+
+ Cycle Jour / Nuit
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index abd8f5827e..1d4041ad6b 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -1,34 +1,34 @@
-
-
- Région :
- inconnue
- ID du domaine :
- Version :
- inconnue
- Pos. dans la Grille :
- Type :
- inconnue
-
-
-
-
-
-
-
-
-
-
-
- Classification :
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Région :
+ inconnue
+ ID du domaine :
+ Version :
+ inconnue
+ Pos. dans la Grille :
+ Type :
+ inconnue
+
+
+
+
+
+
+
+
+
+
+
+ Classification :
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 889800e3e3..0103ec2bfb 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -1,32 +1,32 @@
-
-
- Région :
- inconnue
-
-
-
- Textures du terrain (Requis : fichiers .tga de taille 512x512 ou 1024x1024, 24 bits)
- 1 (Basse altitude)
- 2
- 3
- 4 (Haute altitude)
- Variation des textures
- Ces valeurs représentent l'altitude de changement des textures ci-dessus.
- Mesurées en mÚtres, la valeur Basse est l'altitude maximum de la premiÚre texture, et la valeur Haute est l'altitude minimum de la derniÚre texture.
- Nord-Ouest
- Nord-Est
-
-
-
-
- Sud-Ouest
- Sud-Est
-
-
-
-
-
-
-
-
-
+
+
+ Région :
+ inconnue
+
+
+
+ Textures du terrain (Requis : fichiers .tga de taille 512x512 ou 1024x1024, 24 bits)
+ 1 (Basse altitude)
+ 2
+ 3
+ 4 (Haute altitude)
+ Variation des textures
+ Ces valeurs représentent l'altitude de changement des textures ci-dessus.
+ Mesurées en mÚtres, la valeur Basse est l'altitude maximum de la premiÚre texture, et la valeur Haute est l'altitude minimum de la derniÚre texture.
+ Nord-Ouest
+ Nord-Est
+
+
+
+
+ Sud-Ouest
+ Sud-Est
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/fr/widgets/bodyparts_list_item.xml
index 21d2fd5b52..78cc5b9aa9 100644
--- a/indra/newview/skins/default/xui/fr/widgets/bodyparts_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/bodyparts_list_item.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/fr/widgets/clothing_list_item.xml
index e7eec1e84c..96b3158a43 100644
--- a/indra/newview/skins/default/xui/fr/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/clothing_list_item.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/widgets/dummy_clothing_list_item.xml
index c42f87bc92..485313f9b7 100644
--- a/indra/newview/skins/default/xui/fr/widgets/dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/dummy_clothing_list_item.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_folder.xml
index 42260f74bc..1e40fda2d1 100644
--- a/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_folder.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_item.xml
index 7555d63c9b..3b2efc27c5 100644
--- a/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_item.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/inbox_folder_view_item.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/fr/widgets/panel_camera_item.xml
index df8b31778d..92516453c6 100644
--- a/indra/newview/skins/default/xui/fr/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/panel_camera_item.xml
@@ -1,6 +1,6 @@
- Texte
+ Texte
diff --git a/indra/newview/skins/default/xui/fr/widgets/person_view.xml b/indra/newview/skins/default/xui/fr/widgets/person_view.xml
index 6188bdf31b..ef817b50c4 100644
--- a/indra/newview/skins/default/xui/fr/widgets/person_view.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/person_view.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/indra/newview/skins/default/xui/fr/widgets/texture_picker.xml b/indra/newview/skins/default/xui/fr/widgets/texture_picker.xml
index 018fdc0b12..8c1b14d54e 100644
--- a/indra/newview/skins/default/xui/fr/widgets/texture_picker.xml
+++ b/indra/newview/skins/default/xui/fr/widgets/texture_picker.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/indra/tools/manifests/legacy.manifest b/indra/tools/manifests/legacy.manifest
index 899438c020..39e6aa16cd 100644
--- a/indra/tools/manifests/legacy.manifest
+++ b/indra/tools/manifests/legacy.manifest
@@ -1,17 +1,17 @@
-
-
-
-
-
-
-
-
-
-
- true/PM
-
-
-
+
+
+
+
+
+
+
+
+
+
+ true/PM
+
+
+