Line ending normalization
Ansariel
parent
552e6793fc
commit
9225b7a753
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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@"
|
||||
|
|
@ -666,10 +666,10 @@ void LLFace::renderOneWireframe(const LLColor4 &color, F32 fogCfx, bool wirefram
|
|||
}
|
||||
else
|
||||
{
|
||||
// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
|
||||
if (!LLGLSLShader::sNoFixedFunction)
|
||||
{
|
||||
// </FS:Ansariel>
|
||||
// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
|
||||
if (!LLGLSLShader::sNoFixedFunction)
|
||||
{
|
||||
// </FS:Ansariel>
|
||||
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);
|
||||
// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
|
||||
}
|
||||
// </FS:Ansariel>
|
||||
// <FS:Ansariel> Don't use fixed functions when using shader renderer; found by Drake Arconis
|
||||
}
|
||||
// </FS:Ansariel>
|
||||
|
||||
gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
|
||||
{
|
||||
|
|
|
|||
|
|
@ -125,49 +125,49 @@ void LLSkinningUtil::scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin
|
|||
}
|
||||
|
||||
//<FS:Beq> Per frame SkinningMatrix Caching
|
||||
//void LLSkinningUtil::initSkinningMatrixPalette(
|
||||
// LLMatrix4* mat,
|
||||
// S32 count,
|
||||
// const LLMeshSkinInfo* skin,
|
||||
// LLVOAvatar *avatar)
|
||||
//{
|
||||
// initJointNums(const_cast<LLMeshSkinInfo*>(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<LLMeshSkinInfo*>(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;
|
||||
|
|
|
|||
|
|
@ -473,8 +473,8 @@ void LLViewerAssetStorage::assetRequestCoro(
|
|||
LL_WARNS_ONCE("ViewerAsset") << "region " << gAgent.getRegion() << " mViewerAssetUrl " << mViewerAssetUrl << LL_ENDL;
|
||||
}
|
||||
// <FS:Beq> 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())
|
||||
// </FS:Beq>
|
||||
{
|
||||
mViewerAssetUrl = gAgent.getRegion()->getViewerAssetUrl();
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia>
|
|||
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<!-- FS:Beq [timezone support for teleport history] -->
|
||||
<toggleable_menu
|
||||
name="menu_teleport_history_timezone"
|
||||
left="0" bottom="0" visible="false"
|
||||
mouse_opaque="false">
|
||||
<menu_item_check
|
||||
name="teleport_history_tz_utc"
|
||||
label="UTC">
|
||||
<on_click
|
||||
function="TeleportHistory.TimeZone.Set"
|
||||
parameter="utc" />
|
||||
<on_check
|
||||
function="TeleportHistory.TimeZone.Check"
|
||||
parameter="utc" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
name="teleport_history_tz_slt"
|
||||
label="SLT">
|
||||
<on_click
|
||||
function="TeleportHistory.TimeZone.Set"
|
||||
parameter="slt" />
|
||||
<on_check
|
||||
function="TeleportHistory.TimeZone.Check"
|
||||
parameter="slt" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
name="teleport_history_tz_local"
|
||||
label="Local">
|
||||
<on_click
|
||||
function="TeleportHistory.TimeZone.Set"
|
||||
parameter="local" />
|
||||
<on_check
|
||||
function="TeleportHistory.TimeZone.Check"
|
||||
parameter="local" />
|
||||
</menu_item_check>
|
||||
</toggleable_menu>
|
||||
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<!-- FS:Beq [timezone support for teleport history] -->
|
||||
<toggleable_menu
|
||||
name="menu_teleport_history_timezone"
|
||||
left="0" bottom="0" visible="false"
|
||||
mouse_opaque="false">
|
||||
<menu_item_check
|
||||
name="teleport_history_tz_utc"
|
||||
label="UTC">
|
||||
<on_click
|
||||
function="TeleportHistory.TimeZone.Set"
|
||||
parameter="utc" />
|
||||
<on_check
|
||||
function="TeleportHistory.TimeZone.Check"
|
||||
parameter="utc" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
name="teleport_history_tz_slt"
|
||||
label="SLT">
|
||||
<on_click
|
||||
function="TeleportHistory.TimeZone.Set"
|
||||
parameter="slt" />
|
||||
<on_check
|
||||
function="TeleportHistory.TimeZone.Check"
|
||||
parameter="slt" />
|
||||
</menu_item_check>
|
||||
<menu_item_check
|
||||
name="teleport_history_tz_local"
|
||||
label="Local">
|
||||
<on_click
|
||||
function="TeleportHistory.TimeZone.Set"
|
||||
parameter="local" />
|
||||
<on_check
|
||||
function="TeleportHistory.TimeZone.Check"
|
||||
parameter="local" />
|
||||
</menu_item_check>
|
||||
</toggleable_menu>
|
||||
|
||||
<!-- /FS:Beq [timezone support for teleport history] -->
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="experince_list_editor">
|
||||
<panel.string name="loading">Chargement...</panel.string>
|
||||
<panel.string name="panel_allowed">Exp. autorisées :</panel.string>
|
||||
<panel.string name="panel_blocked">Exp. bloquées :</panel.string>
|
||||
<panel.string name="panel_trusted">Exp. de premier plan :</panel.string>
|
||||
<panel.string name="no_results">(vide)</panel.string>
|
||||
<text name="text_name">Liste des expériences</text>
|
||||
<text name="text_count" left="175"/>
|
||||
<name_list name="experience_list"><name_list.columns name="experience_name" label="Nom"/></name_list>
|
||||
<button name="btn_add" label="Ajouter..." width="70"/>
|
||||
<button name="btn_remove" label="Supprimer" width="70"/>
|
||||
<button name="btn_profile" label="Profil..." width="70"/>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="experince_list_editor">
|
||||
<panel.string name="loading">Chargement...</panel.string>
|
||||
<panel.string name="panel_allowed">Exp. autorisées :</panel.string>
|
||||
<panel.string name="panel_blocked">Exp. bloquées :</panel.string>
|
||||
<panel.string name="panel_trusted">Exp. de premier plan :</panel.string>
|
||||
<panel.string name="no_results">(vide)</panel.string>
|
||||
<text name="text_name">Liste des expériences</text>
|
||||
<text name="text_count" left="175"/>
|
||||
<name_list name="experience_list"><name_list.columns name="experience_name" label="Nom"/></name_list>
|
||||
<button name="btn_add" label="Ajouter..." width="70"/>
|
||||
<button name="btn_remove" label="Supprimer" width="70"/>
|
||||
<button name="btn_profile" label="Profil..." width="70"/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="panel_profile_web" label="Web">
|
||||
<panel.string name="LoadTime" value="Temps de chargement : [TIME] sec."/>
|
||||
<flyout_button name="load" label="Page Web" tool_tip="Afficher cette page de Web" width="90">
|
||||
<flyout_button.item label="Ouvrir dans le navigateur interne" name="open_item"/>
|
||||
<flyout_button.item label="Ouvrir le navigateur par défaut" name="home_item"/>
|
||||
</flyout_button>
|
||||
<flyout_button name="web_profile" label="Profil">
|
||||
<flyout_button.item label="Ouvrir dans une fenêtre séparée" name="builtin_item"/>
|
||||
<flyout_button.item label="Ouvrir le navigateur par défaut" name="open_item"/>
|
||||
</flyout_button>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel name="panel_profile_web" label="Web">
|
||||
<panel.string name="LoadTime" value="Temps de chargement : [TIME] sec."/>
|
||||
<flyout_button name="load" label="Page Web" tool_tip="Afficher cette page de Web" width="90">
|
||||
<flyout_button.item label="Ouvrir dans le navigateur interne" name="open_item"/>
|
||||
<flyout_button.item label="Ouvrir le navigateur par défaut" name="home_item"/>
|
||||
</flyout_button>
|
||||
<flyout_button name="web_profile" label="Profil">
|
||||
<flyout_button.item label="Ouvrir dans une fenêtre séparée" name="builtin_item"/>
|
||||
<flyout_button.item label="Ouvrir le navigateur par défaut" name="open_item"/>
|
||||
</flyout_button>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Règlement" name="Covenant">
|
||||
<panel.string name="can_resell">Le terrain dans cette région peut être revendu.</panel.string>
|
||||
<panel.string name="can_not_resell">Le terrain dans cette région ne peut être revendu.</panel.string>
|
||||
<panel.string name="can_change">Le terrain dans cette région peut être fusionné ou subdivisé.</panel.string>
|
||||
<panel.string name="can_not_change">Le terrain dans cette région ne peut être fusionné ou subdivisé.</panel.string>
|
||||
<text name="estate_section_lbl">Domaine</text>
|
||||
<text name="estate_name_lbl">Nom :</text>
|
||||
<text name="estate_name_text">Continent</text>
|
||||
<text name="estate_owner_lbl">Propriétaire :</text>
|
||||
<text name="estate_owner_text">(Aucun)</text>
|
||||
<text name="estate_cov_lbl">Règlement :</text>
|
||||
<text name="covenant_timestamp_text">Dernière modification le Wed Dec 31 16:00:00 1969</text>
|
||||
<text_editor name="covenant_editor">Il n'y a aucun règlement rédigé pour ce domaine.</text_editor>
|
||||
<button label="Réinitialiser" name="reset_covenant"/>
|
||||
<text name="covenant_help_text">Les modifications apportées au règlement seront affichées sur tous les terrains de ce domaine.</text>
|
||||
<text name="covenant_instructions">Faire glisser une note pour modifier le règlement de ce domaine.</text>
|
||||
<text name="region_section_lbl">Région</text>
|
||||
<text name="region_name_lbl">Nom :</text>
|
||||
<text name="region_name_text">Erica</text>
|
||||
<text name="region_landtype_lbl">Type :</text>
|
||||
<text name="region_landtype_text">Continental / Résidentiel</text>
|
||||
<text name="region_maturity_lbl">Classification :</text>
|
||||
<text name="region_maturity_text">Adulte</text>
|
||||
<text name="resellable_lbl">Revente :</text>
|
||||
<text name="resellable_clause">Le terrain dans cette région ne peut être revendu.</text>
|
||||
<text name="changeable_lbl">Subdivision :</text>
|
||||
<text name="changeable_clause">Le terrain dans cette région ne peut être fusionné/subdivisé.</text>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Règlement" name="Covenant">
|
||||
<panel.string name="can_resell">Le terrain dans cette région peut être revendu.</panel.string>
|
||||
<panel.string name="can_not_resell">Le terrain dans cette région ne peut être revendu.</panel.string>
|
||||
<panel.string name="can_change">Le terrain dans cette région peut être fusionné ou subdivisé.</panel.string>
|
||||
<panel.string name="can_not_change">Le terrain dans cette région ne peut être fusionné ou subdivisé.</panel.string>
|
||||
<text name="estate_section_lbl">Domaine</text>
|
||||
<text name="estate_name_lbl">Nom :</text>
|
||||
<text name="estate_name_text">Continent</text>
|
||||
<text name="estate_owner_lbl">Propriétaire :</text>
|
||||
<text name="estate_owner_text">(Aucun)</text>
|
||||
<text name="estate_cov_lbl">Règlement :</text>
|
||||
<text name="covenant_timestamp_text">Dernière modification le Wed Dec 31 16:00:00 1969</text>
|
||||
<text_editor name="covenant_editor">Il n'y a aucun règlement rédigé pour ce domaine.</text_editor>
|
||||
<button label="Réinitialiser" name="reset_covenant"/>
|
||||
<text name="covenant_help_text">Les modifications apportées au règlement seront affichées sur tous les terrains de ce domaine.</text>
|
||||
<text name="covenant_instructions">Faire glisser une note pour modifier le règlement de ce domaine.</text>
|
||||
<text name="region_section_lbl">Région</text>
|
||||
<text name="region_name_lbl">Nom :</text>
|
||||
<text name="region_name_text">Erica</text>
|
||||
<text name="region_landtype_lbl">Type :</text>
|
||||
<text name="region_landtype_text">Continental / Résidentiel</text>
|
||||
<text name="region_maturity_lbl">Classification :</text>
|
||||
<text name="region_maturity_text">Adulte</text>
|
||||
<text name="resellable_lbl">Revente :</text>
|
||||
<text name="resellable_clause">Le terrain dans cette région ne peut être revendu.</text>
|
||||
<text name="changeable_lbl">Subdivision :</text>
|
||||
<text name="changeable_clause">Le terrain dans cette région ne peut être fusionné/subdivisé.</text>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Débogage" name="Debug">
|
||||
<text name="region_text_lbl">Région :</text>
|
||||
<text name="region_text">inconnue</text>
|
||||
<check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactive tous les scripts dans cette région"/>
|
||||
<check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactive les collisions provoquées par d'autres sources que les avatars dans cette région"/>
|
||||
<check_box label="Désactiver les effets physiques" name="disable_physics_check" tool_tip="Désactive tous les effets physiques dans cette région"/>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
<text name="objret_text_lbl">Renvoi d'objet</text>
|
||||
<text name="resident_text_lbl" width="100">Propriétaire :</text>
|
||||
<line_editor name="target_avatar_name" width="200" left_delta="100">(aucun)</line_editor>
|
||||
<button label="Sélectionner" name="choose_avatar_btn" width="80"/>
|
||||
<text name="options_text_lbl">Options :</text>
|
||||
<check_box label="Avec des scripts" name="return_scripts" tool_tip="Renvoyer seulement les objets possédant des scripts" left_delta="100"/>
|
||||
<check_box label="Sur le terrain de quelqu'un d'autre" name="return_other_land" tool_tip="Renvoyer seulement les objets de ce résident qui sont sur le terrain d'un tiers"/>
|
||||
<check_box label="Dans toutes les régions du domaine" name="return_estate_wide" tool_tip="Renvoyer les objets de toutes les régions de ce domaine"/>
|
||||
<button label="Renvoyer" name="return_btn"/>
|
||||
<button label="Top Collisions..." name="top_colliders_btn" width="200" tool_tip="Liste des objets générant le plus de collisions potentielles"/>
|
||||
<button label="Top Scripts..." name="top_scripts_btn" width="200" tool_tip="Liste des objets consommant le plus de ressources"/>
|
||||
<button label="Redémarrer la région" name="restart_btn" width="200" tool_tip="Indiquez le compte à rebours en secondes et redémarrez la région"/>
|
||||
<text name="label_restart_delay" width="110" left_delta="220">Secondes :</text>
|
||||
<spinner left_delta="65" name="restart_delay" width="50"/>
|
||||
<button label="Annuler le redémarrage" width="200" name="cancel_restart_btn" tool_tip="Annuler le redémarrage de la région"/>
|
||||
<button label="Console de débogage de la région" width="200" name="region_debug_console_btn" tool_tip="Ouvrir la console de débogage de la région"/>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Débogage" name="Debug">
|
||||
<text name="region_text_lbl">Région :</text>
|
||||
<text name="region_text">inconnue</text>
|
||||
<check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactive tous les scripts dans cette région"/>
|
||||
<check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactive les collisions provoquées par d'autres sources que les avatars dans cette région"/>
|
||||
<check_box label="Désactiver les effets physiques" name="disable_physics_check" tool_tip="Désactive tous les effets physiques dans cette région"/>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
<text name="objret_text_lbl">Renvoi d'objet</text>
|
||||
<text name="resident_text_lbl" width="100">Propriétaire :</text>
|
||||
<line_editor name="target_avatar_name" width="200" left_delta="100">(aucun)</line_editor>
|
||||
<button label="Sélectionner" name="choose_avatar_btn" width="80"/>
|
||||
<text name="options_text_lbl">Options :</text>
|
||||
<check_box label="Avec des scripts" name="return_scripts" tool_tip="Renvoyer seulement les objets possédant des scripts" left_delta="100"/>
|
||||
<check_box label="Sur le terrain de quelqu'un d'autre" name="return_other_land" tool_tip="Renvoyer seulement les objets de ce résident qui sont sur le terrain d'un tiers"/>
|
||||
<check_box label="Dans toutes les régions du domaine" name="return_estate_wide" tool_tip="Renvoyer les objets de toutes les régions de ce domaine"/>
|
||||
<button label="Renvoyer" name="return_btn"/>
|
||||
<button label="Top Collisions..." name="top_colliders_btn" width="200" tool_tip="Liste des objets générant le plus de collisions potentielles"/>
|
||||
<button label="Top Scripts..." name="top_scripts_btn" width="200" tool_tip="Liste des objets consommant le plus de ressources"/>
|
||||
<button label="Redémarrer la région" name="restart_btn" width="200" tool_tip="Indiquez le compte à rebours en secondes et redémarrez la région"/>
|
||||
<text name="label_restart_delay" width="110" left_delta="220">Secondes :</text>
|
||||
<spinner left_delta="65" name="restart_delay" width="50"/>
|
||||
<button label="Annuler le redémarrage" width="200" name="cancel_restart_btn" tool_tip="Annuler le redémarrage de la région"/>
|
||||
<button label="Console de débogage de la région" width="200" name="region_debug_console_btn" tool_tip="Ouvrir la console de débogage de la région"/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Environnement" name="panel_env_info">
|
||||
<text name="water_settings_title">Sélectionnez les paramétrages aquatiques et le cycle temporel que vous souhaiteriez que vos visiteurs voient.</text>
|
||||
<radio_group name="region_settings_radio_group">
|
||||
<radio_item label="Utiliser les paramètres par défaut" name="use_sl_default_settings"/>
|
||||
<radio_item label="Utiliser les paramètres suivants" name="use_my_settings"/>
|
||||
</radio_group>
|
||||
<panel name="user_environment_settings">
|
||||
<text name="water_settings_title" left="0">Paramétrage aquatique</text>
|
||||
<combo_box name="water_settings_preset_combo"><combo_box.item label="-Sélectionnez un préréglage-" name="item0"/></combo_box>
|
||||
<text name="sky_dayc_settings_title" left="0">Cycle Jour / Nuit</text>
|
||||
<radio_group name="sky_dayc_settings_radio_group" left_delta="20">
|
||||
<radio_item label="Cycle intemporel" name="my_sky_settings"/>
|
||||
<radio_item label="Cycle du jour" name="my_dayc_settings"/>
|
||||
</radio_group>
|
||||
<combo_box name="sky_settings_preset_combo" left_pad="32"><combo_box.item label="-Sélectionnez un préréglage-" name="item0"/></combo_box>
|
||||
<combo_box name="dayc_settings_preset_combo" left_pad="32"><combo_box.item label="-Sélectionnez un préréglage-" name="item0"/></combo_box>
|
||||
</panel>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
<button label="Annuler" name="cancel_btn"/>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Environnement" name="panel_env_info">
|
||||
<text name="water_settings_title">Sélectionnez les paramétrages aquatiques et le cycle temporel que vous souhaiteriez que vos visiteurs voient.</text>
|
||||
<radio_group name="region_settings_radio_group">
|
||||
<radio_item label="Utiliser les paramètres par défaut" name="use_sl_default_settings"/>
|
||||
<radio_item label="Utiliser les paramètres suivants" name="use_my_settings"/>
|
||||
</radio_group>
|
||||
<panel name="user_environment_settings">
|
||||
<text name="water_settings_title" left="0">Paramétrage aquatique</text>
|
||||
<combo_box name="water_settings_preset_combo"><combo_box.item label="-Sélectionnez un préréglage-" name="item0"/></combo_box>
|
||||
<text name="sky_dayc_settings_title" left="0">Cycle Jour / Nuit</text>
|
||||
<radio_group name="sky_dayc_settings_radio_group" left_delta="20">
|
||||
<radio_item label="Cycle intemporel" name="my_sky_settings"/>
|
||||
<radio_item label="Cycle du jour" name="my_dayc_settings"/>
|
||||
</radio_group>
|
||||
<combo_box name="sky_settings_preset_combo" left_pad="32"><combo_box.item label="-Sélectionnez un préréglage-" name="item0"/></combo_box>
|
||||
<combo_box name="dayc_settings_preset_combo" left_pad="32"><combo_box.item label="-Sélectionnez un préréglage-" name="item0"/></combo_box>
|
||||
</panel>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
<button label="Annuler" name="cancel_btn"/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Région" name="General">
|
||||
<text name="region_text_lbl">Région :</text>
|
||||
<text name="region_text">inconnue</text>
|
||||
<text name="estate_id_lbl" width="95">ID du domaine :</text>
|
||||
<text name="version_channel_text_lbl">Version :</text>
|
||||
<text name="version_channel_text">inconnue</text>
|
||||
<text name="grid_position_lbl" width="115">Pos. dans la Grille :</text>
|
||||
<text name="region_type_lbl">Type :</text>
|
||||
<text name="region_type">inconnue</text>
|
||||
<check_box label="Interdire la terraformation" name="block_terraform_check"/>
|
||||
<check_box label="Interdire le vol" name="block_fly_check"/>
|
||||
<check_box label="Interdire le survol" name="block_fly_over_check" tool_tip="Empêche le survol des terrains"/>
|
||||
<check_box label="Autoriser les dégâts" name="allow_damage_check"/>
|
||||
<check_box label="Restreindre les collisions" name="restrict_pushobject"/>
|
||||
<check_box label="Autoriser la revente de terrain" name="allow_land_resell_check"/>
|
||||
<check_box label="Autoriser la fusion/subdivision de terrain" name="allow_parcel_changes_check"/>
|
||||
<check_box label="Interdire la possibilité d'afficher dans la recherche" name="block_parcel_search_check" tool_tip="Activer cette option bloquera la possibilité des propriétaires de terrain d'afficher celui-ci dans la recherche"/>
|
||||
<spinner label="Limite de personnes" name="agent_limit_spin" label_width="125" width="190"/>
|
||||
<spinner label="Objets bonus" name="object_bonus_spin" label_width="125" width="190"/>
|
||||
<text label="Classification" name="access_text">
|
||||
Classification :
|
||||
</text>
|
||||
<icons_combo_box label="Modérée" name="access_combo">
|
||||
<icons_combo_box.item label="Adulte" name="Adult"/>
|
||||
<icons_combo_box.item label="Modérée" name="Mature"/>
|
||||
<icons_combo_box.item label="Générale" name="PG"/>
|
||||
</icons_combo_box>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
<button label="Téléporter un résident chez lui..." name="kick_btn"/>
|
||||
<button label="Téléporter chez eux tous les résidents..." name="kick_all_btn"/>
|
||||
<button label="Envoyer un message à la région..." name="im_btn"/>
|
||||
<button label="Gérer le Téléhub..." name="manage_telehub_btn"/>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Région" name="General">
|
||||
<text name="region_text_lbl">Région :</text>
|
||||
<text name="region_text">inconnue</text>
|
||||
<text name="estate_id_lbl" width="95">ID du domaine :</text>
|
||||
<text name="version_channel_text_lbl">Version :</text>
|
||||
<text name="version_channel_text">inconnue</text>
|
||||
<text name="grid_position_lbl" width="115">Pos. dans la Grille :</text>
|
||||
<text name="region_type_lbl">Type :</text>
|
||||
<text name="region_type">inconnue</text>
|
||||
<check_box label="Interdire la terraformation" name="block_terraform_check"/>
|
||||
<check_box label="Interdire le vol" name="block_fly_check"/>
|
||||
<check_box label="Interdire le survol" name="block_fly_over_check" tool_tip="Empêche le survol des terrains"/>
|
||||
<check_box label="Autoriser les dégâts" name="allow_damage_check"/>
|
||||
<check_box label="Restreindre les collisions" name="restrict_pushobject"/>
|
||||
<check_box label="Autoriser la revente de terrain" name="allow_land_resell_check"/>
|
||||
<check_box label="Autoriser la fusion/subdivision de terrain" name="allow_parcel_changes_check"/>
|
||||
<check_box label="Interdire la possibilité d'afficher dans la recherche" name="block_parcel_search_check" tool_tip="Activer cette option bloquera la possibilité des propriétaires de terrain d'afficher celui-ci dans la recherche"/>
|
||||
<spinner label="Limite de personnes" name="agent_limit_spin" label_width="125" width="190"/>
|
||||
<spinner label="Objets bonus" name="object_bonus_spin" label_width="125" width="190"/>
|
||||
<text label="Classification" name="access_text">
|
||||
Classification :
|
||||
</text>
|
||||
<icons_combo_box label="Modérée" name="access_combo">
|
||||
<icons_combo_box.item label="Adulte" name="Adult"/>
|
||||
<icons_combo_box.item label="Modérée" name="Mature"/>
|
||||
<icons_combo_box.item label="Générale" name="PG"/>
|
||||
</icons_combo_box>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
<button label="Téléporter un résident chez lui..." name="kick_btn"/>
|
||||
<button label="Téléporter chez eux tous les résidents..." name="kick_all_btn"/>
|
||||
<button label="Envoyer un message à la région..." name="im_btn"/>
|
||||
<button label="Gérer le Téléhub..." name="manage_telehub_btn"/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,32 +1,32 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Terrain" name="Terrain">
|
||||
<text name="region_text_lbl">Région :</text>
|
||||
<text name="region_text">inconnue</text>
|
||||
<spinner label="Niveau de la mer" name="water_height_spin"/>
|
||||
<spinner label="Altitude maximale" name="terrain_raise_spin"/>
|
||||
<spinner label="Altitude minimale" name="terrain_lower_spin"/>
|
||||
<text name="detail_texture_text">Textures du terrain (Requis : fichiers .tga de taille 512x512 ou 1024x1024, 24 bits)</text>
|
||||
<text name="height_text_lbl" width="95">1 (Basse altitude)</text>
|
||||
<text name="height_text_lbl2" left_pad="60">2</text>
|
||||
<text name="height_text_lbl3" width="70">3</text>
|
||||
<text name="height_text_lbl4" left_pad="0">4 (Haute altitude)</text>
|
||||
<text name="height_text_lbl5">Variation des textures</text>
|
||||
<text name="height_text_lbl10">Ces valeurs représentent l'altitude de changement des textures ci-dessus.</text>
|
||||
<text name="height_text_lbl11">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.</text>
|
||||
<text name="height_text_lbl6">Nord-Ouest</text>
|
||||
<text name="height_text_lbl7">Nord-Est</text>
|
||||
<spinner label="Bas" name="height_start_spin_1"/>
|
||||
<spinner label="Bas" name="height_start_spin_3"/>
|
||||
<spinner label="Haut" name="height_range_spin_1"/>
|
||||
<spinner label="Haut" name="height_range_spin_3"/>
|
||||
<text name="height_text_lbl8">Sud-Ouest</text>
|
||||
<text name="height_text_lbl9">Sud-Est</text>
|
||||
<spinner label="Bas" name="height_start_spin_0"/>
|
||||
<spinner label="Bas" name="height_start_spin_2"/>
|
||||
<spinner label="Haut" name="height_range_spin_0"/>
|
||||
<spinner label="Haut" name="height_range_spin_2"/>
|
||||
<button label="Télécharger les données" name="download_raw_btn" tool_tip="Disponible uniquement aux propriétaires du domaine"/>
|
||||
<button label="Uploader les données" name="upload_raw_btn" tool_tip="Disponible uniquement aux propriétaires du domaine"/>
|
||||
<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'altitude"/>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
</panel>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel label="Terrain" name="Terrain">
|
||||
<text name="region_text_lbl">Région :</text>
|
||||
<text name="region_text">inconnue</text>
|
||||
<spinner label="Niveau de la mer" name="water_height_spin"/>
|
||||
<spinner label="Altitude maximale" name="terrain_raise_spin"/>
|
||||
<spinner label="Altitude minimale" name="terrain_lower_spin"/>
|
||||
<text name="detail_texture_text">Textures du terrain (Requis : fichiers .tga de taille 512x512 ou 1024x1024, 24 bits)</text>
|
||||
<text name="height_text_lbl" width="95">1 (Basse altitude)</text>
|
||||
<text name="height_text_lbl2" left_pad="60">2</text>
|
||||
<text name="height_text_lbl3" width="70">3</text>
|
||||
<text name="height_text_lbl4" left_pad="0">4 (Haute altitude)</text>
|
||||
<text name="height_text_lbl5">Variation des textures</text>
|
||||
<text name="height_text_lbl10">Ces valeurs représentent l'altitude de changement des textures ci-dessus.</text>
|
||||
<text name="height_text_lbl11">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.</text>
|
||||
<text name="height_text_lbl6">Nord-Ouest</text>
|
||||
<text name="height_text_lbl7">Nord-Est</text>
|
||||
<spinner label="Bas" name="height_start_spin_1"/>
|
||||
<spinner label="Bas" name="height_start_spin_3"/>
|
||||
<spinner label="Haut" name="height_range_spin_1"/>
|
||||
<spinner label="Haut" name="height_range_spin_3"/>
|
||||
<text name="height_text_lbl8">Sud-Ouest</text>
|
||||
<text name="height_text_lbl9">Sud-Est</text>
|
||||
<spinner label="Bas" name="height_start_spin_0"/>
|
||||
<spinner label="Bas" name="height_start_spin_2"/>
|
||||
<spinner label="Haut" name="height_range_spin_0"/>
|
||||
<spinner label="Haut" name="height_range_spin_2"/>
|
||||
<button label="Télécharger les données" name="download_raw_btn" tool_tip="Disponible uniquement aux propriétaires du domaine"/>
|
||||
<button label="Uploader les données" name="upload_raw_btn" tool_tip="Disponible uniquement aux propriétaires du domaine"/>
|
||||
<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'altitude"/>
|
||||
<button label="Appliquer" name="apply_btn"/>
|
||||
</panel>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<bodyparts_list_item name="wearable_item">
|
||||
<lock_panel name="btn_lock" tool_tip="Vous n'avez pas la permission de modifier cette silhouette"/>
|
||||
<edit_btn name="btn_edit" tool_tip="Modifier cette silhouette"/>
|
||||
<lock_panel name="btn_lock" tool_tip="Vous n'avez pas la permission de modifier cette silhouette"/>
|
||||
<edit_btn name="btn_edit" tool_tip="Modifier cette silhouette"/>
|
||||
</bodyparts_list_item>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<clothing_list_item name="wearable_item">
|
||||
<lock_panel name="btn_lock" tool_tip="Vous n'avez pas la permission de modifier ce vêtement"/>
|
||||
<edit_btn name="btn_edit" tool_tip="Modifier ce vêtement"/>
|
||||
<lock_panel name="btn_lock" tool_tip="Vous n'avez pas la permission de modifier ce vêtement"/>
|
||||
<edit_btn name="btn_edit" tool_tip="Modifier ce vêtement"/>
|
||||
</clothing_list_item>
|
||||
|
|
|
|||
|
|
@ -1,4 +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="Ajouter plus d'objets de ce type"/>
|
||||
<add_btn name="btn_add" tool_tip="Ajouter plus d'objets de ce type"/>
|
||||
</dummy_clothing_list_item>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<inbox_folder_view_folder>
|
||||
<new_badge label="Nouveau"/>
|
||||
<new_badge label="Nouveau"/>
|
||||
</inbox_folder_view_folder>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<inbox_folder_view_item>
|
||||
<new_badge label="Nouveau"/>
|
||||
<new_badge label="Nouveau"/>
|
||||
</inbox_folder_view_item>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<panel_camera_item>
|
||||
<panel_camera_item.text name="picture_name">
|
||||
Texte
|
||||
Texte
|
||||
</panel_camera_item.text>
|
||||
</panel_camera_item>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<person_view>
|
||||
<facebook_icon name="facebook_icon" tool_tip="Utilisateur Facebook"/>
|
||||
<permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="Vous pouvez modifier, supprimer ou vous approprier les objets de cette personne"/>
|
||||
<permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="La personne peut modifier, supprimer ou s'approprier vos objets"/>
|
||||
<permission_map_icon tool_tip="La personne peut vous localiser" name="permission_map_icon"/>
|
||||
<permission_online_icon name="permission_online_icon" tool_tip="”La personne peut savoir lorsque vous êtes connecté"/>
|
||||
<info_btn name="info_btn" tool_tip="Plus d'infos"/>
|
||||
<profile_btn name="profile_btn" tool_tip="Voir le profil"/>
|
||||
<facebook_icon name="facebook_icon" tool_tip="Utilisateur Facebook"/>
|
||||
<permission_edit_theirs_icon name="permission_edit_theirs_icon" tool_tip="Vous pouvez modifier, supprimer ou vous approprier les objets de cette personne"/>
|
||||
<permission_edit_mine_icon name="permission_edit_mine_icon" tool_tip="La personne peut modifier, supprimer ou s'approprier vos objets"/>
|
||||
<permission_map_icon tool_tip="La personne peut vous localiser" name="permission_map_icon"/>
|
||||
<permission_online_icon name="permission_online_icon" tool_tip="”La personne peut savoir lorsque vous êtes connecté"/>
|
||||
<info_btn name="info_btn" tool_tip="Plus d'infos"/>
|
||||
<profile_btn name="profile_btn" tool_tip="Voir le profil"/>
|
||||
</person_view>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<texture_picker name="texture picker">
|
||||
<caption_text label="Multiple"/>
|
||||
<caption_text label="Multiple"/>
|
||||
</texture_picker>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel
|
||||
level="asInvoker"
|
||||
uiAccess="false"
|
||||
/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
|
||||
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
|
||||
<dpiAware>true/PM</dpiAware>
|
||||
</asmv3:windowsSettings>
|
||||
</asmv3:application>
|
||||
</assembly>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel
|
||||
level="asInvoker"
|
||||
uiAccess="false"
|
||||
/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
|
||||
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
|
||||
<dpiAware>true/PM</dpiAware>
|
||||
</asmv3:windowsSettings>
|
||||
</asmv3:application>
|
||||
</assembly>
|
||||
|
|
|
|||
Loading…
Reference in New Issue