diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..82a9a968b90b57cfdf94871c3c28be233bfd3832
--- /dev/null
+++ b/.github/workflows/stale.yaml
@@ -0,0 +1,24 @@
+name: Stale PRs
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: 0 0 * * *
+
+permissions:
+ issues: write
+ pull-requests: write
+
+jobs:
+ stale:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/stale@v6
+ id: stale
+ with:
+ stale-pr-message: This pull request is stale because it has been open 60 days with no activity. Remove stale label or comment or it will be closed in 7 days
+ days-before-stale: 60
+ days-before-close: 7
+ exempt-pr-labels: blocked,must,should,keep
+ stale-pr-label: stale
+ - name: Print outputs
+ run: echo ${{ join(steps.stale.outputs.*, ',') }}
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 4cabb84b1034af760667cf16d4f0d9384e2edc93..e0c6e9cf7eca5d808e724fa0f747f528b9be2fd0 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -490,6 +490,8 @@ Evangelista Emerald
Faelon Swordthain
Farallon Greyskin
VWR-2036
+Fawrsk
+ SL-18893
Feep Larsson
VWR-447
VWR-1314
@@ -582,6 +584,7 @@ Henri Beauchamp
VWR-1320
VWR-1406
VWR-4157
+ SL-15175
herina Bode
Hikkoshi Sakai
VWR-429
@@ -1171,6 +1174,10 @@ Ollie Kubrick
Orenj Marat
Orion Delphis
Oryx Tempel
+PanteraPolnocy
+ SL-18891
+ SL-18904
+ SL-18937
Parvati Silverweb
Patric Mills
VWR-2645
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index e72475cbc4c09195b2d973b493b63624b22e5e3a..3c87e69e5fc6c0b176d3e2d20cc0300a106a6cd9 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -60,7 +60,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
-set(TEMPLATE_VERIFIER_MASTER_URL "https://bitbucket.org/lindenlab/master-message-template-git/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
+set(TEMPLATE_VERIFIER_MASTER_URL "https://github.com/secondlife/master-message-template/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
@@ -194,9 +194,15 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# development must be done after the build as we do in viewer_manifest.py for
# released builds
# https://stackoverflow.com/a/54296008
+ # With Xcode 14.1, apparently you must take drastic steps to prevent
+ # implicit signing.
+ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO)
+ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED NO)
# "-" represents "Sign to Run Locally" and empty string represents "Do Not Sign"
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
-
+ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "")
+ set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES)
+ set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO)
set(CMAKE_OSX_ARCHITECTURES "${ARCH}")
string(REPLACE "i686" "i386" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
string(REPLACE "AMD64" "x86_64" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index f0df3e147489ae16b7752ae5a6892dd3a8db2cd3..89a7c4589b8f13de9cea2f560b587dda5d295cd0 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -214,12 +214,10 @@ void LLAvatarAppearance::initInstance()
mRoot = createAvatarJoint();
mRoot->setName( "mRoot" );
- for (LLAvatarAppearanceDictionary::MeshEntries::const_iterator iter = sAvatarDictionary->getMeshEntries().begin();
- iter != sAvatarDictionary->getMeshEntries().end();
- ++iter)
+ for (const LLAvatarAppearanceDictionary::MeshEntries::value_type& mesh_pair : sAvatarDictionary->getMeshEntries())
{
- const EMeshIndex mesh_index = iter->first;
- const LLAvatarAppearanceDictionary::MeshEntry *mesh_dict = iter->second;
+ const EMeshIndex mesh_index = mesh_pair.first;
+ const LLAvatarAppearanceDictionary::MeshEntry *mesh_dict = mesh_pair.second;
LLAvatarJoint* joint = createAvatarJoint();
joint->setName(mesh_dict->mName);
joint->setMeshID(mesh_index);
@@ -260,21 +258,16 @@ void LLAvatarAppearance::initInstance()
//-------------------------------------------------------------------------
// associate baked textures with meshes
//-------------------------------------------------------------------------
- for (LLAvatarAppearanceDictionary::MeshEntries::const_iterator iter = sAvatarDictionary->getMeshEntries().begin();
- iter != sAvatarDictionary->getMeshEntries().end();
- ++iter)
+ for (const LLAvatarAppearanceDictionary::MeshEntries::value_type& mesh_pair : sAvatarDictionary->getMeshEntries())
{
- const EMeshIndex mesh_index = iter->first;
- const LLAvatarAppearanceDictionary::MeshEntry *mesh_dict = iter->second;
+ const EMeshIndex mesh_index = mesh_pair.first;
+ const LLAvatarAppearanceDictionary::MeshEntry *mesh_dict = mesh_pair.second;
const EBakedTextureIndex baked_texture_index = mesh_dict->mBakedID;
// Skip it if there's no associated baked texture.
if (baked_texture_index == BAKED_NUM_INDICES) continue;
- for (avatar_joint_mesh_list_t::iterator iter = mMeshLOD[mesh_index]->mMeshParts.begin();
- iter != mMeshLOD[mesh_index]->mMeshParts.end();
- ++iter)
+ for (LLAvatarJointMesh* mesh : mMeshLOD[mesh_index]->mMeshParts)
{
- LLAvatarJointMesh* mesh = (*iter);
mBakedTextureDatas[(S32)baked_texture_index].mJointMeshes.push_back(mesh);
}
}
@@ -297,10 +290,8 @@ LLAvatarAppearance::~LLAvatarAppearance()
delete_and_clear(mBakedTextureDatas[i].mTexLayerSet);
mBakedTextureDatas[i].mJointMeshes.clear();
- for (morph_list_t::iterator iter2 = mBakedTextureDatas[i].mMaskedMorphs.begin();
- iter2 != mBakedTextureDatas[i].mMaskedMorphs.end(); iter2++)
+ for (LLMaskedMorph* masked_morph : mBakedTextureDatas[i].mMaskedMorphs)
{
- LLMaskedMorph* masked_morph = (*iter2);
delete masked_morph;
}
}
@@ -314,11 +305,8 @@ LLAvatarAppearance::~LLAvatarAppearance()
std::for_each(mPolyMeshes.begin(), mPolyMeshes.end(), DeletePairedPointer());
mPolyMeshes.clear();
- for (avatar_joint_list_t::iterator jointIter = mMeshLOD.begin();
- jointIter != mMeshLOD.end();
- ++jointIter)
+ for (LLAvatarJoint* joint : mMeshLOD)
{
- LLAvatarJoint* joint = *jointIter;
std::for_each(joint->mMeshParts.begin(), joint->mMeshParts.end(), DeletePointer());
joint->mMeshParts.clear();
}
@@ -472,10 +460,9 @@ void LLAvatarAppearance::compareJointStateMaps(joint_state_map_t& last_state,
if (!last_state.empty() && (last_state != curr_state))
{
S32 diff_count = 0;
- joint_state_map_t::iterator it;
- for (it=last_state.begin(); it != last_state.end(); ++it)
+ for (joint_state_map_t::value_type& pair : last_state)
{
- const std::string& key = it->first;
+ const std::string& key = pair.first;
if (last_state[key] != curr_state[key])
{
LL_DEBUGS("AvatarBodySize") << "BodySize change " << key << " " << last_state[key] << "->" << curr_state[key] << LL_ENDL;
@@ -685,10 +672,8 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent
// setup children
- LLAvatarBoneInfo::bones_t::const_iterator iter;
- for (iter = info->mChildren.begin(); iter != info->mChildren.end(); ++iter)
+ for (LLAvatarBoneInfo* child_info : info->mChildren)
{
- LLAvatarBoneInfo *child_info = *iter;
if (!setupBone(child_info, joint, volume_num, joint_num))
{
return FALSE;
@@ -740,10 +725,8 @@ BOOL LLAvatarAppearance::buildSkeleton(const LLAvatarSkeletonInfo *info)
S32 current_joint_num = 0;
S32 current_volume_num = 0;
- LLAvatarSkeletonInfo::bone_info_list_t::const_iterator iter;
- for (iter = info->mBoneInfoList.begin(); iter != info->mBoneInfoList.end(); ++iter)
+ for (LLAvatarBoneInfo* bone_info : info->mBoneInfoList)
{
- LLAvatarBoneInfo *bone_info = *iter;
if (!setupBone(bone_info, NULL, current_volume_num, current_joint_num))
{
LL_ERRS() << "Error parsing bone in skeleton file" << LL_ENDL;
@@ -821,14 +804,10 @@ void LLAvatarAppearance::buildCharacter()
//-------------------------------------------------------------------------
// clear mesh data
//-------------------------------------------------------------------------
- for (avatar_joint_list_t::iterator jointIter = mMeshLOD.begin();
- jointIter != mMeshLOD.end(); ++jointIter)
+ for (LLAvatarJoint* joint : mMeshLOD)
{
- LLAvatarJoint* joint = *jointIter;
- for (avatar_joint_mesh_list_t::iterator meshIter = joint->mMeshParts.begin();
- meshIter != joint->mMeshParts.end(); ++meshIter)
+ for (LLAvatarJointMesh* mesh : joint->mMeshParts)
{
- LLAvatarJointMesh * mesh = *meshIter;
mesh->setMesh(NULL);
}
}
@@ -1002,12 +981,8 @@ BOOL LLAvatarAppearance::loadAvatar()
}
// avatar_lad.xml : <morph_masks>
- for (LLAvatarXmlInfo::morph_info_list_t::iterator iter = sAvatarXmlInfo->mMorphMaskInfoList.begin();
- iter != sAvatarXmlInfo->mMorphMaskInfoList.end();
- ++iter)
+ for (LLAvatarXmlInfo::LLAvatarMorphInfo* info : sAvatarXmlInfo->mMorphMaskInfoList)
{
- LLAvatarXmlInfo::LLAvatarMorphInfo *info = *iter;
-
EBakedTextureIndex baked = sAvatarDictionary->findBakedByRegionName(info->mRegion);
if (baked != BAKED_NUM_INDICES)
{
@@ -1026,11 +1001,8 @@ BOOL LLAvatarAppearance::loadAvatar()
loadLayersets();
// avatar_lad.xml : <driver_parameters>
- for (LLAvatarXmlInfo::driver_info_list_t::iterator iter = sAvatarXmlInfo->mDriverInfoList.begin();
- iter != sAvatarXmlInfo->mDriverInfoList.end();
- ++iter)
+ for (LLDriverParamInfo* info : sAvatarXmlInfo->mDriverInfoList)
{
- LLDriverParamInfo *info = *iter;
LLDriverParam* driver_param = new LLDriverParam( this );
if (driver_param->setInfo(info))
{
@@ -1062,11 +1034,8 @@ BOOL LLAvatarAppearance::loadSkeletonNode ()
mRoot->addChild( mSkeleton[0] );
// make meshes children before calling parent version of the function
- for (avatar_joint_list_t::iterator iter = mMeshLOD.begin();
- iter != mMeshLOD.end();
- ++iter)
+ for (LLAvatarJoint* joint : mMeshLOD)
{
- LLAvatarJoint *joint = *iter;
joint->mUpdateXform = FALSE;
joint->setMeshesToChildren();
}
@@ -1099,11 +1068,9 @@ BOOL LLAvatarAppearance::loadSkeletonNode ()
// SKELETAL DISTORTIONS
{
LLAvatarXmlInfo::skeletal_distortion_info_list_t::iterator iter;
- for (iter = sAvatarXmlInfo->mSkeletalDistortionInfoList.begin();
- iter != sAvatarXmlInfo->mSkeletalDistortionInfoList.end();
- ++iter)
+ for (LLViewerVisualParamInfo* visual_param_info : sAvatarXmlInfo->mSkeletalDistortionInfoList)
{
- LLPolySkeletalDistortionInfo *info = (LLPolySkeletalDistortionInfo*)*iter;
+ LLPolySkeletalDistortionInfo *info = (LLPolySkeletalDistortionInfo*)visual_param_info;
LLPolySkeletalDistortion *param = new LLPolySkeletalDistortion(this);
if (!param->setInfo(info))
{
@@ -1127,11 +1094,8 @@ BOOL LLAvatarAppearance::loadSkeletonNode ()
//-----------------------------------------------------------------------------
BOOL LLAvatarAppearance::loadMeshNodes()
{
- for (LLAvatarXmlInfo::mesh_info_list_t::const_iterator meshinfo_iter = sAvatarXmlInfo->mMeshInfoList.begin();
- meshinfo_iter != sAvatarXmlInfo->mMeshInfoList.end();
- ++meshinfo_iter)
+ for (const LLAvatarXmlInfo::LLAvatarMeshInfo* info : sAvatarXmlInfo->mMeshInfoList)
{
- const LLAvatarXmlInfo::LLAvatarMeshInfo *info = *meshinfo_iter;
const std::string &type = info->mType;
S32 lod = info->mLOD;
@@ -1143,12 +1107,10 @@ BOOL LLAvatarAppearance::loadMeshNodes()
switch(lod)
case 0:
mesh = &mHairMesh0; */
- for (LLAvatarAppearanceDictionary::MeshEntries::const_iterator mesh_iter = sAvatarDictionary->getMeshEntries().begin();
- mesh_iter != sAvatarDictionary->getMeshEntries().end();
- ++mesh_iter)
+ for (const LLAvatarAppearanceDictionary::MeshEntries::value_type& mesh_pair : sAvatarDictionary->getMeshEntries())
{
- const EMeshIndex mesh_index = mesh_iter->first;
- const LLAvatarAppearanceDictionary::MeshEntry *mesh_dict = mesh_iter->second;
+ const EMeshIndex mesh_index = mesh_pair.first;
+ const LLAvatarAppearanceDictionary::MeshEntry *mesh_dict = mesh_pair.second;
if (type.compare(mesh_dict->mName) == 0)
{
mesh_id = mesh_index;
@@ -1216,20 +1178,17 @@ BOOL LLAvatarAppearance::loadMeshNodes()
mesh->setMesh( poly_mesh );
mesh->setLOD( info->mMinPixelArea );
- for (LLAvatarXmlInfo::LLAvatarMeshInfo::morph_info_list_t::const_iterator xmlinfo_iter = info->mPolyMorphTargetInfoList.begin();
- xmlinfo_iter != info->mPolyMorphTargetInfoList.end();
- ++xmlinfo_iter)
+ for (const LLAvatarXmlInfo::LLAvatarMeshInfo::morph_info_pair_t& info_pair : info->mPolyMorphTargetInfoList)
{
- const LLAvatarXmlInfo::LLAvatarMeshInfo::morph_info_pair_t *info_pair = &(*xmlinfo_iter);
LLPolyMorphTarget *param = new LLPolyMorphTarget(mesh->getMesh());
- if (!param->setInfo((LLPolyMorphTargetInfo*)info_pair->first))
+ if (!param->setInfo((LLPolyMorphTargetInfo*)info_pair.first))
{
delete param;
return FALSE;
}
else
{
- if (info_pair->second)
+ if (info_pair.second)
{
addSharedVisualParam(param);
param->setParamLocation(isSelf() ? LOC_AV_SELF : LOC_AV_OTHER);
@@ -1252,11 +1211,8 @@ BOOL LLAvatarAppearance::loadMeshNodes()
BOOL LLAvatarAppearance::loadLayersets()
{
BOOL success = TRUE;
- for (LLAvatarXmlInfo::layer_info_list_t::const_iterator layerset_iter = sAvatarXmlInfo->mLayerInfoList.begin();
- layerset_iter != sAvatarXmlInfo->mLayerInfoList.end();
- ++layerset_iter)
+ for (LLTexLayerSetInfo* layerset_info : sAvatarXmlInfo->mLayerInfoList)
{
- LLTexLayerSetInfo *layerset_info = *layerset_iter;
if (isSelf())
{
// Construct a layerset for each one specified in avatar_lad.xml and initialize it as such.
@@ -1272,14 +1228,12 @@ BOOL LLAvatarAppearance::loadLayersets()
// scan baked textures and associate the layerset with the appropriate one
EBakedTextureIndex baked_index = BAKED_NUM_INDICES;
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = sAvatarDictionary->getBakedTextures().begin();
- baked_iter != sAvatarDictionary->getBakedTextures().end();
- ++baked_iter)
+ for (const LLAvatarAppearanceDictionary::BakedTextures::value_type& baked_pair : sAvatarDictionary->getBakedTextures())
{
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
if (layer_set->isBodyRegion(baked_dict->mName))
{
- baked_index = baked_iter->first;
+ baked_index = baked_pair.first;
// ensure both structures are aware of each other
mBakedTextureDatas[baked_index].mTexLayerSet = layer_set;
layer_set->setBakedTexIndex(baked_index);
@@ -1295,11 +1249,8 @@ BOOL LLAvatarAppearance::loadLayersets()
}
// scan morph masks and let any affected layers know they have an associated morph
- for (LLAvatarAppearance::morph_list_t::const_iterator morph_iter = mBakedTextureDatas[baked_index].mMaskedMorphs.begin();
- morph_iter != mBakedTextureDatas[baked_index].mMaskedMorphs.end();
- ++morph_iter)
+ for (LLMaskedMorph* morph : mBakedTextureDatas[baked_index].mMaskedMorphs)
{
- LLMaskedMorph *morph = *morph_iter;
LLTexLayerInterface* layer = layer_set->findLayerByName(morph->mLayer);
if (layer)
{
@@ -1315,7 +1266,6 @@ BOOL LLAvatarAppearance::loadLayersets()
else // !isSelf()
{
// Construct a layerset for each one specified in avatar_lad.xml and initialize it as such.
- LLTexLayerSetInfo *layerset_info = *layerset_iter;
layerset_info->createVisualParams(this);
}
}
@@ -1742,13 +1692,13 @@ void LLAvatarAppearance::makeJointAliases(LLAvatarBoneInfo *bone_info)
boost::char_separator<char> sep(" ");
boost::tokenizer<boost::char_separator<char> > tok(aliases, sep);
- for(boost::tokenizer<boost::char_separator<char> >::iterator i = tok.begin(); i != tok.end(); ++i)
+ for(const std::string& i : tok)
{
- if ( mJointAliasMap.find(*i) != mJointAliasMap.end() )
+ if ( mJointAliasMap.find(i) != mJointAliasMap.end() )
{
- LL_WARNS() << "avatar skeleton: Joint alias \"" << *i << "\" remapped from " << mJointAliasMap[*i] << " to " << bone_name << LL_ENDL;
+ LL_WARNS() << "avatar skeleton: Joint alias \"" << i << "\" remapped from " << mJointAliasMap[i] << " to " << bone_name << LL_ENDL;
}
- mJointAliasMap[*i] = bone_name;
+ mJointAliasMap[i] = bone_name;
}
for (LLAvatarBoneInfo* bone : bone_info->mChildren)
@@ -1763,21 +1713,14 @@ const LLAvatarAppearance::joint_alias_map_t& LLAvatarAppearance::getJointAliases
if (mJointAliasMap.empty())
{
- LLAvatarSkeletonInfo::bone_info_list_t::const_iterator iter;
- for (iter = sAvatarSkeletonInfo->mBoneInfoList.begin();
- iter != sAvatarSkeletonInfo->mBoneInfoList.end();
- ++iter)
+ for (LLAvatarBoneInfo* bone_info : sAvatarSkeletonInfo->mBoneInfoList)
{
//LLAvatarBoneInfo *bone_info = *iter;
- makeJointAliases( *iter );
+ makeJointAliases(bone_info);
}
- LLAvatarXmlInfo::attachment_info_list_t::iterator attach_iter;
- for (attach_iter = sAvatarXmlInfo->mAttachmentInfoList.begin();
- attach_iter != sAvatarXmlInfo->mAttachmentInfoList.end();
- ++attach_iter)
+ for (LLAvatarXmlInfo::LLAvatarAttachmentInfo* info : sAvatarXmlInfo->mAttachmentInfoList)
{
- LLAvatarXmlInfo::LLAvatarAttachmentInfo *info = *attach_iter;
std::string bone_name = info->mName;
// Also accept the name with spaces substituted with
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index b1c70f9064aec0126ffd29126444a03c6c751c61..e3444efcf696ba2785eacb03de9dc3494cfdc94f 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -387,10 +387,9 @@ class LLAvatarAppearance : public LLCharacter
LLAvatarMeshInfo() : mLOD(0), mMinPixelArea(.1f) {}
~LLAvatarMeshInfo()
{
- morph_info_list_t::iterator iter;
- for (iter = mPolyMorphTargetInfoList.begin(); iter != mPolyMorphTargetInfoList.end(); iter++)
+ for (morph_info_list_t::value_type& pair : mPolyMorphTargetInfoList)
{
- delete iter->first;
+ delete pair.first;
}
mPolyMorphTargetInfoList.clear();
}
diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index 2bcfd06c402b7d9e99315f32443f5032dee61ac4..8759c387e83ed0b186af7fd13fc3f8dfd07961d0 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -183,18 +183,15 @@ LLAvatarAppearanceDictionary::~LLAvatarAppearanceDictionary()
// map it to the baked texture.
void LLAvatarAppearanceDictionary::createAssociations()
{
- for (BakedTextures::const_iterator iter = mBakedTextures.begin(); iter != mBakedTextures.end(); iter++)
+ for (BakedTextures::value_type& baked_pair : mBakedTextures)
{
- const EBakedTextureIndex baked_index = (iter->first);
- const BakedEntry *dict = (iter->second);
+ const EBakedTextureIndex baked_index = baked_pair.first;
+ const BakedEntry *dict = baked_pair.second;
// For each texture that this baked texture index affects, associate those textures
// with this baked texture index.
- for (texture_vec_t::const_iterator local_texture_iter = dict->mLocalTextures.begin();
- local_texture_iter != dict->mLocalTextures.end();
- local_texture_iter++)
+ for (const ETextureIndex local_texture_index : dict->mLocalTextures)
{
- const ETextureIndex local_texture_index = (ETextureIndex) *local_texture_iter;
mTextures[local_texture_index]->mIsUsedByBakedTexture = true;
mTextures[local_texture_index]->mBakedTextureIndex = baked_index;
}
diff --git a/indra/llappearance/llavatarjoint.cpp b/indra/llappearance/llavatarjoint.cpp
index a1d4fe6423e222e59f62dcab8b86964179579e56..9300b08b7b5bc43b461cd6d701aa6cd74f966f32 100644
--- a/indra/llappearance/llavatarjoint.cpp
+++ b/indra/llappearance/llavatarjoint.cpp
@@ -100,10 +100,9 @@ void LLAvatarJoint::setValid( BOOL valid, BOOL recursive )
//----------------------------------------------------------------
if (recursive)
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->setValid(valid, TRUE);
}
}
@@ -118,10 +117,9 @@ void LLAvatarJoint::setSkeletonComponents( U32 comp, BOOL recursive )
mComponents = comp;
if (recursive)
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (auto child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->setSkeletonComponents(comp, recursive);
}
}
@@ -133,10 +131,9 @@ void LLAvatarJoint::setVisible(BOOL visible, BOOL recursive)
if (recursive)
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->setVisible(visible, recursive);
}
}
@@ -144,30 +141,27 @@ void LLAvatarJoint::setVisible(BOOL visible, BOOL recursive)
void LLAvatarJoint::updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area)
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->updateFaceSizes(num_vertices, num_indices, pixel_area);
}
}
void LLAvatarJoint::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind, bool terse_update)
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->updateFaceData(face, pixel_area, damp_wind, terse_update);
}
}
void LLAvatarJoint::updateJointGeometry()
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->updateJointGeometry();
}
}
@@ -178,10 +172,9 @@ BOOL LLAvatarJoint::updateLOD(F32 pixel_area, BOOL activate)
BOOL lod_changed = FALSE;
BOOL found_lod = FALSE;
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
F32 jointLOD = joint->getLOD();
if (found_lod || jointLOD == DEFAULT_AVATAR_JOINT_LOD)
@@ -207,10 +200,9 @@ BOOL LLAvatarJoint::updateLOD(F32 pixel_area, BOOL activate)
void LLAvatarJoint::dump()
{
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* child : mChildren)
{
- LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(*iter);
+ LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
joint->dump();
}
}
@@ -219,10 +211,9 @@ void LLAvatarJoint::dump()
void LLAvatarJoint::setMeshesToChildren()
{
removeAllChildren();
- for (avatar_joint_mesh_list_t::iterator iter = mMeshParts.begin();
- iter != mMeshParts.end(); iter++)
+ for (LLAvatarJointMesh* mesh : mMeshParts)
{
- addChild((*iter));
+ addChild(mesh);
}
}
//-----------------------------------------------------------------------------
diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp
index 0a23b1fda304e4223679081526839aece8f8b6d7..ed39f78d28bc979cf3a8db13b3e2791dbe730197 100644
--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -379,10 +379,9 @@ void LLAvatarJointMesh::setupJoint(LLAvatarJoint* current_joint)
}
// depth-first traversal
- for (LLJoint::joints_t::iterator iter = current_joint->mChildren.begin();
- iter != current_joint->mChildren.end(); ++iter)
+ for (LLJoint* joint : current_joint->mChildren)
{
- LLAvatarJoint* child_joint = (LLAvatarJoint*)(*iter);
+ LLAvatarJoint* child_joint = (LLAvatarJoint*)joint;
setupJoint(child_joint);
}
}
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
index 05d26fbe7aa66230891d7b51511b5280c0cc2032..f46d0324a5265228ee0a91a9e37971d729ac7402 100644
--- a/indra/llappearance/lldriverparam.cpp
+++ b/indra/llappearance/lldriverparam.cpp
@@ -102,9 +102,8 @@ void LLDriverParamInfo::toStream(std::ostream &out)
LLViewerVisualParamInfo::toStream(out);
out << "driver" << "\t";
out << mDrivenInfoList.size() << "\t";
- for (entry_info_list_t::iterator iter = mDrivenInfoList.begin(); iter != mDrivenInfoList.end(); iter++)
+ for (LLDrivenEntryInfo& driven : mDrivenInfoList)
{
- LLDrivenEntryInfo driven = *iter;
out << driven.mDrivenID << "\t";
}
@@ -121,9 +120,8 @@ void LLDriverParamInfo::toStream(std::ostream &out)
if(mDriverParam && mDriverParam->getAvatarAppearance()->isSelf() &&
mDriverParam->getAvatarAppearance()->isValid())
{
- for (entry_info_list_t::iterator iter = mDrivenInfoList.begin(); iter != mDrivenInfoList.end(); iter++)
+ for (LLDrivenEntryInfo& driven : mDrivenInfoList)
{
- LLDrivenEntryInfo driven = *iter;
LLViewerVisualParam *param =
(LLViewerVisualParam*)mDriverParam->getAvatarAppearance()->getVisualParam(driven.mDrivenID);
if (param)
@@ -232,19 +230,19 @@ void LLDriverParam::setWeight(F32 weight)
//-------|----|-------|----|-------> driver
// | min1 max1 max2 min2
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- LLDrivenEntryInfo* info = driven->mInfo;
+ LLDrivenEntry* drivenp = &driven;
+ LLDrivenEntryInfo* info = drivenp->mInfo;
F32 driven_weight = 0.f;
- F32 driven_min = driven->mParam->getMinWeight();
- F32 driven_max = driven->mParam->getMaxWeight();
+ F32 driven_min = drivenp->mParam->getMinWeight();
+ F32 driven_max = drivenp->mParam->getMaxWeight();
if (mIsAnimating)
{
// driven param doesn't interpolate (textures, for example)
- if (!driven->mParam->getAnimating())
+ if (!drivenp->mParam->getAnimating())
{
continue;
}
@@ -268,7 +266,7 @@ void LLDriverParam::setWeight(F32 weight)
driven_weight = driven_min;
}
- setDrivenWeight(driven,driven_weight);
+ setDrivenWeight(drivenp,driven_weight);
continue;
}
else
@@ -292,23 +290,22 @@ void LLDriverParam::setWeight(F32 weight)
driven_weight = driven_min;
}
- setDrivenWeight(driven,driven_weight);
+ setDrivenWeight(drivenp,driven_weight);
continue;
}
}
- driven_weight = getDrivenWeight(driven, mCurWeight);
- setDrivenWeight(driven,driven_weight);
+ driven_weight = getDrivenWeight(drivenp, mCurWeight);
+ setDrivenWeight(drivenp,driven_weight);
}
}
F32 LLDriverParam::getTotalDistortion()
{
F32 sum = 0.f;
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- sum += driven->mParam->getTotalDistortion();
+ sum += driven.mParam->getTotalDistortion();
}
return sum;
@@ -320,10 +317,9 @@ const LLVector4a &LLDriverParam::getAvgDistortion()
LLVector4a sum;
sum.clear();
S32 count = 0;
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- sum.add(driven->mParam->getAvgDistortion());
+ sum.add(driven.mParam->getAvgDistortion());
count++;
}
sum.mul( 1.f/(F32)count);
@@ -335,10 +331,9 @@ const LLVector4a &LLDriverParam::getAvgDistortion()
F32 LLDriverParam::getMaxDistortion()
{
F32 max = 0.f;
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- F32 param_max = driven->mParam->getMaxDistortion();
+ F32 param_max = driven.mParam->getMaxDistortion();
if( param_max > max )
{
max = param_max;
@@ -353,10 +348,9 @@ LLVector4a LLDriverParam::getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)
{
LLVector4a sum;
sum.clear();
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- sum.add(driven->mParam->getVertexDistortion( index, poly_mesh ));
+ sum.add(driven.mParam->getVertexDistortion(index, poly_mesh));
}
return sum;
}
@@ -365,13 +359,12 @@ const LLVector4a* LLDriverParam::getFirstDistortion(U32 *index, LLPolyMesh **pol
{
mCurrentDistortionParam = NULL;
const LLVector4a* v = NULL;
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- v = driven->mParam->getFirstDistortion( index, poly_mesh );
+ v = driven.mParam->getFirstDistortion(index, poly_mesh);
if( v )
{
- mCurrentDistortionParam = driven->mParam;
+ mCurrentDistortionParam = driven.mParam;
break;
}
}
@@ -415,7 +408,7 @@ const LLVector4a* LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly
for( iter++; iter != mDriven.end(); iter++ )
{
driven = &(*iter);
- v = driven->mParam->getFirstDistortion( index, poly_mesh );
+ v = driven->mParam->getFirstDistortion(index, poly_mesh);
if( v )
{
mCurrentDistortionParam = driven->mParam;
@@ -448,14 +441,14 @@ void LLDriverParam::setAnimationTarget( F32 target_value)
{
LLVisualParam::setAnimationTarget(target_value);
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- F32 driven_weight = getDrivenWeight(driven, mTargetWeight);
+ LLDrivenEntry* drivenp = &driven;
+ F32 driven_weight = getDrivenWeight(drivenp, mTargetWeight);
// this isn't normally necessary, as driver params handle interpolation of their driven params
// but texture params need to know to assume their final value at beginning of interpolation
- driven->mParam->setAnimationTarget(driven_weight);
+ drivenp->mParam->setAnimationTarget(driven_weight);
}
}
@@ -466,10 +459,9 @@ void LLDriverParam::stopAnimating()
{
LLVisualParam::stopAnimating();
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- driven->mParam->setAnimating(FALSE);
+ driven.mParam->setAnimating(FALSE);
}
}
@@ -477,17 +469,15 @@ void LLDriverParam::stopAnimating()
BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross_params)
{
BOOL success = TRUE;
- LLDriverParamInfo::entry_info_list_t::iterator iter;
- for (iter = getInfo()->mDrivenInfoList.begin(); iter != getInfo()->mDrivenInfoList.end(); ++iter)
+ for (LLDrivenEntryInfo& driven_info : getInfo()->mDrivenInfoList)
{
- LLDrivenEntryInfo *driven_info = &(*iter);
- S32 driven_id = driven_info->mDrivenID;
+ S32 driven_id = driven_info.mDrivenID;
// check for already existing links. Do not overwrite.
BOOL found = FALSE;
- for (entry_list_t::iterator driven_iter = mDriven.begin(); driven_iter != mDriven.end() && !found; ++driven_iter)
+ for (auto& driven : mDriven)
{
- if (driven_iter->mInfo->mDrivenID == driven_id)
+ if (driven.mInfo->mDrivenID == driven_id)
{
found = TRUE;
}
@@ -500,7 +490,7 @@ BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross
bool push = param && (!only_cross_params || param->getCrossWearable());
if (push)
{
- mDriven.push_back(LLDrivenEntry( param, driven_info ));
+ mDriven.push_back(LLDrivenEntry( param, &driven_info ));
}
else
{
@@ -523,10 +513,9 @@ void LLDriverParam::updateCrossDrivenParams(LLWearableType::EType driven_type)
bool needs_update = (getWearableType()==driven_type);
// if the driver has a driven entry for the passed-in wearable type, we need to refresh the value
- for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
+ for(LLDrivenEntry& driven : mDriven)
{
- LLDrivenEntry* driven = &(*iter);
- if (driven && driven->mParam && driven->mParam->getCrossWearable() && driven->mParam->getWearableType() == driven_type)
+ if (driven.mParam && driven.mParam->getCrossWearable() && driven.mParam->getWearableType() == driven_type)
{
needs_update = true;
}
diff --git a/indra/llappearance/lllocaltextureobject.cpp b/indra/llappearance/lllocaltextureobject.cpp
index 3f564ec3de305f7f77d4f2ea607bc3187b5c137c..ac8a1abb2dbb28a0d356eb60591c8c72f69066fe 100644
--- a/indra/llappearance/lllocaltextureobject.cpp
+++ b/indra/llappearance/lllocaltextureobject.cpp
@@ -95,9 +95,8 @@ LLTexLayer* LLLocalTextureObject::getTexLayer(U32 index) const
LLTexLayer* LLLocalTextureObject::getTexLayer(const std::string &name)
{
- for( tex_layer_vec_t::iterator iter = mTexLayers.begin(); iter != mTexLayers.end(); iter++)
+ for(LLTexLayer* layer : mTexLayers)
{
- LLTexLayer *layer = *iter;
if (layer->getName().compare(name) == 0)
{
return layer;
diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index 3892e4ce43ee75625f1d8aa179741f59357633ed..dab14851c80fe914097200685b456d80b061aa38 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -890,11 +890,10 @@ void LLPolyMesh::dumpDiagInfo()
LL_INFOS() << "-----------------------------------------------------" << LL_ENDL;
// print each loaded mesh, and it's memory usage
- for(LLPolyMeshSharedDataTable::iterator iter = sGlobalSharedMeshList.begin();
- iter != sGlobalSharedMeshList.end(); ++iter)
+ for(const LLPolyMeshSharedDataTable::value_type& mesh_pair : sGlobalSharedMeshList)
{
- const std::string& mesh_name = iter->first;
- LLPolyMeshSharedData* mesh = iter->second;
+ const std::string& mesh_name = mesh_pair.first;
+ LLPolyMeshSharedData* mesh = mesh_pair.second;
S32 num_verts = mesh->mNumVertices;
S32 num_faces = mesh->mNumFaces;
@@ -997,14 +996,12 @@ LLPolyMorphData* LLPolyMesh::getMorphData(const std::string& morph_name)
{
if (!mSharedData)
return NULL;
- for (LLPolyMeshSharedData::morphdata_list_t::iterator iter = mSharedData->mMorphData.begin();
- iter != mSharedData->mMorphData.end(); ++iter)
+ for (LLPolyMorphData* morph_data : mSharedData->mMorphData)
{
- LLPolyMorphData *morph_data = *iter;
- if (morph_data->getName() == morph_name)
- {
- return morph_data;
- }
+ if (morph_data->getName() == morph_name)
+ {
+ return morph_data;
+ }
}
return NULL;
}
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index 84dd6156a9424387298eb499b52e424b88d107bf..ca3ecda8c33488905585d5b024fdd37dfc1f4aae 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -364,17 +364,16 @@ BOOL LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
LLAvatarAppearance* avatarp = mMesh->getAvatar();
LLPolyMorphTargetInfo::volume_info_list_t::iterator iter;
- for (iter = getInfo()->mVolumeInfoList.begin(); iter != getInfo()->mVolumeInfoList.end(); iter++)
+ for (LLPolyVolumeMorphInfo& volume_info : getInfo()->mVolumeInfoList)
{
- LLPolyVolumeMorphInfo *volume_info = &(*iter);
for (S32 i = 0; i < avatarp->mNumCollisionVolumes; i++)
{
- if (avatarp->mCollisionVolumes[i].getName() == volume_info->mName)
+ if (avatarp->mCollisionVolumes[i].getName() == volume_info.mName)
{
mVolumeMorphs.push_back(
LLPolyVolumeMorph(&avatarp->mCollisionVolumes[i],
- volume_info->mScale,
- volume_info->mPos));
+ volume_info.mScale,
+ volume_info.mPos));
break;
}
}
@@ -641,15 +640,14 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
}
// now apply volume changes
- for( volume_list_t::iterator iter = mVolumeMorphs.begin(); iter != mVolumeMorphs.end(); iter++ )
+ for(LLPolyVolumeMorph& volume_morph : mVolumeMorphs)
{
- LLPolyVolumeMorph* volume_morph = &(*iter);
- LLVector3 scale_delta = volume_morph->mScale * delta_weight;
- LLVector3 pos_delta = volume_morph->mPos * delta_weight;
+ LLVector3 scale_delta = volume_morph.mScale * delta_weight;
+ LLVector3 pos_delta = volume_morph.mPos * delta_weight;
- volume_morph->mVolume->setScale(volume_morph->mVolume->getScale() + scale_delta);
+ volume_morph.mVolume->setScale(volume_morph.mVolume->getScale() + scale_delta);
// SL-315
- volume_morph->mVolume->setPosition(volume_morph->mVolume->getPosition() + pos_delta);
+ volume_morph.mVolume->setPosition(volume_morph.mVolume->getPosition() + pos_delta);
}
}
@@ -735,15 +733,14 @@ void LLPolyMorphTarget::applyMask(U8 *maskTextureData, S32 width, S32 height, S3
void LLPolyMorphTarget::applyVolumeChanges(F32 delta_weight)
{
// now apply volume changes
- for( volume_list_t::iterator iter = mVolumeMorphs.begin(); iter != mVolumeMorphs.end(); iter++ )
+ for(LLPolyVolumeMorph& volume_morph : mVolumeMorphs)
{
- LLPolyVolumeMorph* volume_morph = &(*iter);
- LLVector3 scale_delta = volume_morph->mScale * delta_weight;
- LLVector3 pos_delta = volume_morph->mPos * delta_weight;
+ LLVector3 scale_delta = volume_morph.mScale * delta_weight;
+ LLVector3 pos_delta = volume_morph.mPos * delta_weight;
- volume_morph->mVolume->setScale(volume_morph->mVolume->getScale() + scale_delta);
+ volume_morph.mVolume->setScale(volume_morph.mVolume->getScale() + scale_delta);
// SL-315
- volume_morph->mVolume->setPosition(volume_morph->mVolume->getPosition() + pos_delta);
+ volume_morph.mVolume->setPosition(volume_morph.mVolume->getPosition() + pos_delta);
}
}
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index 360f17508fdba828c8431a7dc23789d19f95a1f7..8712cdd2869c294a058464f301c69995db72096a 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -144,37 +144,35 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
setWeight(getDefaultWeight());
LLPolySkeletalDistortionInfo::bone_info_list_t::iterator iter;
- for (iter = getInfo()->mBoneInfoList.begin(); iter != getInfo()->mBoneInfoList.end(); iter++)
+ for (LLPolySkeletalBoneInfo& bone_info : getInfo()->mBoneInfoList)
{
- LLPolySkeletalBoneInfo *bone_info = &(*iter);
- LLJoint* joint = mAvatar->getJoint(bone_info->mBoneName);
+ LLJoint* joint = mAvatar->getJoint(bone_info.mBoneName);
if (!joint)
{
// There's no point continuing after this error - means
// that either the skeleton or lad file is broken.
- LL_WARNS() << "Joint " << bone_info->mBoneName << " not found." << LL_ENDL;
+ LL_WARNS() << "Joint " << bone_info.mBoneName << " not found." << LL_ENDL;
return FALSE;
}
// store it
- mJointScales[joint] = bone_info->mScaleDeformation;
+ mJointScales[joint] = bone_info.mScaleDeformation;
// apply to children that need to inherit it
- for (LLJoint::joints_t::iterator iter = joint->mChildren.begin();
- iter != joint->mChildren.end(); ++iter)
+ for (LLJoint* joint : joint->mChildren)
{
- LLAvatarJoint* child_joint = (LLAvatarJoint*)(*iter);
+ LLAvatarJoint* child_joint = (LLAvatarJoint*)joint;
if (child_joint->inheritScale())
{
LLVector3 childDeformation = LLVector3(child_joint->getScale());
- childDeformation.scaleVec(bone_info->mScaleDeformation);
+ childDeformation.scaleVec(bone_info.mScaleDeformation);
mJointScales[child_joint] = childDeformation;
}
}
- if (bone_info->mHasPositionDeformation)
+ if (bone_info.mHasPositionDeformation)
{
- mJointOffsets[joint] = bone_info->mPositionDeformation;
+ mJointOffsets[joint] = bone_info.mPositionDeformation;
}
}
return TRUE;
@@ -195,15 +193,12 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex )
F32 effective_weight = ( getSex() & avatar_sex ) ? mCurWeight : getDefaultWeight();
LLJoint* joint;
- joint_vec_map_t::iterator iter;
- for (iter = mJointScales.begin();
- iter != mJointScales.end();
- iter++)
+ for (joint_vec_map_t::value_type& scale_pair : mJointScales)
{
- joint = iter->first;
+ joint = scale_pair.first;
LLVector3 newScale = joint->getScale();
- LLVector3 scaleDelta = iter->second;
+ LLVector3 scaleDelta = scale_pair.second;
LLVector3 offset = (effective_weight - mLastWeight) * scaleDelta;
newScale = newScale + offset;
//An aspect of attached mesh objects (which contain joint offsets) that need to be cleaned up when detached
@@ -218,13 +213,11 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex )
joint->setScale(newScale, true);
}
- for (iter = mJointOffsets.begin();
- iter != mJointOffsets.end();
- iter++)
+ for (joint_vec_map_t::value_type& offset_pair : mJointOffsets)
{
- joint = iter->first;
+ joint = offset_pair.first;
LLVector3 newPosition = joint->getPosition();
- LLVector3 positionDelta = iter->second;
+ LLVector3 positionDelta = offset_pair.second;
newPosition = newPosition + (effective_weight * positionDelta) - (mLastWeight * positionDelta);
// SL-315
bool allow_attachment_pos_overrides = true;
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
index 3df2254b1423ec8477b270050b38dfe320b6e12a..75815482c9856f7e571bf653a4633ea5d66dcf0a 100644
--- a/indra/llappearance/lltexglobalcolor.cpp
+++ b/indra/llappearance/lltexglobalcolor.cpp
@@ -55,12 +55,10 @@ BOOL LLTexGlobalColor::setInfo(LLTexGlobalColorInfo *info)
//mID = info->mID; // No ID
mParamGlobalColorList.reserve(mInfo->mParamColorInfoList.size());
- for (param_color_info_list_t::iterator iter = mInfo->mParamColorInfoList.begin();
- iter != mInfo->mParamColorInfoList.end();
- iter++)
+ for (LLTexLayerParamColorInfo* color_info : mInfo->mParamColorInfoList)
{
LLTexParamGlobalColor* param_color = new LLTexParamGlobalColor(this);
- if (!param_color->setInfo(*iter, TRUE))
+ if (!param_color->setInfo(color_info, TRUE))
{
mInfo = NULL;
return FALSE;
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 3430a255368e7f10c4e583e5418ca578d491787b..6f23b2e04c6ceec0c312cbf751a4c6be15956d6e 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -241,11 +241,8 @@ BOOL LLTexLayerSetInfo::parseXml(LLXmlTreeNode* node)
void LLTexLayerSetInfo::createVisualParams(LLAvatarAppearance *appearance)
{
//layer_info_list_t mLayerInfoList;
- for (layer_info_list_t::iterator layer_iter = mLayerInfoList.begin();
- layer_iter != mLayerInfoList.end();
- layer_iter++)
+ for (LLTexLayerInfo* layer_info : mLayerInfoList)
{
- LLTexLayerInfo *layer_info = *layer_iter;
layer_info->createVisualParams(appearance);
}
}
@@ -287,12 +284,10 @@ BOOL LLTexLayerSet::setInfo(const LLTexLayerSetInfo *info)
//mID = info->mID; // No ID
mLayerList.reserve(info->mLayerInfoList.size());
- for (LLTexLayerSetInfo::layer_info_list_t::const_iterator iter = info->mLayerInfoList.begin();
- iter != info->mLayerInfoList.end();
- iter++)
+ for (LLTexLayerInfo* layer_info : info->mLayerInfoList)
{
LLTexLayerInterface *layer = NULL;
- if ( (*iter)->isUserSettable() )
+ if (layer_info->isUserSettable())
{
layer = new LLTexLayerTemplate( this, getAvatarAppearance() );
}
@@ -301,7 +296,7 @@ BOOL LLTexLayerSet::setInfo(const LLTexLayerSetInfo *info)
layer = new LLTexLayer(this);
}
// this is the first time this layer (of either type) is being created - make sure you add the parameters to the avatar appearance
- if (!layer->setInfo(*iter, NULL))
+ if (!layer->setInfo(layer_info, NULL))
{
mInfo = NULL;
return FALSE;
@@ -348,14 +343,12 @@ BOOL LLTexLayerSet::parseData(LLXmlTreeNode* node)
void LLTexLayerSet::deleteCaches()
{
- for( layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for(LLTexLayerInterface* layer : mLayerList)
{
- LLTexLayerInterface* layer = *iter;
layer->deleteCaches();
}
- for (layer_list_t::iterator iter = mMaskLayerList.begin(); iter != mMaskLayerList.end(); iter++)
+ for (LLTexLayerInterface* layer : mMaskLayerList)
{
- LLTexLayerInterface* layer = *iter;
layer->deleteCaches();
}
}
@@ -368,9 +361,8 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height, LLRenderTarget*
if (mMaskLayerList.size() > 0)
{
- for (layer_list_t::iterator iter = mMaskLayerList.begin(); iter != mMaskLayerList.end(); iter++)
+ for (LLTexLayerInterface* layer : mMaskLayerList)
{
- LLTexLayerInterface* layer = *iter;
if (layer->isInvisibleAlphaMask())
{
mIsVisible = FALSE;
@@ -399,9 +391,8 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height, LLRenderTarget*
if (mIsVisible)
{
// composite color layers
- for( layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for(LLTexLayerInterface* layer : mLayerList)
{
- LLTexLayerInterface* layer = *iter;
if (layer->getRenderPass() == LLTexLayer::RP_COLOR)
{
gGL.flush();
@@ -473,9 +464,8 @@ void LLTexLayerSet::gatherMorphMaskAlpha(U8 *data, S32 origin_x, S32 origin_y, S
LL_PROFILE_ZONE_SCOPED;
memset(data, 255, width * height);
- for( layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for(LLTexLayerInterface* layer : mLayerList)
{
- LLTexLayerInterface* layer = *iter;
layer->gatherAlphaMasks(data, origin_x, origin_y, width, height, bound_target);
}
@@ -526,9 +516,8 @@ void LLTexLayerSet::renderAlphaMaskTextures(S32 x, S32 y, S32 width, S32 height,
if (mMaskLayerList.size() > 0)
{
gGL.setSceneBlendType(LLRender::BT_MULT_ALPHA);
- for (layer_list_t::iterator iter = mMaskLayerList.begin(); iter != mMaskLayerList.end(); iter++)
+ for (LLTexLayerInterface* layer : mMaskLayerList)
{
- LLTexLayerInterface* layer = *iter;
gGL.flush();
layer->blendAlphaTexture(x,y,width, height);
gGL.flush();
@@ -549,9 +538,8 @@ void LLTexLayerSet::applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_
BOOL LLTexLayerSet::isMorphValid() const
{
- for(layer_list_t::const_iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for(const LLTexLayerInterface* layer : mLayerList)
{
- const LLTexLayerInterface* layer = *iter;
if (layer && !layer->isMorphValid())
{
return FALSE;
@@ -562,9 +550,8 @@ BOOL LLTexLayerSet::isMorphValid() const
void LLTexLayerSet::invalidateMorphMasks()
{
- for( layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for(LLTexLayerInterface* layer : mLayerList)
{
- LLTexLayerInterface* layer = *iter;
if (layer)
{
layer->invalidateMorphMasks();
@@ -661,14 +648,12 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
/* if ("upper_shirt" == local_texture_name)
mLocalTexture = TEX_UPPER_SHIRT; */
mLocalTexture = TEX_NUM_INDICES;
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearance::getDictionary()->getTextures().begin();
- iter != LLAvatarAppearance::getDictionary()->getTextures().end();
- iter++)
+ for (const LLAvatarAppearanceDictionary::Textures::value_type& dict_pair : LLAvatarAppearance::getDictionary()->getTextures())
{
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = dict_pair.second;
if (local_texture_name == texture_dict->mName)
{
- mLocalTexture = iter->first;
+ mLocalTexture = dict_pair.first;
break;
}
}
@@ -735,11 +720,8 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
BOOL LLTexLayerInfo::createVisualParams(LLAvatarAppearance *appearance)
{
BOOL success = TRUE;
- for (param_color_info_list_t::iterator color_info_iter = mParamColorInfoList.begin();
- color_info_iter != mParamColorInfoList.end();
- color_info_iter++)
+ for (LLTexLayerParamColorInfo* color_info : mParamColorInfoList)
{
- LLTexLayerParamColorInfo * color_info = *color_info_iter;
LLTexLayerParamColor* param_color = new LLTexLayerParamColor(appearance);
if (!param_color->setInfo(color_info, TRUE))
{
@@ -749,11 +731,8 @@ BOOL LLTexLayerInfo::createVisualParams(LLAvatarAppearance *appearance)
}
}
- for (param_alpha_info_list_t::iterator alpha_info_iter = mParamAlphaInfoList.begin();
- alpha_info_iter != mParamAlphaInfoList.end();
- alpha_info_iter++)
+ for (LLTexLayerParamAlphaInfo* alpha_info : mParamAlphaInfoList)
{
- LLTexLayerParamAlphaInfo * alpha_info = *alpha_info_iter;
LLTexLayerParamAlpha* param_alpha = new LLTexLayerParamAlpha(appearance);
if (!param_alpha->setInfo(alpha_info, TRUE))
{
@@ -796,15 +775,13 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
//mID = info->mID; // No ID
mParamColorList.reserve(mInfo->mParamColorInfoList.size());
- for (param_color_info_list_t::const_iterator iter = mInfo->mParamColorInfoList.begin();
- iter != mInfo->mParamColorInfoList.end();
- iter++)
+ for (LLTexLayerParamColorInfo* color_info : mInfo->mParamColorInfoList)
{
LLTexLayerParamColor* param_color;
if (!wearable)
{
param_color = new LLTexLayerParamColor(this);
- if (!param_color->setInfo(*iter, TRUE))
+ if (!param_color->setInfo(color_info, TRUE))
{
mInfo = NULL;
return FALSE;
@@ -812,7 +789,7 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
}
else
{
- param_color = (LLTexLayerParamColor*)wearable->getVisualParam((*iter)->getID());
+ param_color = (LLTexLayerParamColor*)wearable->getVisualParam(color_info->getID());
if (!param_color)
{
mInfo = NULL;
@@ -823,15 +800,13 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
}
mParamAlphaList.reserve(mInfo->mParamAlphaInfoList.size());
- for (param_alpha_info_list_t::const_iterator iter = mInfo->mParamAlphaInfoList.begin();
- iter != mInfo->mParamAlphaInfoList.end();
- iter++)
+ for (LLTexLayerParamAlphaInfo* alpha_info : mInfo->mParamAlphaInfoList)
{
LLTexLayerParamAlpha* param_alpha;
if (!wearable)
{
param_alpha = new LLTexLayerParamAlpha( this );
- if (!param_alpha->setInfo(*iter, TRUE))
+ if (!param_alpha->setInfo(alpha_info, TRUE))
{
mInfo = NULL;
return FALSE;
@@ -839,7 +814,7 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
}
else
{
- param_alpha = (LLTexLayerParamAlpha*) wearable->getVisualParam((*iter)->getID());
+ param_alpha = (LLTexLayerParamAlpha*) wearable->getVisualParam(alpha_info->getID());
if (!param_alpha)
{
mInfo = NULL;
@@ -873,12 +848,9 @@ LLWearableType::EType LLTexLayerInterface::getWearableType() const
if (TEX_INVALID == te)
{
LLWearableType::EType type = LLWearableType::WT_INVALID;
- param_color_list_t::const_iterator color_iter = mParamColorList.begin();
- param_alpha_list_t::const_iterator alpha_iter = mParamAlphaList.begin();
- for (; color_iter != mParamColorList.end(); color_iter++)
+ for (LLTexLayerParamColor* param : mParamColorList)
{
- LLTexLayerParamColor* param = *color_iter;
if (param)
{
LLWearableType::EType new_type = (LLWearableType::EType)param->getWearableType();
@@ -893,9 +865,8 @@ LLWearableType::EType LLTexLayerInterface::getWearableType() const
}
}
- for (; alpha_iter != mParamAlphaList.end(); alpha_iter++)
+ for (LLTexLayerParamAlpha* param : mParamAlphaList)
{
- LLTexLayerParamAlpha* param = *alpha_iter;
if (param)
{
LLWearableType::EType new_type = (LLWearableType::EType)param->getWearableType();
@@ -938,18 +909,18 @@ void LLTexLayerInterface::invalidateMorphMasks()
LLViewerVisualParam* LLTexLayerInterface::getVisualParamPtr(S32 index) const
{
LLViewerVisualParam *result = NULL;
- for (param_color_list_t::const_iterator color_iter = mParamColorList.begin(); color_iter != mParamColorList.end() && !result; ++color_iter)
+ for (LLTexLayerParamColor* param : mParamColorList)
{
- if ((*color_iter)->getID() == index)
+ if (param->getID() == index)
{
- result = *color_iter;
+ result = param;
}
}
- for (param_alpha_list_t::const_iterator alpha_iter = mParamAlphaList.begin(); alpha_iter != mParamAlphaList.end() && !result; ++alpha_iter)
+ for (LLTexLayerParamAlpha* param : mParamAlphaList)
{
- if ((*alpha_iter)->getID() == index)
+ if (param->getID() == index)
{
- result = *alpha_iter;
+ result = param;
}
}
@@ -994,10 +965,9 @@ LLTexLayer::~LLTexLayer()
//std::for_each(mParamAlphaList.begin(), mParamAlphaList.end(), DeletePointer());
//std::for_each(mParamColorList.begin(), mParamColorList.end(), DeletePointer());
- for( alpha_cache_t::iterator iter = mAlphaCache.begin();
- iter != mAlphaCache.end(); iter++ )
+ for (alpha_cache_t::value_type& alpha_pair : mAlphaCache)
{
- U8* alpha_data = iter->second;
+ U8* alpha_data = alpha_pair.second;
ll_aligned_free_32(alpha_data);
}
@@ -1021,10 +991,8 @@ BOOL LLTexLayer::setInfo(const LLTexLayerInfo* info, LLWearable* wearable )
//static
void LLTexLayer::calculateTexLayerColor(const param_color_list_t ¶m_list, LLColor4 &net_color)
{
- for (param_color_list_t::const_iterator iter = param_list.begin();
- iter != param_list.end(); iter++)
+ for (const LLTexLayerParamColor* param : param_list)
{
- const LLTexLayerParamColor* param = *iter;
LLColor4 param_net = param->getNetColor();
const LLTexLayerParamColorInfo *info = (LLTexLayerParamColorInfo *)param->getInfo();
switch(info->getOperation())
@@ -1049,10 +1017,8 @@ void LLTexLayer::calculateTexLayerColor(const param_color_list_t ¶m_list, LL
/*virtual*/ void LLTexLayer::deleteCaches()
{
// Only need to delete caches for alpha params. Color params don't hold extra memory
- for (param_alpha_list_t::iterator iter = mParamAlphaList.begin();
- iter != mParamAlphaList.end(); iter++ )
+ for (LLTexLayerParamAlpha* param : mParamAlphaList)
{
- LLTexLayerParamAlpha* param = *iter;
param->deleteCaches();
}
}
@@ -1226,9 +1192,8 @@ const U8* LLTexLayer::getAlphaData() const
const LLUUID& uuid = getUUID();
alpha_mask_crc.update((U8*)(&uuid.mData), UUID_BYTES);
- for (param_alpha_list_t::const_iterator iter = mParamAlphaList.begin(); iter != mParamAlphaList.end(); iter++)
+ for (const LLTexLayerParamAlpha* param : mParamAlphaList)
{
- const LLTexLayerParamAlpha* param = *iter;
// MULTI-WEARABLE: verify visual parameters used here
F32 param_weight = param->getWeight();
alpha_mask_crc.update((U8*)¶m_weight, sizeof(F32));
@@ -1365,9 +1330,8 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
// Accumulate alphas
LLGLSNoAlphaTest gls_no_alpha_test;
gGL.color4f( 1.f, 1.f, 1.f, 1.f );
- for (param_alpha_list_t::iterator iter = mParamAlphaList.begin(); iter != mParamAlphaList.end(); iter++)
+ for (LLTexLayerParamAlpha* param : mParamAlphaList)
{
- LLTexLayerParamAlpha* param = *iter;
success &= param->render( x, y, width, height );
if (!success && !force_render)
{
@@ -1441,9 +1405,8 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
const LLUUID& uuid = getUUID();
alpha_mask_crc.update((U8*)(&uuid.mData), UUID_BYTES);
- for (param_alpha_list_t::const_iterator iter = mParamAlphaList.begin(); iter != mParamAlphaList.end(); iter++)
+ for (const LLTexLayerParamAlpha* param : mParamAlphaList)
{
- const LLTexLayerParamAlpha* param = *iter;
F32 param_weight = param->getWeight();
alpha_mask_crc.update((U8*)¶m_weight, sizeof(F32));
}
@@ -1683,12 +1646,10 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) const
BOOL success = TRUE;
updateWearableCache();
- for (wearable_cache_t::const_iterator iter = mWearableCache.begin(); iter!= mWearableCache.end(); iter++)
+ for (LLWearable* wearable : mWearableCache)
{
- LLWearable* wearable = NULL;
LLLocalTextureObject *lto = NULL;
LLTexLayer *layer = NULL;
- wearable = *iter;
if (wearable)
{
lto = wearable->getLocalTextureObject(mInfo->mLocalTexture);
@@ -1785,17 +1746,15 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) const
//-----------------------------------------------------------------------------
LLTexLayerInterface* LLTexLayerSet::findLayerByName(const std::string& name)
{
- for (layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for (LLTexLayerInterface* layer : mLayerList)
{
- LLTexLayerInterface* layer = *iter;
if (layer->getName() == name)
{
return layer;
}
}
- for (layer_list_t::iterator iter = mMaskLayerList.begin(); iter != mMaskLayerList.end(); iter++ )
+ for (LLTexLayerInterface* layer : mMaskLayerList)
{
- LLTexLayerInterface* layer = *iter;
if (layer->getName() == name)
{
return layer;
@@ -1807,20 +1766,20 @@ LLTexLayerInterface* LLTexLayerSet::findLayerByName(const std::string& name)
void LLTexLayerSet::cloneTemplates(LLLocalTextureObject *lto, LLAvatarAppearanceDefines::ETextureIndex tex_index, LLWearable *wearable)
{
// initialize all texlayers with this texture type for this LTO
- for( LLTexLayerSet::layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
+ for(LLTexLayerInterface* layer : mLayerList)
{
- LLTexLayerTemplate* layer = (LLTexLayerTemplate*)*iter;
- if (layer->getInfo()->getLocalTexture() == (S32) tex_index)
+ LLTexLayerTemplate* layer_template = (LLTexLayerTemplate*)layer;
+ if (layer_template->getInfo()->getLocalTexture() == (S32)tex_index)
{
- lto->addTexLayer(layer, wearable);
+ lto->addTexLayer(layer_template, wearable);
}
}
- for( LLTexLayerSet::layer_list_t::iterator iter = mMaskLayerList.begin(); iter != mMaskLayerList.end(); iter++ )
+ for(LLTexLayerInterface* layer : mMaskLayerList)
{
- LLTexLayerTemplate* layer = (LLTexLayerTemplate*)*iter;
- if (layer->getInfo()->getLocalTexture() == (S32) tex_index)
+ LLTexLayerTemplate* layer_template = (LLTexLayerTemplate*)layer;
+ if (layer_template->getInfo()->getLocalTexture() == (S32)tex_index)
{
- lto->addTexLayer(layer, wearable);
+ lto->addTexLayer(layer_template, wearable);
}
}
}
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index ce5c7142d5ccc9d310762105596d30993f03a0c5..a288c8955a1f15738fbc581a753f06742f0ff2a3 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -103,10 +103,8 @@ void LLTexLayerParamAlpha::getCacheByteCount(S32* gl_bytes)
{
*gl_bytes = 0;
- for (param_alpha_ptr_list_t::iterator iter = sInstances.begin();
- iter != sInstances.end(); iter++)
+ for (LLTexLayerParamAlpha* instance : sInstances)
{
- LLTexLayerParamAlpha* instance = *iter;
LLGLTexture* tex = instance->mCachedProcessedTexture;
if (tex)
{
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index e4bc8ff427f75953a8e69d82075e52698260acf1..10d668d0af90f87eb2d33236cb7c56b20383093b 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -60,12 +60,12 @@ LLWearable::LLWearable()
// virtual
LLWearable::~LLWearable()
{
- for (visual_param_index_map_t::iterator vpIter = mVisualParamIndexMap.begin(); vpIter != mVisualParamIndexMap.end(); ++vpIter)
+ for (visual_param_index_map_t::value_type& vp_pair : mVisualParamIndexMap)
{
- LLVisualParam* vp = vpIter->second;
+ LLVisualParam* vp = vp_pair.second;
vp->clearNextParam();
delete vp;
- vpIter->second = NULL;
+ vp_pair.second = NULL;
}
destroyTextures();
@@ -122,12 +122,10 @@ BOOL LLWearable::exportStream( std::ostream& output_stream ) const
// parameters
output_stream << "parameters " << mVisualParamIndexMap.size() << "\n";
- for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin();
- iter != mVisualParamIndexMap.end();
- ++iter)
+ for (const visual_param_index_map_t::value_type& vp_pair : mVisualParamIndexMap)
{
- S32 param_id = iter->first;
- const LLVisualParam* param = iter->second;
+ S32 param_id = vp_pair.first;
+ const LLVisualParam* param = vp_pair.second;
F32 param_weight = param->getWeight();
output_stream << param_id << " " << terse_F32_to_string( param_weight ) << "\n";
}
@@ -135,11 +133,11 @@ BOOL LLWearable::exportStream( std::ostream& output_stream ) const
// texture entries
output_stream << "textures " << mTEMap.size() << "\n";
- for (te_map_t::const_iterator iter = mTEMap.begin(); iter != mTEMap.end(); ++iter)
+ for (const te_map_t::value_type& te_pair : mTEMap)
{
- S32 te = iter->first;
- const LLUUID& image_id = iter->second->getID();
- output_stream << te << " " << image_id << "\n";
+ S32 te = te_pair.first;
+ const LLUUID& image_id = te_pair.second->getID();
+ output_stream << te << " " << image_id << "\n";
}
return TRUE;
}
@@ -160,11 +158,9 @@ void LLWearable::createVisualParams(LLAvatarAppearance *avatarp)
}
// resync driver parameters to point to the newly cloned driven parameters
- for (visual_param_index_map_t::iterator param_iter = mVisualParamIndexMap.begin();
- param_iter != mVisualParamIndexMap.end();
- ++param_iter)
+ for (visual_param_index_map_t::value_type& param_pair : mVisualParamIndexMap)
{
- LLVisualParam* param = param_iter->second;
+ LLVisualParam* param = param_pair.second;
LLVisualParam*(LLWearable::*wearable_function)(S32)const = &LLWearable::getVisualParam;
// need this line to disambiguate between versions of LLCharacter::getVisualParam()
LLVisualParam*(LLAvatarAppearance::*param_function)(S32)const = &LLAvatarAppearance::getVisualParam;
@@ -523,10 +519,9 @@ std::vector<LLLocalTextureObject*> LLWearable::getLocalTextureListSeq()
{
std::vector<LLLocalTextureObject*> result;
- for(te_map_t::const_iterator iter = mTEMap.begin();
- iter != mTEMap.end(); iter++)
+ for(te_map_t::value_type& te_pair : mTEMap)
{
- LLLocalTextureObject* lto = iter->second;
+ LLLocalTextureObject* lto = te_pair.second;
result.push_back(lto);
}
@@ -547,37 +542,15 @@ void LLWearable::revertValues()
// FIXME DRANO - this triggers changes to driven params on avatar, potentially clobbering baked appearance.
//update saved settings so wearable is no longer dirty
- // non-driver params first
- for (param_map_t::const_iterator iter = mSavedVisualParamMap.begin(); iter != mSavedVisualParamMap.end(); iter++)
- {
- S32 id = iter->first;
- F32 value = iter->second;
- LLVisualParam *param = getVisualParam(id);
- if(param && !dynamic_cast<LLDriverParam*>(param) )
- {
- setVisualParamWeight(id, value);
- }
- }
-
- //then driver params
- for (param_map_t::const_iterator iter = mSavedVisualParamMap.begin(); iter != mSavedVisualParamMap.end(); iter++)
+ // One loop should be necessary here
+ for (param_map_t::value_type& vp_pair : mSavedVisualParamMap)
{
- S32 id = iter->first;
- F32 value = iter->second;
+ S32 id = vp_pair.first;
LLVisualParam *param = getVisualParam(id);
- if(param && dynamic_cast<LLDriverParam*>(param) )
+ if(param)
{
+ F32 value = vp_pair.second;
setVisualParamWeight(id, value);
- }
- }
-
- // make sure that saved values are sane
- for (param_map_t::const_iterator iter = mSavedVisualParamMap.begin(); iter != mSavedVisualParamMap.end(); iter++)
- {
- S32 id = iter->first;
- LLVisualParam *param = getVisualParam(id);
- if( param )
- {
mSavedVisualParamMap[id] = param->getWeight();
}
}
@@ -589,10 +562,10 @@ void LLWearable::saveValues()
{
//update saved settings so wearable is no longer dirty
mSavedVisualParamMap.clear();
- for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); ++iter)
+ for (const visual_param_index_map_t::value_type& vp_pair : mVisualParamIndexMap)
{
- S32 id = iter->first;
- LLVisualParam *wearable_param = iter->second;
+ S32 id = vp_pair.first;
+ LLVisualParam *wearable_param = vp_pair.second;
F32 value = wearable_param->getWeight();
mSavedVisualParamMap[id] = value;
}
@@ -706,23 +679,18 @@ LLVisualParam* LLWearable::getVisualParam(S32 index) const
void LLWearable::getVisualParams(visual_param_vec_t &list)
{
- visual_param_index_map_t::iterator iter = mVisualParamIndexMap.begin();
- visual_param_index_map_t::iterator end = mVisualParamIndexMap.end();
-
// add all visual params to the passed-in vector
- for( ; iter != end; ++iter )
+ for(visual_param_index_map_t::value_type& vp_pair : mVisualParamIndexMap)
{
- list.push_back(iter->second);
+ list.push_back(vp_pair.second);
}
}
void LLWearable::animateParams(F32 delta)
{
- for(visual_param_index_map_t::iterator iter = mVisualParamIndexMap.begin();
- iter != mVisualParamIndexMap.end();
- ++iter)
+ for(visual_param_index_map_t::value_type& vp_pair : mVisualParamIndexMap)
{
- LLVisualParam *param = (LLVisualParam*) iter->second;
+ LLVisualParam *param = (LLVisualParam*)vp_pair.second;
param->animate(delta);
}
}
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index 008e1827c516f93893cb6f4a06b8590876eb1f7b..ddc508455fe3ed2199e4911d9ab34d582a4ca43c 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -123,18 +123,16 @@ void LLAudioEngine::shutdown()
cleanupWind();
// Clean up audio sources
- source_map::iterator iter_src;
- for (iter_src = mAllSources.begin(); iter_src != mAllSources.end(); iter_src++)
+ for (source_map::value_type& src_pair : mAllSources)
{
- delete iter_src->second;
+ delete src_pair.second;
}
// Clean up audio data
- data_map::iterator iter_data;
- for (iter_data = mAllData.begin(); iter_data != mAllData.end(); iter_data++)
+ for (data_map::value_type& data_pair : mAllData)
{
- delete iter_data->second;
+ delete data_pair.second;
}
@@ -310,12 +308,12 @@ void LLAudioEngine::idle()
updateChannels();
// Update queued sounds (switch to next queued data if the current has finished playing)
- for (iter = mAllSources.begin(); iter != mAllSources.end(); ++iter)
+ for (source_map::value_type& src_pair : mAllSources)
{
// This is lame, instead of this I could actually iterate through all the sources
// attached to each channel, since only those with active channels
// can have anything interesting happen with their queue? (Maybe not true)
- LLAudioSource *sourcep = iter->second;
+ LLAudioSource *sourcep = src_pair.second;
if (!sourcep->mQueuedDatap || sourcep->isMuted())
{
// Muted, or nothing queued, so we don't care.
@@ -395,9 +393,9 @@ void LLAudioEngine::idle()
LLAudioSource *sync_masterp = NULL;
LLAudioChannel *master_channelp = NULL;
F32 max_sm_priority = -1.f;
- for (iter = mAllSources.begin(); iter != mAllSources.end(); ++iter)
+ for (source_map::value_type& src_pair : mAllSources)
{
- LLAudioSource *sourcep = iter->second;
+ LLAudioSource *sourcep = src_pair.second;
if (sourcep->isMuted())
{
continue;
@@ -417,9 +415,9 @@ void LLAudioEngine::idle()
{
// Synchronize loop slaves with their masters
// Update queued sounds (switch to next queued data if the current has finished playing)
- for (iter = mAllSources.begin(); iter != mAllSources.end(); ++iter)
+ for (source_map::value_type& src_pair : mAllSources)
{
- LLAudioSource *sourcep = iter->second;
+ LLAudioSource *sourcep = src_pair.second;
if (!sourcep->isSyncSlave())
{
@@ -1115,9 +1113,9 @@ void LLAudioEngine::startNextTransfer()
}
- for (data_iter = asp->mPreloadMap.begin(); data_iter != asp->mPreloadMap.end(); data_iter++)
+ for (data_map::value_type& preload_pair : asp->mPreloadMap)
{
- LLAudioData *adp = data_iter->second;
+ LLAudioData *adp = preload_pair.second;
if (!adp)
{
continue;
@@ -1137,9 +1135,9 @@ void LLAudioEngine::startNextTransfer()
{
max_pri = -1.f;
source_map::iterator source_iter;
- for (source_iter = mAllSources.begin(); source_iter != mAllSources.end(); source_iter++)
+ for (source_map::value_type& source_pair : mAllSources)
{
- asp = source_iter->second;
+ asp = source_pair.second;
if (!asp)
{
continue;
@@ -1166,9 +1164,9 @@ void LLAudioEngine::startNextTransfer()
continue;
}
- for (data_iter = asp->mPreloadMap.begin(); data_iter != asp->mPreloadMap.end(); data_iter++)
+ for (data_map::value_type& preload_pair : asp->mPreloadMap)
{
- LLAudioData *adp = data_iter->second;
+ LLAudioData *adp = preload_pair.second;
if (!adp)
{
continue;
@@ -1603,10 +1601,9 @@ void LLAudioSource::addAudioData(LLAudioData *adp, const bool set_current)
bool LLAudioSource::hasPendingPreloads() const
{
// Check to see if we've got any preloads on deck for this source
- data_map::const_iterator iter;
- for (iter = mPreloadMap.begin(); iter != mPreloadMap.end(); iter++)
+ for (const data_map::value_type& preload_pair : mPreloadMap)
{
- LLAudioData *adp = iter->second;
+ LLAudioData *adp = preload_pair.second;
// note: a bad UUID will forever be !hasDecodedData()
// but also hasDecodeFailed(), hence the check for hasDecodeFailed()
if (!adp)
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp
index c16cae1bbc7237eec62fcf9aaa1fded4489e71ba..2e78e304052e501475e5ad54d00ee84a2cbf0213 100644
--- a/indra/llcharacter/llanimationstates.cpp
+++ b/indra/llcharacter/llanimationstates.cpp
@@ -379,12 +379,11 @@ LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, BOOL allo
if (true_name)
{
- for (anim_map_t::iterator iter = mAnimMap.begin();
- iter != mAnimMap.end(); iter++)
+ for (anim_map_t::value_type& anim_pair : mAnimMap)
{
- if (iter->second == true_name)
+ if (anim_pair.second == true_name)
{
- id = iter->first;
+ id = anim_pair.first;
break;
}
}
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index c38614b0b427a2d0ad21c9e7e4d9dc9313d557b4..47c6d6a7bb5c4808b216481892916db08e085f4d 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -156,10 +156,9 @@ LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &error
}
// Recognize all names we've been told are legal.
- std::map<std::string, std::string>::iterator iter;
- for (iter = joint_alias_map.begin(); iter != joint_alias_map.end(); iter++)
+ for (std::map<std::string, std::string>::value_type& alias_pair : joint_alias_map)
{
- makeTranslation( iter->first , iter->second );
+ makeTranslation( alias_pair.first , alias_pair.second );
}
char error_text[128]; /* Flawfinder: ignore */
@@ -951,9 +950,8 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &
void LLBVHLoader::applyTranslations()
{
JointVector::iterator ji;
- for (ji = mJoints.begin(); ji != mJoints.end(); ++ji )
+ for (Joint* joint : mJoints)
{
- Joint *joint = *ji;
//----------------------------------------------------------------
// Look for a translation for this joint.
// If none, skip to next joint
@@ -1067,9 +1065,8 @@ void LLBVHLoader::optimize()
}
JointVector::iterator ji;
- for (ji = mJoints.begin(); ji != mJoints.end(); ++ji)
+ for (Joint* joint : mJoints)
{
- Joint *joint = *ji;
BOOL pos_changed = FALSE;
BOOL rot_changed = FALSE;
@@ -1294,15 +1291,12 @@ U32 LLBVHLoader::getOutputSize()
// writes contents to datapacker
BOOL LLBVHLoader::serialize(LLDataPacker& dp)
{
- JointVector::iterator ji;
- KeyVector::iterator ki;
F32 time;
// count number of non-ignored joints
S32 numJoints = 0;
- for (ji=mJoints.begin(); ji!=mJoints.end(); ++ji)
+ for (Joint* joint : mJoints)
{
- Joint *joint = *ji;
if ( ! joint->mIgnore )
numJoints++;
}
@@ -1321,11 +1315,8 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
dp.packU32(mHand, "hand_pose");
dp.packU32(numJoints, "num_joints");
- for ( ji = mJoints.begin();
- ji != mJoints.end();
- ++ji )
+ for (Joint* joint : mJoints)
{
- Joint *joint = *ji;
// if ignored, skip it
if ( joint->mIgnore )
continue;
@@ -1348,17 +1339,15 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
Joint *mergeParent = NULL;
Joint *mergeChild = NULL;
- JointVector::iterator mji;
- for (mji=mJoints.begin(); mji!=mJoints.end(); ++mji)
+ for (Joint* mjoint : mJoints)
{
- Joint *mjoint = *mji;
if ( !joint->mMergeParentName.empty() && (mjoint->mName == joint->mMergeParentName) )
{
- mergeParent = *mji;
+ mergeParent = mjoint;
}
if ( !joint->mMergeChildName.empty() && (mjoint->mName == joint->mMergeChildName) )
{
- mergeChild = *mji;
+ mergeChild = mjoint;
}
}
@@ -1367,19 +1356,17 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
LLQuaternion::Order order = bvhStringToOrder( joint->mOrder );
S32 outcount = 0;
S32 frame = 0;
- for ( ki = joint->mKeys.begin();
- ki != joint->mKeys.end();
- ++ki )
+ for (Key& key : joint->mKeys)
{
if ((frame == 0) && joint->mRelativeRotationKey)
{
- first_frame_rot = mayaQ( ki->mRot[0], ki->mRot[1], ki->mRot[2], order);
+ first_frame_rot = mayaQ( key.mRot[0], key.mRot[1], key.mRot[2], order);
fixup_rot.shortestArc(LLVector3::z_axis * first_frame_rot * frameRot, LLVector3::z_axis);
}
- if (ki->mIgnoreRot)
+ if (key.mIgnoreRot)
{
frame++;
continue;
@@ -1418,7 +1405,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
mergeChildRot.loadIdentity();
}
- LLQuaternion inRot = mayaQ( ki->mRot[0], ki->mRot[1], ki->mRot[2], order);
+ LLQuaternion inRot = mayaQ( key.mRot[0], key.mRot[1], key.mRot[2], order);
LLQuaternion outRot = frameRotInv* mergeChildRot * inRot * mergeParentRot * ~first_frame_rot * frameRot * offsetRot;
@@ -1446,16 +1433,14 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
LLVector3 relKey;
frame = 0;
- for ( ki = joint->mKeys.begin();
- ki != joint->mKeys.end();
- ++ki )
+ for (Key& key : joint->mKeys)
{
if ((frame == 0) && joint->mRelativePositionKey)
{
- relKey.setVec(ki->mPos);
+ relKey.setVec(key.mPos);
}
- if (ki->mIgnorePos)
+ if (key.mIgnorePos)
{
frame++;
continue;
@@ -1463,7 +1448,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
time = llmax((F32)(frame - NUMBER_OF_IGNORED_FRAMES_AT_START), 0.0f) * mFrameTime; // Time elapsed before this frame starts.
- LLVector3 inPos = (LLVector3(ki->mPos) - relKey) * ~first_frame_rot;// * fixup_rot;
+ LLVector3 inPos = (LLVector3(key.mPos) - relKey) * ~first_frame_rot;// * fixup_rot;
LLVector3 outPos = inPos * frameRot * offsetRot;
outPos *= INCHES_TO_METERS;
@@ -1496,24 +1481,22 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
S32 num_constraints = (S32)mConstraints.size();
dp.packS32(num_constraints, "num_constraints");
- for (ConstraintVector::iterator constraint_it = mConstraints.begin();
- constraint_it != mConstraints.end();
- constraint_it++)
+ for (Constraint& constraint : mConstraints)
{
- U8 byte = constraint_it->mChainLength;
+ U8 byte = constraint.mChainLength;
dp.packU8(byte, "chain_length");
- byte = constraint_it->mConstraintType;
+ byte = constraint.mConstraintType;
dp.packU8(byte, "constraint_type");
- dp.packBinaryDataFixed((U8*)constraint_it->mSourceJointName, 16, "source_volume");
- dp.packVector3(constraint_it->mSourceOffset, "source_offset");
- dp.packBinaryDataFixed((U8*)constraint_it->mTargetJointName, 16, "target_volume");
- dp.packVector3(constraint_it->mTargetOffset, "target_offset");
- dp.packVector3(constraint_it->mTargetDir, "target_dir");
- dp.packF32(constraint_it->mEaseInStart, "ease_in_start");
- dp.packF32(constraint_it->mEaseInStop, "ease_in_stop");
- dp.packF32(constraint_it->mEaseOutStart, "ease_out_start");
- dp.packF32(constraint_it->mEaseOutStop, "ease_out_stop");
+ dp.packBinaryDataFixed((U8*)constraint.mSourceJointName, 16, "source_volume");
+ dp.packVector3(constraint.mSourceOffset, "source_offset");
+ dp.packBinaryDataFixed((U8*)constraint.mTargetJointName, 16, "target_volume");
+ dp.packVector3(constraint.mTargetOffset, "target_offset");
+ dp.packVector3(constraint.mTargetDir, "target_dir");
+ dp.packF32(constraint.mEaseInStart, "ease_in_start");
+ dp.packF32(constraint.mEaseInStop, "ease_in_stop");
+ dp.packF32(constraint.mEaseOutStart, "ease_out_start");
+ dp.packF32(constraint.mEaseOutStop, "ease_out_stop");
}
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 376f096642e1dbbdd566c1b3388a3494a2bde22c..cf6be8daf00e16a38ae4c8cdbfe867ebea674f30 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -246,10 +246,8 @@ void LLCharacter::dumpCharacter( LLJoint* joint )
LL_INFOS() << "DEBUG: " << joint->getName() << " (" << (joint->getParent()?joint->getParent()->getName():std::string("ROOT")) << ")" << LL_ENDL;
// recurse
- for (LLJoint::joints_t::iterator iter = joint->mChildren.begin();
- iter != joint->mChildren.end(); ++iter)
+ for (LLJoint* child_joint : joint->mChildren)
{
- LLJoint* child_joint = *iter;
dumpCharacter(child_joint);
}
}
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 2fac5f53a6552af5aa623e9d1ceaa7e609cdd889..6d56d59e8c132d3081ded024438d41f801e50d43 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -218,11 +218,9 @@ class LLCharacter
S32 getVisualParamCountInGroup(const EVisualParamGroup group) const
{
S32 rtn = 0;
- for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin();
- iter != mVisualParamIndexMap.end();
- /**/ )
+ for (const visual_param_index_map_t::value_type& index_pair : mVisualParamIndexMap)
{
- if ((iter++)->second->getGroup() == group)
+ if (index_pair.second->getGroup() == group)
{
++rtn;
}
@@ -237,11 +235,10 @@ class LLCharacter
}
S32 getVisualParamID(LLVisualParam *id)
{
- visual_param_index_map_t::iterator iter;
- for (iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); iter++)
+ for (visual_param_index_map_t::value_type& index_pair : mVisualParamIndexMap)
{
- if (iter->second == id)
- return iter->first;
+ if (index_pair.second == id)
+ return index_pair.first;
}
return 0;
}
diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp
index 37904936d86a9eba74b76a7c2fbca6332ffd9f9d..80717d8d26d2ed33b3db01e804db738c0a112908 100644
--- a/indra/llcharacter/llgesture.cpp
+++ b/indra/llcharacter/llgesture.cpp
@@ -199,15 +199,14 @@ BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::strin
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
boost::char_separator<char> sep(" ");
tokenizer tokens(string, sep);
- tokenizer::iterator token_iter;
- for( token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
+ for(const std::string& cur_token : tokens)
{
LLGesture* gesture = NULL;
if( !found_gestures ) // Only pay attention to the first gesture in the string.
{
- std::string cur_token_lower = *token_iter;
+ std::string cur_token_lower = cur_token;
LLStringUtil::toLower(cur_token_lower);
for (U32 i = 0; i < mList.size(); i++)
@@ -228,7 +227,7 @@ BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::strin
LLStringUtil::toLower(output_lower);
if( cur_token_lower == output_lower )
{
- revised_string->append(*token_iter);
+ revised_string->append(cur_token);
}
else
{
@@ -249,7 +248,7 @@ BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::strin
{
revised_string->append( " " );
}
- revised_string->append( *token_iter );
+ revised_string->append( cur_token );
}
first_token = FALSE;
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index d72282ab4210759dc728632dc99415582bed243a..280641a1a58c65b02b3da21d2785f8f4693dc889 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -67,11 +67,10 @@ void LLVector3OverrideMap::showJointVector3Overrides( std::ostringstream& os ) c
map_type::const_iterator max_it = std::max_element(m_map.begin(),
m_map.end(),
attachment_map_iter_compare_key<map_type::value_type>);
- for (map_type::const_iterator it = m_map.begin();
- it != m_map.end(); ++it)
+ for (const map_type::value_type& pos_pair : m_map)
{
- const LLVector3& pos = it->second;
- os << " " << "[" << it->first <<": " << pos << "]" << ((it==max_it) ? "*" : "");
+ const LLVector3& pos = pos_pair.second;
+ os << " " << "[" << pos_pair.first <<": " << pos << "]" << ((pos_pair==(*max_it)) ? "*" : "");
}
}
@@ -209,10 +208,8 @@ void LLJoint::touch(U32 flags)
child_flags |= POSITION_DIRTY;
}
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* joint : mChildren)
{
- LLJoint* joint = *iter;
joint->touch(child_flags);
}
}
@@ -251,10 +248,8 @@ LLJoint *LLJoint::findJoint( const std::string &name )
if (name == getName())
return this;
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* joint : mChildren)
{
- LLJoint* joint = *iter;
LLJoint *found = joint->findJoint(name);
if (found)
{
@@ -514,10 +509,9 @@ void LLJoint::getAllAttachmentPosOverrides(S32& num_pos_overrides,
std::set<LLVector3>& distinct_pos_overrides) const
{
num_pos_overrides = m_attachmentPosOverrides.count();
- LLVector3OverrideMap::map_type::const_iterator it = m_attachmentPosOverrides.getMap().begin();
- for (; it != m_attachmentPosOverrides.getMap().end(); ++it)
+ for (const LLVector3OverrideMap::map_type::value_type& pos_override_pair : m_attachmentPosOverrides.getMap())
{
- distinct_pos_overrides.insert(it->second);
+ distinct_pos_overrides.insert(pos_override_pair.second);
}
}
@@ -528,10 +522,9 @@ void LLJoint::getAllAttachmentScaleOverrides(S32& num_scale_overrides,
std::set<LLVector3>& distinct_scale_overrides) const
{
num_scale_overrides = m_attachmentScaleOverrides.count();
- LLVector3OverrideMap::map_type::const_iterator it = m_attachmentScaleOverrides.getMap().begin();
- for (; it != m_attachmentScaleOverrides.getMap().end(); ++it)
+ for (const LLVector3OverrideMap::map_type::value_type& scale_override_pair : m_attachmentScaleOverrides.getMap())
{
- distinct_scale_overrides.insert(it->second);
+ distinct_scale_overrides.insert(scale_override_pair.second);
}
}
@@ -556,10 +549,9 @@ void LLJoint::showAttachmentPosOverrides(const std::string& av_info) const
{
LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " has " << count << " attachment pos overrides" << LL_ENDL;
std::set<LLVector3> distinct_offsets;
- LLVector3OverrideMap::map_type::const_iterator it = m_attachmentPosOverrides.getMap().begin();
- for (; it != m_attachmentPosOverrides.getMap().end(); ++it)
+ for (const LLVector3OverrideMap::map_type::value_type& pos_override_pair : m_attachmentPosOverrides.getMap())
{
- distinct_offsets.insert(it->second);
+ distinct_offsets.insert(pos_override_pair.second);
}
if (distinct_offsets.size()>1)
{
@@ -569,11 +561,10 @@ void LLJoint::showAttachmentPosOverrides(const std::string& av_info) const
{
LL_DEBUGS("Avatar") << "no conflicts" << LL_ENDL;
}
- std::set<LLVector3>::iterator dit = distinct_offsets.begin();
- for ( ; dit != distinct_offsets.end(); ++dit)
+ for (const LLVector3& offset : distinct_offsets)
{
- std::string highlight = (has_active_override && *dit == active_override) ? "*" : "";
- LL_DEBUGS("Avatar") << " POS " << highlight << "" << (*dit) << " default " << mDefaultPosition << LL_ENDL;
+ std::string highlight = (has_active_override && offset == active_override) ? "*" : "";
+ LL_DEBUGS("Avatar") << " POS " << highlight << "" << offset << " default " << mDefaultPosition << LL_ENDL;
}
}
}
@@ -717,10 +708,9 @@ void LLJoint::showAttachmentScaleOverrides(const std::string& av_info) const
{
LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " has " << count << " attachment scale overrides" << LL_ENDL;
std::set<LLVector3> distinct_offsets;
- LLVector3OverrideMap::map_type::const_iterator it = m_attachmentScaleOverrides.getMap().begin();
- for (; it != m_attachmentScaleOverrides.getMap().end(); ++it)
+ for (const LLVector3OverrideMap::map_type::value_type& scale_override_pair : m_attachmentScaleOverrides.getMap())
{
- distinct_offsets.insert(it->second);
+ distinct_offsets.insert(scale_override_pair.second);
}
if (distinct_offsets.size()>1)
{
@@ -731,10 +721,10 @@ void LLJoint::showAttachmentScaleOverrides(const std::string& av_info) const
LL_DEBUGS("Avatar") << "no conflicts" << LL_ENDL;
}
std::set<LLVector3>::iterator dit = distinct_offsets.begin();
- for ( ; dit != distinct_offsets.end(); ++dit)
+ for (const LLVector3& offset : distinct_offsets)
{
- std::string highlight = (has_active_override && *dit == active_override) ? "*" : "";
- LL_DEBUGS("Avatar") << " POS " << highlight << "" << (*dit) << " default " << mDefaultScale << LL_ENDL;
+ std::string highlight = (has_active_override && offset == active_override) ? "*" : "";
+ LL_DEBUGS("Avatar") << " POS " << highlight << "" << offset << " default " << mDefaultScale << LL_ENDL;
}
}
}
@@ -993,10 +983,8 @@ void LLJoint::updateWorldMatrixChildren()
{
updateWorldMatrix();
}
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* joint : mChildren)
{
- LLJoint* joint = *iter;
joint->updateWorldMatrixChildren();
}
}
@@ -1040,10 +1028,8 @@ void LLJoint::clampRotation(LLQuaternion old_rot, LLQuaternion new_rot)
{
LLVector3 main_axis(1.f, 0.f, 0.f);
- for (joints_t::iterator iter = mChildren.begin();
- iter != mChildren.end(); ++iter)
+ for (LLJoint* joint : mChildren)
{
- LLJoint* joint = *iter;
if (joint->isAnimatable())
{
main_axis = joint->getPosition();
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index ebf7454a6154cd148b8d5a0e6de1cd8ab196bb6f..d82ce23b4b17213f94b1e269dfd5d9196cc5ec66 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -626,10 +626,8 @@ BOOL LLKeyframeMotion::setupPose()
}
// initialize joint constraints
- for (JointMotionList::constraint_list_t::iterator iter = mJointMotionList->mConstraints.begin();
- iter != mJointMotionList->mConstraints.end(); ++iter)
+ for (JointConstraintSharedData* shared_constraintp : mJointMotionList->mConstraints)
{
- JointConstraintSharedData* shared_constraintp = *iter;
JointConstraint* constraintp = new JointConstraint(shared_constraintp);
initializeConstraint(constraintp);
mConstraints.push_front(constraintp);
@@ -764,19 +762,15 @@ void LLKeyframeMotion::applyConstraints(F32 time, U8* joint_mask)
if (mCharacter->getSkeletonSerialNum() != mLastSkeletonSerialNum)
{
mLastSkeletonSerialNum = mCharacter->getSkeletonSerialNum();
- for (constraint_list_t::iterator iter = mConstraints.begin();
- iter != mConstraints.end(); ++iter)
+ for (JointConstraint* constraintp : mConstraints)
{
- JointConstraint* constraintp = *iter;
initializeConstraint(constraintp);
}
}
// apply constraints
- for (constraint_list_t::iterator iter = mConstraints.begin();
- iter != mConstraints.end(); ++iter)
+ for (JointConstraint* constraintp : mConstraints)
{
- JointConstraint* constraintp = *iter;
applyConstraint(constraintp, time, joint_mask);
}
}
@@ -786,10 +780,8 @@ void LLKeyframeMotion::applyConstraints(F32 time, U8* joint_mask)
//-----------------------------------------------------------------------------
void LLKeyframeMotion::onDeactivate()
{
- for (constraint_list_t::iterator iter = mConstraints.begin();
- iter != mConstraints.end(); ++iter)
+ for (JointConstraint* constraintp : mConstraints)
{
- JointConstraint* constraintp = *iter;
deactivateConstraint(constraintp);
}
}
@@ -2007,10 +1999,9 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
success &= dp.packS32(joint_motionp->mRotationCurve.mNumKeys, "num_rot_keys");
LL_DEBUGS("BVH") << "Joint " << joint_motionp->mJointName << LL_ENDL;
- for (RotationCurve::key_map_t::iterator iter = joint_motionp->mRotationCurve.mKeys.begin();
- iter != joint_motionp->mRotationCurve.mKeys.end(); ++iter)
+ for (RotationCurve::key_map_t::value_type& rot_pair : joint_motionp->mRotationCurve.mKeys)
{
- RotationKey& rot_key = iter->second;
+ RotationKey& rot_key = rot_pair.second;
U16 time_short = F32_to_U16(rot_key.mTime, 0.f, mJointMotionList->mDuration);
success &= dp.packU16(time_short, "time");
@@ -2029,10 +2020,9 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
}
success &= dp.packS32(joint_motionp->mPositionCurve.mNumKeys, "num_pos_keys");
- for (PositionCurve::key_map_t::iterator iter = joint_motionp->mPositionCurve.mKeys.begin();
- iter != joint_motionp->mPositionCurve.mKeys.end(); ++iter)
+ for (PositionCurve::key_map_t::value_type& pos_pair : joint_motionp->mPositionCurve.mKeys)
{
- PositionKey& pos_key = iter->second;
+ PositionKey& pos_key = pos_pair.second;
U16 time_short = F32_to_U16(pos_key.mTime, 0.f, mJointMotionList->mDuration);
success &= dp.packU16(time_short, "time");
@@ -2051,10 +2041,8 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
success &= dp.packS32(mJointMotionList->mConstraints.size(), "num_constraints");
LL_DEBUGS("BVH") << "num_constraints " << mJointMotionList->mConstraints.size() << LL_ENDL;
- for (JointMotionList::constraint_list_t::const_iterator iter = mJointMotionList->mConstraints.begin();
- iter != mJointMotionList->mConstraints.end(); ++iter)
+ for (JointConstraintSharedData* shared_constraintp : mJointMotionList->mConstraints)
{
- JointConstraintSharedData* shared_constraintp = *iter;
success &= dp.packU8(shared_constraintp->mChainLength, "chain_length");
success &= dp.packU8(shared_constraintp->mConstraintType, "constraint_type");
char source_volume[16]; /* Flawfinder: ignore */
@@ -2406,14 +2394,13 @@ void LLKeyframeDataCache::dumpDiagInfo()
LL_INFOS() << "-----------------------------------------------------" << LL_ENDL;
// print each loaded mesh, and it's memory usage
- for (keyframe_data_map_t::iterator map_it = sKeyframeDataMap.begin();
- map_it != sKeyframeDataMap.end(); ++map_it)
+ for (keyframe_data_map_t::value_type& data_pair : sKeyframeDataMap)
{
U32 joint_motion_kb;
- LLKeyframeMotion::JointMotionList *motion_list_p = map_it->second;
+ LLKeyframeMotion::JointMotionList *motion_list_p = data_pair.second;
- LL_INFOS() << "Motion: " << map_it->first << LL_ENDL;
+ LL_INFOS() << "Motion: " << data_pair.first << LL_ENDL;
joint_motion_kb = motion_list_p->dumpDiagInfo();
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp
index aba1c5db395c77d4fbf7726f44a8d63a1e694650..c80aabe294d6cecf99cabaa03eea638426a20ad0 100644
--- a/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/indra/llcharacter/llkeyframemotionparam.cpp
@@ -64,13 +64,11 @@ LLKeyframeMotionParam::LLKeyframeMotionParam( const LLUUID &id) : LLMotion(id)
//-----------------------------------------------------------------------------
LLKeyframeMotionParam::~LLKeyframeMotionParam()
{
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
delete paramMotion.mMotion;
}
motionList.clear();
@@ -90,13 +88,11 @@ LLMotion::LLMotionInitStatus LLKeyframeMotionParam::onInitialize(LLCharacter *ch
return STATUS_FAILURE;
}
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
LLMotion* motion = paramMotion.mMotion;
motion->onInitialize(character);
@@ -139,13 +135,11 @@ LLMotion::LLMotionInitStatus LLKeyframeMotionParam::onInitialize(LLCharacter *ch
//-----------------------------------------------------------------------------
BOOL LLKeyframeMotionParam::onActivate()
{
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
paramMotion.mMotion->activate(mActivationTimestamp);
}
}
@@ -162,23 +156,20 @@ BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
F32 weightFactor = 1.f / (F32)mParameterizedMotions.size();
// zero out all pose weights
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
// LL_INFOS() << "Weight for pose " << paramMotion.mMotion->getName() << " is " << paramMotion.mMotion->getPose()->getWeight() << LL_ENDL;
paramMotion.mMotion->getPose()->setWeight(0.f);
}
}
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- const std::string& paramName = iter->first;
+ const std::string& paramName = motion_pair.first;
F32* paramValue = (F32 *)mCharacter->getAnimationData(paramName);
if (NULL == paramValue) // unexpected, but...
{
@@ -190,10 +181,9 @@ BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
const ParameterizedMotion* firstMotion = NULL;
const ParameterizedMotion* secondMotion = NULL;
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
paramMotion.mMotion->onUpdate(time, joint_mask);
F32 distToParam = paramMotion.mParam - *paramValue;
@@ -280,13 +270,11 @@ BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
//-----------------------------------------------------------------------------
void LLKeyframeMotionParam::onDeactivate()
{
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
paramMotion.mMotion->onDeactivate();
}
}
@@ -318,13 +306,11 @@ BOOL LLKeyframeMotionParam::addKeyframeMotion(char *name, const LLUUID &id, char
//-----------------------------------------------------------------------------
void LLKeyframeMotionParam::setDefaultKeyframeMotion(char *name)
{
- for (motion_map_t::iterator iter = mParameterizedMotions.begin();
- iter != mParameterizedMotions.end(); ++iter)
+ for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
{
- motion_list_t& motionList = iter->second;
- for (motion_list_t::iterator iter2 = motionList.begin(); iter2 != motionList.end(); ++iter2)
+ motion_list_t& motionList = motion_pair.second;
+ for (const ParameterizedMotion& paramMotion : motionList)
{
- const ParameterizedMotion& paramMotion = *iter2;
if (paramMotion.mMotion->getName() == name)
{
mDefaultKeyframeMotion = paramMotion.mMotion;
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index e66714388a4105b673ec06f1936cdb5a217a06b5..96e0d5e8d71dd6580f8d64275ba25ce7d41867fa 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -211,11 +211,8 @@ void LLMotionController::purgeExcessMotions()
{
// too many motions active this frame, kill all blenders
mPoseBlender.clearBlenders();
- for (motion_set_t::iterator loaded_motion_it = mLoadedMotions.begin();
- loaded_motion_it != mLoadedMotions.end();
- ++loaded_motion_it)
+ for (LLMotion* cur_motionp : mLoadedMotions)
{
- LLMotion* cur_motionp = *loaded_motion_it;
// motion isn't playing, delete it
if (!isMotionActive(cur_motionp))
{
@@ -225,13 +222,10 @@ void LLMotionController::purgeExcessMotions()
}
// clean up all inactive, loaded motions
- for (std::set<LLUUID>::iterator motion_it = motions_to_kill.begin();
- motion_it != motions_to_kill.end();
- ++motion_it)
+ for (LLUUID motion_id : motions_to_kill)
{
// look up the motion again by ID to get canonical instance
// and kill it only if that one is inactive
- LLUUID motion_id = *motion_it;
LLMotion* motionp = findMotion(motion_id);
if (motionp && !isMotionActive(motionp))
{
@@ -1059,12 +1053,11 @@ LLMotion* LLMotionController::findMotion(const LLUUID& id) const
void LLMotionController::dumpMotions()
{
LL_INFOS() << "=====================================" << LL_ENDL;
- for (motion_map_t::iterator iter = mAllMotions.begin();
- iter != mAllMotions.end(); iter++)
+ for (motion_map_t::value_type& motion_pair : mAllMotions)
{
- LLUUID id = iter->first;
+ LLUUID id = motion_pair.first;
std::string state_string;
- LLMotion *motion = iter->second;
+ LLMotion *motion = motion_pair.second;
if (mLoadingMotions.find(motion) != mLoadingMotions.end())
state_string += std::string("l");
if (mLoadedMotions.find(motion) != mLoadedMotions.end())
@@ -1083,10 +1076,9 @@ void LLMotionController::dumpMotions()
//-----------------------------------------------------------------------------
void LLMotionController::deactivateAllMotions()
{
- for (motion_map_t::iterator iter = mAllMotions.begin();
- iter != mAllMotions.end(); iter++)
+ for (motion_map_t::value_type& motion_pair : mAllMotions)
{
- LLMotion* motionp = iter->second;
+ LLMotion* motionp = motion_pair.second;
deactivateMotionInstance(motionp);
}
}
@@ -1118,10 +1110,9 @@ void LLMotionController::flushAllMotions()
mCharacter->removeAnimationData("Hand Pose");
// restart motions
- for (std::vector<std::pair<LLUUID,F32> >::iterator iter = active_motions.begin();
- iter != active_motions.end(); ++iter)
+ for (std::vector<std::pair<LLUUID,F32> >::value_type& motion_pair : active_motions)
{
- startMotion(iter->first, iter->second);
+ startMotion(motion_pair.first, motion_pair.second);
}
}
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 2045739c7f1144e76cfa5b5a703e02a18947f2ec..7ed242f90a04375b57d181ef5204c3252da226a4 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -88,10 +88,8 @@ S32 LLMultiGesture::getMaxSerialSize() const
max_size += 64; // step count S32
- std::vector<LLGestureStep*>::const_iterator it;
- for (it = mSteps.begin(); it != mSteps.end(); ++it)
+ for (LLGestureStep* step : mSteps)
{
- LLGestureStep* step = *it;
max_size += 64; // type S32
max_size += step->getMaxSerialSize();
}
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index fc95fafd61490f81a3b8494afdc4bc5ce24a2ea8..6f41a0e747775635ba6f3738a6fc783816fb8dd7 100644
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -148,11 +148,9 @@ LLJointState* LLPose::findJointState(const std::string &name)
void LLPose::setWeight(F32 weight)
{
joint_map_iterator iter;
- for(iter = mJointMap.begin();
- iter != mJointMap.end();
- ++iter)
+ for (joint_map_value_type& joint_pair : mJointMap)
{
- iter->second->setWeight(weight);
+ joint_pair.second->setWeight(weight);
}
mWeight = weight;
}
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index b917db31172fd5bb8397390834b1db73d2f8bef3..2e8214ffaf4167fec483302aa62d442ceff6436c 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -169,10 +169,9 @@ void LLStateDiagram::setDefaultState(LLFSMState& default_state)
S32 LLStateDiagram::numDeadendStates()
{
S32 numDeadends = 0;
- StateMap::iterator state_it;
- for(state_it = mStates.begin(); state_it != mStates.end(); ++state_it)
+ for (StateMap::value_type& state_pair : mStates)
{
- if (state_it->second.size() == 0)
+ if (state_pair.second.size() == 0)
{
numDeadends++;
}
@@ -191,12 +190,11 @@ BOOL LLStateDiagram::stateIsValid(LLFSMState& state)
LLFSMState* LLStateDiagram::getState(U32 state_id)
{
- StateMap::iterator state_it;
- for(state_it = mStates.begin(); state_it != mStates.end(); ++state_it)
+ for (StateMap::value_type& state_pair : mStates)
{
- if (state_it->first->getID() == state_id)
+ if (state_pair.first->getID() == state_id)
{
- return state_it->first;
+ return state_pair.first;
}
}
return NULL;
@@ -215,18 +213,16 @@ BOOL LLStateDiagram::saveDotFile(const std::string& filename)
}
apr_file_printf(dot_file, "digraph StateMachine {\n\tsize=\"100,100\";\n\tfontsize=40;\n\tlabel=\"Finite State Machine\";\n\torientation=landscape\n\tratio=.77\n");
- StateMap::iterator state_it;
- for(state_it = mStates.begin(); state_it != mStates.end(); ++state_it)
+ for (StateMap::value_type& state_pair : mStates)
{
- apr_file_printf(dot_file, "\t\"%s\" [fontsize=28,shape=box]\n", state_it->first->getName().c_str());
+ apr_file_printf(dot_file, "\t\"%s\" [fontsize=28,shape=box]\n", state_pair.first->getName().c_str());
}
apr_file_printf(dot_file, "\t\"All States\" [fontsize=30,style=bold,shape=box]\n");
- Transitions::iterator transitions_it;
- for(transitions_it = mDefaultTransitions.begin(); transitions_it != mDefaultTransitions.end(); ++transitions_it)
+ for (Transitions::value_type& transition_pair : mDefaultTransitions)
{
- apr_file_printf(dot_file, "\t\"All States\" -> \"%s\" [label = \"%s\",fontsize=24];\n", transitions_it->second->getName().c_str(),
- transitions_it->second->getName().c_str());
+ apr_file_printf(dot_file, "\t\"All States\" -> \"%s\" [label = \"%s\",fontsize=24];\n", transition_pair.second->getName().c_str(),
+ transition_pair.second->getName().c_str());
}
if (mDefaultState)
@@ -235,18 +231,15 @@ BOOL LLStateDiagram::saveDotFile(const std::string& filename)
}
- for(state_it = mStates.begin(); state_it != mStates.end(); ++state_it)
+ for (StateMap::value_type& state_pair : mStates)
{
- LLFSMState *state = state_it->first;
+ LLFSMState *state = state_pair.first;
- Transitions::iterator transitions_it;
- for(transitions_it = state_it->second.begin();
- transitions_it != state_it->second.end();
- ++transitions_it)
+ for (Transitions::value_type& transition_pair : state_pair.second)
{
std::string state_name = state->getName();
- std::string target_name = transitions_it->second->getName();
- std::string transition_name = transitions_it->first->getName();
+ std::string target_name = transition_pair.second->getName();
+ std::string transition_name = transition_pair.first->getName();
apr_file_printf(dot_file, "\t\"%s\" -> \"%s\" [label = \"%s\",fontsize=24];\n", state->getName().c_str(),
target_name.c_str(),
transition_name.c_str());
@@ -265,25 +258,18 @@ std::ostream& operator<<(std::ostream &s, LLStateDiagram &FSM)
s << "Default State: " << FSM.mDefaultState->getName() << "\n";
}
- LLStateDiagram::Transitions::iterator transitions_it;
- for(transitions_it = FSM.mDefaultTransitions.begin();
- transitions_it != FSM.mDefaultTransitions.end();
- ++transitions_it)
+ for (LLStateDiagram::Transitions::value_type& transition_pair : FSM.mDefaultTransitions)
{
- s << "Any State -- " << transitions_it->first->getName()
- << " --> " << transitions_it->second->getName() << "\n";
+ s << "Any State -- " << transition_pair.first->getName()
+ << " --> " << transition_pair.second->getName() << "\n";
}
- LLStateDiagram::StateMap::iterator state_it;
- for(state_it = FSM.mStates.begin(); state_it != FSM.mStates.end(); ++state_it)
+ for (LLStateDiagram::StateMap::value_type& state_pair : FSM.mStates)
{
- LLStateDiagram::Transitions::iterator transitions_it;
- for(transitions_it = state_it->second.begin();
- transitions_it != state_it->second.end();
- ++transitions_it)
+ for (LLStateDiagram::Transitions::value_type& transition_pair : state_pair.second)
{
- s << state_it->first->getName() << " -- " << transitions_it->first->getName()
- << " --> " << transitions_it->second->getName() << "\n";
+ s << state_pair.first->getName() << " -- " << transition_pair.first->getName()
+ << " --> " << transition_pair.second->getName() << "\n";
}
s << "\n";
}
diff --git a/indra/llcommon/llallocator_heap_profile.cpp b/indra/llcommon/llallocator_heap_profile.cpp
index b2eafde1aaf4b0e24928175229ae802e8d4f4aab..6dd399e1e3565acb2803673ed77caa4ac389396c 100644
--- a/indra/llcommon/llallocator_heap_profile.cpp
+++ b/indra/llcommon/llallocator_heap_profile.cpp
@@ -131,14 +131,13 @@ void LLAllocatorHeapProfile::parse(std::string const & prof_text)
void LLAllocatorHeapProfile::dump(std::ostream & out) const
{
lines_t::const_iterator i;
- for(i = mLines.begin(); i != mLines.end(); ++i)
+ for (const LLAllocatorHeapProfile::line& line : mLines)
{
- out << i->mLiveCount << ": " << i->mLiveSize << '[' << i->mTotalCount << ": " << i->mTotalSize << "] @";
+ out << line.mLiveCount << ": " << line.mLiveSize << '[' << line.mTotalCount << ": " << line.mTotalSize << "] @";
- stack_trace::const_iterator j;
- for(j = i->mTrace.begin(); j != i->mTrace.end(); ++j)
+ for (const stack_marker marker : line.mTrace)
{
- out << ' ' << *j;
+ out << ' ' << marker;
}
out << '\n';
}
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 8ddd13279398cc5b51d3cb77b97f41e7477dc91d..c658075a31f8d0176261a4da19cc9c0a16a5a150 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -905,14 +905,14 @@ bool unix_post_minidump_callback(const char *dump_dir,
// heap allocations in a crash handler.
// path format: <dump_dir>/<minidump_id>.dmp
- int dirPathLength = strlen(dump_dir);
- int idLength = strlen(minidump_id);
+ auto dirPathLength = strlen(dump_dir);
+ auto idLength = strlen(minidump_id);
// The path must not be truncated.
llassert((dirPathLength + idLength + 5) <= LLApp::MAX_MINDUMP_PATH_LENGTH);
char * path = LLApp::instance()->getMiniDumpFilename();
- S32 remaining = LLApp::MAX_MINDUMP_PATH_LENGTH;
+ auto remaining = LLApp::MAX_MINDUMP_PATH_LENGTH;
strncpy(path, dump_dir, remaining);
remaining -= dirPathLength;
path += dirPathLength;
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index e6cc06e8d01a1220581153c1216d8d740eb88b35..4c84223dad750e0d6d89b5c910f55454207abda7 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -150,14 +150,12 @@ LLAssetType::EType LLAssetType::lookup(const char* name)
LLAssetType::EType LLAssetType::lookup(const std::string& type_name)
{
const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
- for (LLAssetDictionary::const_iterator iter = dict->begin();
- iter != dict->end();
- iter++)
+ for (const LLAssetDictionary::value_type& pair : *dict)
{
- const AssetEntry *entry = iter->second;
+ const AssetEntry *entry = pair.second;
if (type_name == entry->mTypeName)
{
- return iter->first;
+ return pair.first;
}
}
return AT_UNKNOWN;
@@ -188,14 +186,12 @@ LLAssetType::EType LLAssetType::lookupHumanReadable(const char* name)
LLAssetType::EType LLAssetType::lookupHumanReadable(const std::string& readable_name)
{
const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
- for (LLAssetDictionary::const_iterator iter = dict->begin();
- iter != dict->end();
- iter++)
+ for (const LLAssetDictionary::value_type& pair : *dict)
{
- const AssetEntry *entry = iter->second;
+ const AssetEntry *entry = pair.second;
if (entry->mHumanName && (readable_name == entry->mHumanName))
{
- return iter->first;
+ return pair.first;
}
}
return AT_NONE;
diff --git a/indra/llcommon/llbase64.cpp b/indra/llcommon/llbase64.cpp
index 4e82cf7f209b2edfba28601135a294405f0003de..bb85fe32a3cff7b7805a77416ea3aeea3c48ba7d 100644
--- a/indra/llcommon/llbase64.cpp
+++ b/indra/llcommon/llbase64.cpp
@@ -42,7 +42,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size)
&& input_size > 0)
{
// Yes, it returns int.
- int b64_buffer_length = apr_base64_encode_len(input_size);
+ int b64_buffer_length = apr_base64_encode_len(narrow(input_size));
char* b64_buffer = new char[b64_buffer_length];
// This is faster than apr_base64_encode() if you know
@@ -52,7 +52,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size)
b64_buffer_length = apr_base64_encode_binary(
b64_buffer,
input,
- input_size);
+ narrow(input_size));
output.assign(b64_buffer);
delete[] b64_buffer;
}
diff --git a/indra/llcommon/llcallbacklist.cpp b/indra/llcommon/llcallbacklist.cpp
index 541ff75ee4d834382d61dba0a7f2522084921708..93d0a035da231a995402e273ee1270f5a3978fc2 100644
--- a/indra/llcommon/llcallbacklist.cpp
+++ b/indra/llcommon/llcallbacklist.cpp
@@ -109,7 +109,7 @@ void LLCallbackList::deleteAllFunctions()
void LLCallbackList::callFunctions()
{
- for (callback_list_t::iterator iter = mCallbackList.begin(); iter != mCallbackList.end(); )
+ for (callback_list_t::iterator iter = mCallbackList.begin(); iter != mCallbackList.end(); )
{
callback_list_t::iterator curiter = iter++;
curiter->first(curiter->second);
diff --git a/indra/llcommon/llcallstack.cpp b/indra/llcommon/llcallstack.cpp
index 8db291eed189aa7f9c3df8519c368a02139f269f..83d5ae2a6305414d0ca10b6c684e3273c3a4e704 100644
--- a/indra/llcommon/llcallstack.cpp
+++ b/indra/llcommon/llcallstack.cpp
@@ -91,10 +91,9 @@ LLCallStack::LLCallStack(S32 skip_count, bool verbose):
bool LLCallStack::contains(const std::string& str)
{
- for (std::vector<std::string>::const_iterator it = m_strings.begin();
- it != m_strings.end(); ++it)
+ for (const std::string& src_str : m_strings)
{
- if (it->find(str) != std::string::npos)
+ if (src_str.find(str) != std::string::npos)
{
return true;
}
@@ -105,10 +104,9 @@ bool LLCallStack::contains(const std::string& str)
std::ostream& operator<<(std::ostream& s, const LLCallStack& call_stack)
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
- std::vector<std::string>::const_iterator it;
- for (it=call_stack.m_strings.begin(); it!=call_stack.m_strings.end(); ++it)
+ for (const std::string& str : call_stack.m_strings)
{
- s << *it;
+ s << str;
}
#else
s << "UNAVAILABLE IN RELEASE";
@@ -156,9 +154,9 @@ bool LLContextStrings::contains(const std::string& str)
{
const std::map<std::string,S32>& strings =
LLThreadLocalSingletonPointer<LLContextStrings>::getInstance()->m_contextStrings;
- for (std::map<std::string,S32>::const_iterator it = strings.begin(); it!=strings.end(); ++it)
+ for (const std::map<std::string,S32>::value_type& str_pair : strings)
{
- if (it->first.find(str) != std::string::npos)
+ if (str_pair.first.find(str) != std::string::npos)
{
return true;
}
@@ -171,9 +169,9 @@ void LLContextStrings::output(std::ostream& os)
{
const std::map<std::string,S32>& strings =
LLThreadLocalSingletonPointer<LLContextStrings>::getInstance()->m_contextStrings;
- for (std::map<std::string,S32>::const_iterator it = strings.begin(); it!=strings.end(); ++it)
+ for (const std::map<std::string,S32>::value_type& str_pair : strings)
{
- os << it->first << "[" << it->second << "]" << "\n";
+ os << str_pair.first << "[" << str_pair.second << "]" << "\n";
}
}
diff --git a/indra/llcommon/lldefs.h b/indra/llcommon/lldefs.h
index 5a4b8325f427dd2bb7f5f72a04097f7487015eb7..5c46f6a79651ecd4b6e117342b0576575623f26a 100644
--- a/indra/llcommon/lldefs.h
+++ b/indra/llcommon/lldefs.h
@@ -28,6 +28,7 @@
#define LL_LLDEFS_H
#include "stdtypes.h"
+#include <type_traits>
// Often used array indices
const U32 VX = 0;
@@ -168,80 +169,79 @@ const U32 MAXADDRSTR = 17; // 123.567.901.345 = 15 chars + \0 + 1 for good luc
// llclampb(a) // clamps a to [0 .. 255]
//
-template <class LLDATATYPE>
-inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2)
+template <typename T1, typename T2>
+inline auto llmax(T1 d1, T2 d2)
{
return (d1 > d2) ? d1 : d2;
}
-template <class LLDATATYPE>
-inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3)
+template <typename T1, typename T2, typename T3>
+inline auto llmax(T1 d1, T2 d2, T3 d3)
{
- LLDATATYPE r = llmax(d1,d2);
+ auto r = llmax(d1,d2);
return llmax(r, d3);
}
-template <class LLDATATYPE>
-inline LLDATATYPE llmax(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3, const LLDATATYPE& d4)
+template <typename T1, typename T2, typename T3, typename T4>
+inline auto llmax(T1 d1, T2 d2, T3 d3, T4 d4)
{
- LLDATATYPE r1 = llmax(d1,d2);
- LLDATATYPE r2 = llmax(d3,d4);
+ auto r1 = llmax(d1,d2);
+ auto r2 = llmax(d3,d4);
return llmax(r1, r2);
}
-template <class LLDATATYPE>
-inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2)
+template <typename T1, typename T2>
+inline auto llmin(T1 d1, T2 d2)
{
return (d1 < d2) ? d1 : d2;
}
-template <class LLDATATYPE>
-inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3)
+template <typename T1, typename T2, typename T3>
+inline auto llmin(T1 d1, T2 d2, T3 d3)
{
- LLDATATYPE r = llmin(d1,d2);
+ auto r = llmin(d1,d2);
return (r < d3 ? r : d3);
}
-template <class LLDATATYPE>
-inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATATYPE& d3, const LLDATATYPE& d4)
+template <typename T1, typename T2, typename T3, typename T4>
+inline auto llmin(T1 d1, T2 d2, T3 d3, T4 d4)
{
- LLDATATYPE r1 = llmin(d1,d2);
- LLDATATYPE r2 = llmin(d3,d4);
+ auto r1 = llmin(d1,d2);
+ auto r2 = llmin(d3,d4);
return llmin(r1, r2);
}
-template <class LLDATATYPE>
-inline LLDATATYPE llclamp(const LLDATATYPE& a, const LLDATATYPE& minval, const LLDATATYPE& maxval)
+template <typename A, typename MIN, typename MAX>
+inline A llclamp(A a, MIN minval, MAX maxval)
{
- if ( a < minval )
+ A aminval{ static_cast<A>(minval) }, amaxval{ static_cast<A>(maxval) };
+ if ( a < aminval )
{
- return minval;
+ return aminval;
}
- else if ( a > maxval )
+ else if ( a > amaxval )
{
- return maxval;
+ return amaxval;
}
return a;
}
template <class LLDATATYPE>
-inline LLDATATYPE llclampf(const LLDATATYPE& a)
+inline LLDATATYPE llclampf(LLDATATYPE a)
{
- return llmin(llmax(a, (LLDATATYPE)0), (LLDATATYPE)1);
+ return llmin(llmax(a, LLDATATYPE(0)), LLDATATYPE(1));
}
template <class LLDATATYPE>
-inline LLDATATYPE llclampb(const LLDATATYPE& a)
+inline LLDATATYPE llclampb(LLDATATYPE a)
{
- return llmin(llmax(a, (LLDATATYPE)0), (LLDATATYPE)255);
+ return llmin(llmax(a, LLDATATYPE(0)), LLDATATYPE(255));
}
template <class LLDATATYPE>
inline void llswap(LLDATATYPE& lhs, LLDATATYPE& rhs)
{
- LLDATATYPE tmp = lhs;
- lhs = rhs;
- rhs = tmp;
+ std::swap(lhs, rhs);
}
#endif // LL_LLDEFS_H
diff --git a/indra/llcommon/lldependencies.cpp b/indra/llcommon/lldependencies.cpp
index 0d5757effddf550c331c91a0b78b9e6267aac27c..db546c5c3b3cdce406f6ba60af9fc51f45d23cf1 100644
--- a/indra/llcommon/lldependencies.cpp
+++ b/indra/llcommon/lldependencies.cpp
@@ -42,7 +42,7 @@
// other Linden headers
#include "llexception.h"
-LLDependenciesBase::VertexList LLDependenciesBase::topo_sort(int vertices, const EdgeList& edges) const
+LLDependenciesBase::VertexList LLDependenciesBase::topo_sort(size_t vertices, const EdgeList& edges) const
{
// Construct a Boost Graph Library graph according to the constraints
// we've collected. It seems as though we ought to be able to capture
diff --git a/indra/llcommon/lldependencies.h b/indra/llcommon/lldependencies.h
index db2bbab8b040269e04bec4638b70bea4dd6fa4e4..fa54a944c87e13e3863e82527581363ff6ecf93f 100644
--- a/indra/llcommon/lldependencies.h
+++ b/indra/llcommon/lldependencies.h
@@ -126,7 +126,7 @@ class LL_COMMON_API LLDependenciesBase
protected:
typedef std::vector< std::pair<std::size_t, std::size_t> > EdgeList;
typedef std::vector<std::size_t> VertexList;
- VertexList topo_sort(int vertices, const EdgeList& edges) const;
+ VertexList topo_sort(size_t vertices, const EdgeList& edges) const;
/**
* refpair is specifically intended to capture a pair of references. This
@@ -514,21 +514,16 @@ class LLDependencies: public LLDependenciesBase
// former broken behavior has finally been fixed -- and our builds
// treat warnings as errors.
{
- for (typename DepNodeMap::const_iterator nmi = mNodes.begin(), nmend = mNodes.end();
- nmi != nmend; ++nmi)
+ for (typename const DepNodeMap::value_type& nm_pair : mNodes)
{
- vmap.insert(typename VertexMap::value_type(nmi->first, vmap.size()));
- for (typename DepNode::dep_set::const_iterator ai = nmi->second.after.begin(),
- aend = nmi->second.after.end();
- ai != aend; ++ai)
+ vmap.insert(typename VertexMap::value_type(nm_pair.first, vmap.size()));
+ for (typename const KEY& after_k : nm_pair.second.after)
{
- vmap.insert(typename VertexMap::value_type(*ai, vmap.size()));
+ vmap.insert(typename VertexMap::value_type(after_k, vmap.size()));
}
- for (typename DepNode::dep_set::const_iterator bi = nmi->second.before.begin(),
- bend = nmi->second.before.end();
- bi != bend; ++bi)
+ for (typename const KEY& before_k : nm_pair.second.before)
{
- vmap.insert(typename VertexMap::value_type(*bi, vmap.size()));
+ vmap.insert(typename VertexMap::value_type(before_k, vmap.size()));
}
}
}
@@ -536,24 +531,19 @@ class LLDependencies: public LLDependenciesBase
// all the known key dependencies to integer pairs.
EdgeList edges;
{
- for (typename DepNodeMap::const_iterator nmi = mNodes.begin(), nmend = mNodes.end();
- nmi != nmend; ++nmi)
+ for (typename const DepNodeMap::value_type& nm_pair : mNodes)
{
- int thisnode = vmap[nmi->first];
+ auto thisnode = vmap[nm_pair.first];
// after dependencies: build edges from the named node to this one
- for (typename DepNode::dep_set::const_iterator ai = nmi->second.after.begin(),
- aend = nmi->second.after.end();
- ai != aend; ++ai)
+ for (typename const KEY& after_k : nm_pair.second.after)
{
- edges.push_back(EdgeList::value_type(vmap[*ai], thisnode));
+ edges.push_back(EdgeList::value_type(vmap[after_k], thisnode));
}
// before dependencies: build edges from this node to the
// named one
- for (typename DepNode::dep_set::const_iterator bi = nmi->second.before.begin(),
- bend = nmi->second.before.end();
- bi != bend; ++bi)
+ for (typename const KEY& before_k : nm_pair.second.before)
{
- edges.push_back(EdgeList::value_type(thisnode, vmap[*bi]));
+ edges.push_back(EdgeList::value_type(thisnode, vmap[before_k]));
}
}
}
@@ -565,21 +555,19 @@ class LLDependencies: public LLDependenciesBase
// and we're certain that the associated int values are distinct
// indexes. The fact that they're not in order is irrelevant.
KeyList vkeys(vmap.size());
- for (typename VertexMap::const_iterator vmi = vmap.begin(), vmend = vmap.end();
- vmi != vmend; ++vmi)
+ for (typename const VertexMap::value_type& vm_pair : vmap)
{
- vkeys[vmi->second] = vmi->first;
+ vkeys[vm_pair.second] = vm_pair.first;
}
// Walk the sorted output list, building the result into mCache so
// we'll have it next time someone asks.
mCache.clear();
- for (VertexList::const_iterator svi = sorted.begin(), svend = sorted.end();
- svi != svend; ++svi)
+ for (const size_t sv : sorted)
{
- // We're certain that vkeys[*svi] exists. However, there might not
+ // We're certain that vkeys[sv] exists. However, there might not
// yet be a corresponding entry in mNodes.
self_type* non_const_this(const_cast<self_type*>(this));
- typename DepNodeMap::iterator found = non_const_this->mNodes.find(vkeys[*svi]);
+ typename DepNodeMap::iterator found = non_const_this->mNodes.find(vkeys[sv]);
if (found != non_const_this->mNodes.end())
{
// Make an iterator of appropriate type.
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 919d2dabc4a1d75040e72f9c504ee0dfe9f5eb44..310da2c9f00f16e26b655af7ac54f879c0b62043 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -586,11 +586,9 @@ namespace
void Globals::invalidateCallSites()
{
- for (CallSiteVector::const_iterator i = callSites.begin();
- i != callSites.end();
- ++i)
+ for (LLError::CallSite* site : callSites)
{
- (*i)->invalidate();
+ site->invalidate();
}
callSites.clear();
@@ -1224,12 +1222,8 @@ namespace
std::string escaped_message;
LLMutexLock lock(&s->mRecorderMutex);
- for (Recorders::const_iterator i = s->mRecorders.begin();
- i != s->mRecorders.end();
- ++i)
+ for (LLError::RecorderPtr& r : s->mRecorders)
{
- LLError::RecorderPtr r = *i;
-
if (!r->enabled())
{
continue;
@@ -1514,7 +1508,7 @@ namespace LLError
const size_t BUF_SIZE = 64;
char time_str[BUF_SIZE]; /* Flawfinder: ignore */
- int chars = strftime(time_str, BUF_SIZE,
+ auto chars = strftime(time_str, BUF_SIZE,
"%Y-%m-%dT%H:%M:%SZ",
gmtime(&now));
diff --git a/indra/llcommon/llevent.cpp b/indra/llcommon/llevent.cpp
index 633df01588429c81f22aa2e83e16403f84460d83..501d06e3cdf0aa39ef485d3fdad7e53cd2f53e59 100644
--- a/indra/llcommon/llevent.cpp
+++ b/indra/llcommon/llevent.cpp
@@ -203,10 +203,9 @@ void LLSimpleDispatcher::removeListener(LLEventListener* listener)
std::vector<LLListenerEntry> LLSimpleDispatcher::getListeners() const
{
std::vector<LLListenerEntry> ret;
- std::vector<LLListenerEntry>::const_iterator itor;
- for (itor=mListeners.begin(); itor!=mListeners.end(); ++itor)
+ for (const LLListenerEntry& entry : mListeners)
{
- ret.push_back(*itor);
+ ret.push_back(entry);
}
return ret;
@@ -215,14 +214,12 @@ std::vector<LLListenerEntry> LLSimpleDispatcher::getListeners() const
// virtual
bool LLSimpleDispatcher::fireEvent(LLPointer<LLEvent> event, LLSD filter)
{
- std::vector<LLListenerEntry>::iterator itor;
std::string filter_string = filter.asString();
- for (itor=mListeners.begin(); itor!=mListeners.end(); ++itor)
+ for (LLListenerEntry& entry : mListeners)
{
- LLListenerEntry& entry = *itor;
if (filter_string == "" || entry.filter.asString() == filter_string)
{
- (entry.listener)->handleEvent(event, (*itor).userdata);
+ (entry.listener)->handleEvent(event, entry.userdata);
}
}
return true;
@@ -276,10 +273,9 @@ void LLSimpleListener::clearDispatchers()
bool LLSimpleListener::handleAttach(LLEventDispatcher *dispatcher)
{
// Add dispatcher if it doesn't already exist
- std::vector<LLEventDispatcher *>::iterator itor;
- for (itor = mDispatchers.begin(); itor != mDispatchers.end(); ++itor)
+ for (LLEventDispatcher* disp : mDispatchers)
{
- if ((*itor) == dispatcher) return true;
+ if (disp == dispatcher) return true;
}
mDispatchers.push_back(dispatcher);
return true;
diff --git a/indra/llcommon/lleventdispatcher.cpp b/indra/llcommon/lleventdispatcher.cpp
index 5b6d4efbe98b8259d09197444b7cc914d80bf554..cd0ab6bc2980242a0456f6a76894e7999fb72e9b 100644
--- a/indra/llcommon/lleventdispatcher.cpp
+++ b/indra/llcommon/lleventdispatcher.cpp
@@ -178,7 +178,7 @@ class LL_COMMON_API LLSDArgsMapper
// store it as a map from name string to position index. Of course that's
// easy to generate from the incoming names array, but why do it more than
// once?
- typedef std::map<LLSD::String, LLSD::Integer> IndexMap;
+ typedef std::map<LLSD::String, size_t> IndexMap;
IndexMap _indexes;
// Generated array of default values, aligned with the array of param names.
LLSD _defaults;
@@ -197,9 +197,9 @@ LLSDArgsMapper::LLSDArgsMapper(const std::string& function,
{
LL_ERRS("LLSDArgsMapper") << function << " names must be an array, not " << names << LL_ENDL;
}
- LLSD::Integer nparams(_names.size());
+ auto nparams(_names.size());
// From _names generate _indexes.
- for (LLSD::Integer ni = 0, nend = _names.size(); ni < nend; ++ni)
+ for (size_t ni = 0, nend = _names.size(); ni < nend; ++ni)
{
_indexes[_names[ni]] = ni;
}
@@ -214,7 +214,7 @@ LLSDArgsMapper::LLSDArgsMapper(const std::string& function,
if (defaults.isUndefined() || defaults.isArray())
{
- LLSD::Integer ndefaults = defaults.size();
+ auto ndefaults = defaults.size();
// defaults is a (possibly empty) array. Right-align it with names.
if (ndefaults > nparams)
{
@@ -224,10 +224,10 @@ LLSDArgsMapper::LLSDArgsMapper(const std::string& function,
// Offset by which we slide defaults array right to right-align with
// _names array
- LLSD::Integer offset = nparams - ndefaults;
+ auto offset = nparams - ndefaults;
// Fill rightmost _defaults entries from defaults, and mark them as
// filled
- for (LLSD::Integer i = 0, iend = ndefaults; i < iend; ++i)
+ for (size_t i = 0, iend = ndefaults; i < iend; ++i)
{
_defaults[i + offset] = defaults[i];
_has_dft[i + offset] = 1;
@@ -247,7 +247,7 @@ LLSDArgsMapper::LLSDArgsMapper(const std::string& function,
continue;
}
- LLSD::Integer pos = ixit->second;
+ auto pos = ixit->second;
// Store default value at that position in the _defaults array.
_defaults[pos] = mi->second;
// Don't forget to record the fact that we've filled this
@@ -301,7 +301,7 @@ LLSD LLSDArgsMapper::map(const LLSD& argsmap) const
{
// Fill args from array. If there are too many args in passed array,
// ignore the rest.
- LLSD::Integer size(argsmap.size());
+ auto size(argsmap.size());
if (size > args.size())
{
// We don't just use std::min() because we want to sneak in this
@@ -338,7 +338,7 @@ LLSD LLSDArgsMapper::map(const LLSD& argsmap) const
<< mi->first << "=" << mi->second << LL_ENDL;
continue;
}
- LLSD::Integer pos = ixit->second;
+ auto pos = ixit->second;
// Store the value at that position in the args array.
args[pos] = mi->second;
// Don't forget to record the fact that we've filled this
@@ -349,7 +349,7 @@ LLSD LLSDArgsMapper::map(const LLSD& argsmap) const
// Fill any remaining holes from _defaults.
LLSD unfilled(LLSD::emptyArray());
- for (LLSD::Integer i = 0, iend = args.size(); i < iend; ++i)
+ for (size_t i = 0, iend = args.size(); i < iend; ++i)
{
if (! filled[i])
{
@@ -503,9 +503,9 @@ struct LLEventDispatcher::MapParamsDispatchEntry: public LLEventDispatcher::Para
if (defaults.isArray() || defaults.isUndefined())
{
// Right-align the params and defaults arrays.
- LLSD::Integer offset = params.size() - defaults.size();
+ auto offset = params.size() - defaults.size();
// Now the name of every defaults[i] is at params[i + offset].
- for (LLSD::Integer i(0), iend(defaults.size()); i < iend; ++i)
+ for (size_t i(0), iend(defaults.size()); i < iend; ++i)
{
// Erase this optional param from mRequired.
mRequired.erase(params[i + offset].asString());
diff --git a/indra/llcommon/llheteromap.cpp b/indra/llcommon/llheteromap.cpp
index 7c19196e0c17607a61c03525eb99093fe6dd6724..c84e49d085d6e04da43044b6c5ce18ba7c6baba6 100644
--- a/indra/llcommon/llheteromap.cpp
+++ b/indra/llcommon/llheteromap.cpp
@@ -22,11 +22,11 @@ LLHeteroMap::~LLHeteroMap()
{
// For each entry in our map, we must call its deleter, which is the only
// record we have of its original type.
- for (TypeMap::iterator mi(mMap.begin()), me(mMap.end()); mi != me; ++mi)
+ for (TypeMap::value_type& pair : mMap)
{
- // mi->second is the std::pair; mi->second.first is the void*;
- // mi->second.second points to the deleter function
- (mi->second.second)(mi->second.first);
- mi->second.first = NULL;
+ // pair.second is the std::pair; pair.second.first is the void*;
+ // pair.second.second points to the deleter function
+ (pair.second.second)(pair.second.first);
+ pair.second.first = NULL;
}
}
diff --git a/indra/llcommon/llinitdestroyclass.cpp b/indra/llcommon/llinitdestroyclass.cpp
index e6382a79249bf445638ca712a84a5cebeadc2f09..e3b9e6d09909616d6a8e39dbd50448e1c3f8a9c4 100644
--- a/indra/llcommon/llinitdestroyclass.cpp
+++ b/indra/llcommon/llinitdestroyclass.cpp
@@ -21,10 +21,9 @@
void LLCallbackRegistry::fireCallbacks() const
{
- for (FuncList::const_iterator fi = mCallbacks.begin(), fe = mCallbacks.end();
- fi != fe; ++fi)
+ for (FuncList::value_type pair : mCallbacks)
{
- LL_INFOS("LLInitDestroyClass") << "calling " << fi->first << "()" << LL_ENDL;
- fi->second();
+ LL_INFOS("LLInitDestroyClass") << "calling " << pair.first << "()" << LL_ENDL;
+ pair.second();
}
}
diff --git a/indra/llcommon/llinitparam.cpp b/indra/llcommon/llinitparam.cpp
index aa2f4eb289b5e3e47d09f1cb99bb05ebc3274287..9d3394b4f716942b1a8b5fd127dd289daf23995e 100644
--- a/indra/llcommon/llinitparam.cpp
+++ b/indra/llcommon/llinitparam.cpp
@@ -207,10 +207,10 @@ namespace LLInitParam
if (!mValidated)
{
const BlockDescriptor& block_data = mostDerivedBlockDescriptor();
- for (BlockDescriptor::param_validation_list_t::const_iterator it = block_data.mValidationList.begin(); it != block_data.mValidationList.end(); ++it)
+ for (const BlockDescriptor::param_validation_list_t::value_type& pair : block_data.mValidationList)
{
- const Param* param = getParamFromHandle(it->first);
- if (!it->second(param))
+ const Param* param = getParamFromHandle(pair.first);
+ if (!pair.second(param))
{
if (emit_errors)
{
@@ -235,13 +235,11 @@ namespace LLInitParam
// unnamed param is like LLView::Params::rect - implicit
const BlockDescriptor& block_data = mostDerivedBlockDescriptor();
- for (BlockDescriptor::param_list_t::const_iterator it = block_data.mUnnamedParams.begin();
- it != block_data.mUnnamedParams.end();
- ++it)
+ for (const ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
- param_handle_t param_handle = (*it)->mParamHandle;
+ param_handle_t param_handle = ptr->mParamHandle;
const Param* param = getParamFromHandle(param_handle);
- ParamDescriptor::serialize_func_t serialize_func = (*it)->mSerializeFunc;
+ ParamDescriptor::serialize_func_t serialize_func = ptr->mSerializeFunc;
if (serialize_func && predicate_rule.check(ll_make_predicate(PROVIDED, param->anyProvided())))
{
const Param* diff_param = diff_block ? diff_block->getParamFromHandle(param_handle) : NULL;
@@ -249,23 +247,19 @@ namespace LLInitParam
}
}
- for(BlockDescriptor::param_map_t::const_iterator it = block_data.mNamedParams.begin();
- it != block_data.mNamedParams.end();
- ++it)
+ for (const BlockDescriptor::param_map_t::value_type& pair : block_data.mNamedParams)
{
- param_handle_t param_handle = it->second->mParamHandle;
+ param_handle_t param_handle = pair.second->mParamHandle;
const Param* param = getParamFromHandle(param_handle);
- ParamDescriptor::serialize_func_t serialize_func = it->second->mSerializeFunc;
+ ParamDescriptor::serialize_func_t serialize_func = pair.second->mSerializeFunc;
if (serialize_func && predicate_rule.check(ll_make_predicate(PROVIDED, param->anyProvided())))
{
// Ensure this param has not already been serialized
// Prevents <rect> from being serialized as its own tag.
bool duplicate = false;
- for (BlockDescriptor::param_list_t::const_iterator it2 = block_data.mUnnamedParams.begin();
- it2 != block_data.mUnnamedParams.end();
- ++it2)
+ for (const ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
- if (param_handle == (*it2)->mParamHandle)
+ if (param_handle == ptr->mParamHandle)
{
duplicate = true;
break;
@@ -279,7 +273,7 @@ namespace LLInitParam
continue;
}
- name_stack.push_back(std::make_pair(it->first, !duplicate));
+ name_stack.push_back(std::make_pair(pair.first, !duplicate));
const Param* diff_param = diff_block ? diff_block->getParamFromHandle(param_handle) : NULL;
serialized |= serialize_func(*param, parser, name_stack, predicate_rule, diff_param);
name_stack.pop_back();
@@ -300,45 +294,39 @@ namespace LLInitParam
// unnamed param is like LLView::Params::rect - implicit
const BlockDescriptor& block_data = mostDerivedBlockDescriptor();
- for (BlockDescriptor::param_list_t::const_iterator it = block_data.mUnnamedParams.begin();
- it != block_data.mUnnamedParams.end();
- ++it)
+ for (const ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
- param_handle_t param_handle = (*it)->mParamHandle;
+ param_handle_t param_handle = ptr->mParamHandle;
const Param* param = getParamFromHandle(param_handle);
- ParamDescriptor::inspect_func_t inspect_func = (*it)->mInspectFunc;
+ ParamDescriptor::inspect_func_t inspect_func = ptr->mInspectFunc;
if (inspect_func)
{
name_stack.push_back(std::make_pair("", true));
- inspect_func(*param, parser, name_stack, (*it)->mMinCount, (*it)->mMaxCount);
+ inspect_func(*param, parser, name_stack, ptr->mMinCount, ptr->mMaxCount);
name_stack.pop_back();
}
}
- for(BlockDescriptor::param_map_t::const_iterator it = block_data.mNamedParams.begin();
- it != block_data.mNamedParams.end();
- ++it)
+ for(const BlockDescriptor::param_map_t::value_type& pair : block_data.mNamedParams)
{
- param_handle_t param_handle = it->second->mParamHandle;
+ param_handle_t param_handle = pair.second->mParamHandle;
const Param* param = getParamFromHandle(param_handle);
- ParamDescriptor::inspect_func_t inspect_func = it->second->mInspectFunc;
+ ParamDescriptor::inspect_func_t inspect_func = pair.second->mInspectFunc;
if (inspect_func)
{
// Ensure this param has not already been inspected
bool duplicate = false;
- for (BlockDescriptor::param_list_t::const_iterator it2 = block_data.mUnnamedParams.begin();
- it2 != block_data.mUnnamedParams.end();
- ++it2)
+ for (const ParamDescriptorPtr ptr : block_data.mUnnamedParams)
{
- if (param_handle == (*it2)->mParamHandle)
+ if (param_handle == ptr->mParamHandle)
{
duplicate = true;
break;
}
}
- name_stack.push_back(std::make_pair(it->first, !duplicate));
- inspect_func(*param, parser, name_stack, it->second->mMinCount, it->second->mMaxCount);
+ name_stack.push_back(std::make_pair(pair.first, !duplicate));
+ inspect_func(*param, parser, name_stack, pair.second->mMinCount, pair.second->mMaxCount);
name_stack.pop_back();
}
}
@@ -382,12 +370,10 @@ namespace LLInitParam
}
// try to parse unnamed parameters, in declaration order
- for ( BlockDescriptor::param_list_t::iterator it = block_data.mUnnamedParams.begin();
- it != block_data.mUnnamedParams.end();
- ++it)
+ for (ParamDescriptorPtr& ptr : block_data.mUnnamedParams)
{
- Param* paramp = getParamFromHandle((*it)->mParamHandle);
- ParamDescriptor::deserialize_func_t deserialize_func = (*it)->mDeserializeFunc;
+ Param* paramp = getParamFromHandle(ptr->mParamHandle);
+ ParamDescriptor::deserialize_func_t deserialize_func = ptr->mDeserializeFunc;
if (deserialize_func && deserialize_func(*paramp, p, name_stack_range, new_name))
{
@@ -453,12 +439,9 @@ namespace LLInitParam
{
param_handle_t handle = getHandleFromParam(¶m);
BlockDescriptor& descriptor = mostDerivedBlockDescriptor();
- BlockDescriptor::all_params_list_t::iterator end_it = descriptor.mAllParams.end();
- for (BlockDescriptor::all_params_list_t::iterator it = descriptor.mAllParams.begin();
- it != end_it;
- ++it)
+ for (ParamDescriptorPtr& ptr : descriptor.mAllParams)
{
- if ((*it)->mParamHandle == handle) return *it;
+ if (ptr->mParamHandle == handle) return ptr;
}
return ParamDescriptorPtr();
}
@@ -468,17 +451,14 @@ namespace LLInitParam
bool BaseBlock::mergeBlock(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite)
{
bool some_param_changed = false;
- BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end();
- for (BlockDescriptor::all_params_list_t::const_iterator it = block_data.mAllParams.begin();
- it != end_it;
- ++it)
+ for (const ParamDescriptorPtr& ptr : block_data.mAllParams)
{
- const Param* other_paramp = other.getParamFromHandle((*it)->mParamHandle);
- ParamDescriptor::merge_func_t merge_func = (*it)->mMergeFunc;
+ const Param* other_paramp = other.getParamFromHandle(ptr->mParamHandle);
+ ParamDescriptor::merge_func_t merge_func = ptr->mMergeFunc;
if (merge_func)
{
- Param* paramp = getParamFromHandle((*it)->mParamHandle);
- llassert(paramp->getEnclosingBlockOffset() == (*it)->mParamHandle);
+ Param* paramp = getParamFromHandle(ptr->mParamHandle);
+ llassert(paramp->getEnclosingBlockOffset() == ptr->mParamHandle);
some_param_changed |= merge_func(*paramp, *other_paramp, overwrite);
}
}
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index 7f5b9b4ac23e4e6afb5a236c034c0d82fc33b1a5..9edc7e40f36b5e8e28c2ad8efdc6ea0810909f55 100644
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -325,13 +325,11 @@ namespace LLInitParam
std::string calcValueName(const value_t& value) const
{
value_name_map_t* map = getValueNames();
- for (typename value_name_map_t::iterator it = map->begin(), end_it = map->end();
- it != end_it;
- ++it)
+ for (typename value_name_map_t::value_type& map_pair : *map)
{
- if (ParamCompare<T>::equals(it->second, value))
+ if (ParamCompare<T>::equals(map_pair.second, value))
{
- return it->first;
+ return map_pair.first;
}
}
@@ -376,11 +374,9 @@ namespace LLInitParam
static std::vector<std::string> sValues;
value_name_map_t* map = getValueNames();
- for (typename value_name_map_t::iterator it = map->begin(), end_it = map->end();
- it != end_it;
- ++it)
+ for (typename value_name_map_t::value_type& map_pair : *map)
{
- sValues.push_back(it->first);
+ sValues.push_back(map_pair.first);
}
return &sValues;
}
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index 02535a59e7e1a7c7e5efa7e6c2a6f597e2889126..34f2a5985aa6c6ab34da6590a2931a7942c0ceb7 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -99,7 +99,7 @@ class LLInstanceTracker
return mSelf;
}
- static S32 instanceCount()
+ static size_t instanceCount()
{
return LockStatic()->mMap.size();
}
@@ -363,7 +363,7 @@ class LLInstanceTracker<T, void, KEY_COLLISION_BEHAVIOR>
return mSelf;
}
- static S32 instanceCount()
+ static size_t instanceCount()
{
return LockStatic()->mSet.size();
}
diff --git a/indra/llcommon/llkeybind.cpp b/indra/llcommon/llkeybind.cpp
index 38696c2258b7d4de12ff1ad8d0a8f5603ff47ea5..b89160cc55fcb22a8ce438078f3002753f005e75 100644
--- a/indra/llcommon/llkeybind.cpp
+++ b/indra/llcommon/llkeybind.cpp
@@ -30,6 +30,7 @@
#include "llsd.h"
#include "llsdutil.h"
+#include <algorithm>
LLKeyData::LLKeyData()
:
@@ -180,10 +181,10 @@ LLKeyBind::LLKeyBind(const LLSD &key_bind)
bool LLKeyBind::operator==(const LLKeyBind& rhs)
{
- U32 size = mData.size();
+ auto size = mData.size();
if (size != rhs.mData.size()) return false;
- for (U32 i = 0; i < size; i++)
+ for (size_t i = 0; i < size; i++)
{
if (mData[i] != rhs.mData[i]) return false;
}
@@ -193,7 +194,7 @@ bool LLKeyBind::operator==(const LLKeyBind& rhs)
bool LLKeyBind::operator!=(const LLKeyBind& rhs)
{
- U32 size = mData.size();
+ auto size = mData.size();
if (size != rhs.mData.size()) return true;
for (U32 i = 0; i < size; i++)
@@ -206,26 +207,29 @@ bool LLKeyBind::operator!=(const LLKeyBind& rhs)
bool LLKeyBind::isEmpty() const
{
- for (data_vector_t::const_iterator iter = mData.begin(); iter != mData.end(); iter++)
+ for (const LLKeyData& key_data : mData)
{
- if (!iter->isEmpty()) return false;
+ if (!key_data.isEmpty()) return false;
}
return true;
}
-LLSD LLKeyBind::asLLSD() const
+LLKeyBind::data_vector_t::const_iterator LLKeyBind::endNonEmpty() const
{
- S32 last = mData.size() - 1;
- while (mData[last].empty())
- {
- last--;
- }
+ // search backwards for last non-empty entry, then turn back into forwards
+ // iterator (.base() call)
+ return std::find_if_not(mData.rbegin(), mData.rend(),
+ [](const auto& kdata){ return kdata.empty(); }).base();
+}
+LLSD LLKeyBind::asLLSD() const
+{
LLSD data;
- for (S32 i = 0; i <= last; ++i)
+ for (const LLKeyData& key_data : mData)
{
- // append even if empty to not affect visual representation
- data.append(mData[i].asLLSD());
+ // append intermediate entries even if empty to not affect visual
+ // representation
+ data.append(key_data.asLLSD());
}
return data;
}
@@ -238,9 +242,9 @@ bool LLKeyBind::canHandle(EMouseClickType mouse, KEY key, MASK mask) const
return false;
}
- for (data_vector_t::const_iterator iter = mData.begin(); iter != mData.end(); iter++)
+ for (const LLKeyData& key_data : mData)
{
- if (iter->canHandle(mouse, key, mask))
+ if (key_data.canHandle(mouse, key, mask))
{
return true;
}
@@ -262,12 +266,12 @@ bool LLKeyBind::hasKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignor
{
if (mouse != CLICK_NONE || key != KEY_NONE)
{
- for (data_vector_t::const_iterator iter = mData.begin(); iter != mData.end(); iter++)
+ for (const LLKeyData& key_data : mData)
{
- if (iter->mKey == key
- && iter->mMask == mask
- && iter->mMouse == mouse
- && iter->mIgnoreMasks == ignore)
+ if (key_data.mKey == key
+ && key_data.mMask == mask
+ && key_data.mMouse == mouse
+ && key_data.mIgnoreMasks == ignore)
{
return true;
}
@@ -349,16 +353,16 @@ void LLKeyBind::replaceKeyData(const LLKeyData& data, U32 index)
{
// if both click and key are none (isEmpty()), we are inserting a placeholder, we don't want to reset anything
// otherwise reset identical key
- for (data_vector_t::iterator iter = mData.begin(); iter != mData.end(); iter++)
+ for (LLKeyData& key_data : mData)
{
- if (iter->mKey == data.mKey
- && iter->mMouse == data.mMouse
- && iter->mIgnoreMasks == data.mIgnoreMasks
- && iter->mMask == data.mMask)
+ if (key_data.mKey == data.mKey
+ && key_data.mMouse == data.mMouse
+ && key_data.mIgnoreMasks == data.mIgnoreMasks
+ && key_data.mMask == data.mMask)
{
// Replacing only fully equal combinations even in case 'ignore' is set
// Reason: Simplicity and user might decide to do a 'move' command as W and Shift+Ctrl+W, and 'run' as Shift+W
- iter->reset();
+ key_data.reset();
break;
}
}
@@ -380,16 +384,10 @@ void LLKeyBind::resetKeyData(S32 index)
void LLKeyBind::trimEmpty()
{
- S32 last = mData.size() - 1;
- while (last >= 0 && mData[last].empty())
- {
- mData.erase(mData.begin() + last);
- last--;
- }
+ mData.erase(endNonEmpty(), mData.end());
}
-U32 LLKeyBind::getDataCount()
+size_t LLKeyBind::getDataCount()
{
return mData.size();
}
-
diff --git a/indra/llcommon/llkeybind.h b/indra/llcommon/llkeybind.h
index c6b4bd970f43c716bab9e0d6061e7e5d79df5d4e..488f5094117c286a02ac7991f7151d8e77bca2a0 100644
--- a/indra/llcommon/llkeybind.h
+++ b/indra/llcommon/llkeybind.h
@@ -95,11 +95,13 @@ class LLKeyBind
void clear() { mData.clear(); }
// if there any empty LLKeyData in the end of the array, remove them
void trimEmpty();
- U32 getDataCount();
+ size_t getDataCount();
private:
typedef std::vector<LLKeyData> data_vector_t;
data_vector_t mData;
+
+ data_vector_t::const_iterator endNonEmpty() const;
};
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index 2704f8b6de120db414a2130b8ed861c92e89909c..c87c0758fee9b54b38370293f29b0d8110ed066c 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -231,7 +231,8 @@ class LLLeapImpl: public LLLeap
}
|*==========================================================================*/
- LL_DEBUGS("EventHost") << "Sending: " << buffer.tellp() << ':';
+ LL_DEBUGS("EventHost") << "Sending: "
+ << static_cast<U64>(buffer.tellp()) << ':';
std::string::size_type truncate(80);
if (buffer.tellp() <= truncate)
{
@@ -244,7 +245,8 @@ class LLLeapImpl: public LLLeap
LL_CONT << LL_ENDL;
LLProcess::WritePipe& childin(mChild->getWritePipe(LLProcess::STDIN));
- childin.get_ostream() << buffer.tellp() << ':' << buffer.str() << std::flush;
+ childin.get_ostream() << static_cast<U64>(buffer.tellp())
+ << ':' << buffer.str() << std::flush;
return false;
}
diff --git a/indra/llcommon/llmd5.cpp b/indra/llcommon/llmd5.cpp
index f942a976b7ecba321780038b53000b595be329e7..9b2a2bab60f48195614aa9d1a16c201681d9f477 100644
--- a/indra/llcommon/llmd5.cpp
+++ b/indra/llcommon/llmd5.cpp
@@ -96,10 +96,10 @@ LLMD5::LLMD5()
// operation, processing another message block, and updating the
// context.
-void LLMD5::update (const uint1 *input, const uint4 input_length) {
+void LLMD5::update (const uint1 *input, const size_t input_length) {
- uint4 input_index, buffer_index;
- uint4 buffer_space; // how much space is left in buffer
+ size_t input_index, buffer_index;
+ size_t buffer_space; // how much space is left in buffer
if (finalized){ // so we can't update!
std::cerr << "LLMD5::update: Can't update a finalized digest!" << std::endl;
@@ -107,14 +107,10 @@ void LLMD5::update (const uint1 *input, const uint4 input_length) {
}
// Compute number of bytes mod 64
- buffer_index = (unsigned int)((count[0] >> 3) & 0x3F);
+ buffer_index = size_t((count >> 3) & 0x3F);
// Update number of bits
- if ( (count[0] += ((uint4) input_length << 3))<((uint4) input_length << 3) )
- count[1]++;
-
- count[1] += ((uint4)input_length >> 29);
-
+ count += input_length << 3;
buffer_space = 64 - buffer_index; // how much space is left in buffer
@@ -192,7 +188,7 @@ void LLMD5::update(const std::string& s)
void LLMD5::finalize (){
unsigned char bits[8]; /* Flawfinder: ignore */
- unsigned int index, padLen;
+ size_t index, padLen;
static uint1 PADDING[64]={
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -204,11 +200,12 @@ void LLMD5::finalize (){
return;
}
- // Save number of bits
- encode (bits, count, 8);
+ // Save number of bits.
+ // Treat count, a uint64_t, as uint4[2].
+ encode (bits, reinterpret_cast<uint4*>(&count), 8);
// Pad out to 56 mod 64.
- index = (uint4) ((count[0] >> 3) & 0x3f);
+ index = size_t((count >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index);
update (PADDING, padLen);
@@ -340,8 +337,7 @@ void LLMD5::init(){
finalized=0; // we just started!
// Nothing counted, so count=0
- count[0] = 0;
- count[1] = 0;
+ count = 0;
// Load magic initialization constants.
state[0] = 0x67452301;
@@ -508,9 +504,9 @@ void LLMD5::transform (const U8 block[64]){
// Encodes input (UINT4) into output (unsigned char). Assumes len is
// a multiple of 4.
-void LLMD5::encode (uint1 *output, const uint4 *input, const uint4 len) {
+void LLMD5::encode (uint1 *output, const uint4 *input, const size_t len) {
- unsigned int i, j;
+ size_t i, j;
for (i = 0, j = 0; j < len; i++, j += 4) {
output[j] = (uint1) (input[i] & 0xff);
@@ -525,9 +521,9 @@ void LLMD5::encode (uint1 *output, const uint4 *input, const uint4 len) {
// Decodes input (unsigned char) into output (UINT4). Assumes len is
// a multiple of 4.
-void LLMD5::decode (uint4 *output, const uint1 *input, const uint4 len){
+void LLMD5::decode (uint4 *output, const uint1 *input, const size_t len){
- unsigned int i, j;
+ size_t i, j;
for (i = 0, j = 0; j < len; i++, j += 4)
output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
diff --git a/indra/llcommon/llmd5.h b/indra/llcommon/llmd5.h
index 1526e6ac3c0d5ea50b3c0d0862ac491e5f3c6972..8530dc03891d9d9e85d203709b918bfa66cf3fbd 100644
--- a/indra/llcommon/llmd5.h
+++ b/indra/llcommon/llmd5.h
@@ -86,7 +86,7 @@ class LL_COMMON_API LLMD5 {
public:
// methods for controlled operation:
LLMD5 (); // simple initializer
- void update (const uint1 *input, const uint4 input_length);
+ void update (const uint1 *input, const size_t input_length);
void update (std::istream& stream);
void update (FILE *file);
void update (const std::string& str);
@@ -110,7 +110,7 @@ class LL_COMMON_API LLMD5 {
// next, the private data:
uint4 state[4];
- uint4 count[2]; // number of *bits*, mod 2^64
+ uint64_t count; // number of *bits*, mod 2^64
uint1 buffer[64]; // input buffer
uint1 digest[16];
uint1 finalized;
@@ -120,8 +120,8 @@ class LL_COMMON_API LLMD5 {
void transform (const uint1 *buffer); // does the real update work. Note
// that length is implied to be 64.
- static void encode (uint1 *dest, const uint4 *src, const uint4 length);
- static void decode (uint4 *dest, const uint1 *src, const uint4 length);
+ static void encode (uint1 *dest, const uint4 *src, const size_t length);
+ static void decode (uint4 *dest, const uint1 *src, const size_t length);
};
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp
index 100eb57555c8362ce46e0a4f44ba9753dbcc9d67..ab509b46eb1fe365dfae8fd0dd528c7f3e5f667f 100644
--- a/indra/llcommon/llmetricperformancetester.cpp
+++ b/indra/llcommon/llmetricperformancetester.cpp
@@ -42,9 +42,9 @@ LLMetricPerformanceTesterBasic::name_tester_map_t LLMetricPerformanceTesterBasic
/*static*/
void LLMetricPerformanceTesterBasic::cleanupClass()
{
- for (name_tester_map_t::iterator iter = sTesterMap.begin() ; iter != sTesterMap.end() ; ++iter)
+ for (name_tester_map_t::value_type& pair : sTesterMap)
{
- delete iter->second ;
+ delete pair.second;
}
sTesterMap.clear() ;
}
@@ -111,8 +111,8 @@ LLSD LLMetricPerformanceTesterBasic::analyzeMetricPerformanceLog(std::istream& i
{
ret[label]["Name"] = iter->second["Name"] ;
- S32 num_of_metrics = tester->getNumberOfMetrics() ;
- for(S32 index = 0 ; index < num_of_metrics ; index++)
+ auto num_of_metrics = tester->getNumberOfMetrics() ;
+ for(size_t index = 0 ; index < num_of_metrics ; index++)
{
ret[label][ tester->getMetricName(index) ] = iter->second[ tester->getMetricName(index) ] ;
}
@@ -154,10 +154,9 @@ void LLMetricPerformanceTesterBasic::doAnalysisMetrics(std::string baseline, std
llofstream os(output.c_str());
os << "Label, Metric, Base(B), Target(T), Diff(T-B), Percentage(100*T/B)\n";
- for(LLMetricPerformanceTesterBasic::name_tester_map_t::iterator iter = LLMetricPerformanceTesterBasic::sTesterMap.begin() ;
- iter != LLMetricPerformanceTesterBasic::sTesterMap.end() ; ++iter)
+ for (LLMetricPerformanceTesterBasic::name_tester_map_t::value_type& pair : LLMetricPerformanceTesterBasic::sTesterMap)
{
- LLMetricPerformanceTesterBasic* tester = ((LLMetricPerformanceTesterBasic*)iter->second) ;
+ LLMetricPerformanceTesterBasic* tester = ((LLMetricPerformanceTesterBasic*)pair.second);
tester->analyzePerformance(&os, &base, ¤t) ;
}
diff --git a/indra/llcommon/llmetricperformancetester.h b/indra/llcommon/llmetricperformancetester.h
index 2e99ed979df939396b3d2bcbbaaf40737cd3b9a7..6561a78f03edad84459e4857cc216c0928f905ce 100644
--- a/indra/llcommon/llmetricperformancetester.h
+++ b/indra/llcommon/llmetricperformancetester.h
@@ -67,12 +67,12 @@ class LL_COMMON_API LLMetricPerformanceTesterBasic
/**
* @return Returns the number of the test metrics in this tester instance.
*/
- S32 getNumberOfMetrics() const { return mMetricStrings.size() ;}
+ auto getNumberOfMetrics() const { return mMetricStrings.size() ;}
/**
* @return Returns the metric name at index
* @param[in] index - Index on the list of metrics managed by this tester instance.
*/
- std::string getMetricName(S32 index) const { return mMetricStrings[index] ;}
+ std::string getMetricName(size_t index) const { return mMetricStrings[index] ;}
protected:
/**
diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp
index 93c7d520f2b46325fe73fb68178f2cd01d7925f8..b6ad40c2afedaa8b511916e57af08bc3773970d8 100644
--- a/indra/llcommon/llmortician.cpp
+++ b/indra/llcommon/llmortician.cpp
@@ -37,9 +37,9 @@ LLMortician::~LLMortician()
sGraveyard.remove(this);
}
-U32 LLMortician::logClass(std::stringstream &str)
+size_t LLMortician::logClass(std::stringstream &str)
{
- U32 size = sGraveyard.size();
+ auto size = sGraveyard.size();
str << "Mortician graveyard count: " << size;
str << " Zealous: " << (sDestroyImmediate ? "True" : "False");
if (size == 0)
diff --git a/indra/llcommon/llmortician.h b/indra/llcommon/llmortician.h
index 41cb49fab15d73ab8be712ca287f4cbab4c17d36..f92c5a11db44f942244bac595e582793e050261b 100644
--- a/indra/llcommon/llmortician.h
+++ b/indra/llcommon/llmortician.h
@@ -34,8 +34,8 @@ class LL_COMMON_API LLMortician
{
public:
LLMortician() { mIsDead = FALSE; }
- static U32 graveyardCount() { return sGraveyard.size(); };
- static U32 logClass(std::stringstream &str);
+ static auto graveyardCount() { return sGraveyard.size(); };
+ static size_t logClass(std::stringstream &str);
static void updateClass();
virtual ~LLMortician();
void die();
diff --git a/indra/llcommon/llnametable.h b/indra/llcommon/llnametable.h
index d3283543f3921f2d00e23ee5e1c06a6b3c2dbb64..2c8e71263ef4d89f9121d12e08f3f55db7b92897 100644
--- a/indra/llcommon/llnametable.h
+++ b/indra/llcommon/llnametable.h
@@ -86,12 +86,10 @@ class LLNameTable
// O(N)! (currently only used in one place... (newsim/llstate.cpp))
const char *resolveData(const DATA &data) const
{
- const_iter_t iter = mNameMap.begin();
- const_iter_t end = mNameMap.end();
- for (; iter != end; ++iter)
+ for (const name_map_t::value_type& pair : mNameMap)
{
- if (iter->second == data)
- return iter->first;
+ if (pair.second == data)
+ return pair.first;
}
return NULL;
}
diff --git a/indra/llcommon/llpriqueuemap.h b/indra/llcommon/llpriqueuemap.h
index d8d3edd48ae52403a2af3ac5f7660b0ebadafcae..030e2e0f21c76016963863cfdea5281eced1a4a5 100644
--- a/indra/llcommon/llpriqueuemap.h
+++ b/indra/llcommon/llpriqueuemap.h
@@ -115,9 +115,9 @@ class LLPriQueueMap
LL_WARNS() << "Data not on priority queue!" << LL_ENDL;
// OK, try iterating through all of the data and seeing if we just screwed up the priority
// somehow.
- for (iter = mMap.begin(); iter != mMap.end(); iter++)
+ for (pqm_pair pair : mMap)
{
- if ((*(iter)).second == data)
+ if (pair.second == data)
{
LL_ERRS() << "Data on priority queue but priority not matched!" << LL_ENDL;
}
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 8cef4293cd7cdb4ec204a6ad59e8ba37cf4fe6a1..b06fee0ec2ea612d906a7089b2987eb6e0e503ad 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -110,7 +110,7 @@ void LLQueuedThread::shutdown()
// MAIN THREAD
// virtual
-S32 LLQueuedThread::update(F32 max_time_ms)
+size_t LLQueuedThread::update(F32 max_time_ms)
{
if (!mStarted)
{
@@ -123,11 +123,11 @@ S32 LLQueuedThread::update(F32 max_time_ms)
return updateQueue(max_time_ms);
}
-S32 LLQueuedThread::updateQueue(F32 max_time_ms)
+size_t LLQueuedThread::updateQueue(F32 max_time_ms)
{
F64 max_time = (F64)max_time_ms * .001;
LLTimer timer;
- S32 pending = 1;
+ size_t pending = 1;
// Frame Update
if (mThreaded)
@@ -164,9 +164,9 @@ void LLQueuedThread::incQueue()
//virtual
// May be called from any thread
-S32 LLQueuedThread::getPending()
+size_t LLQueuedThread::getPending()
{
- S32 res;
+ size_t res;
lockData();
res = mRequestQueue.size();
unlockData();
@@ -399,7 +399,7 @@ bool LLQueuedThread::check()
//============================================================================
// Runs on its OWN thread
-S32 LLQueuedThread::processNextRequest()
+size_t LLQueuedThread::processNextRequest()
{
QueuedRequest *req;
// Get next request from pool
@@ -473,8 +473,7 @@ S32 LLQueuedThread::processNextRequest()
LLTrace::get_thread_recorder()->pushToParent();
}
- S32 pending = getPending();
- return pending;
+ return getPending();
}
// virtual
@@ -511,7 +510,7 @@ void LLQueuedThread::run()
threadedUpdate();
- int pending_work = processNextRequest();
+ auto pending_work = processNextRequest();
if (pending_work == 0)
{
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h
index 5d3f8736467fa7f6967d6d9017f53d7bd4d16227..90fce3dc5d71173bef7b18388305f11dd1eabe48 100644
--- a/indra/llcommon/llqueuedthread.h
+++ b/indra/llcommon/llqueuedthread.h
@@ -167,19 +167,19 @@ class LL_COMMON_API LLQueuedThread : public LLThread
protected:
handle_t generateHandle();
bool addRequest(QueuedRequest* req);
- S32 processNextRequest(void);
+ size_t processNextRequest(void);
void incQueue();
public:
bool waitForResult(handle_t handle, bool auto_complete = true);
- virtual S32 update(F32 max_time_ms);
- S32 updateQueue(F32 max_time_ms);
-
+ virtual size_t update(F32 max_time_ms);
+ size_t updateQueue(F32 max_time_ms);
+
void waitOnPending();
void printQueueStats();
- virtual S32 getPending();
+ virtual size_t getPending();
bool getThreaded() { return mThreaded ? true : false; }
// Request accessors
diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h
index 750fe9fdc8a0d3193e99cbcbf1c257d624324f77..e272d7a9b808739782b4259ca94bbaab020cca40 100644
--- a/indra/llcommon/llregistry.h
+++ b/indra/llcommon/llregistry.h
@@ -141,11 +141,9 @@ class LLRegistry
ptr_value_t getValue(ref_const_key_t key)
{
- for(scope_list_iterator_t it = mActiveScopes.begin();
- it != mActiveScopes.end();
- ++it)
+ for(Registrar* scope : mActiveScopes)
{
- ptr_value_t valuep = (*it)->getValue(key);
+ ptr_value_t valuep = scope->getValue(key);
if (valuep != NULL) return valuep;
}
return mDefaultRegistrar.getValue(key);
@@ -153,11 +151,9 @@ class LLRegistry
ptr_const_value_t getValue(ref_const_key_t key) const
{
- for(scope_list_const_iterator_t it = mActiveScopes.begin();
- it != mActiveScopes.end();
- ++it)
+ for(const Registrar* scope : mActiveScopes)
{
- ptr_value_t valuep = (*it)->getValue(key);
+ ptr_const_value_t valuep = scope->getValue(key);
if (valuep != NULL) return valuep;
}
return mDefaultRegistrar.getValue(key);
@@ -165,11 +161,9 @@ class LLRegistry
bool exists(ref_const_key_t key) const
{
- for(scope_list_const_iterator_t it = mActiveScopes.begin();
- it != mActiveScopes.end();
- ++it)
+ for(const Registrar* scope : mActiveScopes)
{
- if ((*it)->exists(key)) return true;
+ if (scope->exists(key)) return true;
}
return mDefaultRegistrar.exists(key);
@@ -177,11 +171,9 @@ class LLRegistry
bool empty() const
{
- for(scope_list_const_iterator_t it = mActiveScopes.begin();
- it != mActiveScopes.end();
- ++it)
+ for(const Registrar* scope : mActiveScopes)
{
- if (!(*it)->empty()) return false;
+ if (!scope->empty()) return false;
}
return mDefaultRegistrar.empty();
diff --git a/indra/llcommon/llrun.cpp b/indra/llcommon/llrun.cpp
index f5d3f302fa0daf78ab4602c51c2157331d1de0db..a3b3fccf4bb494c6e57f1b4b63c26ca285b7d177 100644
--- a/indra/llcommon/llrun.cpp
+++ b/indra/llcommon/llrun.cpp
@@ -47,7 +47,7 @@ LLRunner::~LLRunner()
mRunEvery.clear();
}
-S32 LLRunner::run()
+size_t LLRunner::run()
{
// We collect all of the runnables which should be run. Since the
// runnables are allowed to adjust the run list, we need to copy
diff --git a/indra/llcommon/llrun.h b/indra/llcommon/llrun.h
index a1174053667fbd82b7620381fe572b10eeddb012..d610f86234f63f6c256d208ff7cd2a529e5f4a3d 100644
--- a/indra/llcommon/llrun.h
+++ b/indra/llcommon/llrun.h
@@ -85,7 +85,7 @@ class LL_COMMON_API LLRunner
*
* @return Returns the number of runnables run.
*/
- S32 run();
+ size_t run();
/**
* @brief Add a runnable to the run list.
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index 807b3d13f830f162bdd4378ceb1a2d6f8907f591..a645e624f8e58804f7bc651a9079f5ec95893fac 100644
--- a/indra/llcommon/llsd.cpp
+++ b/indra/llcommon/llsd.cpp
@@ -36,6 +36,18 @@
#include "llsdserialize.h"
#include "stringize.h"
+#include <limits>
+
+// Defend against a caller forcibly passing a negative number into an unsigned
+// size_t index param
+inline
+bool was_negative(size_t i)
+{
+ return (i > std::numeric_limits<int>::max());
+}
+#define NEGATIVE_EXIT(i) if (was_negative(i)) return
+#define NEGATIVE_RETURN(i, result) NEGATIVE_EXIT(i) (result)
+
#ifndef LL_RELEASE_FOR_DOWNLOAD
#define NAME_UNNAMED_NAMESPACE
#endif
@@ -136,10 +148,10 @@ class LLSD::Impl
virtual void erase(const String&) { }
virtual const LLSD& ref(const String&) const{ return undef(); }
- virtual int size() const { return 0; }
- virtual LLSD get(Integer) const { return LLSD(); }
- virtual void erase(Integer) { }
- virtual const LLSD& ref(Integer) const { return undef(); }
+ virtual size_t size() const { return 0; }
+ virtual LLSD get(size_t) const { return LLSD(); }
+ virtual void erase(size_t) { }
+ virtual const LLSD& ref(size_t) const { return undef(); }
virtual LLSD::map_const_iterator beginMap() const { return endMap(); }
virtual LLSD::map_const_iterator endMap() const { static const std::map<String, LLSD> empty; return empty.end(); }
@@ -272,7 +284,7 @@ namespace
virtual LLSD::UUID asUUID() const { return LLUUID(mValue); }
virtual LLSD::Date asDate() const { return LLDate(mValue); }
virtual LLSD::URI asURI() const { return LLURI(mValue); }
- virtual int size() const { return mValue.size(); }
+ virtual size_t size() const { return mValue.size(); }
virtual const LLSD::String& asStringRef() const { return mValue; }
};
@@ -377,9 +389,9 @@ namespace
virtual bool has(const LLSD::String&) const;
- using LLSD::Impl::get; // Unhiding get(LLSD::Integer)
- using LLSD::Impl::erase; // Unhiding erase(LLSD::Integer)
- using LLSD::Impl::ref; // Unhiding ref(LLSD::Integer)
+ using LLSD::Impl::get; // Unhiding get(size_t)
+ using LLSD::Impl::erase; // Unhiding erase(size_t)
+ using LLSD::Impl::ref; // Unhiding ref(size_t)
virtual LLSD get(const LLSD::String&) const;
virtual LLSD getKeys() const;
void insert(const LLSD::String& k, const LLSD& v);
@@ -387,7 +399,7 @@ namespace
LLSD& ref(const LLSD::String&);
virtual const LLSD& ref(const LLSD::String&) const;
- virtual int size() const { return mData.size(); }
+ virtual size_t size() const { return mData.size(); }
LLSD::map_iterator beginMap() { return mData.begin(); }
LLSD::map_iterator endMap() { return mData.end(); }
@@ -518,14 +530,14 @@ namespace
using LLSD::Impl::get; // Unhiding get(LLSD::String)
using LLSD::Impl::erase; // Unhiding erase(LLSD::String)
using LLSD::Impl::ref; // Unhiding ref(LLSD::String)
- virtual int size() const;
- virtual LLSD get(LLSD::Integer) const;
- void set(LLSD::Integer, const LLSD&);
- void insert(LLSD::Integer, const LLSD&);
+ virtual size_t size() const;
+ virtual LLSD get(size_t) const;
+ void set(size_t, const LLSD&);
+ void insert(size_t, const LLSD&);
LLSD& append(const LLSD&);
- virtual void erase(LLSD::Integer);
- LLSD& ref(LLSD::Integer);
- virtual const LLSD& ref(LLSD::Integer) const;
+ virtual void erase(size_t);
+ LLSD& ref(size_t);
+ virtual const LLSD& ref(size_t) const;
LLSD::array_iterator beginArray() { return mData.begin(); }
LLSD::array_iterator endArray() { return mData.end(); }
@@ -550,85 +562,82 @@ namespace
return *this;
}
}
-
- int ImplArray::size() const { return mData.size(); }
-
- LLSD ImplArray::get(LLSD::Integer i) const
+
+ size_t ImplArray::size() const { return mData.size(); }
+
+ LLSD ImplArray::get(size_t i) const
{
- if (i < 0) { return LLSD(); }
+ NEGATIVE_RETURN(i, LLSD());
DataVector::size_type index = i;
-
+
return (index < mData.size()) ? mData[index] : LLSD();
}
-
- void ImplArray::set(LLSD::Integer i, const LLSD& v)
+
+ void ImplArray::set(size_t i, const LLSD& v)
{
- if (i < 0) { return; }
+ NEGATIVE_EXIT(i);
DataVector::size_type index = i;
-
+
if (index >= mData.size())
{
mData.resize(index + 1);
}
-
+
mData[index] = v;
}
-
- void ImplArray::insert(LLSD::Integer i, const LLSD& v)
+
+ void ImplArray::insert(size_t i, const LLSD& v)
{
- if (i < 0)
- {
- return;
- }
+ NEGATIVE_EXIT(i);
DataVector::size_type index = i;
-
+
if (index >= mData.size()) // tbd - sanity check limit for index ?
{
mData.resize(index + 1);
}
-
+
mData.insert(mData.begin() + index, v);
}
-
+
LLSD& ImplArray::append(const LLSD& v)
{
mData.push_back(v);
return mData.back();
}
-
- void ImplArray::erase(LLSD::Integer i)
+
+ void ImplArray::erase(size_t i)
{
- if (i < 0) { return; }
+ NEGATIVE_EXIT(i);
DataVector::size_type index = i;
-
+
if (index < mData.size())
{
mData.erase(mData.begin() + index);
}
}
-
- LLSD& ImplArray::ref(LLSD::Integer i)
+
+ LLSD& ImplArray::ref(size_t i)
{
- DataVector::size_type index = i >= 0 ? i : 0;
-
+ DataVector::size_type index = was_negative(i)? 0 : i;
+
if (index >= mData.size())
{
mData.resize(i + 1);
}
-
+
return mData[index];
}
- const LLSD& ImplArray::ref(LLSD::Integer i) const
+ const LLSD& ImplArray::ref(size_t i) const
{
- if (i < 0) { return undef(); }
+ NEGATIVE_RETURN(i, undef());
DataVector::size_type index = i;
-
+
if (index >= mData.size())
{
return undef();
}
-
+
return mData[index];
}
@@ -841,9 +850,6 @@ LLSD::LLSD(const Date& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
LLSD::LLSD(const URI& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
LLSD::LLSD(const Binary& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-// Convenience Constructors
-LLSD::LLSD(F32 v) : impl(0) { ALLOC_LLSD_OBJECT; assign((Real)v); }
-
// Scalar Assignment
void LLSD::assign(Boolean v) { safe(impl).assign(impl, v); }
void LLSD::assign(Integer v) { safe(impl).assign(impl, v); }
@@ -912,7 +918,7 @@ LLSD LLSD::emptyArray()
return v;
}
-int LLSD::size() const { return safe(impl).size(); }
+size_t LLSD::size() const { return safe(impl).size(); }
LLSD LLSD::get(Integer i) const { return safe(impl).get(i); }
void LLSD::set(Integer i, const LLSD& v){ makeArray(impl).set(i, v); }
@@ -926,12 +932,12 @@ LLSD& LLSD::with(Integer i, const LLSD& v)
LLSD& LLSD::append(const LLSD& v) { return makeArray(impl).append(v); }
void LLSD::erase(Integer i) { makeArray(impl).erase(i); }
-LLSD& LLSD::operator[](Integer i)
+LLSD& LLSD::operator[](size_t i)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_LLSD;
return makeArray(impl).ref(i);
}
-const LLSD& LLSD::operator[](Integer i) const
+const LLSD& LLSD::operator[](size_t i) const
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_LLSD;
return safe(impl).ref(i);
@@ -956,7 +962,7 @@ static const char *llsd_dump(const LLSD &llsd, bool useXMLFormat)
out << LLSDNotationStreamer(llsd);
out_string = out.str();
}
- int len = out_string.length();
+ auto len = out_string.length();
sStorage = new char[len + 1];
memcpy(sStorage, out_string.c_str(), len);
sStorage[len] = '\0';
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index 24cb9bbce170d0f358f9e7ed3b2d5ca8eec1b38f..c1406cf73ff90f788298891a10b3eb2c169ac8fd 100644
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -30,6 +30,7 @@
#include <map>
#include <string>
#include <vector>
+#include <type_traits>
#include "stdtypes.h"
@@ -192,7 +193,17 @@ class LL_COMMON_API LLSD
/** @name Convenience Constructors */
//@{
- LLSD(F32); // F32 -> Real
+ // support construction from size_t et al.
+ template <typename VALUE,
+ typename std::enable_if<std::is_integral<VALUE>::value &&
+ ! std::is_same<VALUE, Boolean>::value,
+ bool>::type = true>
+ LLSD(VALUE v): LLSD(Integer(narrow(v))) {}
+ // support construction from F32 et al.
+ template <typename VALUE,
+ typename std::enable_if<std::is_floating_point<VALUE>::value,
+ bool>::type = true>
+ LLSD(VALUE v): LLSD(Real(narrow(v))) {}
//@}
/** @name Scalar Assignment */
@@ -205,15 +216,21 @@ class LL_COMMON_API LLSD
void assign(const Date&);
void assign(const URI&);
void assign(const Binary&);
-
- LLSD& operator=(Boolean v) { assign(v); return *this; }
- LLSD& operator=(Integer v) { assign(v); return *this; }
- LLSD& operator=(Real v) { assign(v); return *this; }
- LLSD& operator=(const String& v) { assign(v); return *this; }
- LLSD& operator=(const UUID& v) { assign(v); return *this; }
- LLSD& operator=(const Date& v) { assign(v); return *this; }
- LLSD& operator=(const URI& v) { assign(v); return *this; }
- LLSD& operator=(const Binary& v) { assign(v); return *this; }
+
+ // support assignment from size_t et al.
+ template <typename VALUE,
+ typename std::enable_if<std::is_integral<VALUE>::value &&
+ ! std::is_same<VALUE, Boolean>::value,
+ bool>::type = true>
+ void assign(VALUE v) { assign(Integer(narrow(v))); }
+ // support assignment from F32 et al.
+ template <typename VALUE,
+ typename std::enable_if<std::is_floating_point<VALUE>::value,
+ bool>::type = true>
+ void assign(VALUE v) { assign(Real(narrow(v))); }
+
+ template <typename VALUE>
+ LLSD& operator=(VALUE v) { assign(v); return *this; }
//@}
/**
@@ -275,7 +292,6 @@ class LL_COMMON_API LLSD
//@{
LLSD(const char*);
void assign(const char*);
- LLSD& operator=(const char* v) { assign(v); return *this; }
//@}
/** @name Map Values */
@@ -313,14 +329,24 @@ class LL_COMMON_API LLSD
LLSD& append(const LLSD&);
void erase(Integer);
LLSD& with(Integer, const LLSD&);
-
- const LLSD& operator[](Integer) const;
- LLSD& operator[](Integer);
+
+ // accept size_t so we can index relative to size()
+ const LLSD& operator[](size_t) const;
+ LLSD& operator[](size_t);
+ // template overloads to support int literals, U32 et al.
+ template <typename IDX,
+ typename std::enable_if<std::is_convertible<IDX, size_t>::value,
+ bool>::type = true>
+ const LLSD& operator[](IDX i) const { return (*this)[size_t(i)]; }
+ template <typename IDX,
+ typename std::enable_if<std::is_convertible<IDX, size_t>::value,
+ bool>::type = true>
+ LLSD& operator[](IDX i) { return (*this)[size_t(i)]; }
//@}
/** @name Iterators */
//@{
- int size() const;
+ size_t size() const;
typedef std::map<String, LLSD>::iterator map_iterator;
typedef std::map<String, LLSD>::const_iterator map_const_iterator;
diff --git a/indra/llcommon/llsdparam.cpp b/indra/llcommon/llsdparam.cpp
index af4ccf25fd741e39e789013f1062b4c924489cae..30f49b27ea01aa9f7125d53be1c165af73d7a08c 100644
--- a/indra/llcommon/llsdparam.cpp
+++ b/indra/llcommon/llsdparam.cpp
@@ -113,11 +113,9 @@ void LLParamSDParser::writeSDImpl(LLSD& sd, const LLInitParam::BaseBlock& block,
/*virtual*/ std::string LLParamSDParser::getCurrentElementName()
{
std::string full_name = "sd";
- for (name_stack_t::iterator it = mNameStack.begin();
- it != mNameStack.end();
- ++it)
+ for (name_stack_t::value_type& stack_pair : mNameStack)
{
- full_name += llformat("[%s]", it->first.c_str());
+ full_name += llformat("[%s]", stack_pair.first.c_str());
}
return full_name;
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 8b4a0ee6d87404f638b397019e18a03b9a47567b..af57f4ac5ec212c97ad3477cb9ed15572f0e6a48 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -50,7 +50,7 @@
#include "lluri.h"
// File constants
-static const int MAX_HDR_LEN = 20;
+static const size_t MAX_HDR_LEN = 20;
static const S32 UNZIP_LLSD_MAX_DEPTH = 96;
static const char LEGACY_NON_HEADER[] = "<llsd>";
const std::string LLSD_BINARY_HEADER("LLSD/Binary");
@@ -99,7 +99,7 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize
}
// static
-bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
+bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
{
LLPointer<LLSDParser> p = NULL;
char hdr_buf[MAX_HDR_LEN + 1] = ""; /* Flawfinder: ignore */
@@ -252,7 +252,7 @@ F64 ll_ntohd(F64 netdouble)
* @return Returns number of bytes read off of the stream. Returns
* PARSE_FAILURE (-1) on failure.
*/
-int deserialize_string(std::istream& istr, std::string& value, S32 max_bytes);
+llssize deserialize_string(std::istream& istr, std::string& value, llssize max_bytes);
/**
* @brief Parse a delimited string.
@@ -263,7 +263,7 @@ int deserialize_string(std::istream& istr, std::string& value, S32 max_bytes);
* @return Returns number of bytes read off of the stream. Returns
* PARSE_FAILURE (-1) on failure.
*/
-int deserialize_string_delim(std::istream& istr, std::string& value, char d);
+llssize deserialize_string_delim(std::istream& istr, std::string& value, char d);
/**
* @brief Read a raw string off the stream.
@@ -277,10 +277,10 @@ int deserialize_string_delim(std::istream& istr, std::string& value, char d);
* @return Returns number of bytes read off of the stream. Returns
* PARSE_FAILURE (-1) on failure.
*/
-int deserialize_string_raw(
+llssize deserialize_string_raw(
std::istream& istr,
std::string& value,
- S32 max_bytes);
+ llssize max_bytes);
/**
* @brief helper method for dealing with the different notation boolean format.
@@ -292,7 +292,7 @@ int deserialize_string_raw(
* @return Returns number of bytes read off of the stream. Returns
* PARSE_FAILURE (-1) on failure.
*/
-int deserialize_boolean(
+llssize deserialize_boolean(
std::istream& istr,
LLSD& data,
const std::string& compare,
@@ -329,7 +329,7 @@ LLSDParser::LLSDParser()
LLSDParser::~LLSDParser()
{ }
-S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes, S32 max_depth)
+S32 LLSDParser::parse(std::istream& istr, LLSD& data, llssize max_bytes, S32 max_depth)
{
mCheckLimits = (LLSDSerialize::SIZE_UNLIMITED == max_bytes) ? false : true;
mMaxBytesLeft = max_bytes;
@@ -359,7 +359,7 @@ std::istream& LLSDParser::get(
char delim) const
{
istr.get(s, n, delim);
- if(mCheckLimits) mMaxBytesLeft -= (int)istr.gcount();
+ if(mCheckLimits) mMaxBytesLeft -= istr.gcount();
return istr;
}
@@ -369,7 +369,7 @@ std::istream& LLSDParser::get(
char delim) const
{
istr.get(sb, delim);
- if(mCheckLimits) mMaxBytesLeft -= (int)istr.gcount();
+ if(mCheckLimits) mMaxBytesLeft -= istr.gcount();
return istr;
}
@@ -393,11 +393,11 @@ std::istream& LLSDParser::read(
std::streamsize n) const
{
istr.read(s, n);
- if(mCheckLimits) mMaxBytesLeft -= (int)istr.gcount();
+ if(mCheckLimits) mMaxBytesLeft -= istr.gcount();
return istr;
}
-void LLSDParser::account(S32 bytes) const
+void LLSDParser::account(llssize bytes) const
{
if(mCheckLimits) mMaxBytesLeft -= bytes;
}
@@ -502,7 +502,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) c
c = istr.peek();
if(isalpha(c))
{
- int cnt = deserialize_boolean(
+ auto cnt = deserialize_boolean(
istr,
data,
NOTATION_FALSE_SERIAL,
@@ -532,7 +532,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) c
c = istr.peek();
if(isalpha(c))
{
- int cnt = deserialize_boolean(istr,data,NOTATION_TRUE_SERIAL,true);
+ auto cnt = deserialize_boolean(istr,data,NOTATION_TRUE_SERIAL,true);
if(PARSE_FAILURE == cnt) parse_count = cnt;
else account(cnt);
}
@@ -608,7 +608,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) c
c = get(istr); // pop the 'l'
c = get(istr); // pop the delimiter
std::string str;
- int cnt = deserialize_string_delim(istr, str, c);
+ auto cnt = deserialize_string_delim(istr, str, c);
if(PARSE_FAILURE == cnt)
{
parse_count = PARSE_FAILURE;
@@ -631,7 +631,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) c
c = get(istr); // pop the 'd'
c = get(istr); // pop the delimiter
std::string str;
- int cnt = deserialize_string_delim(istr, str, c);
+ auto cnt = deserialize_string_delim(istr, str, c);
if(PARSE_FAILURE == cnt)
{
parse_count = PARSE_FAILURE;
@@ -663,7 +663,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) c
default:
parse_count = PARSE_FAILURE;
- LL_INFOS() << "Unrecognized character while parsing: int(" << (int)c
+ LL_INFOS() << "Unrecognized character while parsing: int(" << int(c)
<< ")" << LL_ENDL;
break;
}
@@ -694,7 +694,7 @@ S32 LLSDNotationParser::parseMap(std::istream& istr, LLSD& map, S32 max_depth) c
{
putback(istr, c);
found_name = true;
- int count = deserialize_string(istr, name, mMaxBytesLeft);
+ auto count = deserialize_string(istr, name, mMaxBytesLeft);
if(PARSE_FAILURE == count) return PARSE_FAILURE;
account(count);
}
@@ -776,7 +776,7 @@ S32 LLSDNotationParser::parseArray(std::istream& istr, LLSD& array, S32 max_dept
bool LLSDNotationParser::parseString(std::istream& istr, LLSD& data) const
{
std::string value;
- int count = deserialize_string(istr, value, mMaxBytesLeft);
+ auto count = deserialize_string(istr, value, mMaxBytesLeft);
if(PARSE_FAILURE == count) return false;
account(count);
data = value;
@@ -803,13 +803,13 @@ bool LLSDNotationParser::parseBinary(std::istream& istr, LLSD& data) const
{
// We probably have a valid raw binary stream. determine
// the size, and read it.
- S32 len = strtol(buf + 2, NULL, 0);
+ auto len = strtol(buf + 2, NULL, 0);
if(mCheckLimits && (len > mMaxBytesLeft)) return false;
std::vector<U8> value;
if(len)
{
value.resize(len);
- account((int)fullread(istr, (char *)&value[0], len));
+ account(fullread(istr, (char *)&value[0], len));
}
c = get(istr); // strip off the trailing double-quote
data = value;
@@ -1006,7 +1006,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) con
case '"':
{
std::string value;
- int cnt = deserialize_string_delim(istr, value, c);
+ auto cnt = deserialize_string_delim(istr, value, c);
if(PARSE_FAILURE == cnt)
{
parse_count = PARSE_FAILURE;
@@ -1093,7 +1093,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) con
if(size > 0)
{
value.resize(size);
- account((int)fullread(istr, (char*)&value[0], size));
+ account(fullread(istr, (char*)&value[0], size));
}
data = value;
}
@@ -1107,7 +1107,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data, S32 max_depth) con
default:
parse_count = PARSE_FAILURE;
- LL_INFOS() << "Unrecognized character while parsing: int(" << (int)c
+ LL_INFOS() << "Unrecognized character while parsing: int(" << int(c)
<< ")" << LL_ENDL;
break;
}
@@ -1141,7 +1141,7 @@ S32 LLSDBinaryParser::parseMap(std::istream& istr, LLSD& map, S32 max_depth) con
case '\'':
case '"':
{
- int cnt = deserialize_string_delim(istr, name, c);
+ auto cnt = deserialize_string_delim(istr, name, c);
if(PARSE_FAILURE == cnt) return PARSE_FAILURE;
account(cnt);
break;
@@ -1225,7 +1225,7 @@ bool LLSDBinaryParser::parseString(
if(size)
{
buf.resize(size);
- account((int)fullread(istr, &buf[0], size));
+ account(fullread(istr, &buf[0], size));
value.assign(buf.begin(), buf.end());
}
return true;
@@ -1429,7 +1429,7 @@ S32 LLSDNotationFormatter::format_impl(const LLSD& data, std::ostream& ostr,
ostr << std::uppercase;
auto oldfill(ostr.fill('0'));
auto oldwidth(ostr.width());
- for (int i = 0; i < buffer.size(); i++)
+ for (size_t i = 0; i < buffer.size(); i++)
{
// have to restate setw() before every conversion
ostr << std::setw(2) << (int) buffer[i];
@@ -1592,7 +1592,7 @@ void LLSDBinaryFormatter::formatString(
/**
* local functions
*/
-int deserialize_string(std::istream& istr, std::string& value, S32 max_bytes)
+llssize deserialize_string(std::istream& istr, std::string& value, llssize max_bytes)
{
int c = istr.get();
if(istr.fail())
@@ -1602,7 +1602,7 @@ int deserialize_string(std::istream& istr, std::string& value, S32 max_bytes)
return LLSDParser::PARSE_FAILURE;
}
- int rv = LLSDParser::PARSE_FAILURE;
+ llssize rv = LLSDParser::PARSE_FAILURE;
switch(c)
{
case '\'':
@@ -1622,7 +1622,7 @@ int deserialize_string(std::istream& istr, std::string& value, S32 max_bytes)
return rv + 1; // account for the character grabbed at the top.
}
-int deserialize_string_delim(
+llssize deserialize_string_delim(
std::istream& istr,
std::string& value,
char delim)
@@ -1632,7 +1632,7 @@ int deserialize_string_delim(
bool found_hex = false;
bool found_digit = false;
U8 byte = 0;
- int count = 0;
+ llssize count = 0;
while (true)
{
@@ -1647,7 +1647,7 @@ int deserialize_string_delim(
}
char next_char = (char)next_byte; // Now that we know it's not EOF
-
+
if(found_escape)
{
// next character(s) is a special sequence.
@@ -1725,16 +1725,16 @@ int deserialize_string_delim(
return count;
}
-int deserialize_string_raw(
+llssize deserialize_string_raw(
std::istream& istr,
std::string& value,
- S32 max_bytes)
+ llssize max_bytes)
{
- int count = 0;
+ llssize count = 0;
const S32 BUF_LEN = 20;
char buf[BUF_LEN]; /* Flawfinder: ignore */
istr.get(buf, BUF_LEN - 1, ')');
- count += (int)istr.gcount();
+ count += istr.gcount();
int c = istr.get();
c = istr.get();
count += 2;
@@ -1743,13 +1743,13 @@ int deserialize_string_raw(
// We probably have a valid raw string. determine
// the size, and read it.
// *FIX: This is memory inefficient.
- S32 len = strtol(buf + 1, NULL, 0);
+ auto len = strtol(buf + 1, NULL, 0);
if((max_bytes>0)&&(len>max_bytes)) return LLSDParser::PARSE_FAILURE;
std::vector<char> buf;
if(len)
{
buf.resize(len);
- count += (int)fullread(istr, (char *)&buf[0], len);
+ count += fullread(istr, (char *)&buf[0], len);
value.assign(buf.begin(), buf.end());
}
c = istr.get();
@@ -2038,7 +2038,7 @@ void serialize_string(const std::string& value, std::ostream& str)
}
}
-int deserialize_boolean(
+llssize deserialize_boolean(
std::istream& istr,
LLSD& data,
const std::string& compare,
@@ -2055,7 +2055,7 @@ int deserialize_boolean(
// * set data to LLSD::null
// * return LLSDParser::PARSE_FAILURE (-1)
//
- int bytes_read = 0;
+ llssize bytes_read = 0;
std::string::size_type ii = 0;
char c = istr.peek();
while((++ii < compare.size())
@@ -2110,7 +2110,7 @@ std::string zip_llsd(LLSD& data)
U8 out[CHUNK];
- strm.avail_in = source.size();
+ strm.avail_in = narrow(source.size());
strm.next_in = (U8*) source.data();
U8* output = NULL;
@@ -2173,7 +2173,7 @@ std::string zip_llsd(LLSD& data)
LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is, S32 size)
{
U8* result = NULL;
- U32 cur_size = 0;
+ llssize cur_size = 0;
z_stream strm;
const U32 CHUNK = 65536;
@@ -2294,7 +2294,7 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is,
//This unzip function will only work with a gzip header and trailer - while the contents
//of the actual compressed data is the same for either format (gzip vs zlib ), the headers
//and trailers are different for the formats.
-U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize, std::istream& is, S32 size )
+U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size )
{
if (size == 0)
{
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index d6079fd9fa81c9cfecd29c84a7be6921432a29d9..bd5ef668c0a8c80f284e21bd8d2015772154b4dc 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -77,7 +77,7 @@ class LL_COMMON_API LLSDParser : public LLRefCount
* @return Returns the number of LLSD objects parsed into
* data. Returns PARSE_FAILURE (-1) on parse failure.
*/
- S32 parse(std::istream& istr, LLSD& data, S32 max_bytes, S32 max_depth = -1);
+ S32 parse(std::istream& istr, LLSD& data, llssize max_bytes, S32 max_depth = -1);
/** Like parse(), but uses a different call (istream.getline()) to read by lines
* This API is better suited for XML, where the parse cannot tell
@@ -194,7 +194,7 @@ class LL_COMMON_API LLSDParser : public LLRefCount
* Conceptually const since it only modifies mutable members.
* @param bytes The number of bytes read.
*/
- void account(S32 bytes) const;
+ void account(llssize bytes) const;
protected:
/**
@@ -205,7 +205,7 @@ class LL_COMMON_API LLSDParser : public LLRefCount
/**
* @brief The maximum number of bytes left to be parsed.
*/
- mutable S32 mMaxBytesLeft;
+ mutable llssize mMaxBytesLeft;
/**
* @brief Use line-based reading to get text
@@ -336,7 +336,7 @@ class LL_COMMON_API LLSDXMLParser : public LLSDParser
class Impl;
Impl& impl;
- void parsePart(const char* buf, int len);
+ void parsePart(const char* buf, llssize len);
friend class LLSDSerialize;
};
@@ -756,7 +756,7 @@ class LL_COMMON_API LLSDSerialize
* @param max_bytes the maximum number of bytes to parse
* @return Returns true if the stream appears to contain valid data
*/
- static bool deserialize(LLSD& sd, std::istream& str, S32 max_bytes);
+ static bool deserialize(LLSD& sd, std::istream& str, llssize max_bytes);
/*
* Notation Methods
@@ -778,12 +778,12 @@ class LL_COMMON_API LLSDSerialize
LLSDFormatter::EFormatterOptions(LLSDFormatter::OPTIONS_PRETTY |
LLSDFormatter::OPTIONS_PRETTY_BINARY));
}
- static S32 fromNotation(LLSD& sd, std::istream& str, S32 max_bytes)
+ static S32 fromNotation(LLSD& sd, std::istream& str, llssize max_bytes)
{
LLPointer<LLSDNotationParser> p = new LLSDNotationParser;
return p->parse(str, sd, max_bytes);
}
- static LLSD fromNotation(std::istream& str, S32 max_bytes)
+ static LLSD fromNotation(std::istream& str, llssize max_bytes)
{
LLPointer<LLSDNotationParser> p = new LLSDNotationParser;
LLSD sd;
@@ -834,12 +834,12 @@ class LL_COMMON_API LLSDSerialize
LLPointer<LLSDBinaryFormatter> f = new LLSDBinaryFormatter;
return f->format(sd, str, LLSDFormatter::OPTIONS_NONE);
}
- static S32 fromBinary(LLSD& sd, std::istream& str, S32 max_bytes, S32 max_depth = -1)
+ static S32 fromBinary(LLSD& sd, std::istream& str, llssize max_bytes, S32 max_depth = -1)
{
LLPointer<LLSDBinaryParser> p = new LLSDBinaryParser;
return p->parse(str, sd, max_bytes, max_depth);
}
- static LLSD fromBinary(std::istream& str, S32 max_bytes, S32 max_depth = -1)
+ static LLSD fromBinary(std::istream& str, llssize max_bytes, S32 max_depth = -1)
{
LLPointer<LLSDBinaryParser> p = new LLSDBinaryParser;
LLSD sd;
@@ -867,5 +867,5 @@ class LL_COMMON_API LLUZipHelper : public LLRefCount
LL_COMMON_API std::string zip_llsd(LLSD& data);
-LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
+LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
#endif // LL_LLSDSERIALIZE_H
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index 0da824d6945b1f3222b4a74ce810e86973ba98da..ac128c9f86dc34c3a6c625d0ff43335e53864185 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -196,12 +196,12 @@ S32 LLSDXMLFormatter::format_impl(const LLSD& data, std::ostream& ostr,
// *FIX: memory inefficient.
// *TODO: convert to use LLBase64
ostr << pre << "<binary encoding=\"base64\">";
- int b64_buffer_length = apr_base64_encode_len(buffer.size());
+ int b64_buffer_length = apr_base64_encode_len(narrow(buffer.size()));
char* b64_buffer = new char[b64_buffer_length];
b64_buffer_length = apr_base64_encode_binary(
b64_buffer,
&buffer[0],
- buffer.size());
+ narrow(buffer.size()));
ostr.write(b64_buffer, b64_buffer_length - 1);
delete[] b64_buffer;
ostr << "</binary>" << post;
@@ -260,7 +260,7 @@ class LLSDXMLParser::Impl
S32 parse(std::istream& input, LLSD& data);
S32 parseLines(std::istream& input, LLSD& data);
- void parsePart(const char *buf, int len);
+ void parsePart(const char *buf, llssize len);
void reset();
@@ -542,7 +542,7 @@ LLSDXMLParser::Impl::findAttribute(const XML_Char* name, const XML_Char** pairs)
return NULL;
}
-void LLSDXMLParser::Impl::parsePart(const char* buf, int len)
+void LLSDXMLParser::Impl::parsePart(const char* buf, llssize len)
{
if ( buf != NULL
&& len > 0 )
@@ -915,7 +915,7 @@ LLSDXMLParser::~LLSDXMLParser()
delete &impl;
}
-void LLSDXMLParser::parsePart(const char *buf, int len)
+void LLSDXMLParser::parsePart(const char *buf, llssize len)
{
impl.parsePart(buf, len);
}
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 8e90d1e8b89f76dafba377d1efaa9f538bc9da5c..f70bee99039aab61faacf785843c7c6576838345 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -148,10 +148,9 @@ LLSD ll_binary_from_string(const LLSD& sd)
std::vector<U8> binary_value;
std::string string_value = sd.asString();
- for (std::string::iterator iter = string_value.begin();
- iter != string_value.end(); ++iter)
+ for (const U8 c : string_value)
{
- binary_value.push_back(*iter);
+ binary_value.push_back(c);
}
binary_value.push_back('\0');
diff --git a/indra/llcommon/llstreamtools.cpp b/indra/llcommon/llstreamtools.cpp
index d7a6f47932cc4147015e06ce05617793ef5aba76..1ff15fcf89599b8877efc95ec1d2b32bed7e024d 100644
--- a/indra/llcommon/llstreamtools.cpp
+++ b/indra/llcommon/llstreamtools.cpp
@@ -118,7 +118,7 @@ bool skip_to_next_word(std::istream& input_stream)
bool skip_to_end_of_next_keyword(const char* keyword, std::istream& input_stream)
{
- int key_length = strlen(keyword); /*Flawfinder: ignore*/
+ auto key_length = strlen(keyword); /*Flawfinder: ignore*/
if (0 == key_length)
{
return false;
@@ -315,7 +315,7 @@ bool unget_line(const std::string& line, std::istream& input_stream)
// returns true if removed last char
bool remove_last_char(char c, std::string& line)
{
- int line_size = line.size();
+ auto line_size = line.size();
if (line_size > 1
&& c == line[line_size - 1])
{
@@ -330,9 +330,8 @@ bool remove_last_char(char c, std::string& line)
// "\\n" ---> '\n' (backslash n becomes carriage return)
void unescape_string(std::string& line)
{
- int line_size = line.size();
- int index = 0;
- while (index < line_size - 1)
+ auto line_size = line.size();
+ for (size_t index = 0; line_size >= 1 && index < line_size - 1; ++index)
{
if ('\\' == line[index])
{
@@ -347,7 +346,6 @@ void unescape_string(std::string& line)
line_size--;
}
}
- index++;
}
}
@@ -356,9 +354,8 @@ void unescape_string(std::string& line)
// '\n' ---> "\\n" (carriage return becomes backslash n)
void escape_string(std::string& line)
{
- int line_size = line.size();
- int index = 0;
- while (index < line_size)
+ auto line_size = line.size();
+ for (size_t index = 0; index < line_size; ++index)
{
if ('\\' == line[index])
{
@@ -372,31 +369,27 @@ void escape_string(std::string& line)
line_size++;
index++;
}
- index++;
}
}
// removes '\n' characters
void replace_newlines_with_whitespace(std::string& line)
{
- int line_size = line.size();
- int index = 0;
- while (index < line_size)
+ auto line_size = line.size();
+ for (size_t index = 0; index < line_size; ++index)
{
if ('\n' == line[index])
{
line.replace(index, 1, " ");
}
- index++;
}
}
// erases any double-quote characters in 'line'
void remove_double_quotes(std::string& line)
{
- int index = 0;
- int line_size = line.size();
- while (index < line_size)
+ auto line_size = line.size();
+ for (size_t index = 0; index < line_size; )
{
if ('"' == line[index])
{
@@ -424,22 +417,21 @@ void get_keyword_and_value(std::string& keyword,
const std::string& line)
{
// skip initial whitespace
- int line_size = line.size();
- int line_index = 0;
+ auto line_size = line.size();
+ size_t line_index = 0;
char c;
- while (line_index < line_size)
+ for ( ; line_index < line_size; ++line_index)
{
c = line[line_index];
if (!LLStringOps::isSpace(c))
{
break;
}
- line_index++;
}
// get the keyword
keyword.clear();
- while (line_index < line_size)
+ for ( ; line_index < line_size; ++line_index)
{
c = line[line_index];
if (LLStringOps::isSpace(c) || '\r' == c || '\n' == c)
@@ -447,7 +439,6 @@ void get_keyword_and_value(std::string& keyword,
break;
}
keyword += c;
- line_index++;
}
// get the value
@@ -465,7 +456,7 @@ void get_keyword_and_value(std::string& keyword,
line_index++;
}
- while (line_index < line_size)
+ for ( ; line_index < line_size; ++line_index)
{
c = line[line_index];
if ('\r' == c || '\n' == c)
@@ -473,7 +464,6 @@ void get_keyword_and_value(std::string& keyword,
break;
}
value += c;
- line_index++;
}
}
}
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 7f501f2e776341f852461a720547ada37716cd53..f6629803ee333baab56c23fe4f904f45e2a45f4f 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -141,7 +141,7 @@ std::string rawstr_to_utf8(const std::string& raw)
return wstring_to_utf8str(wstr);
}
-S32 wchar_to_utf8chars(llwchar in_char, char* outchars)
+std::ptrdiff_t wchar_to_utf8chars(llwchar in_char, char* outchars)
{
U32 cur_char = (U32)in_char;
char* base = outchars;
@@ -192,7 +192,7 @@ S32 wchar_to_utf8chars(llwchar in_char, char* outchars)
return outchars - base;
}
-S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
+auto utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
{
const U16* base = inchars;
U16 cur_char = *inchars++;
@@ -310,7 +310,7 @@ S32 wstring_utf16_length(const LLWString &wstr, const S32 woffset, const S32 wle
// and whose equivalent utf-16 string does not exceeds the given utf16_length.
S32 wstring_wstring_length_from_utf16_length(const LLWString & wstr, const S32 woffset, const S32 utf16_length, BOOL *unaligned)
{
- const S32 end = wstr.length();
+ const auto end = wstr.length();
BOOL u = FALSE;
S32 n = woffset + utf16_length;
S32 i = woffset;
@@ -426,7 +426,7 @@ LLWString utf8str_to_wstring(const char* utf8str, size_t len)
}
// Check that this character doesn't go past the end of the string
- S32 end = (len < (i + cont_bytes)) ? len : (i + cont_bytes);
+ auto end = (len < (i + cont_bytes)) ? len : (i + cont_bytes);
do
{
++i;
@@ -471,7 +471,7 @@ std::string wstring_to_utf8str(const llwchar* utf32str, size_t len)
while (i < len)
{
char tchars[8]; /* Flawfinder: ignore */
- S32 n = wchar_to_utf8chars(utf32str[i], tchars);
+ auto n = wchar_to_utf8chars(utf32str[i], tchars);
tchars[n] = 0;
out += tchars;
i++;
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index d94f5494808a398b36a6f7792aeecf3a462e1eb5..7ba5c8c2414f410a73dc4a815635b3a40f9169d0 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -664,7 +664,7 @@ ll_convert_forms(ll_convert_alias, LLWString, std::string, utf8str_to_
// Same function, better name. JC
inline LLWString utf8string_to_wstring(const std::string& utf8_string) { return utf8str_to_wstring(utf8_string); }
-LL_COMMON_API S32 wchar_to_utf8chars(llwchar inchar, char* outchars);
+LL_COMMON_API std::ptrdiff_t wchar_to_utf8chars(llwchar inchar, char* outchars);
ll_convert_forms(ll_convert_alias, std::string, LLWString, wstring_to_utf8str);
ll_convert_forms(ll_convert_u16_alias, std::string, llutf16string, utf16str_to_utf8str);
@@ -1668,13 +1668,13 @@ std::basic_string<T> LLStringUtilBase<T>::quote(const string_type& str,
// For whatever reason, we must quote this string.
string_type result;
result.push_back('"');
- for (typename string_type::const_iterator ci(str.begin()), cend(str.end()); ci != cend; ++ci)
+ for (typename const S8 c : str)
{
- if (*ci == '"')
+ if (c == '"')
{
result.append(escape);
}
- result.push_back(*ci);
+ result.push_back(c);
}
result.push_back('"');
return result;
diff --git a/indra/llcommon/llstringtable.cpp b/indra/llcommon/llstringtable.cpp
index f288999964b2dd5336fc6a03792f0160e2a6bf6f..92a5e777a611713efdda85514601fb0bab536b7f 100644
--- a/indra/llcommon/llstringtable.cpp
+++ b/indra/llcommon/llstringtable.cpp
@@ -89,9 +89,8 @@ LLStringTable::~LLStringTable()
{
if (mStringList[i])
{
- string_list_t::iterator iter;
- for (iter = mStringList[i]->begin(); iter != mStringList[i]->end(); iter++)
- delete *iter; // *iter = (LLStringTableEntry*)
+ for (LLStringTableEntry* entry : *mStringList[i])
+ delete entry;
}
delete mStringList[i];
}
@@ -156,9 +155,9 @@ LLStringTableEntry* LLStringTable::checkStringEntry(const char *str)
if (str)
{
char *ret_val;
- LLStringTableEntry *entry;
U32 hash_value = hash_my_string(str, mMaxEntries);
#if STRING_TABLE_HASH_MAP
+ LLStringTableEntry *entry;
#if 1 // Microsoft
string_hash_t::iterator lower = mStringHash.lower_bound(hash_value);
string_hash_t::iterator upper = mStringHash.upper_bound(hash_value);
@@ -180,10 +179,8 @@ LLStringTableEntry* LLStringTable::checkStringEntry(const char *str)
string_list_t *strlist = mStringList[hash_value];
if (strlist)
{
- string_list_t::iterator iter;
- for (iter = strlist->begin(); iter != strlist->end(); iter++)
+ for (LLStringTableEntry* entry : *strlist)
{
- entry = *iter;
ret_val = entry->mString;
if (!strncmp(ret_val, str, MAX_STRINGS_LENGTH))
{
@@ -226,9 +223,9 @@ LLStringTableEntry* LLStringTable::addStringEntry(const char *str)
if (str)
{
char *ret_val = NULL;
- LLStringTableEntry *entry;
U32 hash_value = hash_my_string(str, mMaxEntries);
#if STRING_TABLE_HASH_MAP
+ LLStringTableEntry *entry;
#if 1 // Microsoft
string_hash_t::iterator lower = mStringHash.lower_bound(hash_value);
string_hash_t::iterator upper = mStringHash.upper_bound(hash_value);
@@ -257,10 +254,8 @@ LLStringTableEntry* LLStringTable::addStringEntry(const char *str)
if (strlist)
{
- string_list_t::iterator iter;
- for (iter = strlist->begin(); iter != strlist->end(); iter++)
+ for (LLStringTableEntry* entry : *strlist)
{
- entry = *iter;
ret_val = entry->mString;
if (!strncmp(ret_val, str, MAX_STRINGS_LENGTH))
{
@@ -294,10 +289,10 @@ void LLStringTable::removeString(const char *str)
if (str)
{
char *ret_val;
- LLStringTableEntry *entry;
U32 hash_value = hash_my_string(str, mMaxEntries);
#if STRING_TABLE_HASH_MAP
{
+ LLStringTableEntry *entry;
#if 1 // Microsoft
string_hash_t::iterator lower = mStringHash.lower_bound(hash_value);
string_hash_t::iterator upper = mStringHash.upper_bound(hash_value);
@@ -331,10 +326,8 @@ void LLStringTable::removeString(const char *str)
if (strlist)
{
- string_list_t::iterator iter;
- for (iter = strlist->begin(); iter != strlist->end(); iter++)
+ for (LLStringTableEntry* entry : *strlist)
{
- entry = *iter;
ret_val = entry->mString;
if (!strncmp(ret_val, str, MAX_STRINGS_LENGTH))
{
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h
index ff09e7167719e5882ec6321465376b174cecce9b..0a292c8bacdea92a52ec116ac403f59122517b31 100644
--- a/indra/llcommon/llstringtable.h
+++ b/indra/llcommon/llstringtable.h
@@ -136,9 +136,9 @@ class LL_COMMON_API LLStdStringTable
for (S32 i = 0; i<mTableSize; i++)
{
string_set_t& stringset = mStringList[i];
- for (string_set_t::iterator iter = stringset.begin(); iter != stringset.end(); iter++)
+ for (LLStdStringHandle str : stringset)
{
- delete *iter;
+ delete str;
}
stringset.clear();
}
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index a8b5c7b3a8a8dfd563946f1354e8331e11bae76d..91cb65b815a8cab24a123a91f9e2c827207ebef4 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -273,7 +273,7 @@ LLOSInfo::LLOSInfo() :
{
const char * DARWIN_PRODUCT_NAME = "Mac OS X";
- S32 major_version, minor_version, bugfix_version = 0;
+ int64_t major_version, minor_version, bugfix_version = 0;
if (LLGetDarwinOSInfo(major_version, minor_version, bugfix_version))
{
@@ -454,14 +454,14 @@ LLOSInfo::LLOSInfo() :
#ifndef LL_WINDOWS
// static
-S32 LLOSInfo::getMaxOpenFiles()
+long LLOSInfo::getMaxOpenFiles()
{
- const S32 OPEN_MAX_GUESS = 256;
+ const long OPEN_MAX_GUESS = 256;
#ifdef OPEN_MAX
- static S32 open_max = OPEN_MAX;
+ static long open_max = OPEN_MAX;
#else
- static S32 open_max = 0;
+ static long open_max = 0;
#endif
if (0 == open_max)
@@ -909,7 +909,7 @@ void LLMemoryInfo::stream(std::ostream& s) const
// Now stream stats
BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap))
{
- s << pfx << std::setw(key_width+1) << (pair.first + ':') << ' ';
+ s << pfx << std::setw(narrow(key_width+1)) << (pair.first + ':') << ' ';
LLSD value(pair.second);
if (value.isInteger())
s << std::setw(12) << value.asInteger();
@@ -1280,7 +1280,7 @@ class FrameWatcher
<< " seconds ";
}
- S32 precision = LL_CONT.precision();
+ auto precision = LL_CONT.precision();
LL_CONT << std::fixed << std::setprecision(1) << framerate << '\n'
<< LLMemoryInfo();
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index 5ffbf5a732b07a2659350f92310349fd4f319a44..70a03810c5d948bd6eed1c3291549c5b18e552c1 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -59,7 +59,7 @@ class LL_COMMON_API LLOSInfo : public LLSingleton<LLOSInfo>
S32 mBuild;
#ifndef LL_WINDOWS
- static S32 getMaxOpenFiles();
+ static long getMaxOpenFiles();
#endif
static bool is64Bit();
diff --git a/indra/llcommon/llsys_objc.h b/indra/llcommon/llsys_objc.h
index 35599a574b7212c9eb00e3be9522283a0a760973..b48ff97bdbeae96e9856a31f077b12123c8b1867 100644
--- a/indra/llcommon/llsys_objc.h
+++ b/indra/llcommon/llsys_objc.h
@@ -27,7 +27,11 @@
#ifndef LL_LLSYS_OBJC_H
#define LL_LLSYS_OBJC_H
-bool LLGetDarwinOSInfo(int &major, int &minor, int &patch);
+#include <cstdint>
+
+// C++ land doesn't define NSInteger, and we don't want to introduce that for
+// this one case, so use int64_t instead (which is equivalent).
+bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch);
#endif // LL_LLSYS_OBJC_H
diff --git a/indra/llcommon/llsys_objc.mm b/indra/llcommon/llsys_objc.mm
index cdb1e320d5c7924895c1630be6bedbf1c90352bb..3fd85fb1c9c61e0665c67cda9f9ca610aeab5b44 100644
--- a/indra/llcommon/llsys_objc.mm
+++ b/indra/llcommon/llsys_objc.mm
@@ -27,12 +27,12 @@
#import "llsys_objc.h"
#import <AppKit/AppKit.h>
-static int intAtStringIndex(NSArray *array, int index)
+static auto intAtStringIndex(NSArray *array, int index)
{
return [(NSString *)[array objectAtIndex:index] integerValue];
}
-bool LLGetDarwinOSInfo(int &major, int &minor, int &patch)
+bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch)
{
if (NSAppKitVersionNumber > NSAppKitVersionNumber10_8)
{
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
index 68d79cdd12d7d565d824bdd6f981e8dbca8d0b7f..f396a71e6f713c352c14d965ebd6ac955e1e159e 100644
--- a/indra/llcommon/llthreadsafequeue.h
+++ b/indra/llcommon/llthreadsafequeue.h
@@ -82,7 +82,7 @@ class LLThreadSafeQueue
// Limiting the number of pending items prevents unbounded growth of the
// underlying queue.
- LLThreadSafeQueue(U32 capacity = 1024);
+ LLThreadSafeQueue(size_t capacity = 1024);
virtual ~LLThreadSafeQueue() {}
// Add an element to the queue (will block if the queue has reached
@@ -179,7 +179,7 @@ class LLThreadSafeQueue
protected:
typedef QueueT queue_type;
QueueT mStorage;
- U32 mCapacity;
+ size_t mCapacity;
bool mClosed;
boost::fibers::timed_mutex mLock;
@@ -262,7 +262,7 @@ namespace LL
* LLThreadSafeQueue implementation
*****************************************************************************/
template<typename ElementT, typename QueueT>
-LLThreadSafeQueue<ElementT, QueueT>::LLThreadSafeQueue(U32 capacity) :
+LLThreadSafeQueue<ElementT, QueueT>::LLThreadSafeQueue(size_t capacity) :
mCapacity(capacity),
mClosed(false)
{
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index aaa6df325cb741060c7b66c0ee2c0c5a0462760b..74ec62d347c93c7e2e0c072c457877afc3251666 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -123,7 +123,7 @@ U32 micro_sleep(U64 us, U32 max_yields)
// interrupts at 250 Hz (every 4,000 microseconds).
const U64 KERNEL_SLEEP_INTERVAL_US = 4000;
- S32 num_sleep_intervals = (us - (KERNEL_SLEEP_INTERVAL_US >> 1)) / KERNEL_SLEEP_INTERVAL_US;
+ auto num_sleep_intervals = (us - (KERNEL_SLEEP_INTERVAL_US >> 1)) / KERNEL_SLEEP_INTERVAL_US;
if (num_sleep_intervals > 0)
{
U64 sleep_time = (num_sleep_intervals * KERNEL_SLEEP_INTERVAL_US) - (KERNEL_SLEEP_INTERVAL_US >> 1);
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp
index acdda5fe1e2af3ad7af9da39e54dc8d1febbaf50..ff671a837089be312599ff7c9f010a8a61bd7e83 100644
--- a/indra/llcommon/lltrace.cpp
+++ b/indra/llcommon/lltrace.cpp
@@ -65,7 +65,7 @@ void TimeBlockTreeNode::setParent( BlockTimerStatHandle* parent )
llassert_always(parent != mBlock);
llassert_always(parent != NULL);
- TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(parent->getIndex());
+ TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(narrow(parent->getIndex()));
if (!parent_tree_node) return;
if (mParent)
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index fcd8753f753004dfca5c7fed93a90b78544ab943..580cf0a5fdb7e76aa613f9ed3d754a6bab4ab732 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -340,7 +340,7 @@ inline void claim_alloc(MemStatHandle& measurement, const T& value)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
#if LL_TRACE_ENABLED
- S32 size = MeasureMem<T>::measureFootprint(value);
+ auto size = MeasureMem<T>::measureFootprint(value);
if(size == 0) return;
MemAccumulator& accumulator = measurement.getCurrentAccumulator();
accumulator.mSize.sample(accumulator.mSize.hasValue() ? accumulator.mSize.getLastValue() + (F64)size : (F64)size);
@@ -353,7 +353,7 @@ inline void disclaim_alloc(MemStatHandle& measurement, const T& value)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
#if LL_TRACE_ENABLED
- S32 size = MeasureMem<T>::measureFootprint(value);
+ auto size = MeasureMem<T>::measureFootprint(value);
if(size == 0) return;
MemAccumulator& accumulator = measurement.getCurrentAccumulator();
accumulator.mSize.sample(accumulator.mSize.hasValue() ? accumulator.mSize.getLastValue() - (F64)size : -(F64)size);
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp
index fe447d531923d7c4a8cb15614993b5941743ab8b..6bd886ae98aff6bf4e64b61412fbf7d88f9be05e 100644
--- a/indra/llcommon/lltraceaccumulators.cpp
+++ b/indra/llcommon/lltraceaccumulators.cpp
@@ -96,9 +96,9 @@ void AccumulatorBufferGroup::makeCurrent()
ThreadRecorder* thread_recorder = get_thread_recorder();
AccumulatorBuffer<TimeBlockAccumulator>& timer_accumulator_buffer = mStackTimers;
// update stacktimer parent pointers
- for (S32 i = 0, end_i = mStackTimers.size(); i < end_i; i++)
+ for (size_t i = 0, end_i = mStackTimers.size(); i < end_i; i++)
{
- TimeBlockTreeNode* tree_node = thread_recorder->getTimeBlockTreeNode(i);
+ TimeBlockTreeNode* tree_node = thread_recorder->getTimeBlockTreeNode(narrow(i));
if (tree_node)
{
timer_accumulator_buffer[i].mParent = tree_node->mParent;
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index 8cbb0db135292216143bd0553c8cebd11d2b2bb2..a8dcc5226afafd0401bd7eb7a7e93447421123fb 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -606,7 +606,8 @@ void PeriodicRecording::nextPeriod()
mCurPeriod = (mCurPeriod + 1) % mRecordingPeriods.size();
old_recording.splitTo(getCurRecording());
- mNumRecordedPeriods = llmin((S32)mRecordingPeriods.size() - 1, mNumRecordedPeriods + 1);
+ mNumRecordedPeriods = mRecordingPeriods.empty()? 0 :
+ llmin(mRecordingPeriods.size() - 1, mNumRecordedPeriods + 1);
}
void PeriodicRecording::appendRecording(Recording& recording)
@@ -625,21 +626,21 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
getCurRecording().update();
other.getCurRecording().update();
- const S32 other_recording_slots = other.mRecordingPeriods.size();
- const S32 other_num_recordings = other.getNumRecordedPeriods();
- const S32 other_current_recording_index = other.mCurPeriod;
- const S32 other_oldest_recording_index = (other_current_recording_index + other_recording_slots - other_num_recordings) % other_recording_slots;
+ const auto other_recording_slots = other.mRecordingPeriods.size();
+ const auto other_num_recordings = other.getNumRecordedPeriods();
+ const auto other_current_recording_index = other.mCurPeriod;
+ const auto other_oldest_recording_index = (other_current_recording_index + other_recording_slots - other_num_recordings) % other_recording_slots;
// append first recording into our current slot
getCurRecording().appendRecording(other.mRecordingPeriods[other_oldest_recording_index]);
// from now on, add new recordings for everything after the first
- S32 other_index = (other_oldest_recording_index + 1) % other_recording_slots;
+ auto other_index = (other_oldest_recording_index + 1) % other_recording_slots;
if (mAutoResize)
{
// push back recordings for everything in the middle
- S32 other_index = (other_oldest_recording_index + 1) % other_recording_slots;
+ auto other_index = (other_oldest_recording_index + 1) % other_recording_slots;
while (other_index != other_current_recording_index)
{
mRecordingPeriods.push_back(other.mRecordingPeriods[other_index]);
@@ -652,8 +653,8 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
mRecordingPeriods.push_back(other.mRecordingPeriods[other_current_recording_index]);
}
- mCurPeriod = mRecordingPeriods.size() - 1;
- mNumRecordedPeriods = mRecordingPeriods.size() - 1;
+ mCurPeriod = mRecordingPeriods.empty()? 0 : mRecordingPeriods.size() - 1;
+ mNumRecordedPeriods = mCurPeriod;
}
else
{
@@ -682,7 +683,7 @@ void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
llassert(num_to_copy >= 1);
// advance to last recording period copied, and make that our current period
mCurPeriod = (mCurPeriod + num_to_copy - 1) % mRecordingPeriods.size();
- mNumRecordedPeriods = llmin((S32)mRecordingPeriods.size() - 1, mNumRecordedPeriods + num_to_copy - 1);
+ mNumRecordedPeriods = llmin(mRecordingPeriods.size() - 1, mNumRecordedPeriods + num_to_copy - 1);
}
// end with fresh period, otherwise next appendPeriodicRecording() will merge the first
@@ -695,10 +696,10 @@ F64Seconds PeriodicRecording::getDuration() const
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
F64Seconds duration;
- S32 num_periods = mRecordingPeriods.size();
- for (S32 i = 1; i <= num_periods; i++)
+ auto num_periods = mRecordingPeriods.size();
+ for (size_t i = 1; i <= num_periods; i++)
{
- S32 index = (mCurPeriod + num_periods - i) % num_periods;
+ auto index = (mCurPeriod + num_periods - i) % num_periods;
duration += mRecordingPeriods[index].getDuration();
}
return duration;
@@ -734,16 +735,16 @@ const Recording& PeriodicRecording::getCurRecording() const
return mRecordingPeriods[mCurPeriod];
}
-Recording& PeriodicRecording::getPrevRecording( S32 offset )
+Recording& PeriodicRecording::getPrevRecording( size_t offset )
{
- S32 num_periods = mRecordingPeriods.size();
+ auto num_periods = mRecordingPeriods.size();
offset = llclamp(offset, 0, num_periods - 1);
return mRecordingPeriods[(mCurPeriod + num_periods - offset) % num_periods];
}
-const Recording& PeriodicRecording::getPrevRecording( S32 offset ) const
+const Recording& PeriodicRecording::getPrevRecording( size_t offset ) const
{
- S32 num_periods = mRecordingPeriods.size();
+ auto num_periods = mRecordingPeriods.size();
offset = llclamp(offset, 0, num_periods - 1);
return mRecordingPeriods[(mCurPeriod + num_periods - offset) % num_periods];
}
@@ -772,11 +773,9 @@ void PeriodicRecording::handleReset()
}
else
{
- for (std::vector<Recording>::iterator it = mRecordingPeriods.begin(), end_it = mRecordingPeriods.end();
- it != end_it;
- ++it)
+ for (Recording& rec : mRecordingPeriods)
{
- it->reset();
+ rec.reset();
}
}
mCurPeriod = 0;
@@ -790,7 +789,7 @@ void PeriodicRecording::handleSplitTo(PeriodicRecording& other)
getCurRecording().splitTo(other.getCurRecording());
}
-F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -812,7 +811,7 @@ F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, S32
: NaN;
}
-F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -835,7 +834,7 @@ F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, S32
}
// calculates means using aggregates per period
-F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -858,7 +857,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, S3
: NaN;
}
-F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -883,7 +882,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulat
: NaN;
}
-F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -905,7 +904,7 @@ F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, S3
: NaN;
}
-F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, S32 num_periods /*= S32_MAX*/)
+F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -928,7 +927,7 @@ F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, S32
}
-F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -951,7 +950,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, S
: NaN;
}
-F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -977,7 +976,7 @@ F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat,
return F64((buf.size() % 2 == 0) ? (buf[buf.size() / 2 - 1] + buf[buf.size() / 2]) / 2 : buf[buf.size() / 2]);
}
-F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1003,7 +1002,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumula
}
-F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1018,12 +1017,12 @@ F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& st
return min_val;
}
-F64Kilobytes PeriodicRecording::getPeriodMin(const MemStatHandle& stat, S32 num_periods)
+F64Kilobytes PeriodicRecording::getPeriodMin(const MemStatHandle& stat, size_t num_periods)
{
return getPeriodMin(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
}
-F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& stat, S32 num_periods /*= S32_MAX*/)
+F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1038,12 +1037,12 @@ F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& sta
return max_val;
}
-F64Kilobytes PeriodicRecording::getPeriodMax(const MemStatHandle& stat, S32 num_periods)
+F64Kilobytes PeriodicRecording::getPeriodMax(const MemStatHandle& stat, size_t num_periods)
{
return getPeriodMax(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
}
-F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1059,12 +1058,12 @@ F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& s
return mean / F64(num_periods);
}
-F64Kilobytes PeriodicRecording::getPeriodMean(const MemStatHandle& stat, S32 num_periods)
+F64Kilobytes PeriodicRecording::getPeriodMean(const MemStatHandle& stat, size_t num_periods)
{
return getPeriodMean(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
}
-F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAccumulator>& stat, S32 num_periods /*= S32_MAX*/ )
+F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAccumulator>& stat, size_t num_periods /*= S32_MAX*/ )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -1089,7 +1088,7 @@ F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAc
: NaN);
}
-F64Kilobytes PeriodicRecording::getPeriodStandardDeviation(const MemStatHandle& stat, S32 num_periods)
+F64Kilobytes PeriodicRecording::getPeriodStandardDeviation(const MemStatHandle& stat, size_t num_periods)
{
return getPeriodStandardDeviation(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
}
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 556b7470cf56afb6e5bd94944b44bddb4bfc8e0a..8b56721f42f1ef7f219642bd319d993e100c4dcf 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -334,7 +334,7 @@ namespace LLTrace
~PeriodicRecording();
void nextPeriod();
- S32 getNumRecordedPeriods()
+ auto getNumRecordedPeriods()
{
// current period counts if not active
return mNumRecordedPeriods + (isStarted() ? 0 : 1);
@@ -348,24 +348,24 @@ namespace LLTrace
const Recording& getLastRecording() const;
Recording& getCurRecording();
const Recording& getCurRecording() const;
- Recording& getPrevRecording(S32 offset);
- const Recording& getPrevRecording(S32 offset) const;
+ Recording& getPrevRecording(size_t offset);
+ const Recording& getPrevRecording(size_t offset) const;
Recording snapshotCurRecording() const;
template <typename T>
- S32 getSampleCount(const StatType<T>& stat, S32 num_periods = S32_MAX)
- {
- LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+ auto getSampleCount(const StatType<T>& stat, size_t num_periods = S32_MAX)
+ {
+ LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
- S32 num_samples = 0;
- for (S32 i = 1; i <= num_periods; i++)
+ size_t num_samples = 0;
+ for (size_t i = 1; i <= num_periods; i++)
{
Recording& recording = getPrevRecording(i);
num_samples += recording.getSampleCount(stat);
}
return num_samples;
- }
+ }
//
// PERIODIC MIN
@@ -373,7 +373,7 @@ namespace LLTrace
// catch all for stats that have a defined sum
template <typename T>
- typename T::value_t getPeriodMin(const StatType<T>& stat, S32 num_periods = S32_MAX)
+ typename T::value_t getPeriodMin(const StatType<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -396,33 +396,33 @@ namespace LLTrace
}
template<typename T>
- T getPeriodMin(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ T getPeriodMin(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return T(getPeriodMin(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMin(const StatType<SampleAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMin(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- T getPeriodMin(const SampleStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ T getPeriodMin(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return T(getPeriodMin(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMin(const StatType<EventAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMin(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- T getPeriodMin(const EventStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ T getPeriodMin(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return T(getPeriodMin(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
}
- F64Kilobytes getPeriodMin(const StatType<MemAccumulator>& stat, S32 num_periods = S32_MAX);
- F64Kilobytes getPeriodMin(const MemStatHandle& stat, S32 num_periods = S32_MAX);
+ F64Kilobytes getPeriodMin(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
+ F64Kilobytes getPeriodMin(const MemStatHandle& stat, size_t num_periods = S32_MAX);
template <typename T>
- typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMinPerSec(const StatType<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMinPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -437,7 +437,7 @@ namespace LLTrace
}
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMinPerSec(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMinPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMinPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
@@ -449,7 +449,7 @@ namespace LLTrace
// catch all for stats that have a defined sum
template <typename T>
- typename T::value_t getPeriodMax(const StatType<T>& stat, S32 num_periods = S32_MAX)
+ typename T::value_t getPeriodMax(const StatType<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -472,33 +472,33 @@ namespace LLTrace
}
template<typename T>
- T getPeriodMax(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ T getPeriodMax(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return T(getPeriodMax(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMax(const StatType<SampleAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- T getPeriodMax(const SampleStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ T getPeriodMax(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return T(getPeriodMax(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMax(const StatType<EventAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMax(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- T getPeriodMax(const EventStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ T getPeriodMax(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return T(getPeriodMax(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
}
- F64Kilobytes getPeriodMax(const StatType<MemAccumulator>& stat, S32 num_periods = S32_MAX);
- F64Kilobytes getPeriodMax(const MemStatHandle& stat, S32 num_periods = S32_MAX);
+ F64Kilobytes getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
+ F64Kilobytes getPeriodMax(const MemStatHandle& stat, size_t num_periods = S32_MAX);
template <typename T>
- typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMaxPerSec(const StatType<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMaxPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -513,7 +513,7 @@ namespace LLTrace
}
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMaxPerSec(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMaxPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMaxPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
@@ -525,7 +525,7 @@ namespace LLTrace
// catch all for stats that have a defined sum
template <typename T>
- typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMean(const StatType<T >& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMean(const StatType<T >& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -546,32 +546,32 @@ namespace LLTrace
}
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMean(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMean(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMean(const StatType<SampleAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMean(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMean(const SampleStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMean(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMean(const StatType<EventAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMean(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMean(const EventStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMean(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
}
- F64Kilobytes getPeriodMean(const StatType<MemAccumulator>& stat, S32 num_periods = S32_MAX);
- F64Kilobytes getPeriodMean(const MemStatHandle& stat, S32 num_periods = S32_MAX);
+ F64Kilobytes getPeriodMean(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
+ F64Kilobytes getPeriodMean(const MemStatHandle& stat, size_t num_periods = S32_MAX);
template <typename T>
- typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMeanPerSec(const StatType<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMeanPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -593,16 +593,16 @@ namespace LLTrace
}
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMeanPerSec(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMeanPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMeanPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
}
- F64 getPeriodMedian( const StatType<SampleAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
template <typename T>
- typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMedianPerSec(const StatType<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMedianPerSec(const StatType<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
num_periods = llmin(num_periods, getNumRecordedPeriods());
@@ -622,7 +622,7 @@ namespace LLTrace
}
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodMedianPerSec(const CountStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodMedianPerSec(const CountStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodMedianPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
@@ -632,25 +632,25 @@ namespace LLTrace
// PERIODIC STANDARD DEVIATION
//
- F64 getPeriodStandardDeviation(const StatType<SampleAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodStandardDeviation(const StatType<SampleAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const SampleStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const SampleStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodStandardDeviation(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
}
- F64 getPeriodStandardDeviation(const StatType<EventAccumulator>& stat, S32 num_periods = S32_MAX);
+ F64 getPeriodStandardDeviation(const StatType<EventAccumulator>& stat, size_t num_periods = S32_MAX);
template<typename T>
- typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const EventStatHandle<T>& stat, S32 num_periods = S32_MAX)
+ typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const EventStatHandle<T>& stat, size_t num_periods = S32_MAX)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
return typename RelatedTypes<T>::fractional_t(getPeriodStandardDeviation(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
}
- F64Kilobytes getPeriodStandardDeviation(const StatType<MemAccumulator>& stat, S32 num_periods = S32_MAX);
- F64Kilobytes getPeriodStandardDeviation(const MemStatHandle& stat, S32 num_periods = S32_MAX);
+ F64Kilobytes getPeriodStandardDeviation(const StatType<MemAccumulator>& stat, size_t num_periods = S32_MAX);
+ F64Kilobytes getPeriodStandardDeviation(const MemStatHandle& stat, size_t num_periods = S32_MAX);
private:
// implementation for LLStopWatchControlsMixin
@@ -662,8 +662,8 @@ namespace LLTrace
private:
std::vector<Recording> mRecordingPeriods;
const bool mAutoResize;
- S32 mCurPeriod;
- S32 mNumRecordedPeriods;
+ size_t mCurPeriod;
+ size_t mNumRecordedPeriods;
};
PeriodicRecording& get_frame_recording();
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index 26db15eaa0be7ef682786170d172a884235cb87a..282c454a2aa1f4b424f274947e3bcebc9b1f5557 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -125,7 +125,7 @@ ThreadRecorder::~ThreadRecorder()
#endif
}
-TimeBlockTreeNode* ThreadRecorder::getTimeBlockTreeNode( S32 index )
+TimeBlockTreeNode* ThreadRecorder::getTimeBlockTreeNode( size_t index )
{
#if LL_TRACE_ENABLED
if (0 <= index && index < mNumTimeBlockTreeNodes)
@@ -284,13 +284,11 @@ void ThreadRecorder::pullFromChildren()
AccumulatorBufferGroup& target_recording_buffers = mActiveRecordings.back()->mPartialRecording;
target_recording_buffers.sync();
- for (child_thread_recorder_list_t::iterator it = mChildThreadRecorders.begin(), end_it = mChildThreadRecorders.end();
- it != end_it;
- ++it)
- { LLMutexLock lock(&(*it)->mSharedRecordingMutex);
+ for (LLTrace::ThreadRecorder* rec : mChildThreadRecorders)
+ { LLMutexLock lock(&(rec->mSharedRecordingMutex));
- target_recording_buffers.merge((*it)->mSharedRecordingBuffers);
- (*it)->mSharedRecordingBuffers.reset();
+ target_recording_buffers.merge(rec->mSharedRecordingBuffers);
+ rec->mSharedRecordingBuffers.reset();
}
}
#endif
diff --git a/indra/llcommon/lltracethreadrecorder.h b/indra/llcommon/lltracethreadrecorder.h
index 8fd1e5ef58cc4df9bf1a41c7aa9f316d221995a3..8ee6729ac6de0f1a3f26aa05f97fc4110aa7e08c 100644
--- a/indra/llcommon/lltracethreadrecorder.h
+++ b/indra/llcommon/lltracethreadrecorder.h
@@ -57,7 +57,7 @@ namespace LLTrace
void pullFromChildren();
void pushToParent();
- TimeBlockTreeNode* getTimeBlockTreeNode(S32 index);
+ TimeBlockTreeNode* getTimeBlockTreeNode(size_t index);
protected:
void init();
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index 22711a83d2e70b0cb76ec5ce3f289daea638504f..4fb92a8f3ed97c3a684d4acd901c840395d78a45 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -663,9 +663,9 @@ LLSD LLURI::pathArray() const
tokenizer::iterator end = tokens.end();
LLSD params;
- for ( ; it != end; ++it)
+ for (const std::string& str : tokens)
{
- params.append(*it);
+ params.append(str);
}
return params;
}
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
index 4b91b2cacaf4007ab467ff4a7c505a7e32ff8826..e5eda1eac7346328077dfeda5f7cc85f98384d6f 100644
--- a/indra/llcommon/llworkerthread.cpp
+++ b/indra/llcommon/llworkerthread.cpp
@@ -69,11 +69,11 @@ void LLWorkerThread::clearDeleteList()
<< " entries in delete list." << LL_ENDL;
mDeleteMutex->lock();
- for (delete_list_t::iterator iter = mDeleteList.begin(); iter != mDeleteList.end(); ++iter)
+ for (LLWorkerClass* worker : mDeleteList)
{
- (*iter)->mRequestHandle = LLWorkerThread::nullHandle();
- (*iter)->clearFlags(LLWorkerClass::WCF_HAVE_WORK);
- delete *iter ;
+ worker->mRequestHandle = LLWorkerThread::nullHandle();
+ worker->clearFlags(LLWorkerClass::WCF_HAVE_WORK);
+ delete worker;
}
mDeleteList.clear() ;
mDeleteMutex->unlock() ;
@@ -81,9 +81,9 @@ void LLWorkerThread::clearDeleteList()
}
// virtual
-S32 LLWorkerThread::update(F32 max_time_ms)
+size_t LLWorkerThread::update(F32 max_time_ms)
{
- S32 res = LLQueuedThread::update(max_time_ms);
+ auto res = LLQueuedThread::update(max_time_ms);
// Delete scheduled workers
std::vector<LLWorkerClass*> delete_list;
std::vector<LLWorkerClass*> abort_list;
@@ -108,15 +108,12 @@ S32 LLWorkerThread::update(F32 max_time_ms)
}
mDeleteMutex->unlock();
// abort and delete after releasing mutex
- for (std::vector<LLWorkerClass*>::iterator iter = abort_list.begin();
- iter != abort_list.end(); ++iter)
+ for (LLWorkerClass* worker : abort_list)
{
- (*iter)->abortWork(false);
+ worker->abortWork(false);
}
- for (std::vector<LLWorkerClass*>::iterator iter = delete_list.begin();
- iter != delete_list.end(); ++iter)
+ for (LLWorkerClass* worker : delete_list)
{
- LLWorkerClass* worker = *iter;
if (worker->mRequestHandle)
{
// Finished but not completed
@@ -124,7 +121,7 @@ S32 LLWorkerThread::update(F32 max_time_ms)
worker->mRequestHandle = LLWorkerThread::nullHandle();
worker->clearFlags(LLWorkerClass::WCF_HAVE_WORK);
}
- delete *iter;
+ delete worker;
}
// delete and aborted entries mean there's still work to do
res += delete_list.size() + abort_list.size();
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index 0387e75c6530107a89957b7470aa0ea986df9dd1..e3004d7242c7c3552bd4886d502082719d02f06d 100644
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -88,7 +88,7 @@ class LL_COMMON_API LLWorkerThread : public LLQueuedThread
LLWorkerThread(const std::string& name, bool threaded = true, bool should_pause = false);
~LLWorkerThread();
- /*virtual*/ S32 update(F32 max_time_ms);
+ /*virtual*/ size_t update(F32 max_time_ms);
handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL);
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h
index b07805b62831271404212e025f1b9151c76eb86b..da8512169c689826cdd8ded90f97b2b34cea82f9 100644
--- a/indra/llcommon/stdtypes.h
+++ b/indra/llcommon/stdtypes.h
@@ -26,16 +26,23 @@
#ifndef LL_STDTYPES_H
#define LL_STDTYPES_H
+#include <cassert>
#include <cfloat>
#include <climits>
+#include <limits>
+#include <type_traits>
-typedef signed char S8;
+typedef signed char S8;
typedef unsigned char U8;
typedef signed short S16;
typedef unsigned short U16;
-typedef signed int S32;
+typedef signed int S32;
typedef unsigned int U32;
+// to express an index that might go negative
+// (ssize_t is provided by SOME compilers, don't collide)
+typedef typename std::make_signed<size_t>::type llssize;
+
#if LL_WINDOWS
// https://docs.microsoft.com/en-us/cpp/build/reference/zc-wchar-t-wchar-t-is-native-type
// https://docs.microsoft.com/en-us/cpp/cpp/fundamental-types-cpp
@@ -45,7 +52,7 @@ typedef unsigned int U32;
// The version of clang available with VS 2019 also defines wchar_t as __wchar_t
// which is also 16 bits.
// In any case, llwchar should be a UTF-32 type.
-typedef U32 llwchar;
+typedef U32 llwchar;
#else
typedef wchar_t llwchar;
// What we'd actually want is a simple module-scope 'if constexpr' to test
@@ -76,7 +83,7 @@ typedef double F64;
typedef S32 BOOL;
typedef U8 KEY;
typedef U32 MASK;
-typedef U32 TPACKETID;
+typedef U32 TPACKETID;
// Use #define instead of consts to avoid conversion headaches
#define S8_MAX (SCHAR_MAX)
@@ -118,4 +125,95 @@ typedef U8 LLPCode;
typedef int intptr_t;
#endif
+/*****************************************************************************
+* Narrowing
+*****************************************************************************/
+/**
+ * narrow() is used to cast a wider type to a narrower type with validation.
+ *
+ * In many cases we take the size() of a container and try to pass it to an
+ * S32 or a U32 parameter. We used to be able to assume that the size of
+ * anything we could fit into memory could be expressed as a 32-bit int. With
+ * 64-bit viewers, though, size_t as returned by size() and length() and so
+ * forth is 64 bits, and the compiler is unhappy about stuffing such values
+ * into 32-bit types.
+ *
+ * It works to force the compiler to truncate, e.g. static_cast<S32>(len) or
+ * S32(len) or (S32)len, but we can do better.
+ *
+ * For:
+ * @code
+ * std::vector<Object> container;
+ * void somefunc(S32 size);
+ * @endcode
+ * call:
+ * @code
+ * somefunc(narrow(container.size()));
+ * @endcode
+ *
+ * narrow() truncates but, in RelWithDebInfo builds, it validates (using
+ * assert()) that the passed value can validly be expressed by the destination
+ * type.
+ */
+// narrow_holder is a struct that accepts the passed value as its original
+// type and provides templated conversion functions to other types. Once we're
+// building with compilers that support Class Template Argument Deduction, we
+// can rename this class template 'narrow' and eliminate the narrow() factory
+// function below.
+template <typename FROM>
+class narrow_holder
+{
+private:
+ FROM mValue;
+
+public:
+ narrow_holder(FROM value): mValue(value) {}
+
+ /*---------------------- Narrowing unsigned to signed ----------------------*/
+ template <typename TO,
+ typename std::enable_if<std::is_unsigned<FROM>::value &&
+ std::is_signed<TO>::value,
+ bool>::type = true>
+ inline
+ operator TO() const
+ {
+ // The reason we skip the
+ // assert(value >= std::numeric_limits<TO>::lowest());
+ // like the overload below is that to perform the above comparison,
+ // the compiler promotes the signed lowest() to the unsigned FROM
+ // type, making it hugely positive -- so a reasonable 'value' will
+ // always fail the assert().
+ assert(mValue <= std::numeric_limits<TO>::max());
+ return static_cast<TO>(mValue);
+ }
+
+ /*----------------------- Narrowing all other cases ------------------------*/
+ template <typename TO,
+ typename std::enable_if<! (std::is_unsigned<FROM>::value &&
+ std::is_signed<TO>::value),
+ bool>::type = true>
+ inline
+ operator TO() const
+ {
+ // two different assert()s so we can tell which condition failed
+ assert(mValue <= std::numeric_limits<TO>::max());
+ // Funny, with floating point types min() is "positive epsilon" rather
+ // than "largest negative" -- that's lowest().
+ assert(mValue >= std::numeric_limits<TO>::lowest());
+ // Do we really expect to use this with floating point types?
+ // If so, does it matter if a very small value truncates to zero?
+ //assert(fabs(mValue) >= std::numeric_limits<TO>::min());
+ return static_cast<TO>(mValue);
+ }
+};
+
+/// narrow() factory function returns a narrow_holder<FROM>(), which can be
+/// implicitly converted to the target type.
+template <typename FROM>
+inline
+narrow_holder<FROM> narrow(FROM value)
+{
+ return { value };
+}
+
#endif
diff --git a/indra/llcommon/tests/lleventdispatcher_test.cpp b/indra/llcommon/tests/lleventdispatcher_test.cpp
index 9da1ecfd67a71fc87cf889f118c986e6b7a79ffe..966dc2c5aa2fa4882f750e2951c3688b2713d4c7 100644
--- a/indra/llcommon/tests/lleventdispatcher_test.cpp
+++ b/indra/llcommon/tests/lleventdispatcher_test.cpp
@@ -335,7 +335,7 @@ namespace tut
// Full, partial defaults arrays for params for freena(), freenb()
LLSD dft_array_full, dft_array_partial;
// Start index of partial defaults arrays
- const LLSD::Integer partial_offset;
+ const size_t partial_offset;
// Full, partial defaults maps for params for freena(), freenb()
LLSD dft_map_full, dft_map_partial;
// Most of the above are indexed by "a" or "b". Useful to have an
diff --git a/indra/llcommon/threadsafeschedule.h b/indra/llcommon/threadsafeschedule.h
index 3e0da94c0278054c894f248bf613ee222f55de00..2d82d6a15e1ae47e4767432f31394e96b5190fad 100644
--- a/indra/llcommon/threadsafeschedule.h
+++ b/indra/llcommon/threadsafeschedule.h
@@ -82,7 +82,7 @@ namespace LL
using TimePoint = ThreadSafeSchedulePrivate::TimePoint;
using Clock = TimePoint::clock;
- ThreadSafeSchedule(U32 capacity=1024):
+ ThreadSafeSchedule(size_t capacity=1024):
super(capacity)
{}
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
index e0b2876a0016167b6dc007da55e8eef869f54287..8d2e7c6a63b6fb17a586e6091e44f2917c6c4b74 100644
--- a/indra/llcorehttp/bufferarray.cpp
+++ b/indra/llcorehttp/bufferarray.cpp
@@ -196,7 +196,7 @@ size_t BufferArray::read(size_t pos, void * dst, size_t len)
return 0;
size_t result(0), offset(0);
- const int block_limit(mBlocks.size());
+ const auto block_limit(mBlocks.size());
int block_start(findBlock(pos, &offset));
if (block_start < 0)
return 0;
@@ -228,7 +228,7 @@ size_t BufferArray::write(size_t pos, const void * src, size_t len)
return 0;
size_t result(0), offset(0);
- const int block_limit(mBlocks.size());
+ const auto block_limit(mBlocks.size());
int block_start(findBlock(pos, &offset));
if (block_start >= 0)
@@ -288,7 +288,7 @@ int BufferArray::findBlock(size_t pos, size_t * ret_offset)
if (pos >= mLen)
return -1; // Doesn't exist
- const int block_limit(mBlocks.size());
+ const int block_limit(narrow(mBlocks.size()));
for (int i(0); i < block_limit; ++i)
{
if (pos < mBlocks[i]->mUsed)
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index 0dbb744bcf9985bd9f7192801356eaf7587ebbf6..ff4336d2deacd54c3c8156476e54e9ba62ca2288 100644
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -46,7 +46,7 @@ LLImageDecodeThread::~LLImageDecodeThread()
// MAIN THREAD
// virtual
-S32 LLImageDecodeThread::update(F32 max_time_ms)
+size_t LLImageDecodeThread::update(F32 max_time_ms)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
LLMutexLock lock(mCreationMutex);
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
index 1bfb0ddfd3f28ca36ff3dd1b760a61dd7cff32fa..54814c24c5785a8d9daa76276f56eb99290e2fa6 100644
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -78,7 +78,7 @@ class LLImageDecodeThread : public LLQueuedThread
handle_t decodeImage(LLImageFormatted* image,
U32 priority, S32 discard, BOOL needs_aux,
Responder* responder);
- S32 update(F32 max_time_ms);
+ size_t update(F32 max_time_ms);
// Used by unit tests to check the consistency of the thread instance
S32 tut_size();
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index be25592d541764bdc7e2d2717f307bda7ff5c2ed..ed5334d31b5ee994923cffdceae8ab9846e9307a 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2398,7 +2398,7 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
mVolumeFaces.resize(face_count);
- for (U32 i = 0; i < face_count; ++i)
+ for (size_t i = 0; i < face_count; ++i)
{
LLVolumeFace& face = mVolumeFaces[i];
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index be014e7b1e385a947b02fec00e2ffd5927d7c9f2..d310cefd1e598690b49e546813261984900c95fb 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -47,7 +47,10 @@ static const std::map<std::string, U32> DefaultPoolSizes{
};
static const U32 DEFAULT_POOL_SIZE = 5;
-const U32 LLCoprocedureManager::DEFAULT_QUEUE_SIZE = 4096;
+// SL-14399: When we teleport to a brand-new simulator, the coprocedure queue
+// gets absolutely slammed with fetch requests. Make this queue effectively
+// unlimited.
+const U32 LLCoprocedureManager::DEFAULT_QUEUE_SIZE = 1024*1024;
//=========================================================================
class LLCoprocedurePool: private boost::noncopyable
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 805af552996e68f9418d90ab74491210378bfd1c..220e0fbe84337a01294ab6830aa22774f03aefe7 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -832,55 +832,69 @@ LLSD LLModel::writeModel(
if (skinning)
{
- //write out skin weights
-
- //each influence list entry is up to 4 24-bit values
- // first 8 bits is bone index
- // last 16 bits is bone influence weight
- // a bone index of 0xFF signifies no more influences for this vertex
-
- std::stringstream ostr;
-
- for (U32 j = 0; j < face.mNumVertices; ++j)
- {
- LLVector3 pos(face.mPositions[j].getF32ptr());
-
- weight_list& weights = model[idx]->getJointInfluences(pos);
-
- S32 count = 0;
- for (weight_list::iterator iter = weights.begin(); iter != weights.end(); ++iter)
- {
- // Note joint index cannot exceed 255.
- if (iter->mJointIdx < 255 && iter->mJointIdx >= 0)
- {
- U8 idx = (U8) iter->mJointIdx;
- ostr.write((const char*) &idx, 1);
-
- U16 influence = (U16) (iter->mWeight*65535);
- ostr.write((const char*) &influence, 2);
-
- ++count;
- }
- }
- U8 end_list = 0xFF;
- if (count < 4)
- {
- ostr.write((const char*) &end_list, 1);
- }
- }
-
- //copy ostr to binary buffer
- std::string data = ostr.str();
- const U8* buff = (U8*) data.data();
- U32 bytes = data.size();
-
- LLSD::Binary w(bytes);
- for (U32 j = 0; j < bytes; ++j)
- {
- w[j] = buff[j];
- }
-
- mdl[model_names[idx]][i]["Weights"] = w;
+ if (!model[idx]->mSkinWeights.empty())
+ {
+ //write out skin weights
+
+ //each influence list entry is up to 4 24-bit values
+ // first 8 bits is bone index
+ // last 16 bits is bone influence weight
+ // a bone index of 0xFF signifies no more influences for this vertex
+
+ std::stringstream ostr;
+ for (U32 j = 0; j < face.mNumVertices; ++j)
+ {
+ LLVector3 pos(face.mPositions[j].getF32ptr());
+
+ weight_list& weights = model[idx]->getJointInfluences(pos);
+
+ S32 count = 0;
+ for (weight_list::iterator iter = weights.begin(); iter != weights.end(); ++iter)
+ {
+ // Note joint index cannot exceed 255.
+ if (iter->mJointIdx < 255 && iter->mJointIdx >= 0)
+ {
+ U8 idx = (U8)iter->mJointIdx;
+ ostr.write((const char*)&idx, 1);
+
+ U16 influence = (U16)(iter->mWeight * 65535);
+ ostr.write((const char*)&influence, 2);
+
+ ++count;
+ }
+ }
+ U8 end_list = 0xFF;
+ if (count < 4)
+ {
+ ostr.write((const char*)&end_list, 1);
+ }
+ }
+
+ //copy ostr to binary buffer
+ std::string data = ostr.str();
+ const U8* buff = (U8*)data.data();
+ U32 bytes = data.size();
+
+ LLSD::Binary w(bytes);
+ for (U32 j = 0; j < bytes; ++j)
+ {
+ w[j] = buff[j];
+ }
+
+ mdl[model_names[idx]][i]["Weights"] = w;
+ }
+ else
+ {
+ if (idx == LLModel::LOD_PHYSICS)
+ {
+ // Ex: using "bounding box"
+ LL_DEBUGS("MESHSKININFO") << "Using physics model without skin weights" << LL_ENDL;
+ }
+ else
+ {
+ LL_WARNS("MESHSKININFO") << "Attempting to use skinning without having skin weights" << LL_ENDL;
+ }
+ }
}
}
}
@@ -982,6 +996,8 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
//1. If a vertex has been weighted then we'll find it via pos and return its weight list
weight_map::iterator iterPos = mSkinWeights.begin();
weight_map::iterator iterEnd = mSkinWeights.end();
+
+ llassert(!mSkinWeights.empty());
for ( ; iterPos!=iterEnd; ++iterPos )
{
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 049226db65b3ee64088b28a7e3207e10a49179ba..79362457448268059fa8c10226ac5d2a12e0d46d 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -495,7 +495,12 @@ attributedStringInfo getSegments(NSAttributedString *str)
// e.g. OS Window for upload something or Input Window...
// mModifiers instance variable is for insertText: or insertText:replacementRange: (by Pell Smit)
mModifiers = [theEvent modifierFlags];
- unichar ch = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
+ NSString *str_no_modifiers = [theEvent charactersIgnoringModifiers];
+ unichar ch = 0;
+ if (str_no_modifiers.length)
+ {
+ ch = [str_no_modifiers characterAtIndex:0];
+ }
bool acceptsText = mHasMarkedText ? false : callKeyDown(&eventData, keycode, mModifiers, ch);
if (acceptsText &&
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6789e71e4109392d6d047e72e832812a334753ed..2f5bf7d148de7106faaef846096fdb718330c49f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16766,17 +16766,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ResetUIScaleOnFirstRun</key>
- <map>
- <key>Comment</key>
- <string>Resets the UI scale factor on first run due to changed display scaling behavior</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>360CaptureUseInterestListCap</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index c4c88d304c09bf5e841f880f66de9d805a67b55d..e6b6b1040816ecef6b12f134ee19cdd4aa887a50 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -78,7 +78,9 @@ static S32 cube_channel = -1;
static S32 diffuse_channel = -1;
static S32 bump_channel = -1;
-#define LL_BUMPLIST_MULTITHREADED 0 // TODO -- figure out why this doesn't work
+// Enabled after changing LLViewerTexture::mNeedsCreateTexture to an
+// LLAtomicBool; this should work just fine, now. HB
+#define LL_BUMPLIST_MULTITHREADED 1
// static
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp
index 31e76267e65363078d8dc1cf43ceb4656358ee48..d790c6f95ecc000cfa8d5771be16d5a461b577b1 100644
--- a/indra/newview/lllandmarklist.cpp
+++ b/indra/newview/lllandmarklist.cpp
@@ -39,12 +39,6 @@
// Globals
LLLandmarkList gLandmarkList;
-// number is mostly arbitrary, but it should be below DEFAULT_QUEUE_SIZE pool size,
-// which is 4096, to not overfill the pool if user has more than 4K of landmarks
-// and it should leave some space for other potential simultaneous asset request
-const S32 MAX_SIMULTANEOUS_REQUESTS = 512;
-
-
////////////////////////////////////////////////////////////////////////////
// LLLandmarkList
@@ -83,12 +77,6 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
loaded_callback_map_t::value_type vt(asset_uuid, cb);
mLoadedCallbackMap.insert(vt);
}
-
- if ( mWaitList.find(asset_uuid) != mWaitList.end() )
- {
- // Landmark is sheduled for download, but not requested yet
- return NULL;
- }
landmark_requested_list_t::iterator iter = mRequestedList.find(asset_uuid);
if (iter != mRequestedList.end())
@@ -100,17 +88,6 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
}
}
- if (mRequestedList.size() > MAX_SIMULTANEOUS_REQUESTS)
- {
- // Workarounds for corutines pending list size limit:
- // Postpone download till queue is emptier.
- // Coroutines have own built in 'pending' list, but unfortunately
- // it is too small compared to potential amount of landmarks
- // or assets.
- mWaitList.insert(asset_uuid);
- return NULL;
- }
-
mRequestedList[asset_uuid] = gFrameTimeSeconds;
// Note that getAssetData can callback immediately and cleans mRequestedList
@@ -197,33 +174,6 @@ void LLLandmarkList::processGetAssetReply(
gLandmarkList.mRequestedList.erase(uuid); //mBadList effectively blocks any load, so no point keeping id in requests
gLandmarkList.eraseCallbacks(uuid);
}
-
- // getAssetData can fire callback immediately, causing
- // a recursion which is suboptimal for very large wait list.
- // 'scheduling' indicates that we are inside request and
- // shouldn't be launching more requests.
- static bool scheduling = false;
- if (!scheduling && !gLandmarkList.mWaitList.empty())
- {
- scheduling = true;
- while (!gLandmarkList.mWaitList.empty() && gLandmarkList.mRequestedList.size() < MAX_SIMULTANEOUS_REQUESTS)
- {
- // start new download from wait list
- landmark_uuid_list_t::iterator iter = gLandmarkList.mWaitList.begin();
- LLUUID asset_uuid = *iter;
- gLandmarkList.mWaitList.erase(iter);
-
- // add to mRequestedList before calling getAssetData()
- gLandmarkList.mRequestedList[asset_uuid] = gFrameTimeSeconds;
-
- // Note that getAssetData can callback immediately and cleans mRequestedList
- gAssetStorage->getAssetData(asset_uuid,
- LLAssetType::AT_LANDMARK,
- LLLandmarkList::processGetAssetReply,
- NULL);
- }
- scheduling = false;
- }
}
BOOL LLLandmarkList::isAssetInLoadedCallbackMap(const LLUUID& asset_uuid)
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
index f5fa958204bb404b35ecc3d361b0e4ad938361f6..b50332b215f8227d86fba9ddbcff8e3bed268517 100644
--- a/indra/newview/lllandmarklist.h
+++ b/indra/newview/lllandmarklist.h
@@ -72,7 +72,6 @@ class LLLandmarkList
typedef std::set<LLUUID> landmark_uuid_list_t;
landmark_uuid_list_t mBadList;
- landmark_uuid_list_t mWaitList;
typedef std::map<LLUUID,F32> landmark_requested_list_t;
landmark_requested_list_t mRequestedList;
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index 0287c07f962c0573f930c3bc9994efa44d178446..c297cac771fe75f89eadce7de06de1cbeb5c3107 100644
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -143,7 +143,7 @@ void LLPathfindingNavMesh::handleNavMeshResult(const LLSD &pContent, U32 pNavMes
unsigned int binSize = value.size();
std::string newStr(reinterpret_cast<const char *>(&value[0]), binSize);
std::istringstream streamdecomp( newStr );
- unsigned int decompBinSize = 0;
+ size_t decompBinSize = 0;
bool valid = false;
U8* pUncompressedNavMeshContainer = unzip_llsdNavMesh( valid, decompBinSize, streamdecomp, binSize ) ;
if ( !valid )
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index af89b4b53b2b2835639819b5d4c46275c6df1e5b..5c6f7254f22469d0691b9d42431e2222b622f2b4 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -859,12 +859,12 @@ LLTextureCache::~LLTextureCache()
//////////////////////////////////////////////////////////////////////////////
//virtual
-S32 LLTextureCache::update(F32 max_time_ms)
+size_t LLTextureCache::update(F32 max_time_ms)
{
static LLFrameTimer timer ;
static const F32 MAX_TIME_INTERVAL = 300.f ; //seconds.
- S32 res;
+ size_t res;
res = LLWorkerThread::update(max_time_ms);
mListMutex.lock();
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index e1c752b58ed09a39e3c5e710d44bc6bcf03d0c0e..b6ace467c781c6d83d47caf2b527a56b047331f0 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -113,7 +113,7 @@ class LLTextureCache : public LLWorkerThread
LLTextureCache(bool threaded);
~LLTextureCache();
- /*virtual*/ S32 update(F32 max_time_ms);
+ /*virtual*/ size_t update(F32 max_time_ms);
void purgeCache(ELLPath location, bool remove_dir = true);
void setReadOnly(BOOL read_only) ;
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index a7dcb1a9bb2db0f2c9cd607b14d4faaae101fd08..6f6ca2be9bac616e26c4d81da2870c1dd8b810a8 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2879,9 +2879,9 @@ bool LLTextureFetch::updateRequestPriority(const LLUUID& id, F32 priority)
// Threads: T*
//virtual
-S32 LLTextureFetch::getPending()
+size_t LLTextureFetch::getPending()
{
- S32 res;
+ size_t res;
lockData(); // +Ct
{
LLMutexLock lock(&mQueueMutex); // +Mfq
@@ -2956,7 +2956,7 @@ void LLTextureFetch::commonUpdate()
// Threads: Tmain
//virtual
-S32 LLTextureFetch::update(F32 max_time_ms)
+size_t LLTextureFetch::update(F32 max_time_ms)
{
static LLCachedControl<F32> band_width(gSavedSettings,"ThrottleBandwidthKBPS", 3000.0);
@@ -2970,7 +2970,7 @@ S32 LLTextureFetch::update(F32 max_time_ms)
mNetworkQueueMutex.unlock(); // -Mfnq
}
- S32 res = LLWorkerThread::update(max_time_ms);
+ size_t res = LLWorkerThread::update(max_time_ms);
if (!mThreaded)
{
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index d087db275bb8f768ec7f52aa86ef318294b06e84..611a7d641966c88653e293b116697b41c395ae5b 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -65,7 +65,7 @@ class LLTextureFetch : public LLWorkerThread
class TFRequest;
// Threads: Tmain
- /*virtual*/ S32 update(F32 max_time_ms);
+ /*virtual*/ size_t update(F32 max_time_ms);
// called in the main thread after the TextureCacheThread shuts down.
// Threads: Tmain
@@ -131,7 +131,7 @@ class LLTextureFetch : public LLWorkerThread
U32 getTotalNumHTTPRequests();
// Threads: T*
- S32 getPending();
+ size_t getPending();
// Threads: T*
void lockQueue() { mQueueMutex.lock(); }
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 70065cb5a049698ba081585cd3cdf9076711d33a..aa9ff012c30d36af790f6d52a8b6872f14314d27 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -134,14 +134,6 @@ LLViewerAssetStorage::~LLViewerAssetStorage()
// This class has dedicated coroutine pool, clean it up, otherwise coroutines will crash later.
LLCoprocedureManager::instance().close(VIEWER_ASSET_STORAGE_CORO_POOL);
}
-
- while (mCoroWaitList.size() > 0)
- {
- CoroWaitList &request = mCoroWaitList.front();
- // Clean up pending downloads, delete request and trigger callbacks
- removeAndCallbackPendingDownloads(request.mId, request.mType, request.mId, request.mType, LL_ERR_NOERR, LLExtStat::NONE);
- mCoroWaitList.pop_front();
- }
}
// virtual
@@ -346,28 +338,6 @@ void LLViewerAssetStorage::storeAssetData(
}
}
-void LLViewerAssetStorage::checkForTimeouts()
-{
- LLAssetStorage::checkForTimeouts();
-
- // Restore requests
- LLCoprocedureManager* manager = LLCoprocedureManager::getInstance();
- while (mCoroWaitList.size() > 0
- && manager->count(VIEWER_ASSET_STORAGE_CORO_POOL) < (LLCoprocedureManager::DEFAULT_QUEUE_SIZE - 1))
- {
- CoroWaitList &request = mCoroWaitList.front();
-
- bool with_http = true;
- bool is_temp = false;
- LLViewerAssetStatsFF::record_enqueue(request.mType, with_http, is_temp);
-
- manager->enqueueCoprocedure(VIEWER_ASSET_STORAGE_CORO_POOL, "LLViewerAssetStorage::assetRequestCoro",
- boost::bind(&LLViewerAssetStorage::assetRequestCoro, this, request.mRequest, request.mId, request.mType, request.mCallback, request.mUserData));
-
- mCoroWaitList.pop_front();
- }
-}
-
/**
* @brief Allocate and queue an asset fetch request for the viewer
*
@@ -424,21 +394,18 @@ void LLViewerAssetStorage::queueRequestHttp(
// This is the same as the current UDP logic - don't re-request a duplicate.
if (!duplicate)
{
- // Coroutine buffer has fixed size (synchronization buffer, so we have no alternatives), so buffer any request above limit
LLCoprocedureManager* manager = LLCoprocedureManager::getInstance();
- if (manager->count(VIEWER_ASSET_STORAGE_CORO_POOL) < (LLCoprocedureManager::DEFAULT_QUEUE_SIZE - 1))
- {
- bool with_http = true;
- bool is_temp = false;
- LLViewerAssetStatsFF::record_enqueue(atype, with_http, is_temp);
-
- manager->enqueueCoprocedure(VIEWER_ASSET_STORAGE_CORO_POOL, "LLViewerAssetStorage::assetRequestCoro",
- boost::bind(&LLViewerAssetStorage::assetRequestCoro, this, req, uuid, atype, callback, user_data));
- }
- else
- {
- mCoroWaitList.emplace_back(req, uuid, atype, callback, user_data);
- }
+ bool with_http = true;
+ bool is_temp = false;
+ LLViewerAssetStatsFF::record_enqueue(atype, with_http, is_temp);
+ manager->enqueueCoprocedure(
+ VIEWER_ASSET_STORAGE_CORO_POOL,
+ "LLViewerAssetStorage::assetRequestCoro",
+ [this, req, uuid, atype, callback, user_data]
+ (LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t&, const LLUUID&)
+ {
+ assetRequestCoro(req, uuid, atype, callback, user_data);
+ });
}
}
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index 0965a17ce186c3c3cf5997f5d5bbdd957d44197d..c3719d0918df862b4df77d058c1160d36d13fa26 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -65,8 +65,6 @@ class LLViewerAssetStorage : public LLAssetStorage
bool user_waiting=FALSE,
F64Seconds timeout=LL_ASSET_STORAGE_TIMEOUT) override;
- void checkForTimeouts() override;
-
protected:
void _queueDataRequest(const LLUUID& uuid,
LLAssetType::EType type,
@@ -118,8 +116,6 @@ class LLViewerAssetStorage : public LLAssetStorage
LLGetAssetCallback mCallback;
void *mUserData;
};
- typedef std::list<CoroWaitList> wait_list_t;
- wait_list_t mCoroWaitList;
std::string mViewerAssetUrl;
S32 mCountRequests;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index bc0fafb29f53a2165fddacf560122b95d647bda6..031f9f6c5245ad80eca5deaa1f0d3444535bfd12 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -236,6 +236,148 @@ void display_stats()
}
}
+static void update_tp_display(bool minimized)
+{
+ static LLCachedControl<F32> teleport_arrival_delay(gSavedSettings, "TeleportArrivalDelay");
+ static LLCachedControl<F32> teleport_local_delay(gSavedSettings, "TeleportLocalDelay");
+
+ S32 attach_count = 0;
+ if (isAgentAvatarValid())
+ {
+ attach_count = gAgentAvatarp->getAttachmentCount();
+ }
+ F32 teleport_save_time = TELEPORT_EXPIRY + TELEPORT_EXPIRY_PER_ATTACHMENT * attach_count;
+ F32 teleport_elapsed = gTeleportDisplayTimer.getElapsedTimeF32();
+ F32 teleport_percent = teleport_elapsed * (100.f / teleport_save_time);
+ if (gAgent.getTeleportState() != LLAgent::TELEPORT_START && teleport_percent > 100.f)
+ {
+ // Give up. Don't keep the UI locked forever.
+ LL_WARNS("Teleport") << "Giving up on teleport. elapsed time " << teleport_elapsed << " exceeds max time " << teleport_save_time << LL_ENDL;
+ gAgent.setTeleportState(LLAgent::TELEPORT_NONE);
+ gAgent.setTeleportMessage(std::string());
+ }
+
+ // Make sure the TP progress panel gets hidden in case the viewer window
+ // is minimized *during* a TP. HB
+ if (minimized)
+ {
+ gViewerWindow->setShowProgress(FALSE);
+ }
+
+ const std::string& message = gAgent.getTeleportMessage();
+ switch (gAgent.getTeleportState())
+ {
+ case LLAgent::TELEPORT_PENDING:
+ {
+ gTeleportDisplayTimer.reset();
+ const std::string& msg = LLAgent::sTeleportProgressMessages["pending"];
+ if (!minimized)
+ {
+ gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setProgressPercent(llmin(teleport_percent, 0.0f));
+ gViewerWindow->setProgressString(msg);
+ }
+ gAgent.setTeleportMessage(msg);
+ break;
+ }
+
+ case LLAgent::TELEPORT_START:
+ {
+ // Transition to REQUESTED. Viewer has sent some kind
+ // of TeleportRequest to the source simulator
+ gTeleportDisplayTimer.reset();
+ const std::string& msg = LLAgent::sTeleportProgressMessages["requesting"];
+ LL_INFOS("Teleport") << "A teleport request has been sent, setting state to TELEPORT_REQUESTED" << LL_ENDL;
+ gAgent.setTeleportState(LLAgent::TELEPORT_REQUESTED);
+ gAgent.setTeleportMessage(msg);
+ if (!minimized)
+ {
+ gViewerWindow->setShowProgress(TRUE);
+ gViewerWindow->setProgressPercent(llmin(teleport_percent, 0.0f));
+ gViewerWindow->setProgressString(msg);
+ gViewerWindow->setProgressMessage(gAgent.mMOTD);
+ }
+ break;
+ }
+
+ case LLAgent::TELEPORT_REQUESTED:
+ // Waiting for source simulator to respond
+ if (!minimized)
+ {
+ gViewerWindow->setProgressPercent(llmin(teleport_percent, 37.5f));
+ gViewerWindow->setProgressString(message);
+ }
+ break;
+
+ case LLAgent::TELEPORT_MOVING:
+ // Viewer has received destination location from source simulator
+ if (!minimized)
+ {
+ gViewerWindow->setProgressPercent(llmin(teleport_percent, 75.f));
+ gViewerWindow->setProgressString(message);
+ }
+ break;
+
+ case LLAgent::TELEPORT_START_ARRIVAL:
+ // Transition to ARRIVING. Viewer has received avatar update, etc.,
+ // from destination simulator
+ gTeleportArrivalTimer.reset();
+ LL_INFOS("Teleport") << "Changing state to TELEPORT_ARRIVING" << LL_ENDL;
+ gAgent.setTeleportState(LLAgent::TELEPORT_ARRIVING);
+ gAgent.setTeleportMessage(LLAgent::sTeleportProgressMessages["arriving"]);
+ gAgent.sheduleTeleportIM();
+ gTextureList.mForceResetTextureStats = TRUE;
+ gAgentCamera.resetView(TRUE, TRUE);
+ if (!minimized)
+ {
+ gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
+ gViewerWindow->setProgressPercent(75.f);
+ }
+ break;
+
+ case LLAgent::TELEPORT_ARRIVING:
+ // Make the user wait while content "pre-caches"
+ {
+ F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / teleport_arrival_delay());
+ if (arrival_fraction > 1.f)
+ {
+ arrival_fraction = 1.f;
+ //LLFirstUse::useTeleport();
+ LL_INFOS("Teleport") << "arrival_fraction is " << arrival_fraction << " changing state to TELEPORT_NONE" << LL_ENDL;
+ gAgent.setTeleportState(LLAgent::TELEPORT_NONE);
+ }
+ if (!minimized)
+ {
+ gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
+ gViewerWindow->setProgressPercent(arrival_fraction * 25.f + 75.f);
+ gViewerWindow->setProgressString(message);
+ }
+ break;
+ }
+
+ case LLAgent::TELEPORT_LOCAL:
+ // Short delay when teleporting in the same sim (progress screen active but not shown - did not
+ // fall-through from TELEPORT_START)
+ {
+ if (gTeleportDisplayTimer.getElapsedTimeF32() > teleport_local_delay())
+ {
+ //LLFirstUse::useTeleport();
+ LL_INFOS("Teleport") << "State is local and gTeleportDisplayTimer " << gTeleportDisplayTimer.getElapsedTimeF32()
+ << " exceeds teleport_local_delete " << teleport_local_delay
+ << "; setting state to TELEPORT_NONE"
+ << LL_ENDL;
+ gAgent.setTeleportState(LLAgent::TELEPORT_NONE);
+ }
+ break;
+ }
+
+ case LLAgent::TELEPORT_NONE:
+ // No teleport in progress
+ gViewerWindow->setShowProgress(FALSE);
+ gTeleportDisplay = FALSE;
+ }
+}
+
static LLTrace::BlockTimerStatHandle FTM_PICK("Picking");
static LLTrace::BlockTimerStatHandle FTM_RENDER("Render");
static LLTrace::BlockTimerStatHandle FTM_RENDER_HUD("Render HUD");
@@ -326,6 +468,15 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
stop_glerror();
gViewerWindow->returnEmptyPicks();
stop_glerror();
+
+ // We still need to update the teleport progress (to get changes done
+ // in TP states, else the sim does not get the messages signaling the
+ // agent's arrival). This fixes BUG-230616. HB
+ if (gTeleportDisplay)
+ {
+ // true = minimized, do not show/update the TP screen. HB
+ update_tp_display(true);
+ }
return;
}
@@ -413,116 +564,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
{
LL_RECORD_BLOCK_TIME(FTM_TELEPORT_DISPLAY);
LLAppViewer::instance()->pingMainloopTimeout("Display:Teleport");
- static LLCachedControl<F32> teleport_arrival_delay(gSavedSettings, "TeleportArrivalDelay");
- static LLCachedControl<F32> teleport_local_delay(gSavedSettings, "TeleportLocalDelay");
-
- S32 attach_count = 0;
- if (isAgentAvatarValid())
- {
- attach_count = gAgentAvatarp->getAttachmentCount();
- }
- F32 teleport_save_time = TELEPORT_EXPIRY + TELEPORT_EXPIRY_PER_ATTACHMENT * attach_count;
- F32 teleport_elapsed = gTeleportDisplayTimer.getElapsedTimeF32();
- F32 teleport_percent = teleport_elapsed * (100.f / teleport_save_time);
- if( (gAgent.getTeleportState() != LLAgent::TELEPORT_START) && (teleport_percent > 100.f) )
- {
- // Give up. Don't keep the UI locked forever.
- LL_WARNS("Teleport") << "Giving up on teleport. elapsed time " << teleport_elapsed << " exceeds max time " << teleport_save_time << LL_ENDL;
- gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
- gAgent.setTeleportMessage(std::string());
- }
-
- const std::string& message = gAgent.getTeleportMessage();
- switch( gAgent.getTeleportState() )
- {
- case LLAgent::TELEPORT_PENDING:
- gTeleportDisplayTimer.reset();
- gViewerWindow->setShowProgress(TRUE);
- gViewerWindow->setProgressPercent(llmin(teleport_percent, 0.0f));
- gAgent.setTeleportMessage(LLAgent::sTeleportProgressMessages["pending"]);
- gViewerWindow->setProgressString(LLAgent::sTeleportProgressMessages["pending"]);
- break;
-
- case LLAgent::TELEPORT_START:
- // Transition to REQUESTED. Viewer has sent some kind
- // of TeleportRequest to the source simulator
- gTeleportDisplayTimer.reset();
- gViewerWindow->setShowProgress(TRUE);
- gViewerWindow->setProgressPercent(llmin(teleport_percent, 0.0f));
- LL_INFOS("Teleport") << "A teleport request has been sent, setting state to TELEPORT_REQUESTED" << LL_ENDL;
- gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
- gAgent.setTeleportMessage(
- LLAgent::sTeleportProgressMessages["requesting"]);
- gViewerWindow->setProgressString(LLAgent::sTeleportProgressMessages["requesting"]);
- gViewerWindow->setProgressMessage(gAgent.mMOTD);
- break;
-
- case LLAgent::TELEPORT_REQUESTED:
- // Waiting for source simulator to respond
- gViewerWindow->setProgressPercent( llmin(teleport_percent, 37.5f) );
- gViewerWindow->setProgressString(message);
- break;
-
- case LLAgent::TELEPORT_MOVING:
- // Viewer has received destination location from source simulator
- gViewerWindow->setProgressPercent( llmin(teleport_percent, 75.f) );
- gViewerWindow->setProgressString(message);
- break;
-
- case LLAgent::TELEPORT_START_ARRIVAL:
- // Transition to ARRIVING. Viewer has received avatar update, etc., from destination simulator
- gTeleportArrivalTimer.reset();
- gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
- gViewerWindow->setProgressPercent(75.f);
- LL_INFOS("Teleport") << "Changing state to TELEPORT_ARRIVING" << LL_ENDL;
- gAgent.setTeleportState( LLAgent::TELEPORT_ARRIVING );
- gAgent.setTeleportMessage(
- LLAgent::sTeleportProgressMessages["arriving"]);
- gAgent.sheduleTeleportIM();
- gTextureList.mForceResetTextureStats = TRUE;
- gAgentCamera.resetView(TRUE, TRUE);
-
- break;
-
- case LLAgent::TELEPORT_ARRIVING:
- // Make the user wait while content "pre-caches"
- {
- F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / teleport_arrival_delay());
- if( arrival_fraction > 1.f )
- {
- arrival_fraction = 1.f;
- //LLFirstUse::useTeleport();
- LL_INFOS("Teleport") << "arrival_fraction is " << arrival_fraction << " changing state to TELEPORT_NONE" << LL_ENDL;
- gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
- }
- gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
- gViewerWindow->setProgressPercent( arrival_fraction * 25.f + 75.f);
- gViewerWindow->setProgressString(message);
- }
- break;
-
- case LLAgent::TELEPORT_LOCAL:
- // Short delay when teleporting in the same sim (progress screen active but not shown - did not
- // fall-through from TELEPORT_START)
- {
- if( gTeleportDisplayTimer.getElapsedTimeF32() > teleport_local_delay() )
- {
- //LLFirstUse::useTeleport();
- LL_INFOS("Teleport") << "State is local and gTeleportDisplayTimer " << gTeleportDisplayTimer.getElapsedTimeF32()
- << " exceeds teleport_local_delete " << teleport_local_delay
- << "; setting state to TELEPORT_NONE"
- << LL_ENDL;
- gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
- }
- }
- break;
-
- case LLAgent::TELEPORT_NONE:
- // No teleport in progress
- gViewerWindow->setShowProgress(FALSE);
- gTeleportDisplay = FALSE;
- break;
- }
+ // Note: false = not minimized, do update the TP screen. HB
+ update_tp_display(false);
}
else if(LLAppViewer::instance()->logoutRequestSent())
{
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index e3ac56d0d399d4d817adcb540a1a616bf7a6ab9b..8a11c5cf8f38ecf3a29b896851844e6d0af24556 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1118,7 +1118,7 @@ void LLViewerFetchedTexture::init(bool firstinit)
mLoadedCallbackDesiredDiscardLevel = S8_MAX;
mPauseLoadedCallBacks = FALSE;
- mNeedsCreateTexture = FALSE;
+ mNeedsCreateTexture = false;
mIsRawImageValid = FALSE;
mRawDiscardLevel = INVALID_DISCARD_LEVEL;
@@ -1400,12 +1400,12 @@ void LLViewerFetchedTexture::addToCreateTexture()
{
//just update some variables, not to create a real GL texture.
createGLTexture(mRawDiscardLevel, mRawImage, 0, FALSE);
- mNeedsCreateTexture = FALSE;
+ mNeedsCreateTexture = false;
destroyRawImage();
}
else if(!force_update && getDiscardLevel() > -1 && getDiscardLevel() <= mRawDiscardLevel)
{
- mNeedsCreateTexture = FALSE;
+ mNeedsCreateTexture = false;
destroyRawImage();
}
else
@@ -1441,7 +1441,7 @@ void LLViewerFetchedTexture::addToCreateTexture()
mRawDiscardLevel += i;
if(mRawDiscardLevel >= getDiscardLevel() && getDiscardLevel() > 0)
{
- mNeedsCreateTexture = FALSE;
+ mNeedsCreateTexture = false;
destroyRawImage();
return;
}
@@ -1473,7 +1473,7 @@ BOOL LLViewerFetchedTexture::preCreateTexture(S32 usename/*= 0*/)
destroyRawImage();
return FALSE;
}
- mNeedsCreateTexture = FALSE;
+ mNeedsCreateTexture = false;
if (mRawImage.isNull())
{
@@ -1609,14 +1609,14 @@ void LLViewerFetchedTexture::postCreateTexture()
destroyRawImage();
}
- mNeedsCreateTexture = FALSE;
+ mNeedsCreateTexture = false;
}
void LLViewerFetchedTexture::scheduleCreateTexture()
{
if (!mNeedsCreateTexture)
{
- mNeedsCreateTexture = TRUE;
+ mNeedsCreateTexture = true;
if (preCreateTexture())
{
#if LL_IMAGEGL_THREAD_CHECK
@@ -1630,7 +1630,7 @@ void LLViewerFetchedTexture::scheduleCreateTexture()
memcpy(data_copy, data, size);
}
#endif
- mNeedsCreateTexture = TRUE;
+ mNeedsCreateTexture = true;
auto mainq = LLImageGLThread::sEnabled ? mMainQueue.lock() : nullptr;
if (mainq)
{
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index b953d7006b26603b993028d63e35406a14523775..2f5e0d01dfd494a4a8198332ac1c7c9fa80f9dc3 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -27,6 +27,7 @@
#ifndef LL_LLVIEWERTEXTURE_H
#define LL_LLVIEWERTEXTURE_H
+#include "llatomic.h"
#include "llgltexture.h"
#include "lltimer.h"
#include "llframetimer.h"
@@ -528,7 +529,9 @@ class LLViewerFetchedTexture : public LLViewerTexture
LLFrameTimer mStopFetchingTimer; // Time since mDecodePriority == 0.f.
BOOL mInImageList; // TRUE if image is in list (in which case don't reset priority!)
- BOOL mNeedsCreateTexture;
+ // This needs to be atomic, since it is written both in the main thread
+ // and in the GL image worker thread... HB
+ LLAtomicBool mNeedsCreateTexture;
BOOL mForSculpt ; //a flag if the texture is used as sculpt data.
BOOL mIsFetched ; //is loaded from remote or from cache, not generated locally.
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
deleted file mode 100644
index a5942eb6256ccf4ba4b5d95bae04dcb673e62743..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="HARDWARE OPSÆTNING">
- <text name="Filtering:">
- Filtrering:
- </text>
- <check_box label="Anisotropic filtrering (langsommere når aktiveret)" name="ani"/>
- <text name="Antialiasing:">
- Antialiasing:
- </text>
- <combo_box label="Antialiasing" name="fsaa" width="100">
- <combo_box.item label="Slået fra" 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">
- (kræver genstart af din Second Life klient)
- </text>
- <spinner label="Gamma:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (Lysstyrke, lavere er lysere, 0=benyt standard)
- </text>
- <text name="Enable VBO:">
- Aktivér VBO:
- </text>
- <check_box initial_value="true" label="Aktivér OpenGL Vertex Buffer objekter" name="vbo" tool_tip="Aktivér af dette på nyere hardware giver performance forbedring. På ældre hardware kan aktivering medfø nedbrud."/>
- <slider label="Tekstur hukommelse (MB):" name="GraphicsCardTextureMemory" tool_tip="Mængde hukommelse der skal allokeres til teksturer (textures). Standardindstilling er hukommelse på grafikkortet. Reduktion kan medfø bedre ydeevne, men kan samtidig gøre teksturer mere udflydende."/>
- <spinner label="TÃ¥ge: afstandsforhold:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml
deleted file mode 100644
index fc4780a34e18cb83b19c732808b1255483d3d5f6..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/da/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Redigér annoncer" name="panel_edit_classified">
- <panel.string name="location_notice">
- (vil blive opdateret efter gemning)
- </panel.string>
- <string name="publish_label">
- Publicér
- </string>
- <string name="save_label">
- Gem
- </string>
- <text name="title">
- Rediger annonce
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Klik for at vælge et billede"/>
- </panel>
- <text name="Name:">
- Titel:
- </text>
- <text name="description_label">
- Beskrivelse:
- </text>
- <text name="location_label">
- Lokation:
- </text>
- <text name="classified_location">
- henter...
- </text>
- <button label="Sæt til nuværende lokation" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Kategori:"/>
- <text name="content_type_label" value="Indholdstype:"/>
- <icons_combo_box label="Generelt" name="content_type">
- <icons_combo_box.item label="Moderat" name="mature_ci" value="Voksent"/>
- <icons_combo_box.item label="Generelt" name="pg_ci" value="PG"/>
- </icons_combo_box>
- <check_box label="Forny automatisk hver uge" name="auto_renew"/>
- <text name="price_for_listing_label" value="Pris for optagelse:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Pris for optagelse." value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="Annullér" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
deleted file mode 100644
index 3036f30240721a300ea41d10a89edfba0552330a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Redigér Pick" name="panel_edit_pick">
- <panel.string name="location_notice">
- (vil blive opdateret ved gemning)
- </panel.string>
- <text name="title">
- Redigér favorit
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Klik for at vælge billede"/>
- <text name="Name:">
- Titel:
- </text>
- <text name="description_label">
- Beskrivelse:
- </text>
- <text name="location_label">
- Lokation:
- </text>
- <text name="pick_location">
- henter...
- </text>
- <button label="Sæt til nuværende lokation" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Gem valgte" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Annullér" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
deleted file mode 100644
index 14fd48ba2fb4bcb41e139e9bc2bcbda77f2cb052..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Redigér profil" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Beboer"/>
- <string name="AcctTypeTrial" value="På prøve"/>
- <string name="AcctTypeCharterMember" value="æresmedlem"/>
- <string name="AcctTypeEmployee" value="Linden Lab medarbejder"/>
- <string name="PaymentInfoUsed" value="Betalende medlem"/>
- <string name="PaymentInfoOnFile" value="Registreret betalende"/>
- <string name="NoPaymentInfoOnFile" value="Ingen betalingsinfo"/>
- <string name="AgeVerified" value="Alders-checket"/>
- <string name="NotAgeVerified" value="Ikke alders-checket"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=da
- </string>
- <string name="no_partner_text" value="Ingen"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Visningsnavn:"/>
- <text name="solo_username_label" value="Bugernavn:"/>
- <button name="set_name" tool_tip="Sæt visningsnavn"/>
- <text name="user_label" value="Brugernavn:"/>
- <panel name="lifes_images_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Klik for at vælge et billede"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Real World:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Klik for at vælge et billede"/>
- <text name="title_homepage_text">
- Hjemmeside:
- </text>
- <check_box label="Vis mig i søgeresultater" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Min konto:"/>
- <text_editor name="acc_status_text" value="Beboer. Ingen betalingsinfo."/>
- <text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
- <text name="title_partner_text" value="Min partner:"/>
- <panel name="partner_data_panel">
- <text initial_value="(henter)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Edit]"/>
- </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="Gem ændringer" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Annullér" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml
deleted file mode 100644
index 8a5141f967a0e35fb66740565782fcd0f98cedfa..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/da/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Favorit info"/>
- <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]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Teleport" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Kort" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Rediger" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_picks.xml b/indra/newview/skins/default/xui/da/panel_picks.xml
deleted file mode 100644
index 8af68ee69ad1207ade28a4c4c061484126325a81..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/da/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Favoritter" name="panel_picks">
- <string name="no_picks" value="Ingen favoritter"/>
- <string name="no_classifieds" value="Ingen annoncer"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Favoritter"/>
- <accordion_tab name="tab_classifieds" title="Annoncer"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Opret favorit eller annonce på nuværende lokation"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Info" name="info_btn" tool_tip="Vis favoritinformation"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Teleport" name="teleport_btn" tool_tip="Teleportér til tilsvarende område"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Kort" name="show_on_map_btn" tool_tip="Vis tilsvarende område på verdenskort"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
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
deleted file mode 100644
index 8b29428c24106c1da6e13f8d3a23aeb8810754d7..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Tageszyklus bearbeiten">
- <string name="title_new">
- Neuen Tageszyklus erstellen
- </string>
- <string name="title_edit">
- Tageszyklus bearbeiten
- </string>
- <string name="hint_new">
- Geben Sie einen Namen für den Tageszyklus ein, passen Sie die Steuerungen an, um den Tageszyklus zu erstellen, und klicken Sie auf „Speichern“.
- </string>
- <string name="hint_edit">
- Um den Tageszyklus zu bearbeiten, passen Sie die Steuerungen unten an und klicken Sie auf „Speichern“.
- </string>
- <string name="combo_label">
- -Voreinstellung auswählen-
- </string>
- <text name="label">
- Name der Voreinstellung:
- </text>
- <text name="note">
- Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert.
- </text>
- <text name="hint_item1">
- - Klicken Sie auf eine Registerkarte, um die Himmeleinstellungen und die Uhrzeit zu bearbeiten.
- </text>
- <text name="hint_item2">
- - Klicken und ziehen Sie die Registerkarten, um die Ãœbergangszeiten einzustellen.
- </text>
- <text name="hint_item3">
- - Anhand des Scrubbers können Sie eine Vorschau Ihres Tageszyklus anzeigen.
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Schlüssel hinzufügen" label_selected="Schlüssel hinzufügen" name="WLAddKey"/>
- <button label="Schlüssel löschen" label_selected="Schlüssel löschen" name="WLDeleteKey"/>
- <text name="WL12am">
- 0: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">
- 0:00
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Himmeleinstellung:
- </text>
- <combo_box label="Voreinstellung" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- Uhrzeit:
- </text>
- <time name="time" value="6:00"/>
- <check_box label="Zu meinem neuen Tageszyklus machen" name="make_default_cb"/>
- <button label="Speichern" name="save"/>
- <button label="Abbrechen" name="cancel"/>
-</floater>
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
deleted file mode 100644
index adb7e5e4799b96a0c17b5d6f2f81b794a0d86a49..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Himmel-Voreinstellung bearbeiten">
- <string name="title_new">
- Neue Himmel-Voreinstellung erstellen
- </string>
- <string name="title_edit">
- Himmel-Voreinstellung bearbeiten
- </string>
- <string name="hint_new">
- Geben Sie einen Namen für die Voreinstellung ein, passen Sie die Steuerungen an, um die Voreinstellung zu erstellen, und klicken Sie dann auf „Speichern“.
- </string>
- <string name="hint_edit">
- Um Ihre Himmel-Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
- </string>
- <string name="combo_label">
- -Voreinstellung auswählen-
- </string>
- <text name="hint">
- Um Ihre Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
- </text>
- <text name="label">
- Name der Voreinstellung:
- </text>
- <text name="note">
- Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, erstellen Sie eine neue Voreinstellung. Die vorhandene Voreinstellung wird nicht geändert.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ATMOSPHÄRE" name="Atmosphere">
- <text name="BHText">
- Blauer Horizont
- </text>
- <text name="BDensText">
- Horizonttrübung
- </text>
- <text name="BDensText2">
- Farbintensität
- </text>
- <text name="HDText">
- Trübungsintensität
- </text>
- <text name="DensMultText">
- Dichtemultiplikator
- </text>
- <text name="WLDistanceMultText">
- Entfernungsmultiplikator
- </text>
- <text name="MaxAltText">
- Max. Höhe
- </text>
- </panel>
- <panel label="BELEUCHTUNG" name="Lighting">
- <text name="SLCText">
- Sonne/Mond-Farbe
- </text>
- <text name="WLAmbientText">
- Umgebung
- </text>
- <text name="SunGlowText">
- Sonnenleuchtkraft
- </text>
- <slider label="Fokus" name="WLGlowB"/>
- <slider label="Größe" name="WLGlowR"/>
- <text name="WLStarText">
- Sternenleuchtkraft
- </text>
- <text name="SceneGammaText">
- Gamma in Szene
- </text>
- <text name="TODText">
- Sonne/Mond-Stand
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 0:00
- </text>
- <text name="WL6am">
- 6:00
- </text>
- <text name="WL12pmHash">
- 12:00
- </text>
- <text name="WL6pm">
- 18:00
- </text>
- <text name="WL12am2">
- 0:00
- </text>
- <time name="WLDayTime" value="6:00"/>
- <text name="WLEastAngleText">
- Ostausrichtung
- </text>
- </panel>
- <panel label="WOLKEN" name="Clouds">
- <text name="WLCloudColorText">
- Wolkenfarbe
- </text>
- <text name="WLCloudColorText2">
- Wolken-XY/Dichte
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- Wolkendichte
- </text>
- <text name="WLCloudScaleText">
- Wolkenskalierung
- </text>
- <text name="WLCloudDetailText">
- Wolkendetails (XY/Dichte)
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Wolkenbewegung X
- </text>
- <check_box label="Sperren" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Wolkenbewegung Y
- </text>
- <check_box label="Sperren" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Diese Voreinstellung zu meiner neuen Himmeleinstellung machen" name="make_default_cb"/>
- <button label="Speichern" name="save"/>
- <button label="Abbrechen" name="cancel"/>
-</floater>
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
deleted file mode 100644
index dc7a18acb83da642e92400e3a64fed2081e22606..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Wasser-Voreinstellung bearbeiten">
- <string name="title_new">
- Neue Wasser-Voreinstellung erstellen
- </string>
- <string name="title_edit">
- Wasser-Voreinstellung bearbeiten
- </string>
- <string name="hint_new">
- Geben Sie einen Namen für die Voreinstellung ein, passen Sie die Steuerungen an, um die Voreinstellung zu erstellen, und klicken Sie dann auf „Speichern“.
- </string>
- <string name="hint_edit">
- Um Ihre Wasser-Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
- </string>
- <string name="combo_label">
- -Voreinstellung auswählen-
- </string>
- <text name="hint">
- Um Ihre Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
- </text>
- <text name="label">
- Name der Voreinstellung:
- </text>
- <text name="note">
- Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, erstellen Sie eine neue Voreinstellung. Die vorhandene Voreinstellung wird nicht geändert.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Trübungsfarbe
- </text>
- <text name="water_fog_density_label">
- Exponent für Trübungsdichte
- </text>
- <text name="underwater_fog_modifier_label">
- Modifikator für Wassertrübung
- </text>
- <text name="BHText">
- Richtung für große Wellen
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- Reflexionswellengröße
- </text>
- <text name="HDText">
- Fresnel-Skalierung
- </text>
- <text name="FresnelOffsetText">
- Fresnel-Versatz
- </text>
- <text name="BHText2">
- Richtung für kleine Wellen
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Brechungsstärke oben
- </text>
- <text name="WaterScaleBelowText">
- Brechungsstärke unten
- </text>
- <text name="MaxAltText">
- Mischungsmultiplikator
- </text>
- <text name="BHText3">
- Normal-Map
- </text>
- </panel>
- <check_box label="Diese Voreinstellung zu meiner neuen Wassereinstellung machen" name="make_default_cb"/>
- <button label="Speichern" name="save"/>
- <button label="Abbrechen" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
deleted file mode 100644
index 7ad26b23b5e79bfec361bf31f3698fbf6eae3be5..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="UMGEBUNGSEINSTELLUNGEN">
- <text name="note">
- Anhand der nachstehenden Optionen können Sie die Umgebungseinstellungen für Ihren Viewer anpassen.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="Regionseinstellungen verwenden" name="use_region_settings"/>
- <radio_item label="Meine Umgebung anpassen" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Hinweis: Ihre benutzerdefinierten Einstellungen sind für andere Benutzer nicht sichtbar.
- </text>
- <text name="water_settings_title">
- Wassereinstellung
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Himmel/Tageszyklus
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="Fester Himmel" name="my_sky_settings"/>
- <radio_item label="Tageszyklus" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
- </combo_box>
- </panel>
- <button label="OK" name="ok_btn"/>
- <button label="Abbrechen" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_facebook.xml b/indra/newview/skins/default/xui/de/floater_facebook.xml
deleted file mode 100644
index 32d6d02c7a20fa705b3ac2dbb130e2fc01ecd4c2..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="AUF FACEBOOK POSTEN">
- <tab_container name="tabs">
- <panel label="STATUS" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="EINCHECKEN" name="panel_facebook_place"/>
- <panel label="FREUNDE" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Fehler
- </text>
- <text name="connection_loading_text">
- Laden...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_flickr.xml b/indra/newview/skins/default/xui/de/floater_flickr.xml
deleted file mode 100644
index 525d015c2ba4b031d1d0f4c355710ca0b579b318..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="AUF FLICKR TEILEN">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="FOTO" name="panel_flickr_photo"/>
- <panel label="KONTO" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Fehler
- </text>
- <text name="connection_loading_text">
- Laden...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
deleted file mode 100644
index fd6c9a0875aa5d1663a0a0466bb82b7014d3cfd0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="HARDWARE-EINSTELLUNGEN">
- <text name="Filtering:">
- Filtern:
- </text>
- <check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani"/>
- <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 des Viewers erforderlich)
- </text>
- <spinner label="Gamma:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (0 = Standard-Helligkeit, weniger = heller)
- </text>
- <text name="Enable VBO:">
- VBO aktivieren:
- </text>
- <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."/>
- <text name="tc label">
- S3TC aktivieren:
- </text>
- <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)."/>
- <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."/>
- <spinner label="Nebeldistanzverhältnis:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_twitter.xml b/indra/newview/skins/default/xui/de/floater_twitter.xml
deleted file mode 100644
index 483641c26080dab6e4a1d24993f48e1781f35d0d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="ERSTELLEN" name="panel_twitter_photo"/>
- <panel label="KONTO" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Fehler
- </text>
- <text name="connection_loading_text">
- Laden...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
deleted file mode 100644
index 8adacb4a5fe1b22c15b3ef8214d3f3a7ef3b952f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Anzeige bearbeiten" name="panel_edit_classified">
- <panel.string name="location_notice">
- (wird nach Speichern aktualisiert)
- </panel.string>
- <string name="publish_label">
- Veröffentlichen
- </string>
- <string name="save_label">
- Speichern
- </string>
- <text name="title">
- Anzeige bearbeiten
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
- </panel>
- <text name="Name:">
- Titel:
- </text>
- <text name="description_label">
- Beschreibung:
- </text>
- <text name="location_label">
- Standort:
- </text>
- <text name="classified_location">
- wird geladen...
- </text>
- <button label="Aktuellen Standort verwenden" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Kategorie:"/>
- <text name="content_type_label" value="Inhaltsart:"/>
- <icons_combo_box label="Genereller Inhalt" name="content_type">
- <icons_combo_box.item label="Moderater Inhalt" name="mature_ci" value="Moderat"/>
- <icons_combo_box.item label="Genereller Inhalt" name="pg_ci" value="G"/>
- </icons_combo_box>
- <check_box label="Jede Woche automatisch erneuern" name="auto_renew"/>
- <text name="price_for_listing_label" value="Preis für Anzeige:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Preis für Anzeige." value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Abbrechen" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
deleted file mode 100644
index aafffc7ae39a82ec4d0f5c9ce3603e5bd08bc553..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Auswahl bearbeiten" name="panel_edit_pick">
- <panel.string name="location_notice">
- (wird nach Speichern aktualisiert)
- </panel.string>
- <text name="title">
- Auswahl bearbeiten
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
- <text name="Name:">
- Titel:
- </text>
- <text name="description_label">
- Beschreibung:
- </text>
- <text name="location_label">
- Standort:
- </text>
- <text name="pick_location">
- wird geladen...
- </text>
- <button label="Aktuellen Standort verwenden" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Auswahl speichern" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Abbrechen" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
deleted file mode 100644
index 03974e7f7f49b3f9a39f71909bac5bfc8ac6c6e3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profil bearbeiten" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Einwohner"/>
- <string name="AcctTypeTrial" value="Test"/>
- <string name="AcctTypeCharterMember" value="Charta-Mitglied"/>
- <string name="AcctTypeEmployee" value="Linden Lab-Mitarbeiter"/>
- <string name="PaymentInfoUsed" value="Zahlungsinfo verwendet"/>
- <string name="PaymentInfoOnFile" value="Zahlungsinfo archiviert"/>
- <string name="NoPaymentInfoOnFile" value="Keine Zahlungsinfo archiviert"/>
- <string name="AgeVerified" value="Altersgeprüft"/>
- <string name="NotAgeVerified" value="Nicht altersgeprüft"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=de
- </string>
- <string name="my_account_link_url">
- http://de.secondlife.com/my
- </string>
- <string name="no_partner_text" value="Keiner"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Anzeigename:"/>
- <text name="solo_username_label" value="Benutzername:"/>
- <button name="set_name" tool_tip="Anzeigenamen festlegen"/>
- <text name="user_label" value="Benutzername:"/>
- <panel name="lifes_images_panel">
- <panel name="second_life_image_panel">
- <text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
- </panel>
- <icon label="" name="2nd_life_edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Echtes Leben:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
- <text name="title_homepage_text">
- Webseite:
- </text>
- <line_editor name="homepage_edit" value="http://"/>
- <check_box label="In Suchergebnissen anzeigen" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Mein Konto:"/>
- <text_editor name="acc_status_text" value="Einwohner. Keine Zahlungsinfo archiviert."/>
- <text name="my_account_link" value="[[URL] Meine Startseite aufrufen]"/>
- <text name="title_partner_text" value="Mein Partner:"/>
- <panel name="partner_data_panel">
- <text initial_value="(wird in Datenbank gesucht)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] bearbeiten]"/>
- </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="Änderungen speichern" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Abbrechen" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_friends.xml b/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
deleted file mode 100644
index 1a0bbc7d30125f5c689e39e22b0ab87f5a33b53f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Sie haben gegenwärtig keine Facebook-Freunde, die ebenfalls Second Life-Einwohner sind. Laden Sie Ihre Facebook-Freunde ein, Second Life beizutreten!"/>
- <string name="facebook_friends_no_connected" value="Sie sind gegenwärtig nicht mit Facebook verbunden. Um eine Verbindung herzustellen und diese Funktion zu aktivieren, wechseln Sie zur Registerkarte "Status"."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="SL-Freunde"/>
- <accordion_tab name="tab_suggested_friends" title="Diese Personen als SL-Freunde hinzufügen"/>
- </accordion>
- <text name="facebook_friends_status">
- Nicht mit Facebook verbunden.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml b/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
deleted file mode 100644
index fac9fe99848ac77f6864fe9dda609d0702b2508a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
- <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
- <combo_box.item label="640 x 480" name="640x480"/>
- <combo_box.item label="800 x 600" name="800x600"/>
- <combo_box.item label="1024 x 768" name="1024x768"/>
- <combo_box.item label="1200 x 630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Bildfilter">
- <combo_box.item label="Kein Filter" name="NoFilter"/>
- </combo_box>
- <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
- <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
- <text name="caption_label">
- Kommentar (optional):
- </text>
- <button label="Posten" name="post_photo_btn"/>
- <button label="Abbrechen" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_place.xml b/indra/newview/skins/default/xui/de/panel_facebook_place.xml
deleted file mode 100644
index 102be805025c62a7d2c0feb1f74ea75f57b07aff..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Details zu Ihrem aktuellen Standort:
- </text>
- <check_box initial_value="false" label="Draufsicht des Standorts einschließen" name="add_place_view_cb"/>
- <button label="Posten" name="post_place_btn"/>
- <button label="Abbrechen" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_facebook_status.xml b/indra/newview/skins/default/xui/de/panel_facebook_status.xml
deleted file mode 100644
index 1fefef548e42b35a7da58cb78fc0994b0662a042..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Sie sind mit Facebook verbunden als:"/>
- <string name="facebook_disconnected" value="Nicht mit Facebook verbunden"/>
- <text name="account_caption_label">
- Nicht mit Facebook verbunden.
- </text>
- <panel name="panel_buttons">
- <button label="Verbinden..." name="connect_btn"/>
- <button label="Trennen" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Anweisungen zum Posten auf Facebook]
- </text>
- </panel>
- <text name="status_caption_label">
- Was machen Sie gerade?
- </text>
- <button label="Posten" name="post_status_btn"/>
- <button label="Abbrechen" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_flickr_account.xml b/indra/newview/skins/default/xui/de/panel_flickr_account.xml
deleted file mode 100644
index 416761f0daf0b7bdfdc54565950613b04c8582aa..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Sie sind mit Flickr verbunden als:"/>
- <string name="flickr_disconnected" value="Nicht mit Flickr verbunden"/>
- <text name="account_caption_label">
- Nicht mit Flickr verbunden.
- </text>
- <panel name="panel_buttons">
- <button label="Verbinden..." name="connect_btn"/>
- <button label="Trennen" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Anweisungen zum Posten auf Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_flickr_photo.xml b/indra/newview/skins/default/xui/de/panel_flickr_photo.xml
deleted file mode 100644
index d8bc1f310d5c228626c97a301a90a8e054c7bb6e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
- <combo_box.item label="Aktuelles Fenster" 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>
- <combo_box name="filters_combobox" tool_tip="Bildfilter">
- <combo_box.item label="Kein Filter" name="NoFilter"/>
- </combo_box>
- <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
- <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
- <text name="title_label">
- Titel:
- </text>
- <text name="description_label">
- Beschreibung:
- </text>
- <check_box initial_value="true" label="SL-Standort am Ende der Beschreibung hinzufügen" name="add_location_cb"/>
- <text name="tags_label">
- Markierungen:
- </text>
- <text name="tags_help_label">
- Markierungen durch Leerzeichen trennen.
-Für Markierungen, die aus mehreren Wörtern bestehen, "" verwenden.
- </text>
- <combo_box name="rating_combobox" tool_tip="Flickr-Inhaltseinstufung">
- <combo_box.item label="Sichere Flickr-Einstufung" name="SafeRating"/>
- <combo_box.item label="Moderate Flickr-Einstufung" name="ModerateRating"/>
- <combo_box.item label="Beschränkte Flickr-Einstufung" name="RestrictedRating"/>
- </combo_box>
- <button label="Teilen" name="post_photo_btn"/>
- <button label="Abbrechen" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index f215c43a3d4a417114f3912197d1a542278e1b41..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Auswahl-Info"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[name]"/>
- <text_editor name="pick_location" value="[wird geladen...]"/>
- <text_editor name="pick_desc" value="[description]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Teleportieren" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Karte" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Bearbeiten" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml
deleted file mode 100644
index 6aaa3151a8e60ceb7a52c534c49003eb8299b8e9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Auswahl" name="panel_picks">
- <string name="no_picks" value="Keine Auswahl"/>
- <string name="no_classifieds" value="Keine Anzeigen"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Auswahl"/>
- <accordion_tab name="tab_classifieds" title="Anzeigen"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="An aktuellem Standort neue Auswahl oder Anzeige erstellen"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Info" name="info_btn" tool_tip="Informationen zur Auswahl anzeigen"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Teleportieren" name="teleport_btn" tool_tip="Zu entsprechendem Standort teleportieren"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Karte" name="show_on_map_btn" tool_tip="Den entsprechenden Standort auf der Karte anzeigen"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_twitter_account.xml b/indra/newview/skins/default/xui/de/panel_twitter_account.xml
deleted file mode 100644
index f2cbf3eb5586597b79eebdae12cc288b8b6e0edb..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Sie sind mit Twitter verbunden als:"/>
- <string name="twitter_disconnected" value="Nicht mit Twitter verbunden"/>
- <text name="account_caption_label">
- Nicht mit Twitter verbunden.
- </text>
- <panel name="panel_buttons">
- <button label="Verbinden..." name="connect_btn"/>
- <button label="Trennen" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Anweisungen zum Posten auf Twitter]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_twitter_photo.xml b/indra/newview/skins/default/xui/de/panel_twitter_photo.xml
deleted file mode 100644
index e63725398383f2d3c98c104aa275f1120761d564..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- Was ist los?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="SL-Standort hinzufügen" name="add_location_cb"/>
- <check_box initial_value="true" label="Foto hinzufügen" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Bildauflösung">
- <combo_box.item label="Aktuelles Fenster" 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>
- <combo_box name="filters_combobox" tool_tip="Bildfilter">
- <combo_box.item label="Kein Filter" name="NoFilter"/>
- </combo_box>
- <button label="Aktualisieren" name="new_snapshot_btn" tool_tip="Zum Aktualisieren klicken"/>
- <button label="Vorschau" name="big_preview_btn" tool_tip="Klicken, um Vorschau ein-/auszuschalten"/>
- <button label="Tweeten" name="post_photo_btn"/>
- <button label="Abbrechen" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
index c89489d145ce171d785ac1ef3fb41918184a0e8d..23d054105f2220a3bfe39f6c36b3beb97b48e19c 100644
--- a/indra/newview/skins/default/xui/en/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -24,6 +24,7 @@
height="16"
layout="topleft"
left="10"
+ name="quality_level_label"
top="10"
width="100">
Quality level
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index c6776ad039d892856a476ac0a20436a10536c3c6..4985d07eb9ab83288fc34a1564e6528d8313de00 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2,13 +2,16 @@
<floater
positioning="cascading"
can_tear_off="false"
- height="396"
+ can_resize="true"
layout="topleft"
name="floaterland"
help_topic="floaterland"
save_rect="true"
title="ABOUT LAND"
- width="634">
+ height="396"
+ width="634"
+ min_height="420"
+ min_width="634">
<floater.string
name="maturity_icon_general">
"Parcel_PG_Dark"
@@ -659,10 +662,11 @@
type="string"
length="1"
enabled="false"
- follows="top|left"
+ follows="top|left|right"
height="175"
layout="topleft"
left="10"
+ right="-10"
max_length="65535"
name="covenant_editor"
width="470"
@@ -1129,25 +1133,25 @@
top_delta="-6"/>
<button
enabled="false"
- follows="left|top"
+ follows="top|right"
height="23"
label="Return Objects"
layout="topleft"
left_pad="6"
name="Return objects..."
top_delta="0"
- right="-154"
+ right="-10"
width="164" />
<name_list
column_padding="0"
draw_heading="true"
- follows="top|left"
+ follows="all"
height="150"
layout="topleft"
left="10"
name="owner list"
name_column="name"
- width="470">
+ right="-10">
<name_list.columns
label="Type"
name="type"
@@ -1341,9 +1345,9 @@ Only large parcels can be listed in search.
<panel
bevel_style="none"
border="true"
- top="121"
- bottom="121"
- follows="left|bottom|right"
+ top="116"
+ bottom="116"
+ follows="left|top|right"
left="20"
right="-20"/>
<check_box
@@ -1377,9 +1381,10 @@ Only large parcels can be listed in search.
enabled="true"
height="23"
layout="topleft"
- left="164"
+ left="18"
top="194"
name="land category"
+ follows="left|top"
visible="true"
width="140">
<combo_box.item
@@ -1508,18 +1513,18 @@ Only large parcels can be listed in search.
Landing Point: [LANDING]
</text>
<button
- follows="right|top"
+ follows="left|top"
top_pad="0"
height="23"
label="Set"
label_selected="Set"
layout="topleft"
name="Set"
- left="399"
+ left_delta="0"
tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel."
width="50" />
<button
- follows="right|top"
+ follows="left|top"
height="23"
label="Clear"
label_selected="Clear"
@@ -1546,7 +1551,8 @@ Only large parcels can be listed in search.
layout="topleft"
name="landing type"
top_pad="0"
- left="399"
+ left_delta="0"
+ follows="left|top"
tool_tip="Teleport Routing -- select how to handle teleports onto your land"
width="120">
<combo_box.item
@@ -1590,7 +1596,8 @@ Only large parcels can be listed in search.
<combo_box
height="23"
layout="topleft"
- left_pad="144"
+ left_pad="0"
+ follows="left|top"
name="media type"
tool_tip="Specify if the URL is a movie, web page, or other media"
width="120"
@@ -1625,11 +1632,11 @@ Only large parcels can be listed in search.
width="300"
top_delta="0"/>
<button
- follows="right|top"
+ follows="left|top"
height="23"
label="Set"
layout="topleft"
- left_pad="149"
+ left_pad="3"
name="set_media_url"
width="70"
top_delta="0"/>
@@ -1985,7 +1992,8 @@ Only large parcels can be listed in search.
<combo_box
height="23"
layout="topleft"
- left_pad="166"
+ follows="left|top"
+ left_pad="22"
name="pass_combo"
top_delta="0"
width="100">
@@ -2039,14 +2047,21 @@ Only large parcels can be listed in search.
top_pad="5"
width="400">
(The estate owner may have limited these choices)
- </text>
- <panel
- name="Allowed_layout_panel"
- follows="top|left"
- left="10"
- height="170"
- top_pad="8"
- width="240">
+ </text>
+ <layout_stack name="access_stack"
+ height="170"
+ follows="all"
+ animate="false"
+ left="10"
+ right="-10"
+ top_pad="8"
+ orientation="horizontal">
+ <layout_panel
+ auto_resize="true"
+ user_resize="false"
+ name="Allowed_layout_panel"
+ height="170"
+ width="240">
<text
type="string"
length="1"
@@ -2062,7 +2077,7 @@ Only large parcels can be listed in search.
</text>
<name_list
column_padding="0"
- follows="top|bottom"
+ follows="all"
heading_height="14"
height="125"
layout="topleft"
@@ -2070,7 +2085,7 @@ Only large parcels can be listed in search.
multi_select="true"
name="AccessList"
tool_tip="([LISTED] listed, [MAX] max)"
- width="230" />
+ width="228" />
<button
follows="bottom"
height="23"
@@ -2080,22 +2095,21 @@ Only large parcels can be listed in search.
name="add_allowed"
width="100" />
<button
- follows="bottom"
+ follows="right|bottom"
height="23"
label="Remove"
label_selected="Remove"
layout="topleft"
- left_pad="10"
+ left_pad="28"
name="remove_allowed"
- right="-10"
width="100" />
- </panel>
- <panel
+ </layout_panel>
+ <layout_panel
+ auto_resize="true"
+ user_resize="false"
name="Banned_layout_panel"
- follows="top|right"
height="170"
- width="240"
- left_pad="146">
+ width="240">
<text
type="string"
length="1"
@@ -2103,7 +2117,7 @@ Only large parcels can be listed in search.
height="16"
label="Ban"
layout="topleft"
- left="0"
+ left="1"
name="BanCheck"
top="0"
width="200">
@@ -2111,11 +2125,11 @@ Only large parcels can be listed in search.
</text>
<name_list
column_padding="0"
- follows="top|bottom"
+ follows="all"
heading_height="16"
height="125"
layout="topleft"
- left="0"
+ left="1"
multi_select="true"
draw_heading="true"
name="BannedList"
@@ -2135,21 +2149,21 @@ Only large parcels can be listed in search.
height="23"
label="Add"
layout="topleft"
- left="0"
+ left="1"
name="add_banned"
width="100" />
<button
enabled="false"
- follows="bottom"
+ follows="right|bottom"
height="23"
label="Remove"
label_selected="Remove"
layout="topleft"
- left_pad="10"
+ left_pad="29"
name="remove_banned"
- right="-10"
width="100" />
- </panel>
+ </layout_panel>
+ </layout_stack>
</panel>
<panel
border="true"
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index f4a686bae1406c41625402d915b80dd8f25c4dd0..bf97d32a5c0e2fd9752c882f757c7df32c75fbfd 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -33,6 +33,7 @@
animate="false"
orientation="horizontal">
<layout_panel border="false"
+ name="lp_1"
bevel_style="in"
auto_resize="false"
user_resize="false"
@@ -40,6 +41,7 @@
width="160"
height="150">
<text follows="left|top"
+ name="ambient_lbl"
height="10"
layout="topleft"
left="10"
@@ -55,6 +57,7 @@
top_pad="5"
width="60"/>
<text follows="left|top"
+ name="blue_horizon_lbl"
height="10"
layout="topleft"
left_delta="0"
@@ -70,6 +73,7 @@
top_pad="5"
width="60"/>
<text follows="left|top"
+ name="blue_density_lbl"
height="10"
layout="topleft"
left_delta="0"
@@ -95,6 +99,7 @@
top_pad="10"
width="100"/>
<text follows="right|top"
+ name="sun_color_lbl"
height="10"
layout="topleft"
right="-12"
@@ -110,6 +115,7 @@
top_pad="5"
width="60"/>
<text follows="left|top"
+ name="cloud_color_lbl"
height="10"
layout="topleft"
left_delta="0"
@@ -142,7 +148,7 @@
layout="topleft"
left_delta="0"
top_pad="-13"
- name="cloud_map_label"
+ name="water_map_label"
width="80">Water Image:</text>
<texture_picker height="63"
layout="topleft"
@@ -152,6 +158,7 @@
width="60"/>
</layout_panel>
<layout_panel border="false"
+ name="lp_2"
bevel_style="in"
auto_resize="false"
user_resize="false"
@@ -159,6 +166,7 @@
width="200"
height="150">
<text follows="left|top"
+ name="haze_horizon_label"
height="10"
layout="topleft"
left_delta="5"
@@ -178,6 +186,7 @@
width="185"
can_edit_text="true"/>
<text follows="left|top"
+ name="haze_density_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -197,6 +206,7 @@
width="185"
can_edit_text="true"/>
<text follows="left|top"
+ name="cloud_coverage_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -216,6 +226,7 @@
width="185"
can_edit_text="true"/>
<text follows="left|top"
+ name="cloud_scale_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -235,6 +246,7 @@
width="185"
can_edit_text="true"/>
<text follows="left|top"
+ name="scene_gamma_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -254,6 +266,7 @@
can_edit_text="true"/>
</layout_panel>
<layout_panel border="false"
+ name="lp_3"
bevel_style="in"
auto_resize="false"
user_resize="false"
@@ -277,6 +290,7 @@
width="150"
thumb_mode="sun"/>
<text follows="left|top"
+ name="sun_azimuth_label"
height="10"
layout="topleft"
left_delta="0"
@@ -296,6 +310,7 @@
width="130"
can_edit_text="true"/>
<text follows="left|top"
+ name="sun_elevation_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -324,6 +339,7 @@
top_pad="8"
follows="left|top"/>
<text follows="left|top"
+ name="scale_label"
height="10"
layout="topleft"
left_pad="95"
@@ -343,6 +359,7 @@
width="130"
can_edit_text="true"/>
<text follows="left|top"
+ name="glow_focus_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -362,6 +379,7 @@
width="130"
can_edit_text="true"/>
<text follows="left|top"
+ name="glow_size_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -381,6 +399,7 @@
width="130"
can_edit_text="true"/>
<text follows="left|top"
+ name="star_brightness_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -401,6 +420,7 @@
can_edit_text="true"/>
</layout_panel>
<layout_panel border="false"
+ name="lp_4"
bevel_style="in"
auto_resize="false"
user_resize="false"
@@ -424,6 +444,7 @@
width="150"
thumb_mode="moon"/>
<text follows="left|top"
+ name="moon_azimuth_label"
height="10"
layout="topleft"
left_delta="0"
@@ -443,6 +464,7 @@
width="130"
can_edit_text="true"/>
<text follows="left|top"
+ name="moon_elevation_label"
height="10"
layout="topleft"
left_delta="-5"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 31c524c38a8cd107fad8f3b645c484ccfcf13308..f3d7c38a763644169023d0020d163151e713dd87 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -270,6 +270,7 @@
word_wrap="true"/>
<layout_stack
+ name="track_options_ls"
follows="all"
height="200"
animate="false"
@@ -277,6 +278,7 @@
left="0"
orientation="horizontal">
<layout_panel
+ name="track_options_lp"
border="false"
bevel_style="in"
auto_resize="false"
@@ -312,6 +314,7 @@
</layout_panel>
<layout_panel
+ name="track_progress_lp"
border="false"
bevel_style="in"
auto_resize="false"
@@ -457,6 +460,7 @@
</layout_stack>
</layout_panel>
<layout_panel
+ name="frames_lp"
border="false"
bevel_style="in"
auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index f275fec066e6968bd33f70a7517701e625a9c0b4..588aca38e69d21078a88ee3a776c251d05b85590 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<floater
+ name="experience_profile"
positioning="cascading"
can_close="true"
enabled="true"
@@ -88,6 +89,7 @@
animate="false"
top="0"
orientation="vertical"
+ name="ls1"
width="315">
<layout_panel
follows="all"
@@ -264,6 +266,7 @@
auto_resize="false"
name="marketplace panel">
<text
+ name="Marketplace"
type="string"
length="1"
follows="left|top"
@@ -287,6 +290,7 @@
</text>
</layout_panel>
<layout_panel
+ name="owner panel"
follows="left|top|right"
height="18"
left="0"
@@ -613,6 +617,7 @@
name="clear_btn"
label="Clear Location"/>
<text
+ name="edit_marketplace"
type="string"
length="1"
follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index a6e20880a91fd9ded8069bf266b3d1dff9f0e6a0..45f3880a156264b05d45b1576d5ec6e60aedbbb7 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -34,6 +34,7 @@
left_delta="10"
width="35"
height="20"
+ name="info_panel_label"
font="SansSerif">
Name:
</text>
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 6aff387dcb1b360630e52d88879f51f9244f37f8..4ff25de5e2c43bb7bf4ac765b89df0fa3583c1ba 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -17,6 +17,7 @@
min_width="265"
width="313">
<layout_stack
+ name="main_layout"
follows="all"
layout="topleft"
left="5"
@@ -126,6 +127,7 @@
auto_resize="false"
user_resize="false"
tab_group="1"
+ name="lp_showfolders"
height="15">
<check_box
follows="left|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
index 70d8a4fc64672dfa657e1206adbba8e160cca41f..5b6dab3ac6d1e47a7e5851ba7b0cda082811dcc4 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -44,6 +44,7 @@
width="315"
min_width="315">
<layout_stack
+ name="ls1"
follows="all"
height="480"
layout="topleft"
@@ -73,6 +74,7 @@
width="290" />
</layout_panel>
<layout_panel
+ name="title panel"
follows="all"
height="19"
layout="topleft"
@@ -203,6 +205,7 @@
</text>
</layout_panel>
<layout_panel
+ name="details panel"
follows="left|top|right"
height="69"
left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
index a9777c51e70023a8b75145460edc57a7e402401e..58c18b8bb15d9d76694a80c543b86c05b80b4893 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
+ name="panel_experience_list_item"
layout="topleft"
top="100"
left="5"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_log.xml b/indra/newview/skins/default/xui/en/panel_experience_log.xml
index 6869a135d8d22a2995f9caf28e10e62f774ce427..bf7295b1875e0b8044663e7eccaa99be4e4ce5d4 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_log.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
+ name="panel_experience_log"
layout="topleft"
top="3"
left="3"
@@ -16,6 +17,7 @@
name="loading"
value="loading..."/>
<layout_stack
+ name="ls1"
layout="topleft"
top="0"
left="4"
@@ -24,6 +26,7 @@
orientation="vertical"
follows="all">
<layout_panel
+ name="list panel"
layout="topleft"
top="0"
left="1"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index 99ad3e7fe3e33fbeab5837889d41403e47967173..c2fe9fb0851c48b2355e1f2c0dfe835f29bc3d8f 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
+ name="panel_experience_search"
layout="topleft"
top="18"
left="0"
@@ -44,6 +45,7 @@
top="0"
name="search_panel">
<text
+ name="lbl name part"
left="0"
follows="top|left|right"
right="-1">
@@ -63,6 +65,7 @@
height="18"
name="find"/>
<text
+ name="lbl max content rating"
top_pad="6"
left="0"
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 7691e684c0b625e3e93dc2267a3ca097c95160f6..9d306154425950fa1930a413010b2d32b0a1dcda 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
+ name="panel_experiences"
layout="topleft"
top="3"
left="3"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 6f82a0efa1a42fa21ca3162c91b9864c15d03fe6..5647fd27db563e897d32aa3f936b7f7742a85fd4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -8,6 +8,7 @@
name="panel_settings_sky_atmos"
top="0">
<layout_stack
+ name="main_ls"
follows="all"
layout="topleft"
left="5"
@@ -16,6 +17,7 @@
bottom="-5"
orientation="vertical">
<layout_panel
+ name="top_lp"
border="true"
bevel_style="in"
auto_resize="false"
@@ -24,6 +26,7 @@
height="75">
<text
+ name="ambient_color_label"
follows="left|top"
height="10"
layout="topleft"
@@ -43,6 +46,7 @@
top_pad="5"
width="60" />
<text
+ name="blue_horizon_label"
follows="left"
height="10"
layout="topleft"
@@ -62,6 +66,7 @@
top_pad="5"
width="60" />
<text
+ name="blue_density_label"
follows="left"
height="10"
layout="topleft"
@@ -82,6 +87,7 @@
width="60" />
</layout_panel>
<layout_panel
+ name="bottom_lp"
border="true"
bevel_style="in"
auto_resize="true"
@@ -95,6 +101,7 @@
follows="left|top|right|bottom"
orientation="hoizontal">
<layout_panel
+ name="left_lp"
border="false"
bevel_style="in"
auto_resize="true"
@@ -102,6 +109,7 @@
visible="true"
min_width="225">
<text
+ name="haze_horizon_label"
follows="left|top"
height="10"
layout="topleft"
@@ -125,6 +133,7 @@
width="207"
can_edit_text="true"/>
<text
+ name="haze_density_label"
follows="left|top"
height="10"
layout="topleft"
@@ -148,6 +157,7 @@
width="207"
can_edit_text="true"/>
<text
+ name="moisture_level_label"
follows="left|top"
height="10"
layout="topleft"
@@ -171,6 +181,7 @@
width="207"
can_edit_text="true"/>
<text
+ name="droplet_radius_label"
follows="left|top"
height="10"
layout="topleft"
@@ -194,6 +205,7 @@
width="207"
can_edit_text="true"/>
<text
+ name="ice_level_label"
follows="left|top"
height="10"
layout="topleft"
@@ -217,6 +229,7 @@
width="207"
can_edit_text="true"/>
<text
+ name="scene_gamma_label"
follows="left|top"
height="10"
layout="topleft"
@@ -240,6 +253,7 @@
can_edit_text="true"/>
</layout_panel>
<layout_panel
+ name="right_lp"
border="false"
bevel_style="in"
auto_resize="true"
@@ -247,6 +261,7 @@
visible="true"
min_width="225">
<text
+ name="density_multiplier_label"
follows="left|top"
height="10"
layout="topleft"
@@ -270,6 +285,7 @@
width="219"
can_edit_text="true"/>
<text
+ name="distance_multiplier_label"
follows="left|top"
height="10"
layout="topleft"
@@ -293,6 +309,7 @@
width="219"
can_edit_text="true"/>
<text
+ name="maximum_altitude_label"
follows="left|top"
height="10"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index ac3b45d24c3aa6c74c414b7bda6ea247f35fc022..9bdfa94a335b29cfcfde95e45c3b28dc59aa9d79 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -9,6 +9,7 @@
name="panel_settings_sky_clouds"
top="0">
<layout_stack
+ name="main_ls"
follows="all"
layout="topleft"
left="5"
@@ -17,6 +18,7 @@
bottom="-5"
orientation="hoizontal">
<layout_panel
+ name="left_lp"
border="true"
bevel_style="in"
auto_resize="true"
@@ -24,6 +26,7 @@
visible="true"
height="75">
<text
+ name="cloud_color_label"
follows="left|top"
height="10"
layout="topleft"
@@ -43,6 +46,7 @@
top_pad="5"
width="60" />
<text
+ name="cloud_coverage_label"
follows="left|top"
height="10"
layout="topleft"
@@ -66,6 +70,7 @@
width="214"
can_edit_text="true"/>
<text
+ name="cloud_scale_label"
follows="left|top"
height="10"
layout="topleft"
@@ -89,6 +94,7 @@
width="214"
can_edit_text="true"/>
<text
+ name="cloud_variance_label"
follows="left|top"
height="10"
layout="topleft"
@@ -112,6 +118,7 @@
width="214"
can_edit_text="true"/>
<text
+ name="cloud_scroll_label"
follows="left|top"
height="10"
layout="topleft"
@@ -135,6 +142,7 @@
logarithmic="1"/>
<text
+ name="cloud_image_label"
follows="left|top"
height="10"
layout="topleft"
@@ -152,6 +160,7 @@
width="100"/>
</layout_panel>
<layout_panel
+ name="right_lp"
border="true"
bevel_style="in"
auto_resize="true"
@@ -159,6 +168,7 @@
visible="true"
height="75">
<text
+ name="cloud_density_label"
follows="left|top"
height="10"
layout="topleft"
@@ -213,6 +223,7 @@
width="200"
can_edit_text="true"/>
<text
+ name="cloud_detail_label"
follows="left|top"
height="10"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index b3a33961bcc45a4f99a0a0e0594251ce785f3e9d..9b3789697945a8f9799a75fa562f3bc531e282f1 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -9,6 +9,7 @@
name="panel_settings_sky_density"
top="0">
<layout_stack
+ name="main_ls"
follows="all"
layout="topleft"
left="5"
@@ -17,6 +18,7 @@
bottom="-5"
orientation="vertical">
<layout_panel
+ name="lp_1"
border="true"
bevel_style="in"
auto_resize="true"
@@ -96,6 +98,7 @@
can_edit_text="true"/>
</layout_panel>
<layout_panel
+ name="lp_2"
border="true"
bevel_style="in"
auto_resize="true"
@@ -190,6 +193,7 @@
can_edit_text="true"/>
</layout_panel>
<layout_panel
+ name="lp_3"
border="true"
bevel_style="in"
auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 1ad78dbb13bf9c89248e6ed727685f5dafaf46c7..35adb262bbfd11c23616cf4365efe39417c9c45a 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -8,6 +8,7 @@
name="panel_settings_sky_hbodies"
top="0">
<layout_stack
+ name="main_ls"
follows="all"
layout="topleft"
left="5"
@@ -24,6 +25,7 @@
name="sun_layout"
height="400">
<text
+ name="sun_stars_label"
follows="left|top"
height="10"
layout="topleft"
@@ -34,6 +36,7 @@
Sun & Stars
</text>
<text
+ name="position_label"
follows="left|top"
height="10"
layout="topleft"
@@ -51,6 +54,7 @@
width="150"
thumb_mode="sun" />
<text
+ name="image_label"
follows="left|top"
height="10"
layout="topleft"
@@ -67,6 +71,7 @@
top_pad="10"
width="100"/>
<text
+ name="scale_label"
follows="left|top"
height="10"
layout="topleft"
@@ -90,6 +95,7 @@
width="130"
can_edit_text="true"/>
<text
+ name="color_label"
follows="left|top"
height="10"
layout="topleft"
@@ -110,6 +116,7 @@
width="60" />
<text
follows="left|top"
+ name="sun_azimuth_label"
height="10"
layout="topleft"
left_delta="-235"
@@ -133,6 +140,7 @@
can_edit_text="true"/>
<text
follows="left|top"
+ name="sun_elevation_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -155,6 +163,7 @@
width="215"
can_edit_text="true"/>
<text
+ name="glow_focus_label"
follows="left|top"
height="10"
layout="topleft"
@@ -178,6 +187,7 @@
width="215"
can_edit_text="true"/>
<text
+ name="glow_size_label"
follows="left|top"
height="10"
layout="topleft"
@@ -201,6 +211,7 @@
width="215"
can_edit_text="true"/>
<text
+ name="star_brightness_label"
follows="left|top"
height="10"
layout="topleft"
@@ -237,6 +248,7 @@
</layout_panel>
<layout_panel
+ name="moon_layout"
border="false"
bevel_style="in"
auto_resize="true"
@@ -244,6 +256,7 @@
visible="true"
height="400">
<layout_stack
+ name="moon_stack"
left="5"
top="5"
right="-5"
@@ -259,6 +272,7 @@
name="moon_layout"
height="220">
<text
+ name="moon_label"
follows="left|top"
height="10"
layout="topleft"
@@ -269,6 +283,7 @@
Moon
</text>
<text
+ name="position_label"
follows="left|top"
height="10"
layout="topleft"
@@ -286,6 +301,7 @@
width="150"
thumb_mode="moon" />
<text
+ name="moon_image_label"
follows="left|top"
height="10"
layout="topleft"
@@ -302,6 +318,7 @@
top_pad="10"
width="100"/>
<text
+ name="scale_label"
follows="left|top"
height="10"
layout="topleft"
@@ -326,6 +343,7 @@
can_edit_text="true"/>
<text
follows="left|top"
+ name="moon_azimuth_label"
height="10"
layout="topleft"
left_delta="-170"
@@ -349,6 +367,7 @@
can_edit_text="true"/>
<text
follows="left|top"
+ name="moon_elevation_label"
height="10"
layout="topleft"
left_delta="-5"
@@ -371,6 +390,7 @@
width="215"
can_edit_text="true"/>
<text
+ name="brightness_label"
follows="left|top"
height="10"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 991ce25becef969d12d4587312213bd1215775df..1aa42af3a8ce354f90ba57ba276bbed9cb625c3b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -17,6 +17,7 @@
bottom="-5"
orientation="vertical">
<layout_panel
+ name="lp_top"
border="true"
bevel_style="in"
auto_resize="false"
@@ -24,6 +25,7 @@
visible="true"
height="105">
<text
+ name="water_fog_label"
follows="left|top"
height="20"
font="SansSerif"
@@ -34,6 +36,7 @@
Water Fog:
</text>
<text
+ name="color_label"
follows="left|top"
height="10"
layout="left|top"
@@ -53,6 +56,7 @@
top_pad="5"
width="60" />
<text
+ name="density_exponent_label"
follows="left|top"
height="10"
top_delta="-15"
@@ -75,6 +79,7 @@
width="150"
can_edit_text="true"/>
<text
+ name="underwater_modifier_label"
follows="left|top"
height="10"
top_delta="25"
@@ -101,6 +106,7 @@
height="10"
layout="topleft"
left_delta="165"
+ name="FresnelScaleText"
top_delta="-53"
width="150">
Fresnel Scale:
@@ -141,6 +147,7 @@
</layout_panel>
<layout_panel
+ name="lp_bottom"
auto_resize="true"
user_resize="false"
visible="true">
@@ -152,6 +159,7 @@
follows="left|top|right|bottom"
orientation="horizontal">
<layout_panel
+ name="lp_left"
border="true"
bevel_style="in"
auto_resize="true"
@@ -160,6 +168,7 @@
min_width="460"
width="50">
<text
+ name="normal_map_label"
follows="left|top|right"
height="16"
layout="topleft"
@@ -177,6 +186,7 @@
width="61"/>
<text
+ name="large_wave_speed_label"
follows="left|top"
height="16"
width="120"
@@ -202,6 +212,7 @@
arrow_color="white"/>
<text
+ name="small_wave_speed_label"
follows="left|top"
height="16"
layout="topleft"
@@ -226,6 +237,7 @@
arrow_color="white"/>
<text
+ name="reflection_wavelet_scale_label"
follows="left|top|right"
height="16"
layout="topleft"
@@ -277,6 +289,7 @@
</layout_panel>
<layout_panel
+ name="lp_right"
border="true"
bevel_style="in"
auto_resize="true"
@@ -284,6 +297,7 @@
width="50"
visible="true">
<text
+ name="refraction_and_blur_label"
follows="left|top"
height="20"
font="SansSerif"
@@ -294,6 +308,7 @@
Refraction And Blur:
</text>
<text
+ name="refraction_scale_above_label"
follows="left|top|right"
height="16"
layout="topleft"
@@ -318,6 +333,7 @@
width="200"
can_edit_text="true" />
<text
+ name="refraction_scale_below_label"
type="string"
length="1"
follows="left|top|right"
@@ -344,6 +360,7 @@
width="200"
can_edit_text="true"/>
<text
+ name="blur_multiplier_label"
follows="left|top|right"
font="SansSerif"
height="16"
diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
index 0f3f0159db429746423108de61602abb59edbf0d..eb665fd3cbf7301f2ec9dfd6528f61104ea5d013 100644
--- a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
@@ -13,6 +13,7 @@
follows="left|top"
height="11"
layout="topleft"
+ name="exponential_term_label"
left="15"
top_pad="-5"
width="120">
@@ -45,6 +46,7 @@ Exponential Term
follows="left|top"
height="11"
layout="topleft"
+ name="exponential_scale_factor_label"
left="15"
top_pad="-5"
width="120">
@@ -69,6 +71,7 @@ Exponential Scale Factor
follows="left|top"
height="11"
layout="topleft"
+ name="linear_term_label"
left="15"
top_pad="-5"
width="120">
@@ -93,6 +96,7 @@ Linear Term
follows="left|top"
height="11"
layout="topleft"
+ name="constant_term_label"
left="15"
top_pad="-5"
width="120">
@@ -117,6 +121,7 @@ Constant Term
follows="left|top"
height="11"
layout="topleft"
+ name="max_altitude_label"
left="15"
top_pad="15"
width="80">
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
deleted file mode 100644
index 6ac46351dbbb681acbbdccab4b7d1c2e1551a480..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Editar ciclo del dÃa">
- <string name="title_new">
- Crear un ciclo del dÃa nuevo
- </string>
- <string name="title_edit">
- Editar ciclo del dÃa
- </string>
- <string name="hint_new">
- Asigna un nombre al ciclo del dÃa, ajusta los controles para crearlo y selecciona "Guardar".
- </string>
- <string name="hint_edit">
- Para editar el ciclo del dÃa, ajusta los controles siguientes y selecciona "Guardar".
- </string>
- <string name="combo_label">
- -Selecciona un valor predefinido-
- </string>
- <text name="label">
- Nombre predefinido:
- </text>
- <text name="note">
- Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará.
- </text>
- <text name="hint_item1">
- - Pulsa en una pestaña para editar la configuración y el tiempo de un cielo determinado.
- </text>
- <text name="hint_item2">
- - Pulsa y arrastra las pestañas para ajustar los tiempos de transición.
- </text>
- <text name="hint_item3">
- - Usa el depurador para obtener una vista previa del ciclo del dÃa.
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Añadir clave" label_selected="Añadir clave" name="WLAddKey"/>
- <button label="Eliminar clave" label_selected="Eliminar clave" name="WLDeleteKey"/>
- <text name="WL12am">
- 12 AM
- </text>
- <text name="WL3am">
- 3 AM
- </text>
- <text name="WL6am">
- 6 AM
- </text>
- <text name="WL9amHash">
- 9 AM
- </text>
- <text name="WL12pmHash">
- 12 PM
- </text>
- <text name="WL3pm">
- 3 PM
- </text>
- <text name="WL6pm">
- 6 PM
- </text>
- <text name="WL9pm">
- 9 PM
- </text>
- <text name="WL12am2">
- 12 AM
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Configuración del cielo:
- </text>
- <combo_box label="Predefinido" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- Hora:
- </text>
- <time name="time" value="6 AM"/>
- <check_box label="Convertir en mi nuevo ciclo del dÃa" name="make_default_cb"/>
- <button label="Guardar" name="save"/>
- <button label="Cancelar" name="cancel"/>
-</floater>
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
deleted file mode 100644
index bbb9d64c6cc88da5561021e5269aaa3fe35d7010..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Editar cielo predefinido">
- <string name="title_new">
- Crear un nuevo cielo predefinido
- </string>
- <string name="title_edit">
- Editar cielo predefinido
- </string>
- <string name="hint_new">
- Asigna un nombre al valor predefinido, ajusta los controles para crearlo y selecciona "Guardar".
- </string>
- <string name="hint_edit">
- Para editar el cielo predefinido, ajusta los controles y selecciona "Guardar".
- </string>
- <string name="combo_label">
- -Selecciona un valor predefinido-
- </string>
- <text name="hint">
- Para editar el valor predefinido, ajusta los controles y selecciona "Guardar".
- </text>
- <text name="label">
- Nombre predefinido:
- </text>
- <text name="note">
- Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ATMÓSFERA" name="Atmosphere">
- <text name="BHText">
- Horizonte azul
- </text>
- <text name="BDensText">
- Cantidad de bruma
- </text>
- <text name="BDensText2">
- Saturación
- </text>
- <text name="HDText">
- Densidad de la bruma
- </text>
- <text name="DensMultText">
- Densidad
- </text>
- <text name="WLDistanceMultText">
- Distancia
- </text>
- <text name="MaxAltText">
- Altitud máx.
- </text>
- </panel>
- <panel label="LUZ" name="Lighting">
- <text name="SLCText">
- Color del sol y de la luna
- </text>
- <text name="WLAmbientText">
- Ambiental
- </text>
- <text name="SunGlowText">
- Resplandor del sol
- </text>
- <slider label="Visión" name="WLGlowB"/>
- <slider label="Tamaño" name="WLGlowR"/>
- <text name="WLStarText">
- Brillo de las estrellas
- </text>
- <text name="SceneGammaText">
- Gamma de la escena
- </text>
- <text name="TODText">
- Posición del sol y la luna
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 12 AM
- </text>
- <text name="WL6am">
- 6 AM
- </text>
- <text name="WL12pmHash">
- 12 PM
- </text>
- <text name="WL6pm">
- 6 PM
- </text>
- <text name="WL12am2">
- 12 AM
- </text>
- <time name="WLDayTime" value="6 AM"/>
- <text name="WLEastAngleText">
- Ãngulo de elevación
- </text>
- </panel>
- <panel label="NUBES" name="Clouds">
- <text name="WLCloudColorText">
- Color de las nubes
- </text>
- <text name="WLCloudColorText2">
- Posición/Densidad de las nubes
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- Nubosidad
- </text>
- <text name="WLCloudScaleText">
- Altitud de las nubes
- </text>
- <text name="WLCloudDetailText">
- Detalle de las nubes (Posición/Densidad)
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Velocidad de las nubes: X
- </text>
- <check_box label="Bloquear" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Velocidad de las nubes: Y
- </text>
- <check_box label="Bloquear" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Convertir este valor predefinido en mi nueva configuración de cielo" name="make_default_cb"/>
- <button label="Guardar" name="save"/>
- <button label="Cancelar" name="cancel"/>
-</floater>
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
deleted file mode 100644
index f90ad59f781828468bb04452e80784c93aec9585..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Editar el agua predefinida">
- <string name="title_new">
- Crear una nueva agua predefinida
- </string>
- <string name="title_edit">
- Editar el agua predefinida
- </string>
- <string name="hint_new">
- Asigna un nombre al valor predefinido, ajusta los controles para crearlo y selecciona "Guardar".
- </string>
- <string name="hint_edit">
- Para editar el agua predefinida, ajusta los controles y selecciona "Guardar".
- </string>
- <string name="combo_label">
- -Selecciona un valor predefinido-
- </string>
- <text name="hint">
- Para editar el valor predefinido, ajusta los controles y selecciona "Guardar".
- </text>
- <text name="label">
- Nombre predefinido:
- </text>
- <text name="note">
- Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Color del agua
- </text>
- <text name="water_fog_density_label">
- Transparencia
- </text>
- <text name="underwater_fog_modifier_label">
- Modificar la claridad del agua
- </text>
- <text name="BHText">
- Sentido de las olas grandes
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- Tamaño de las ondulaciones
- </text>
- <text name="HDText">
- Escala de Fresnel
- </text>
- <text name="FresnelOffsetText">
- Coeficiente de reflexión
- </text>
- <text name="BHText2">
- Sentido de las olas pequeñas
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Refracción de la superficie
- </text>
- <text name="WaterScaleBelowText">
- Refracción bajo la superficie
- </text>
- <text name="MaxAltText">
- Desenfoque
- </text>
- <text name="BHText3">
- Vista Normal
- </text>
- </panel>
- <check_box label="Convertir este valor predefinido en mi nueva configuración de agua" name="make_default_cb"/>
- <button label="Guardar" name="save"/>
- <button label="Cancelar" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
deleted file mode 100644
index 7f48a26def6e858e714710a94eda578a80e141c1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="CONFIGURACIÓN DE ENTORNO">
- <text name="note">
- Puedes personalizar la configuración del entorno de tu visor con las opciones siguientes.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="Usar configuración de región" name="use_region_settings"/>
- <radio_item label="Personalizar mi entorno" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Nota: Tu configuración personalizada no estará visible para otros usuarios.
- </text>
- <text name="water_settings_title">
- Configuración de agua
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Cielo/Ciclo del dÃa
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="Cielo invariable" name="my_sky_settings"/>
- <radio_item label="Ciclo del dÃa" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
- </combo_box>
- </panel>
- <button label="OK" name="ok_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_facebook.xml b/indra/newview/skins/default/xui/es/floater_facebook.xml
deleted file mode 100644
index 4bccc6ee579d8036dfa43f3a9a40497f5b78b877..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="PUBLICAR EN FACEBOOK">
- <tab_container name="tabs">
- <panel label="ESTADO" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="ESTOY AQUÃ" name="panel_facebook_place"/>
- <panel label="AMIGOS" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Error
- </text>
- <text name="connection_loading_text">
- Cargando...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_flickr.xml b/indra/newview/skins/default/xui/es/floater_flickr.xml
deleted file mode 100644
index e254d8ba77dfd67990a9ba1528c4ce2f130be6bd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="COMPARTIR EN FLICKR">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="FOTO" name="panel_flickr_photo"/>
- <panel label="CUENTA" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Error
- </text>
- <text name="connection_loading_text">
- Cargando...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
deleted file mode 100644
index c2327c96c442f9d379de53a0cc6da013c8fb91e9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="CONFIGURACIÓN DEL HARDWARE">
- <text name="Filtering:">
- Filtrado:
- </text>
- <check_box label="Filtrado anisotrópico (más lento si se activa)" name="ani"/>
- <text name="antialiasing label">
- Antialiasing:
- </text>
- <combo_box label="Antialiasing" name="fsaa" width="94">
- <combo_box.item label="Desactivado" 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">
- (requiere reiniciar el visor)
- </text>
- <spinner label="Gamma:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (0 = brillo por defecto, más bajo = más brillo)
- </text>
- <text name="Enable VBO:">
- Activar VBO:
- </text>
- <check_box initial_value="true" label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caÃdas."/>
- <text name="tc label">
- Activar S3TC:
- </text>
- <check_box initial_value="true" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas de 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."/>
- <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."/>
- <spinner label="Intensidad de la niebla:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_twitter.xml b/indra/newview/skins/default/xui/es/floater_twitter.xml
deleted file mode 100644
index 92f4fc5bba86313f0e2ef6ca79496e6fe5786669..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="REDACTAR" name="panel_twitter_photo"/>
- <panel label="CUENTA" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Error
- </text>
- <text name="connection_loading_text">
- Cargando...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
deleted file mode 100644
index 09f87015cc03ddb715536f544760214ef5ec00f8..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Editar el clasificado" name="panel_edit_classified">
- <panel.string name="location_notice">
- (se actualizará tras guardarlo)
- </panel.string>
- <string name="publish_label">
- Publicar
- </string>
- <string name="save_label">
- Guardar
- </string>
- <text name="title">
- Editar el clasificado
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/>
- </panel>
- <text name="Name:">
- TÃtulo:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <text name="location_label">
- Localización:
- </text>
- <text name="classified_location">
- cargando...
- </text>
- <button label="Configurar en esta posición" name="set_to_curr_location_btn"/>
- <text name="category_label" value="CategorÃa:"/>
- <text name="content_type_label" value="Tipo de contenido:"/>
- <icons_combo_box label="Contenido general" name="content_type">
- <icons_combo_box.item label="Contenido moderado" name="mature_ci" value="Moderado"/>
- <icons_combo_box.item label="Contenido general" name="pg_ci" value="General"/>
- </icons_combo_box>
- <check_box label="Renovar automáticamente cada semana" name="auto_renew"/>
- <text name="price_for_listing_label" value="Precio por publicarlo:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Cancelar" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
deleted file mode 100644
index cda465da9c9cd343e6066a272426a471f9818599..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Editar el destacado" name="panel_edit_pick">
- <panel.string name="location_notice">
- (se actualizará tras guardarlo)
- </panel.string>
- <text name="title">
- Editar el destacado
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/>
- <text name="Name:">
- TÃtulo:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <text name="location_label">
- Posición:
- </text>
- <text name="pick_location">
- cargando...
- </text>
- <button label="Configurar en mi posición" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Guardar" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Cancelar" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
deleted file mode 100644
index 8e5e09cfec28da0ddaf02d85f16966986fdddf58..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Editar el perfil" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Residente"/>
- <string name="AcctTypeTrial" value="Prueba"/>
- <string name="AcctTypeCharterMember" value="Miembro fundador"/>
- <string name="AcctTypeEmployee" value="Empleado de Linden Lab"/>
- <string name="PaymentInfoUsed" value="Ha usado una forma de pago"/>
- <string name="PaymentInfoOnFile" value="Hay infor. de la forma de pago"/>
- <string name="NoPaymentInfoOnFile" value="Sin infor. de la forma de pago"/>
- <string name="AgeVerified" value="Edad verificada"/>
- <string name="NotAgeVerified" value="Edad no verificada"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=es
- </string>
- <string name="no_partner_text" value="Ninguno"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Nombre mostrado:"/>
- <text name="solo_username_label" value="Nombre de usuario:"/>
- <button name="set_name" tool_tip="Configurar nombre mostrado"/>
- <text name="user_label" value="Nombre de usuario:"/>
- <panel name="lifes_images_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Pulsa para elegir una imagen"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Mundo real:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Pulsa para elegir una imagen"/>
- <text name="title_homepage_text">
- Web:
- </text>
- <check_box label="Mostrarme en los resultados de la búsqueda" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Mi cuenta:"/>
- <text_editor name="acc_status_text" value="Residente. No ha aportado información de pago."/>
- <text name="my_account_link" value="[[URL] Ir a mi Panel de Control]"/>
- <text name="title_partner_text" value="Mi compañero/a:"/>
- <panel name="partner_data_panel">
- <text initial_value="(obteniendo)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Editar]"/>
- </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="Guardar cambios" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Cancelar" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_friends.xml b/indra/newview/skins/default/xui/es/panel_facebook_friends.xml
deleted file mode 100644
index 5557c0a73c843bd080763d03b2805530072f5ae7..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Actualmente no tienes amigos en Facebook que también sean residentes de Second Life. Invita a tus amigos de Facebook a que se unan a Second Life."/>
- <string name="facebook_friends_no_connected" value="Actualmente no estás conectado a Facebook. Selecciona la pestaña Estado para conectarte y habilitar esta función."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="Amigos de SL"/>
- <accordion_tab name="tab_suggested_friends" title="Agregar estas personas como amigos de SL"/>
- </accordion>
- <text name="facebook_friends_status">
- No conectado a Facebook.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_photo.xml b/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
deleted file mode 100644
index 5a533f8bcb11697024ec4d3485b09811921b5d9f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
- <combo_box.item label="640 × 480" name="640x480"/>
- <combo_box.item label="800 × 600" name="800x600"/>
- <combo_box.item label="1024 × 768" name="1024x768"/>
- <combo_box.item label="1200 × 630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
- <combo_box.item label="Sin filtro" name="NoFilter"/>
- </combo_box>
- <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
- <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sÃ/no"/>
- <text name="caption_label">
- Comentario (opcional):
- </text>
- <button label="Publicar" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_place.xml b/indra/newview/skins/default/xui/es/panel_facebook_place.xml
deleted file mode 100644
index 29f6147f2382b23ba78ffd53934ba44a3cbbabf9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Cuenta algo del lugar donde te encuentras:
- </text>
- <check_box initial_value="false" label="Incluye una vista general del lugar" name="add_place_view_cb"/>
- <button label="Publicar" name="post_place_btn"/>
- <button label="Cancelar" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_facebook_status.xml b/indra/newview/skins/default/xui/es/panel_facebook_status.xml
deleted file mode 100644
index e6f137b75079efc9a2239b49648b11013e1eced4..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Estás conectado a Facebook como:"/>
- <string name="facebook_disconnected" value="No conectado a Facebook"/>
- <text name="account_caption_label">
- No conectado a Facebook.
- </text>
- <panel name="panel_buttons">
- <button label="Conectar..." name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprende a publicar en Facebook]
- </text>
- </panel>
- <text name="status_caption_label">
- ¿En qué estás pensando?
- </text>
- <button label="Publicar" name="post_status_btn"/>
- <button label="Cancelar" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_flickr_account.xml b/indra/newview/skins/default/xui/es/panel_flickr_account.xml
deleted file mode 100644
index 7dcf5b5595794928cb25ef0dc3d414af25d53c54..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Estás conectado a Flickr como:"/>
- <string name="flickr_disconnected" value="No conectado a Flickr"/>
- <text name="account_caption_label">
- No estás conectado a Flickr.
- </text>
- <panel name="panel_buttons">
- <button label="Conectar..." name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Aprende a publicar en Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_flickr_photo.xml b/indra/newview/skins/default/xui/es/panel_flickr_photo.xml
deleted file mode 100644
index f8cc8c1de7e63bb0ec3a31fbf3dae25a6a08c554..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
- <combo_box.item label="640 × 480" name="640x480"/>
- <combo_box.item label="800 × 600" name="800x600"/>
- <combo_box.item label="1024 × 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
- <combo_box.item label="Sin filtro" name="NoFilter"/>
- </combo_box>
- <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
- <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sÃ/no"/>
- <text name="title_label">
- TÃtulo:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <check_box initial_value="true" label="Incluir la ubicación de SL al final de la descripción" name="add_location_cb"/>
- <text name="tags_label">
- Etiquetas:
- </text>
- <text name="tags_help_label">
- Separa las etiquetas con espacios
-Usa "" para las etiquetas con varias palabras
- </text>
- <combo_box name="rating_combobox" tool_tip="Calificación de contenido de Flickr">
- <combo_box.item label="Calificación segura de Flickr" name="SafeRating"/>
- <combo_box.item label="Calificación moderada de Flickr" name="ModerateRating"/>
- <combo_box.item label="Calificación restringida de Flickr" name="RestrictedRating"/>
- </combo_box>
- <button label="Compartir" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index 3450279b4a62aff58cc665d486898df83797d858..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Datos del destacado"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[nombre]"/>
- <text_editor name="pick_location" value="[cargando...]"/>
- <text_editor name="pick_desc" value="[descripción]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Teleporte" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Editar" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml
deleted file mode 100644
index 904cdd12f1544df68c665ed639e46b030c43d01e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Destacados" name="panel_picks">
- <string name="no_picks" value="No hay destacados"/>
- <string name="no_classifieds" value="No hay clasificados"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Destacados"/>
- <accordion_tab name="tab_classifieds" title="Clasificados"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Crear un nuevo destacado o clasificado de la posición actual"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Información" name="info_btn" tool_tip="Mostrar la información del destacado"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Teleporte" name="teleport_btn" tool_tip="Teleportar a esta zona"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar esta zona en el mapa del mundo"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_twitter_account.xml b/indra/newview/skins/default/xui/es/panel_twitter_account.xml
deleted file mode 100644
index f51af64b0509f7c71e2032121838af94dd23cc90..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Estás conectado a Twitter como:"/>
- <string name="twitter_disconnected" value="No conectado a Twitter"/>
- <text name="account_caption_label">
- No estás conectado a Twitter.
- </text>
- <panel name="panel_buttons">
- <button label="Conectar..." name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Aprende a publicar en Twitter]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_twitter_photo.xml b/indra/newview/skins/default/xui/es/panel_twitter_photo.xml
deleted file mode 100644
index 0ae790514a93be1d53d8157e9486ef515d79c682..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- ¿Qué está ocurriendo?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Incluir ubicación de SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Incluir una foto" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Resolución de imagen">
- <combo_box.item label="Ventana actual" name="CurrentWindow"/>
- <combo_box.item label="640 × 480" name="640x480"/>
- <combo_box.item label="800 × 600" name="800x600"/>
- <combo_box.item label="1024 × 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagen">
- <combo_box.item label="Sin filtro" name="NoFilter"/>
- </combo_box>
- <button label="Actualizar" name="new_snapshot_btn" tool_tip="Pulsa para actualizar"/>
- <button label="Vista previa" name="big_preview_btn" tool_tip="Pulsa para alternar entre vista previa sÃ/no"/>
- <button label="Tuitear" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
-</panel>
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
deleted file mode 100644
index 5ec68458e1e6d60f3b0fdbcb29ce96124db34b8b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Modifier un cycle du jour">
- <string name="title_new">
- Créer un nouveau cycle du jour
- </string>
- <string name="title_edit">
- Modifier un cycle du jour
- </string>
- <string name="hint_new">
- Donnez un nom au cycle du jour, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer.
- </string>
- <string name="hint_edit">
- Pour modifier le cycle du jour, ajustez les contrôles ci-dessous, puis cliquez sur Enregistrer.
- </string>
- <string name="combo_label">
- -Effectuer une sélection-
- </string>
- <text name="label">
- Nom du préréglage :
- </text>
- <text name="note">
- Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
- </text>
- <text name="hint_item1">
- - Modifier un réglage de ciel/heure : clic sur le repère
- </text>
- <text name="hint_item2">
- - Heures de transition : clic-glissement des repères
- </text>
- <text name="hint_item3">
- - Aperçu du cycle du jour : déplacement du triangle
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/>
- <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/>
- <text name="WL12am">
- Min.
- </text>
- <text name="WL3am">
- 3h
- </text>
- <text name="WL6am">
- 6h
- </text>
- <text name="WL9amHash">
- 9h
- </text>
- <text name="WL12pmHash">
- Midi
- </text>
- <text name="WL3pm">
- 15h
- </text>
- <text name="WL6pm">
- 18h
- </text>
- <text name="WL9pm">
- 21h
- </text>
- <text name="WL12am2">
- Min.
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Régl. ciel :
- </text>
- <combo_box label="Préréglage" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- H. :
- </text>
- <time name="time" value="6h"/>
- <check_box label="Appliquer ce nouveau cycle du jour" name="make_default_cb"/>
- <button label="Enregistrer" name="save"/>
- <button label="Annuler" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 47293a63422d6e1089381c1f5cdf14629f201d6e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Modifier un préréglage du ciel">
- <string name="title_new">
- Créer un nouveau préréglage du ciel
- </string>
- <string name="title_edit">
- Modifier un préréglage du ciel
- </string>
- <string name="hint_new">
- Donnez un nom à votre préréglage, ajustez les contrôles afin de le créer, puis cliquez sur "Enregistrer".
- </string>
- <string name="hint_edit">
- Pour modifier le préréglage du ciel, ajustez les contrôles, puis cliquez sur "Enregistrer".
- </string>
- <string name="combo_label">
- -Sélectionner un préréglage-
- </string>
- <text name="hint">
- Pour modifier le préréglage, ajustez les contrôles, puis cliquez sur "Enregistrer".
- </text>
- <text name="label">
- Nom du préréglage :
- </text>
- <text name="note">
- Remarque : Si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ATMOSPHÈRE" name="Atmosphere">
- <text name="BHText">
- Horizon bleu
- </text>
- <text name="BDensText">
- Horizon brumeux
- </text>
- <text name="BDensText2">
- Densité bleue
- </text>
- <text name="HDText">
- Densité brumeuse
- </text>
- <text name="DensMultText">
- Multiplicateur de densité
- </text>
- <text name="WLDistanceMultText">
- Multiplicateur de distance
- </text>
- <text name="MaxAltText">
- Altitude maximum
- </text>
- </panel>
- <panel label="LUMIÈRE" name="Lighting">
- <text name="SLCText">
- Couleur soleil/lune
- </text>
- <text name="WLAmbientText">
- Ambiante
- </text>
- <text name="SunGlowText">
- Rayonnement du soleil
- </text>
- <slider label="Netteté" name="WLGlowB"/>
- <slider label="Taille" name="WLGlowR"/>
- <text name="WLStarText">
- Éclat des étoiles
- </text>
- <text name="SceneGammaText">
- Gamma de la scène
- </text>
- <text name="TODText">
- Position soleil/lune
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- Min.
- </text>
- <text name="WL6am">
- 6h
- </text>
- <text name="WL12pmHash">
- Midi
- </text>
- <text name="WL6pm">
- 18h
- </text>
- <text name="WL12am2">
- Min.
- </text>
- <time name="WLDayTime" value="6h"/>
- <text name="WLEastAngleText">
- Angle du levant
- </text>
- </panel>
- <panel label="NUAGES" name="Clouds">
- <text name="WLCloudColorText">
- Couleur des nuages
- </text>
- <text name="WLCloudColorText2">
- Nuages - XY/Densité
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- Couverture nuageuse
- </text>
- <text name="WLCloudScaleText">
- Altitude des nuages
- </text>
- <text name="WLCloudDetailText">
- Détails des nuages (XY/Densité)
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Défilement des nuages X
- </text>
- <check_box label="Verrouillage" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Défilement des nuages Y
- </text>
- <check_box label="Verrouillage" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Appliquer ce nouveau préréglage pour le ciel" name="make_default_cb"/>
- <button label="Enregistrer" name="save"/>
- <button label="Annuler" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 08dced834d2f89686614cc5b2054a51f7d6deb91..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Modifier un préréglage de l'eau">
- <string name="title_new">
- Créer un nouveau préréglage de l'eau
- </string>
- <string name="title_edit">
- Modifier un préréglage de l'eau
- </string>
- <string name="hint_new">
- Donnez un nom à votre préréglage, ajustez les contrôles afin de le créer, puis cliquez sur "Enregistrer".
- </string>
- <string name="hint_edit">
- Pour modifier le préréglage de l'eau, ajustez les contrôles, puis cliquez sur "Enregistrer".
- </string>
- <string name="combo_label">
- -Sélectionner un préréglage-
- </string>
- <text name="hint">
- Pour modifier le préréglage, ajustez les contrôles, puis cliquez sur "Enregistrer".
- </text>
- <text name="label">
- Nom du préréglage :
- </text>
- <text name="note">
- Remarque : Si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Couleur du brouillard dans l'eau
- </text>
- <text name="water_fog_density_label">
- Exposant densité de brouillard
- </text>
- <text name="underwater_fog_modifier_label">
- Modificateurs de brouillard sous-marin
- </text>
- <text name="BHText">
- Direction grande vague
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- Échelle d'ondelettes à réflexion
- </text>
- <text name="HDText">
- Échelle Fresnel
- </text>
- <text name="FresnelOffsetText">
- Décalage Fresnel
- </text>
- <text name="BHText2">
- Direction petite vague
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Échelle de réfraction au-dessus
- </text>
- <text name="WaterScaleBelowText">
- Échelle de réfraction en-dessous
- </text>
- <text name="MaxAltText">
- Multiplicateur de flou
- </text>
- <text name="BHText3">
- Carte normale
- </text>
- </panel>
- <check_box label="Appliquer ce nouveau préréglage pour l'eau" name="make_default_cb"/>
- <button label="Enregistrer" name="save"/>
- <button label="Annuler" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
deleted file mode 100644
index e438fcbf42faf4d1306927fd75cec05a01df267e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="PARAMÈTRES D'ENVIRONNEMENT">
- <text name="note">
- Utilisez les options ci-dessous pour personnaliser l'environnement de votre client.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="Utiliser les réglages de la région" name="use_region_settings"/>
- <radio_item label="Personnaliser mon environnement" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Remarque : Les autres utilisateurs ne pourront pas voir votre configuration personnalisée.
- </text>
- <text name="water_settings_title">
- Réglage de l'eau
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Sélectionner un préréglage-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Ciel / Cycle du jour
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="Ciel fixe" name="my_sky_settings"/>
- <radio_item label="Cycle du jour" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Sélectionner un préréglage-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Sélectionner un préréglage-" name="item0"/>
- </combo_box>
- </panel>
- <button label="OK" name="ok_btn"/>
- <button label="Annuler" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_facebook.xml b/indra/newview/skins/default/xui/fr/floater_facebook.xml
deleted file mode 100644
index f6e8696e53fbfb1b0a9781a4802a42cb9c3d3ea6..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="PUBLIER SUR FACEBOOK">
- <tab_container name="tabs">
- <panel label="STATUT" name="panel_facebook_status"/>
- <panel label="PHOTO" name="panel_facebook_photo"/>
- <panel label="INDIQUER VOTRE PRÉSENCE" name="panel_facebook_place"/>
- <panel label="AMIS" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Erreur
- </text>
- <text name="connection_loading_text">
- En cours de chargement...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_flickr.xml b/indra/newview/skins/default/xui/fr/floater_flickr.xml
deleted file mode 100644
index 721d6aa6bfa1439d3e2634548067f13fbff89701..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="PARTAGER SUR FLICKR">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="PHOTO" name="panel_flickr_photo"/>
- <panel label="COMPTE" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Erreur
- </text>
- <text name="connection_loading_text">
- Chargement...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
deleted file mode 100644
index bb146556ba0f1ae1cc8ae159722fb441b9f3d54e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="PARAMÈTRES MATÉRIELS">
- <text name="Filtering:">
- Filtres :
- </text>
- <check_box label="Filtre anisotrope (plus lent si activé)" name="ani"/>
- <text name="antialiasing label">
- Anti-aliasing :
- </text>
- <combo_box label="Anti-aliasing" name="fsaa" width="84">
- <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 du client requis)
- </text>
- <spinner label="Gamma :" name="gamma"/>
- <text left="217" name="(brightness, lower is brighter)">
- (0 = défaut, valeur faible = plus lumineux)
- </text>
- <text name="Enable VBO:">
- Activer le VBOÂ :
- </text>
- <check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
- <text name="tc label">
- Activer S3TCÂ :
- </text>
- <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."/>
- <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."/>
- <spinner label="Indice du brouillard :" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_twitter.xml b/indra/newview/skins/default/xui/fr/floater_twitter.xml
deleted file mode 100644
index 608b02dced33e3ca375ebb276ef27e500132a0f8..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="COMPOSER" name="panel_twitter_photo"/>
- <panel label="COMPTE" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Erreur
- </text>
- <text name="connection_loading_text">
- Chargement...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
deleted file mode 100644
index b892d25f264759d02191389a1d23636a93b27a99..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifier la petite annonce" name="panel_edit_classified">
- <panel.string name="location_notice">
- (mise à jour après l'enregistrement)
- </panel.string>
- <string name="publish_label">
- Publier
- </string>
- <string name="save_label">
- Enregistrer
- </string>
- <text name="title">
- Modifier la petite annonce
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Cliquer pour sélectionner une image"/>
- </panel>
- <text name="Name:">
- Titre :
- </text>
- <text name="description_label">
- Description :
- </text>
- <text name="location_label">
- Lieu :
- </text>
- <text name="classified_location">
- en cours de chargement...
- </text>
- <button label="Définir sur l'emplacement actuel" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Catégorie :"/>
- <text name="content_type_label" value="Type de contenu :"/>
- <icons_combo_box label="Contenu Général" name="content_type">
- <icons_combo_box.item label="Contenu Modéré" name="mature_ci" value="Mature"/>
- <icons_combo_box.item label="Contenu Général" name="pg_ci" value="PG"/>
- </icons_combo_box>
- <check_box label="Renouvellement auto toutes les semaines" name="auto_renew"/>
- <text name="price_for_listing_label" value="Coût de l'annonce :"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Coût de l'annonce." value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Annuler" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
deleted file mode 100644
index 247e18da82dc188e547fed27540761efcbc33858..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifier le favori" name="panel_edit_pick">
- <panel.string name="location_notice">
- (mise à jour après enregistrement)
- </panel.string>
- <text name="title">
- Modifier le favori
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
- <text name="Name:">
- Titre :
- </text>
- <text name="description_label">
- Description :
- </text>
- <text name="location_label">
- Lieu :
- </text>
- <text name="pick_location">
- en cours de chargement...
- </text>
- <button label="Définir sur l'emplacement actuel" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Enregistrer" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Annuler" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
deleted file mode 100644
index 9e63c8822103f50d155b4908e2760afdceff54c9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modification du profil" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Résident"/>
- <string name="AcctTypeTrial" value="Essai"/>
- <string name="AcctTypeCharterMember" value="Membre originaire"/>
- <string name="AcctTypeEmployee" value="Employé(e) de Linden Lab"/>
- <string name="PaymentInfoUsed" value="Infos de paiement utilisées"/>
- <string name="PaymentInfoOnFile" value="Infos de paiement enregistrées"/>
- <string name="NoPaymentInfoOnFile" value="Aucune info de paiement enregistrée"/>
- <string name="AgeVerified" value="Personne dont l'âge a été vérifié"/>
- <string name="NotAgeVerified" value="Personne dont l'âge n'a pas été vérifié"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=fr
- </string>
- <string name="my_account_link_url">
- http://secondlife.com/my
- </string>
- <string name="no_partner_text" value="Aucun"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Nom d'affichage :"/>
- <text name="solo_username_label" value="Nom d'utilisateur :"/>
- <button name="set_name" tool_tip="Définir un nom d'affichage"/>
- <text name="user_label" value="Nom d'utilisateur :"/>
- <panel name="lifes_images_panel">
- <panel name="second_life_image_panel">
- <text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
- </panel>
- <icon label="" name="2nd_life_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Vie réelle :"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
- <text name="title_homepage_text">
- Page d'accueil :
- </text>
- <line_editor name="homepage_edit" value="http://"/>
- <check_box label="Afficher avec la recherche" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Mon compte :"/>
- <text_editor name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/>
- <text name="my_account_link" value="[[URL] Accéder à ma Page d'accueil]"/>
- <text name="title_partner_text" value="Mon partenaire :"/>
- <panel name="partner_data_panel">
- <text initial_value="(récupération en cours)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Modifier]"/>
- </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="Enregistrer" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Annuler" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml b/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
deleted file mode 100644
index 0e36c2092c89b231e291386940ad070680d3424a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Vous n'avez actuellement aucun ami Facebook qui est également résident de Second Life. Invitez vos amis Facebook à rejoindre Second Life aujourd'hui !"/>
- <string name="facebook_friends_no_connected" value="Vous n'êtes pas connecté(e) à Facebook. Allez à l'onglet Statut pour vous connecter et activer cette fonctionnalité."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="Amis SL"/>
- <accordion_tab name="tab_suggested_friends" title="Ajouter ces personnes en tant qu'amis SL"/>
- </accordion>
- <text name="facebook_friends_status">
- Pas connecté(e) à Facebook.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml b/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
deleted file mode 100644
index cc4045bc740354ba7d684a5a1a06df4a36f05d10..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
- <combo_box.item label="640Â x 480" name="640x480"/>
- <combo_box.item label="800Â x 600" name="800x600"/>
- <combo_box.item label="1024Â x 768" name="1024x768"/>
- <combo_box.item label="1200 x 630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtres d’image">
- <combo_box.item label="Aucun filtre" name="NoFilter"/>
- </combo_box>
- <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
- <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour basculer l'aperçu"/>
- <text name="caption_label">
- Commentaire (facultatif)Â :
- </text>
- <button label="Publier" name="post_photo_btn"/>
- <button label="Annuler" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_place.xml b/indra/newview/skins/default/xui/fr/panel_facebook_place.xml
deleted file mode 100644
index f8e597450b7f59946119d4f22fd02beccbf76e4d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Dites quelque chose au sujet du lieu où vous vous trouvez :
- </text>
- <check_box initial_value="false" label="Inclure la vue aérienne du lieu" name="add_place_view_cb"/>
- <button label="Publier" name="post_place_btn"/>
- <button label="Annuler" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_facebook_status.xml b/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
deleted file mode 100644
index dc8e4b9ecc37b2bcd3696499d44d24366c09fd68..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Vous êtes connecté(e) à Facebook en tant que :"/>
- <string name="facebook_disconnected" value="Pas connecté(e) à Facebook"/>
- <text name="account_caption_label">
- Pas connecté(e) à Facebook.
- </text>
- <panel name="panel_buttons">
- <button label="Connexion en cours..." name="connect_btn"/>
- <button label="Déconnexion" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Apprenez comment publier sur Facebook]
- </text>
- </panel>
- <text name="status_caption_label">
- À quoi pensez-vous ?
- </text>
- <button label="Publier" name="post_status_btn"/>
- <button label="Annuler" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_flickr_account.xml b/indra/newview/skins/default/xui/fr/panel_flickr_account.xml
deleted file mode 100644
index 7082223b144ae329c2bc8dae5aa5992c4f5bfa8e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Vous êtes connecté(e) à Flickr en tant que :"/>
- <string name="flickr_disconnected" value="Pas connecté(e) à Flickr"/>
- <text name="account_caption_label">
- Pas connecté(e) à Flickr.
- </text>
- <panel name="panel_buttons">
- <button label="Connexion..." name="connect_btn"/>
- <button label="Déconnexion" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Apprenez comment publier sur Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml b/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
deleted file mode 100644
index 9dac26b165a42a842c385ff5eb64200464422424..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
- <combo_box.item label="640Â x 480" name="640x480"/>
- <combo_box.item label="800Â x 600" name="800x600"/>
- <combo_box.item label="1Â 024Â x 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtres d'image">
- <combo_box.item label="Aucun filtre" name="NoFilter"/>
- </combo_box>
- <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
- <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l'aperçu"/>
- <text name="title_label">
- Titre :
- </text>
- <text name="description_label">
- Description :
- </text>
- <check_box initial_value="true" label="Inclure l'emplacement SL Ã la fin de la description" name="add_location_cb"/>
- <text name="tags_label">
- Balises :
- </text>
- <text name="tags_help_label">
- Séparer les balises par des espaces
-Utiliser "" pour les balises contenant plusieurs mots
- </text>
- <combo_box name="rating_combobox" tool_tip="Catégorie de contenu Flickr">
- <combo_box.item label="Catégorie de contenu Flickr sûr" name="SafeRating"/>
- <combo_box.item label="Catégorie de contenu Flickr modéré" name="ModerateRating"/>
- <combo_box.item label="Catégorie de contenu Flickr réservé aux adultes" name="RestrictedRating"/>
- </combo_box>
- <button label="Partager" name="post_photo_btn"/>
- <button label="Annuler" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index 1de9b243f17722b3ff385f40e234d077d4259e8b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Infos"/>
- <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]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Téléportation" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Carte" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Modifier" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml
deleted file mode 100644
index fb277f653f3da258ccad030bf1ae77a6db3559a1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Favoris" name="panel_picks">
- <string name="no_picks" value="Pas de favoris"/>
- <string name="no_classifieds" value="Pas de petites annonces"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Favoris"/>
- <accordion_tab name="tab_classifieds" title="Petites annonces"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Créer un nouveau favori ou une nouvelle petite annonce à l’endroit actuel"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Infos" name="info_btn" tool_tip="Afficher les informations du favori"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Téléportation" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone correspondante"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Carte" name="show_on_map_btn" tool_tip="Afficher la zone correspondante sur la carte du monde"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_twitter_account.xml b/indra/newview/skins/default/xui/fr/panel_twitter_account.xml
deleted file mode 100644
index ed2208c69fd2c1549f30a9be28ba1a7f5b862553..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Vous êtes connecté(e) à Twitter en tant que :"/>
- <string name="twitter_disconnected" value="Pas connecté(e) à Twitter"/>
- <text name="account_caption_label">
- Pas connecté(e) à Twitter.
- </text>
- <panel name="panel_buttons">
- <button label="Connexion..." name="connect_btn"/>
- <button label="Déconnexion" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Apprenez comment publier sur Twitter]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml b/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml
deleted file mode 100644
index 3e23e5d577d88f3963d4cb85893d0cf0f86ba2ae..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- Que se passe-t-il ?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Inclure l'emplacement SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Inclure une photo" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Résolution d’image">
- <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
- <combo_box.item label="640Â x 480" name="640x480"/>
- <combo_box.item label="800Â x 600" name="800x600"/>
- <combo_box.item label="1Â 024Â x 768" name="1024x768"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtres d'image">
- <combo_box.item label="Aucun filtre" name="NoFilter"/>
- </combo_box>
- <button label="Actualiser" name="new_snapshot_btn" tool_tip="Cliquer pour actualiser"/>
- <button label="Aperçu" name="big_preview_btn" tool_tip="Cliquer pour activer/désactiver l'aperçu"/>
- <button label="Envoyer tweet" name="post_photo_btn"/>
- <button label="Annuler" name="cancel_photo_btn"/>
-</panel>
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
deleted file mode 100644
index c922b2e4f767fc2303b19d8609dcbf863291caca..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Modifica ciclo giornata">
- <string name="title_new">
- Crea un nuovo ciclo giornata
- </string>
- <string name="title_edit">
- Modifica ciclo giornata
- </string>
- <string name="hint_new">
- Dai un nome al ciclo della giornata, modifica i controlli per crearlo e fai clic su "Salva".
- </string>
- <string name="hint_edit">
- Per modificare il ciclo della giornata, modifica i controlli seguenti e fai clic su "Salva".
- </string>
- <string name="combo_label">
- -Seleziona un valore predefinito-
- </string>
- <text name="label">
- Nome predefinito:
- </text>
- <text name="note">
- Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato.
- </text>
- <text name="hint_item1">
- - Fai clic su una scheda per modificare gli orari e le impostazioni cielo specifiche.
- </text>
- <text name="hint_item2">
- - Fai clic e trascina le schede per impostare i tempi di transizione.
- </text>
- <text name="hint_item3">
- - Usa lo scrubber per visualizzare in anteprima il ciclo giornata.
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Aggiungi chiave" label_selected="Aggiungi chiave" name="WLAddKey"/>
- <button label="Tasto cancella" label_selected="Tasto cancella" name="WLDeleteKey"/>
- <text name="WL12am">
- 00:00
- </text>
- <text name="WL3am">
- 03:00:00
- </text>
- <text name="WL6am">
- 06:00:00
- </text>
- <text name="WL9amHash">
- 09:00:00
- </text>
- <text name="WL12pmHash">
- 12:00:00
- </text>
- <text name="WL3pm">
- 15:00:00
- </text>
- <text name="WL6pm">
- 18:00:00
- </text>
- <text name="WL9pm">
- 21:00:00
- </text>
- <text name="WL12am2">
- 00:00
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Impostazioni cielo:
- </text>
- <combo_box label="Valori predefiniti" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- Giorno/ora:
- </text>
- <time name="time" value="06:00:00"/>
- <check_box label="Usa come nuovo ciclo giornata" name="make_default_cb"/>
- <button label="Salva" name="save"/>
- <button label="Annulla" name="cancel"/>
-</floater>
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
deleted file mode 100644
index e2dda7da9d0d0e8d3d4dccf06df5a83a8780b79b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Modifica valore predefinito cielo">
- <string name="title_new">
- Crea un nuovo valore predefinito cielo
- </string>
- <string name="title_edit">
- Modifica valore predefinito cielo
- </string>
- <string name="hint_new">
- Dai un nome al valore predefinito, regola i comandi per crearlo e fai clic su "Salva".
- </string>
- <string name="hint_edit">
- Per modificare il valore predefinito cielo, regola i comandi e fai clic su "Salva".
- </string>
- <string name="combo_label">
- -Seleziona un valore predefinito-
- </string>
- <text name="hint">
- Per modificare il valore predefinito, regola i comandi e quindi fai clic su "Salva"
- </text>
- <text name="label">
- Nome predefinito:
- </text>
- <text name="note">
- Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ATMOSFERA" name="Atmosphere">
- <text name="BHText">
- Orizzonte blu
- </text>
- <text name="BDensText">
- Orizzonte foschia
- </text>
- <text name="BDensText2">
- Densità blu
- </text>
- <text name="HDText">
- Densità foschia
- </text>
- <text name="DensMultText">
- Fattore moltiplicativo densitÃ
- </text>
- <text name="WLDistanceMultText">
- Fattore moltiplicativo distanza
- </text>
- <text name="MaxAltText">
- Altitudine massima
- </text>
- </panel>
- <panel label="ILLUMINAZIONE" name="Lighting">
- <text name="SLCText">
- Colore sole/luna
- </text>
- <text name="WLAmbientText">
- Ambiente
- </text>
- <text name="SunGlowText">
- Bagliore sole
- </text>
- <slider label="Centro focale" name="WLGlowB"/>
- <slider label="Dimensioni" name="WLGlowR"/>
- <text name="WLStarText">
- Luminosità stella
- </text>
- <text name="SceneGammaText">
- Gamma scena
- </text>
- <text name="TODText">
- Posizione sole/luna
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 00:00
- </text>
- <text name="WL6am">
- 06.00
- </text>
- <text name="WL12pmHash">
- 12:00
- </text>
- <text name="WL6pm">
- 18:00
- </text>
- <text name="WL12am2">
- 00:00
- </text>
- <time name="WLDayTime" value="06:00"/>
- <text name="WLEastAngleText">
- Angolo est
- </text>
- </panel>
- <panel label="NUVOLE" name="Clouds">
- <text name="WLCloudColorText">
- Colore nuvole
- </text>
- <text name="WLCloudColorText2">
- XY/Densità nuvole
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- Copertura nuvole
- </text>
- <text name="WLCloudScaleText">
- Scala nuvole
- </text>
- <text name="WLCloudDetailText">
- Dettaglio nuvole (XY/Densità )
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Scorrimento nuvole X
- </text>
- <check_box label="Blocca" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Scorrimento nuvole Y
- </text>
- <check_box label="Blocca" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Usa questo valore predefinito come nuova impostazione per il cielo" name="make_default_cb"/>
- <button label="Salva" name="save"/>
- <button label="Annulla" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 19eb6566c96b37b794148f6fc8d26b55af13e117..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Modifica valore predefinito acqua">
- <string name="title_new">
- Crea un nuovo valore predefinito per l'acqua
- </string>
- <string name="title_edit">
- Modifica un valore predefinito per l'acqua
- </string>
- <string name="hint_new">
- Dai un nome al valore predefinito, regola i comandi per crearlo e fai clic su "Salva".
- </string>
- <string name="hint_edit">
- Per modificare il valore predefinito per l’acqua, regola i comandi e fai clic su "Salva".
- </string>
- <string name="combo_label">
- -Seleziona un valore predefinito-
- </string>
- <text name="hint">
- Per modificare il valore predefinito, regola i comandi e quindi fai clic su "Salva"
- </text>
- <text name="label">
- Nome predefinito:
- </text>
- <text name="note">
- Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Colore nebbia acqua
- </text>
- <text name="water_fog_density_label">
- Esponente densità nebbia
- </text>
- <text name="underwater_fog_modifier_label">
- Modificatore nebbia sott'acqua
- </text>
- <text name="BHText">
- Direzione onda grande
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- Scala wavelet riflesso
- </text>
- <text name="HDText">
- Scala Fresnel
- </text>
- <text name="FresnelOffsetText">
- Spostamento Fresnel
- </text>
- <text name="BHText2">
- Direzione onda piccola
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Scala wavelet sopra
- </text>
- <text name="WaterScaleBelowText">
- Scala wavelet sotto
- </text>
- <text name="MaxAltText">
- Fattore moltiplicativo sfocatura
- </text>
- <text name="BHText3">
- Mappa normale
- </text>
- </panel>
- <check_box label="Usa questo valore predefinito come nuova impostazione per l'acqua" name="make_default_cb"/>
- <button label="Salva" name="save"/>
- <button label="Annulla" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
deleted file mode 100644
index a7ed5f9e67f58f83a405275275a091577008eff9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="IMPOSTAZIONI AMBIENTE">
- <text name="note">
- Usa le opzioni seguenti per personalizzare le impostazioni dell'ambiente per il tuo viewer.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="Usa impostazioni regione" name="use_region_settings"/>
- <radio_item label="Personalizza il mio ambiente" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Nota: gli altri utenti non vedranno le tue impostazioni personalizzate.
- </text>
- <text name="water_settings_title">
- Impostazione Acqua
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Ciclo cielo / giornata
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="Cielo fisso" name="my_sky_settings"/>
- <radio_item label="Ciclo giornata" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
- </combo_box>
- </panel>
- <button label="OK" name="ok_btn"/>
- <button label="Annulla" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_facebook.xml b/indra/newview/skins/default/xui/it/floater_facebook.xml
deleted file mode 100644
index cb700f00e1a4c4e10e44c590a59e0c0158a61efe..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="PUBBLICA SU FACEBOOK">
- <tab_container name="tabs">
- <panel label="STATO" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="REGISTRATI" name="panel_facebook_place"/>
- <panel label="AMICI" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Errore
- </text>
- <text name="connection_loading_text">
- Caricamento in corso...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_flickr.xml b/indra/newview/skins/default/xui/it/floater_flickr.xml
deleted file mode 100644
index 85482a44a46eb9802e008693fda100a7f5e080c4..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="CONDIVIDI SU FLICKR">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="FOTO" name="panel_flickr_photo"/>
- <panel label="ACCOUNT" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Errore
- </text>
- <text name="connection_loading_text">
- Caricamento...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
deleted file mode 100644
index edbbc354cfade7f501368eb1e6094cf33fbf3527..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="OPZIONI HARDWARE">
- <text name="Filtering:">
- Filtraggio:
- </text>
- <check_box label="Filtraggio Anisotropico (rallenta se attivato)" name="ani"/>
- <text name="antialiasing label">
- Antialiasing:
- </text>
- <combo_box label="Antialiasing" name="fsaa" width="94">
- <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 del viewer)
- </text>
- <spinner label="Gamma:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (0 = luminosità default, più basso = più luminoso)
- </text>
- <text name="Enable VBO:">
- Attiva VBO:
- </text>
- <check_box initial_value="true" label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance. Ma, su un vecchio hardware, spesso l'implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/>
- <text name="tc label">
- Attiva S3TC:
- </text>
- <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 ua perdita di qualit' del colore."/>
- <slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. 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."/>
- <spinner label="Indice della distanza della nebbia:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_twitter.xml b/indra/newview/skins/default/xui/it/floater_twitter.xml
deleted file mode 100644
index a34052a620132060019bc8cb0e93023029997536..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="COMPONI" name="panel_twitter_photo"/>
- <panel label="ACCOUNT" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Errore
- </text>
- <text name="connection_loading_text">
- Caricamento in corso...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
deleted file mode 100644
index 57e422a25b4585500d2833343ec2fb141d7a9370..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifica inserzione" name="panel_edit_classified">
- <panel.string name="location_notice">
- (si aggiornerà dopo il salvataggio)
- </panel.string>
- <string name="publish_label">
- Pubblica
- </string>
- <string name="save_label">
- Salva
- </string>
- <text name="title">
- Modifica inserzione
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Clicca per selezionare un'immagine"/>
- </panel>
- <text name="Name:">
- Titolo:
- </text>
- <text name="description_label">
- Descrizione:
- </text>
- <text name="location_label">
- Luogo:
- </text>
- <text name="classified_location">
- caricamento...
- </text>
- <button label="Imposta come luogo attuale" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Categoria:"/>
- <text name="content_type_label" value="Tipo di contenuto:"/>
- <icons_combo_box label="Contenuto generale" name="content_type">
- <icons_combo_box.item label="Contenuto moderato" name="mature_ci" value="Moderato"/>
- <icons_combo_box.item label="Contenuto generale" name="pg_ci" value="Generale"/>
- </icons_combo_box>
- <check_box label="Rinnovo automatico ogni settimana" name="auto_renew"/>
- <text name="price_for_listing_label" value="Prezzo per inserzione:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Prezzo per inserzione:" value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Annulla" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
deleted file mode 100644
index 145b8cf4e3ce93ccdd0caf330465d2f3bde2d785..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifica preferito" name="panel_edit_pick">
- <panel.string name="location_notice">
- (si aggiornerà dopo il salvataggio)
- </panel.string>
- <text name="title">
- Modifica preferito
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Clicca per selezionare un'immagine"/>
- <text name="Name:">
- Titolo:
- </text>
- <text name="description_label">
- Descrizione:
- </text>
- <text name="location_label">
- Luogo:
- </text>
- <text name="pick_location">
- caricamento...
- </text>
- <button label="Imposta come luogo attuale" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Salva luogo preferito" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Annulla" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
deleted file mode 100644
index 545e96a8f190ab939b674b92eaa62b832c010824..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifica profilo" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Residente"/>
- <string name="AcctTypeTrial" value="Prova"/>
- <string name="AcctTypeCharterMember" value="Membro privilegiato"/>
- <string name="AcctTypeEmployee" value="Impiegato della Linden Lab"/>
- <string name="PaymentInfoUsed" value="Info. di pagamento usate"/>
- <string name="PaymentInfoOnFile" value="Info. di pagamento in archivio"/>
- <string name="NoPaymentInfoOnFile" value="Nessuna info. di pagamento"/>
- <string name="AgeVerified" value="Età verificata"/>
- <string name="NotAgeVerified" value="Età non verificata"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=it
- </string>
- <string name="no_partner_text" value="Nessuno"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Nome visualizzato:"/>
- <text name="solo_username_label" value="Nome utente:"/>
- <button name="set_name" tool_tip="Imposta nome visualizzato"/>
- <text name="solo_user_name" value="Hamilton Hitchings"/>
- <text name="user_name" value="Hamilton Hitchings"/>
- <text name="user_name_small" value="Hamilton Hitchings"/>
- <text name="user_label" value="Nome utente:"/>
- <text name="user_slid" value="hamilton.linden"/>
- <panel name="lifes_images_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Clicca per selezionare un'immagine"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Mondo reale:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Clicca per selezionare un'immagine"/>
- <text name="title_homepage_text">
- Home page:
- </text>
- <check_box label="Mostrami nei risultati della ricerca" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Il mio account:"/>
- <text_editor name="acc_status_text" value="Residente. Nessuna informazione di pagamento disponibile."/>
- <text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
- <text name="title_partner_text" value="Il mio partner:"/>
- <panel name="partner_data_panel">
- <text initial_value="(recupero)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Edit]"/>
- </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="Salva modifiche" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Annulla" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_friends.xml b/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
deleted file mode 100644
index 28769a010f5cb002f08d7528fd383d2b6832dddd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Attualmente non hai amici su Facebook che sono anche residenti Second Life. Invita ora i tuoi amici di Facebook a unirsi a Second Life!"/>
- <string name="facebook_friends_no_connected" value="Non sei connesso a Facebook. Accedi alla scheda Stato per collegarti e attivare questa funzionalità ."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="Amici SL"/>
- <accordion_tab name="tab_suggested_friends" title="Aggiungi queste persone come amici SL"/>
- </accordion>
- <text name="facebook_friends_status">
- Non connesso a Facebook.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_photo.xml b/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
deleted file mode 100644
index 8d66f35c3c17115b0f804db026e0be6775d101c1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Risoluzione immagine">
- <combo_box.item label="Finestra attuale" 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="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtri immagine">
- <combo_box.item label="Nessun filtro" name="NoFilter"/>
- </combo_box>
- <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
- <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l'anteprima"/>
- <text name="caption_label">
- Commento (facoltativo):
- </text>
- <button label="Post" name="post_photo_btn"/>
- <button label="Annulla" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_place.xml b/indra/newview/skins/default/xui/it/panel_facebook_place.xml
deleted file mode 100644
index 3f1365f12c99e7b062fe20ba84aa724c614a262e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Racconta dove ti trovi:
- </text>
- <check_box initial_value="false" label="Includi vista dall'alto del luogo" name="add_place_view_cb"/>
- <button label="Post" name="post_place_btn"/>
- <button label="Annulla" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_facebook_status.xml b/indra/newview/skins/default/xui/it/panel_facebook_status.xml
deleted file mode 100644
index 7fb1cec78eebc4159a4ab4a68c814c0e8c5e2c5a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Sei connesso a Facebook come:"/>
- <string name="facebook_disconnected" value="Non connesso a Facebook"/>
- <text name="account_caption_label">
- Non connesso a Facebook.
- </text>
- <panel name="panel_buttons">
- <button label="Connessione in corso..." name="connect_btn"/>
- <button label="Disconnetti" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Come pubblicare su Facebook]
- </text>
- </panel>
- <text name="status_caption_label">
- A cosa stai pensando?
- </text>
- <button label="Post" name="post_status_btn"/>
- <button label="Annulla" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_flickr_account.xml b/indra/newview/skins/default/xui/it/panel_flickr_account.xml
deleted file mode 100644
index 573754a68e46c155b3dd8eeaca1f597e3ea813d0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Sei in collegamento con Flickr come:"/>
- <string name="flickr_disconnected" value="Non in collegamento con Flickr"/>
- <text name="account_caption_label">
- Non in collegamento con Flickr.
- </text>
- <panel name="panel_buttons">
- <button label="Collegamento..." name="connect_btn"/>
- <button label="Interrompi collegamento" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Come pubblicare su Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_flickr_photo.xml b/indra/newview/skins/default/xui/it/panel_flickr_photo.xml
deleted file mode 100644
index f6700b6150a5f1775c11258c84f600f1bc03fce2..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
- <combo_box.item label="Finestra attuale" 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>
- <combo_box name="filters_combobox" tool_tip="Filtri immagini">
- <combo_box.item label="Nessun filtro" name="NoFilter"/>
- </combo_box>
- <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
- <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l'anteprima"/>
- <text name="title_label">
- Titolo:
- </text>
- <text name="description_label">
- Descrizione:
- </text>
- <check_box initial_value="true" label="Includi il luogo SL al termine della descrizione" name="add_location_cb"/>
- <text name="tags_label">
- Tag:
- </text>
- <text name="tags_help_label">
- Separa tag con spazi
-Usa "" per tag con più di una parola
- </text>
- <combo_box name="rating_combobox" tool_tip="Categoria del contenuto di Flickr">
- <combo_box.item label="Categoria Flickr Sicuro" name="SafeRating"/>
- <combo_box.item label="Categoria Flickr Moderato" name="ModerateRating"/>
- <combo_box.item label="Categoria Flickr Censurato" name="RestrictedRating"/>
- </combo_box>
- <button label="Condividi" name="post_photo_btn"/>
- <button label="Annulla" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index ca9959a581902df3a9ee1f21b28b45443e5b3f31..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Scegli Info"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[nome]"/>
- <text_editor name="pick_location" value="[caricamento...]"/>
- <text_editor name="pick_desc" value="[descrizione]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Teleport" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mappa" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Modifica" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_picks.xml b/indra/newview/skins/default/xui/it/panel_picks.xml
deleted file mode 100644
index 3faf28a948488278bbe585b7f832784cddbfc641..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Preferiti" name="panel_picks">
- <string name="no_picks" value="Nessun luogo preferito"/>
- <string name="no_classifieds" value="Nessun annuncio"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Preferiti"/>
- <accordion_tab name="tab_classifieds" title="Annunci pubblicitari"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Crea un nuovo luogo preferito o annuncio in questo luogo"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Informazioni" name="info_btn" tool_tip="Mostra informazioni sul luogo preferito"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Teleport" name="teleport_btn" tool_tip="Teleport alla zona corrispondente"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mappa" name="show_on_map_btn" tool_tip="Mostra la zona corrispondente nella mappa del Mondo"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_twitter_account.xml b/indra/newview/skins/default/xui/it/panel_twitter_account.xml
deleted file mode 100644
index 7eb3968f7530c0c799dd5871fa68c41270909b89..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Sei in collegamento con Twitter come:"/>
- <string name="twitter_disconnected" value="Non in collegamento con Twitter"/>
- <text name="account_caption_label">
- Non in collegamento con Twitter.
- </text>
- <panel name="panel_buttons">
- <button label="Collegamento..." name="connect_btn"/>
- <button label="Interrompi collegamento" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Come pubblicare su Twitter]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_twitter_photo.xml b/indra/newview/skins/default/xui/it/panel_twitter_photo.xml
deleted file mode 100644
index 69596784bd842d374f5a1aa71f4234e401766f29..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/it/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- Cosa sta succedendo?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Includi il luogo in SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Includi una foto" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Risoluzione immagini">
- <combo_box.item label="Finestra attuale" 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>
- <combo_box name="filters_combobox" tool_tip="Filtri immagini">
- <combo_box.item label="Nessun filtro" name="NoFilter"/>
- </combo_box>
- <button label="Aggiorna" name="new_snapshot_btn" tool_tip="Fai clic per aggiornare"/>
- <button label="Anteprima" name="big_preview_btn" tool_tip="Fai clic per alternare l'anteprima"/>
- <button label="Tweetta" name="post_photo_btn"/>
- <button label="Annulla" name="cancel_photo_btn"/>
-</panel>
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
deleted file mode 100644
index fd601672b68e37b451c85c1ec20cec7810861d8f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="デイサイクルを編集">
- <string name="title_new">
- æ–°ãŸãªãƒ‡ã‚¤ã‚µã‚¤ã‚¯ãƒ«ã‚’作æˆ
- </string>
- <string name="title_edit">
- デイサイクルを編集
- </string>
- <string name="hint_new">
- æ–°ã—ã„デイサイクルã«åå‰ã‚’ã¤ã‘ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </string>
- <string name="hint_edit">
- 自分ã§ä½œæˆã—ãŸãƒ‡ã‚¤ã‚µã‚¤ã‚¯ãƒ«ã‚’編集ã™ã‚‹ã«ã¯ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </string>
- <string name="combo_label">
- - 事å‰è¨å®šã‚’é¸æŠž -
- </string>
- <text name="label">
- 事å‰è¨å®šã®åå‰ï¼š
- </text>
- <text name="note">
- 注æ„：自分ã§ä½œæˆã—ãŸäº‹å‰è¨å®šã®åå‰ã‚’変更ã™ã‚‹ã¨ã€æ–°ã—ã„事å‰è¨å®šãŒåˆ¥ã«ä½œæˆã•ã‚Œã‚‹ã ã‘ã§ã€å…ƒã®äº‹å‰è¨å®šã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。
- </text>
- <text name="hint_item1">
- - 特定ã®ç©ºã®è¨å®šã‚„時間を編集ã™ã‚‹ã«ã¯ã‚¿ãƒ–ã‚’1ã¤ã‚¯ãƒªãƒƒã‚¯ã—ã¾ã™ã€‚
- </text>
- <text name="hint_item2">
- - 移行時間をè¨å®šã™ã‚‹ã«ã¯ã‚¿ãƒ–をクリックã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã—ã¾ã™ã€‚
- </text>
- <text name="hint_item3">
- - デイサイクルをプレビューã™ã‚‹ã«ã¯ã‚¹ã‚¯ãƒ©ãƒãƒ¼ã‚’使ã„ã¾ã™ã€‚
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="ã‚ーã®è¿½åŠ " label_selected="ã‚ーã®è¿½åŠ " name="WLAddKey"/>
- <button label="ã‚ーã®å‰Šé™¤" label_selected="ã‚ーã®å‰Šé™¤" name="WLDeleteKey"/>
- <text name="WL12am">
- 12am
- </text>
- <text name="WL3am">
- 3am
- </text>
- <text name="WL6am">
- 6am
- </text>
- <text name="WL9amHash">
- 9am
- </text>
- <text name="WL12pmHash">
- 12pm
- </text>
- <text name="WL3pm">
- 3pm
- </text>
- <text name="WL6pm">
- 6pm
- </text>
- <text name="WL9pm">
- 9pm
- </text>
- <text name="WL12am2">
- 12am
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- 空ã®è¨å®šï¼š
- </text>
- <combo_box label="事å‰è¨å®š" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- 時間：
- </text>
- <time name="time" value="6:00 AM"/>
- <check_box label="ã“れを新ã—ã„デイサイクルã«ã™ã‚‹" name="make_default_cb"/>
- <button label="ä¿å˜" name="save"/>
- <button label="å–り消ã—" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 2d74bdeeb992aacbacaf25a1d0c768ea2e354073..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="空ã®äº‹å‰è¨å®šã‚’編集">
- <string name="title_new">
- æ–°ã—ã„空ã®äº‹å‰è¨å®šã‚’作æˆ
- </string>
- <string name="title_edit">
- 空ã®äº‹å‰è¨å®šã‚’編集
- </string>
- <string name="hint_new">
- æ–°ã—ã„事å‰è¨å®šã«åå‰ã‚’ã¤ã‘ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </string>
- <string name="hint_edit">
- 空ã®äº‹å‰è¨å®šã‚’編集ã™ã‚‹ã«ã¯ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </string>
- <string name="combo_label">
- - 事å‰è¨å®šã‚’é¸æŠž -
- </string>
- <text name="hint">
- 事å‰è¨å®šã‚’編集ã™ã‚‹ã«ã¯ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </text>
- <text name="label">
- 事å‰è¨å®šã®åå‰ï¼š
- </text>
- <text name="note">
- 注記： 自分ã§ä½œæˆã—ãŸäº‹å‰è¨å®šã®åå‰ã‚’変更ã™ã‚‹ã¨ã€æ–°ã—ã„事å‰è¨å®šãŒåˆ¥ã«ä½œæˆã•ã‚Œã‚‹ã ã‘ã§ã€å…ƒã®äº‹å‰è¨å®šã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="大気" name="Atmosphere">
- <text name="BHText">
- 空ã®é…色
- </text>
- <text name="BDensText">
- 空ã¨é 景ã®éœ²å…‰
- </text>
- <text name="BDensText2">
- 空ã®é…色ã¨æ¿ƒåº¦
- </text>
- <text name="HDText">
- 大気ã®ä¸é€æ˜Žåº¦
- </text>
- <text name="DensMultText">
- 大気ã®ä¸é€æ˜Žåº¦ã®å¢—å¹…
- </text>
- <text name="WLDistanceMultText">
- 視界ã®å¢—å¹…
- </text>
- <text name="MaxAltText">
- 最大高度
- </text>
- </panel>
- <panel label="ライティング" name="Lighting">
- <text name="SLCText">
- 太陽/月ã®è‰²
- </text>
- <text name="WLAmbientText">
- アンビエント
- </text>
- <text name="SunGlowText">
- 太陽ã®è¼ã
- </text>
- <slider label="焦点" name="WLGlowB"/>
- <slider label="サイズ" name="WLGlowR"/>
- <text name="WLStarText">
- 星ã®è¼ã
- </text>
- <text name="SceneGammaText">
- 風景ガンマ
- </text>
- <text name="TODText">
- 太陽/月ã®ä½ç½®
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 12am
- </text>
- <text name="WL6am">
- 6am
- </text>
- <text name="WL12pmHash">
- 12pm
- </text>
- <text name="WL6pm">
- 6pm
- </text>
- <text name="WL12am2">
- 12am
- </text>
- <time name="WLDayTime" value="6:00 AM"/>
- <text name="WLEastAngleText">
- æ±ã®è§’度
- </text>
- </panel>
- <panel label="雲" name="Clouds">
- <text name="WLCloudColorText">
- 雲ã®è‰²
- </text>
- <text name="WLCloudColorText2">
- 雲ã®XY/密度
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- 雲ã®é‡
- </text>
- <text name="WLCloudScaleText">
- 雲ã®ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <text name="WLCloudDetailText">
- 雲ã®è©³ç´°ï¼ˆXY/密度）
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- 雲ã®ç§»å‹•é€Ÿåº¦ï¼ˆXæ–¹å‘）
- </text>
- <check_box label="ãƒãƒƒã‚¯" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- 雲ã®ç§»å‹•é€Ÿåº¦ï¼ˆYæ–¹å‘）
- </text>
- <check_box label="ãƒãƒƒã‚¯" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="ã“ã®äº‹å‰è¨å®šã‚’æ–°ã—ã„空ã®è¨å®šã«ã™ã‚‹" name="make_default_cb"/>
- <button label="ä¿å˜" name="save"/>
- <button label="ã‚ャンセル" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 691aed35d05ecadb0bb5ffcc5ebab3ba261a6f5a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="æ°´ã®äº‹å‰è¨å®šã‚’編集">
- <string name="title_new">
- æ–°ã—ã„æ°´ã®äº‹å‰è¨å®šã‚’作æˆ
- </string>
- <string name="title_edit">
- æ°´ã®äº‹å‰è¨å®šã‚’編集
- </string>
- <string name="hint_new">
- æ–°ã—ã„事å‰è¨å®šã«åå‰ã‚’ã¤ã‘ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </string>
- <string name="hint_edit">
- æ°´ã®äº‹å‰è¨å®šã‚’編集ã™ã‚‹ã«ã¯ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </string>
- <string name="combo_label">
- - 事å‰è¨å®šã‚’é¸æŠž -
- </string>
- <text name="hint">
- 事å‰è¨å®šã‚’編集ã™ã‚‹ã«ã¯ã€å¸Œæœ›ã®è¨å®šã«èª¿ç¯€ã—ã¦ã€ã€Œä¿å˜ã€ã‚’クリックã—ã¾ã™ã€‚
- </text>
- <text name="label">
- 事å‰è¨å®šã®åå‰ï¼š
- </text>
- <text name="note">
- 注記： 自分ã§ä½œæˆã—ãŸäº‹å‰è¨å®šã®åå‰ã‚’変更ã™ã‚‹ã¨ã€æ–°ã—ã„事å‰è¨å®šãŒåˆ¥ã«ä½œæˆã•ã‚Œã‚‹ã ã‘ã§ã€å…ƒã®äº‹å‰è¨å®šã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- æ°´ä¸ã®ãƒ•ã‚©ã‚°åŠ¹æžœã®è‰²
- </text>
- <text name="water_fog_density_label">
- æ°´ä¸ã®é€æ˜Žåº¦æŒ‡æ•°
- </text>
- <text name="underwater_fog_modifier_label">
- æ°´ä¸ã®ãƒ•ã‚©ã‚°åŠ¹æžœåŠ 減
- </text>
- <text name="BHText">
- 大波ã®æ–¹å‘
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- ã•ã–æ³¢ã®å射スケール
- </text>
- <text name="HDText">
- フレãƒãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <text name="FresnelOffsetText">
- フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆ
- </text>
- <text name="BHText2">
- å°æ³¢ã®æ–¹å‘
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- æ°´é¢ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <text name="WaterScaleBelowText">
- æ°´ä¸ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <text name="MaxAltText">
- ä¸é€æ˜Žåº¦ã®å¢—å¹…
- </text>
- <text name="BHText3">
- ノーマル・マップ
- </text>
- </panel>
- <check_box label="ã“ã®äº‹å‰è¨å®šã‚’æ–°ã—ã„æ°´ã®è¨å®šã«ã™ã‚‹" name="make_default_cb"/>
- <button label="ä¿å˜" name="save"/>
- <button label="ã‚ャンセル" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
deleted file mode 100644
index f9290971c6a54d7a294d0e4afa055551a7e148c0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="自然環境ã®è¨å®š">
- <text name="note">
- ビューワã®è‡ªç„¶ç’°å¢ƒã®è¨å®šã¯ä»¥ä¸‹ã®ã‚ªãƒ—ションを使ã£ã¦ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã§ãã¾ã™ã€‚
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="リージョンã®è¨å®šã‚’使用" name="use_region_settings"/>
- <radio_item label="自然環境をカスタマイズ" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- 注記： カスタムè¨å®šã¯ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«ã¯è¦‹ãˆã¾ã›ã‚“。
- </text>
- <text name="water_settings_title">
- æ°´ã®è¨å®š
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="- 事å‰è¨å®šã‚’é¸æŠž -" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- 空 / デイサイクル
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="空ã®å›ºå®š" name="my_sky_settings"/>
- <radio_item label="デイサイクル" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="- 事å‰è¨å®šã‚’é¸æŠž -" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="- 事å‰è¨å®šã‚’é¸æŠž -" name="item0"/>
- </combo_box>
- </panel>
- <button label="OK" name="ok_btn"/>
- <button label="ã‚ャンセル" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_facebook.xml b/indra/newview/skins/default/xui/ja/floater_facebook.xml
deleted file mode 100644
index 76149a875e326b834a8c0199e599cbd569da5a26..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="FACEBOOK ã«æŠ•ç¨¿">
- <tab_container name="tabs">
- <panel label="ステータス" name="panel_facebook_status"/>
- <panel label="写真" name="panel_facebook_photo"/>
- <panel label="ãƒã‚§ãƒƒã‚¯ã‚¤ãƒ³" name="panel_facebook_place"/>
- <panel label="フレンド" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- エラー
- </text>
- <text name="connection_loading_text">
- ãƒãƒ¼ãƒ‰ä¸...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_flickr.xml b/indra/newview/skins/default/xui/ja/floater_flickr.xml
deleted file mode 100644
index 77df22c9a07b8b4e820ca72d0e254dc503394431..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="FLICKR ã§å…±æœ‰ã™ã‚‹">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="写真" name="panel_flickr_photo"/>
- <panel label="アカウント" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- エラー
- </text>
- <text name="connection_loading_text">
- ãƒãƒ¼ãƒ‰ä¸...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
deleted file mode 100644
index c8b8e918e0f32be8cc0e48b6aab2f51b5e8b5bcc..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢è¨å®š">
- <text name="Filtering:">
- フィルタリング：
- </text>
- <check_box label="異方的フィルタリング（有効ã«ã™ã‚‹ã¨é€Ÿåº¦ãŒä½Žä¸‹ã—ã¾ã™ï¼‰" name="ani"/>
- <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>
- <spinner label="ガンマ：" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- （0 ã§ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã€ä½Žã„ã»ã©æ˜Žã‚‹ã„）
- </text>
- <text name="Enable VBO:">
- VBO を有効化：
- </text>
- <check_box initial_value="true" label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã¨ã€ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ã€‚ ã—ã‹ã—ã€æ—§åž‹ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã¯ VBO ã®å®Ÿè£…ãŒè²§å¼±ãªå ´åˆãŒå¤šãã€ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã“ã¨ã§ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã«ã¤ãªãŒã‚‹ãŠãã‚ŒãŒã‚ã‚Šã¾ã™ã€‚"/>
- <text name="tc label">
- S3TC を有効ã«ã™ã‚‹ï¼š
- </text>
- <check_box initial_value="true" label="テクスãƒãƒ£åœ§ç¸®ã‚’有効ã«ã™ã‚‹ï¼ˆå†èµ·å‹•ãŒå¿…è¦ï¼‰" name="texture compression" tool_tip="ビデオメモリ内ã§ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’圧縮ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€è‰²ã®è³ªã‚’å¤šå°‘çŠ ç‰²ã«ã—ãªãŒã‚‰ã€ã‚ˆã‚Šé«˜è§£åƒåº¦ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’èªã¿è¾¼ã‚るよã†ã«ã—ã¾ã™ã€‚"/>
- <slider label="テクスãƒãƒ£ãƒ¡ãƒ¢ãƒªï¼ˆMB）：" name="GraphicsCardTextureMemory" tool_tip="テクスãƒãƒ£ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸãƒ¡ãƒ¢ãƒªã®é‡ã€‚ ビデオカードã®ãƒ¡ãƒ¢ãƒªã«æ—¢å®šã€‚ 数値を下ã’ã‚‹ã¨ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ãŒã€ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ç²¾åº¦ãŒè½ã¡ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚"/>
- <spinner label="フォグã®è·é›¢æ¯”率：" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_twitter.xml b/indra/newview/skins/default/xui/ja/floater_twitter.xml
deleted file mode 100644
index 6df204555484d08854fdc8b4f7b9d36e55865ea9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="作æˆ" name="panel_twitter_photo"/>
- <panel label="アカウント" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- エラー
- </text>
- <text name="connection_loading_text">
- ãƒãƒ¼ãƒ‰ä¸...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
deleted file mode 100644
index 619e9de65a7e2bda46ce6add935c4927dea313bd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="クラシファイド広告ã®ç·¨é›†" name="panel_edit_classified">
- <panel.string name="location_notice">
- （掲載後更新）
- </panel.string>
- <string name="publish_label">
- 掲載
- </string>
- <string name="save_label">
- ä¿å˜
- </string>
- <text name="title">
- クラシファイド広告ã®ç·¨é›†
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="クリックã—ã¦ç”»åƒã‚’é¸æŠž"/>
- </panel>
- <text name="Name:">
- タイトル：
- </text>
- <text name="description_label">
- 説明：
- </text>
- <text name="location_label">
- ä½ç½®ï¼š
- </text>
- <text name="classified_location">
- ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...
- </text>
- <button label="ç¾åœ¨åœ°ã«è¨å®š" name="set_to_curr_location_btn"/>
- <text name="category_label" value="カテゴリ："/>
- <text name="content_type_label" value="内容ã®ç¨®é¡žï¼š"/>
- <icons_combo_box label="「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="content_type">
- <icons_combo_box.item label="「Moderateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="mature_ci" value="Mature"/>
- <icons_combo_box.item label="「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="pg_ci" value="PG"/>
- </icons_combo_box>
- <check_box label="毎週自動更新" name="auto_renew"/>
- <text name="price_for_listing_label" value="æŽ²è¼‰ä¾¡æ ¼ï¼š"/>
- <spinner label="L$" name="price_for_listing" tool_tip="æŽ²è¼‰ä¾¡æ ¼" value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="ã‚ャンセル" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
deleted file mode 100644
index 39ea1df1e36ef2d41d3f0f1849434674088847bd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="ピック編集" name="panel_edit_pick">
- <panel.string name="location_notice">
- （掲載後更新）
- </panel.string>
- <text name="title">
- ピック編集
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="クリックã—ã¦ç”»åƒã‚’é¸æŠž"/>
- <text name="Name:">
- タイトル：
- </text>
- <text name="description_label">
- 説明：
- </text>
- <text name="location_label">
- å ´æ‰€ï¼š
- </text>
- <text name="pick_location">
- ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...
- </text>
- <button label="ç¾åœ¨åœ°ã«è¨å®š" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="ピックをä¿å˜" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="å–り消ã—" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
deleted file mode 100644
index 4cbd7f793befbcdf5c00275412a69837b7570cb9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã®ç·¨é›†" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="ä½äºº"/>
- <string name="AcctTypeTrial" value="トライアル"/>
- <string name="AcctTypeCharterMember" value="創立メンãƒãƒ¼"/>
- <string name="AcctTypeEmployee" value="Linden Lab 従æ¥å“¡"/>
- <string name="PaymentInfoUsed" value="æ”¯æ‰•æƒ…å ±ä½¿ç”¨å±¥æ´ã‚ã‚Š"/>
- <string name="PaymentInfoOnFile" value="æ”¯æ‰•æƒ…å ±ç™»éŒ²æ¸ˆ"/>
- <string name="NoPaymentInfoOnFile" value="æ”¯æ‰•æƒ…å ±æœªç™»éŒ²"/>
- <string name="AgeVerified" value="年齢確èªæ¸ˆ"/>
- <string name="NotAgeVerified" value="年齢未確èª"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=ja
- </string>
- <string name="my_account_link_url">
- http://jp.secondlife.com/my
- </string>
- <string name="no_partner_text" value="ãªã—"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="表示å："/>
- <text name="solo_username_label" value="ユーザーå："/>
- <button name="set_name" tool_tip="表示åã‚’è¨å®š"/>
- <text name="solo_user_name" value="Hamilton Hitchings"/>
- <text name="user_name" value="Hamilton Hitchings"/>
- <text name="user_name_small" value="Hamilton Hitchings"/>
- <text name="user_label" value="ユーザーå："/>
- <text name="user_slid" value="hamilton.linden"/>
- <panel name="lifes_images_panel">
- <panel name="second_life_image_panel">
- <text name="second_life_photo_title_text" value="[SECOND_LIFE]："/>
- </panel>
- <icon label="" name="2nd_life_edit_icon" tool_tip="クリックã—ã¦ç”»åƒã‚’é¸æŠž"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="ç¾å®Ÿä¸–界："/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="クリックã—ã¦ç”»åƒã‚’é¸æŠž"/>
- <text name="title_homepage_text">
- Web サイト：
- </text>
- <line_editor name="homepage_edit" value="http://"/>
- <check_box label="検索çµæžœã«è¡¨ç¤º" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="マイアカウント："/>
- <text_editor name="acc_status_text" value="ä½äººã€‚ æ”¯æ‰•æƒ…å ±æœªç™»éŒ²ã€‚"/>
- <text name="my_account_link" value="[[URL] マイアカウントã«ç§»å‹•]"/>
- <text name="title_partner_text" value="マイパートナー："/>
- <panel name="partner_data_panel">
- <text initial_value="（å–å¾—ä¸ï¼‰" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] 編集]" width="100"/>
- </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="変更をä¿å˜" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="å–り消ã—" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml b/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml
deleted file mode 100644
index 17c628a19035f5523dd94c63887edf88859c949d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Second Life ã®ä½äººã«ã‚‚ãªã£ã¦ã„ã‚‹ Facebook ã®å‹ã ã¡ãŒã„ã¾ã›ã‚“。今ã™ã Facebook ã®å‹ã ã¡ã« Second Life ã«å‚åŠ ã—ã¦ã‚‚らã„ã¾ã—ょã†ï¼"/>
- <string name="facebook_friends_no_connected" value="ç¾åœ¨ Facebook ã«æŽ¥ç¶šã•ã‚Œã¦ã„ã¾ã›ã‚“。「ステータスã€ã‚¿ãƒ–ã«é€²ã‚“ã§ã€ã“ã®æ©Ÿèƒ½ã‚’有効ã«ã—ã¦ãã ã•ã„。"/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="SL ã®å‹ã ã¡"/>
- <accordion_tab name="tab_suggested_friends" title="ã“れらã®äººã‚’ SL ã®å‹ã ã¡ã¨ã—ã¦è¿½åŠ "/>
- </accordion>
- <text name="facebook_friends_status">
- Facebook ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“。
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml b/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
deleted file mode 100644
index ee57d178e820caa277ed3e1a9675470a2d58debb..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" 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="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
- <combo_box.item label="フィルターãªã—" name="NoFilter"/>
- </combo_box>
- <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
- <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
- <text name="caption_label">
- コメント (オプション):
- </text>
- <button label="投稿" name="post_photo_btn"/>
- <button label="ã‚ャンセル" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_place.xml b/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
deleted file mode 100644
index e97422a9df21ebe4885cd5f9ab9b3892661b5e2b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- 自分ãŒã„ã‚‹å ´æ‰€ã«ã¤ã„ã¦ä½•ã‹è¨€ã£ã¦ãã ã•ã„:
- </text>
- <check_box initial_value="false" label="å ´æ‰€ã®ä¿¯çž°å›³ã‚’å«ã‚ã‚‹" name="add_place_view_cb"/>
- <button label="投稿" name="post_place_btn"/>
- <button label="ã‚ャンセル" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_facebook_status.xml b/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
deleted file mode 100644
index 1f48c9c8c7ae08563880eaad5cec2dc845176843..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¨ã—㦠Facebook ã«æŽ¥ç¶šï¼š"/>
- <string name="facebook_disconnected" value="Facebook ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“"/>
- <text name="account_caption_label">
- Facebook ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“。
- </text>
- <panel name="panel_buttons">
- <button label="接続..." name="connect_btn"/>
- <button label="切æ–" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook ã¸ã®æŠ•ç¨¿ã«ã¤ã„ã¦]
- </text>
- </panel>
- <text name="status_caption_label">
- 今ã€ä½•ã‚’考ãˆã¦ã„ã‚‹?
- </text>
- <button label="投稿" name="post_status_btn"/>
- <button label="ã‚ャンセル" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_flickr_account.xml b/indra/newview/skins/default/xui/ja/panel_flickr_account.xml
deleted file mode 100644
index bd2e96d58c91d35b46a2138e4404846aa68a8cbe..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¨ã—㦠Flickr ã«æŽ¥ç¶š:"/>
- <string name="flickr_disconnected" value="Flickr ã«æŽ¥ç¶šã—ã¦ã„ãªã„"/>
- <text name="account_caption_label">
- Flickr ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“。
- </text>
- <panel name="panel_buttons">
- <button label="接続..." name="connect_btn"/>
- <button label="切æ–" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Flickr ã¸ã®æŠ•ç¨¿ã«ã¤ã„ã¦]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml b/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
deleted file mode 100644
index 6a484b8e59dd1d8aa3e520b0810857313293728d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" 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>
- <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
- <combo_box.item label="フィルターãªã—" name="NoFilter"/>
- </combo_box>
- <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
- <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
- <text name="title_label">
- タイトル：
- </text>
- <text name="description_label">
- 説明：
- </text>
- <check_box initial_value="true" label="SL ã®å ´æ‰€ã‚’説明ã®æœ€å¾Œã«å«ã‚ã‚‹" name="add_location_cb"/>
- <text name="tags_label">
- タグ：
- </text>
- <text name="tags_help_label">
- タグをスペースã§åŒºåˆ‡ã‚‹
-複数å˜èªžã®ã‚¿ã‚°ã« "" を使用
- </text>
- <combo_box name="rating_combobox" tool_tip="Flickr コンテンツã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†">
- <combo_box.item label="Flickr レーティング区分「Safeã€" name="SafeRating"/>
- <combo_box.item label="Flickr レーティング区分「Moderateã€" name="ModerateRating"/>
- <combo_box.item label="Flickr レーティング区分「Restrictedã€" name="RestrictedRating"/>
- </combo_box>
- <button label="共有" name="post_photo_btn"/>
- <button label="å–り消ã—" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index e7b5d1929d8293e5f26d65eadd0e6de36c7f72b7..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="ピックã®æƒ…å ±"/>
- <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]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="地図" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="編集" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
deleted file mode 100644
index c6eaaeef4175b5d4d50cd0d778393b28369b3b7c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="ピック" name="panel_picks">
- <string name="no_picks" value="ピックãªã—"/>
- <string name="no_classifieds" value="クラシファイド広告ãªã—"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="ピック"/>
- <accordion_tab name="tab_classifieds" title="クラシファイド広告"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="ç¾åœ¨åœ°ã®æ–°ã—ã„ピックã€ã¾ãŸã¯ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’作æˆã—ã¾ã™"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="æƒ…å ±" name="info_btn" tool_tip="ピックã®æƒ…å ±ã‚’è¡¨ç¤º"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn" tool_tip="該当ã™ã‚‹ã‚¨ãƒªã‚¢ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="地図" name="show_on_map_btn" tool_tip="世界地図ã«è©²å½“ã™ã‚‹ã‚¨ãƒªã‚¢ã‚’表示"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_twitter_account.xml b/indra/newview/skins/default/xui/ja/panel_twitter_account.xml
deleted file mode 100644
index b140b7463f4075b010fa91773369aefacebf56b1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¨ã—㦠Twitter ã«æŽ¥ç¶š:"/>
- <string name="twitter_disconnected" value="Twitter ã«æŽ¥ç¶šã—ã¦ã„ãªã„"/>
- <text name="account_caption_label">
- Twitter ã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“。
- </text>
- <panel name="panel_buttons">
- <button label="接続..." name="connect_btn"/>
- <button label="切æ–" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Twitter ã¸ã®æŠ•ç¨¿ã«ã¤ã„ã¦]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml b/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml
deleted file mode 100644
index cdb45e185385106bb8d834941bc9b3013715730b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- 何ãŒèµ·ãã¦ã„ã‚‹ã®ã§ã—ょã†ã‹?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="SL ã®å ´æ‰€ã‚’å«ã‚€" name="add_location_cb"/>
- <check_box initial_value="true" label="写真をå«ã‚ã‚‹" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="ç”»åƒè§£åƒåº¦">
- <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" 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>
- <combo_box name="filters_combobox" tool_tip="ç”»åƒãƒ•ã‚£ãƒ«ã‚¿ãƒ¼">
- <combo_box.item label="フィルターãªã—" name="NoFilter"/>
- </combo_box>
- <button label="æ›´æ–°" name="new_snapshot_btn" tool_tip="クリックã—ã¦æ›´æ–°"/>
- <button label="プレビュー" name="big_preview_btn" tool_tip="クリックã—ã¦ãƒ—レビューを切り替ãˆã‚‹"/>
- <button label="ツイート" name="post_photo_btn"/>
- <button label="å–り消ã—" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml b/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml
new file mode 100644
index 0000000000000000000000000000000000000000..95a2e0aceeac61939d8bb7c3c95ecbde2befbd38
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/control_table_contents_camera.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+ <rows name="camera_actions">
+ <columns label="Kamera" name="lst_action" />
+ </rows>
+ <rows name="look_up">
+ <columns name="lst_action" value="Patrz w górę" />
+ </rows>
+ <rows name="look_down">
+ <columns name="lst_action" value="Patrz w dół" />
+ </rows>
+ <rows name="move_forward">
+ <columns name="lst_action" value="Kamera w przód" />
+ </rows>
+ <rows name="move_backward">
+ <columns name="lst_action" value="Kamera w tył" />
+ </rows>
+ <rows name="move_forward_fast">
+ <columns name="lst_action" value="Kamera szybko w przód" />
+ </rows>
+ <rows name="move_backward_fast">
+ <columns name="lst_action" value="Kamera szybko w tył" />
+ </rows>
+ <rows name="spin_over">
+ <columns name="lst_action" value="Obrót kamery w górę" />
+ </rows>
+ <rows name="spin_under">
+ <columns name="lst_action" value="Obrót kamery w dół" />
+ </rows>
+ <rows name="pan_up">
+ <columns name="lst_action" value="Przesuń kamerę w górę" />
+ </rows>
+ <rows name="pan_down">
+ <columns name="lst_action" value="Przesuń kamerę w dół" />
+ </rows>
+ <rows name="pan_left">
+ <columns name="lst_action" value="Przesuń kamerę w lewo" />
+ </rows>
+ <rows name="pan_right">
+ <columns name="lst_action" value="Przesuń kamerę w prawo" />
+ </rows>
+ <rows name="pan_in">
+ <columns name="lst_action" value="Przybliż kamerę" />
+ </rows>
+ <rows name="pan_out">
+ <columns name="lst_action" value="Oddal kamerÄ™" />
+ </rows>
+ <rows name="spin_around_ccw">
+ <columns name="lst_action" tool_tip="Obrót kamery w kierunku przeciwnym do ruchu wskazówek zegara." value="Obrót kamery w prawo" />
+ </rows>
+ <rows name="spin_around_cw">
+ <columns name="lst_action" tool_tip="Obrót kamery zgodnie z ruchem wskazówek zegara." value="Obrót kamery w lewo" />
+ </rows>
+ <rows name="move_forward_sitting">
+ <columns name="lst_action" value="Kamera w przód siedząc" />
+ </rows>
+ <rows name="move_backward_sitting">
+ <columns name="lst_action" value="Kamera w tył siedząc" />
+ </rows>
+ <rows name="spin_over_sitting">
+ <columns name="lst_action" value="Obrót kamery w górę siedząc" />
+ </rows>
+ <rows name="spin_under_sitting">
+ <columns name="lst_action" value="Obrót kamery w dół siedząc" />
+ </rows>
+ <rows name="spin_around_ccw_sitting">
+ <columns name="lst_action" tool_tip="Obrót kamery w kierunku przeciwnym do ruchu wskazówek zegara - siedząc." value="Obrót kamery w prawo siedząc" />
+ </rows>
+ <rows name="spin_around_cw_sitting">
+ <columns name="lst_action" tool_tip="Obrót kamery zgodnie z ruchem wskazówek zegara - siedząc." value="Obrót kamery w lewo siedząc" />
+ </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/pl/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/pl/control_table_contents_columns_basic.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5f995b412844e7082662c76dc5fd63e7dbb626ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/control_table_contents_columns_basic.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+ <columns label="Akcja" name="lst_action" />
+ <columns label="Wyzwalacz" name="lst_ctrl1" />
+ <columns label="Alternatywny 1" name="lst_ctrl2" />
+ <columns label="Alternatywny 2" name="lst_ctrl3" />
+</contents>
diff --git a/indra/newview/skins/default/xui/pl/control_table_contents_editing.xml b/indra/newview/skins/default/xui/pl/control_table_contents_editing.xml
new file mode 100644
index 0000000000000000000000000000000000000000..568b7dcf6dc352ba5a23bd3dade0acb654f69922
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/control_table_contents_editing.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+ <rows name="editing_actions">
+ <columns label="Edytowanie" name="lst_action" />
+ </rows>
+ <rows name="edit_avatar_spin_ccw">
+ <columns name="lst_action" tool_tip="Obrót kamery wokół awatara w kierunku przeciwnym do ruchu wskazówek zegara." value="Obrót kamery w prawo" />
+ </rows>
+ <rows name="edit_avatar_spin_cw">
+ <columns name="lst_action" tool_tip="Obrót kamery wokół awatara zgodnie z ruchem wskazówek zegara." value="Obrót kamery w lewo" />
+ </rows>
+ <rows name="edit_avatar_spin_over">
+ <columns name="lst_action" tool_tip="Obrót kamery ponad awatarem" value="Obrót kamery w górę" />
+ </rows>
+ <rows name="edit_avatar_spin_under">
+ <columns name="lst_action" tool_tip="Obrót kamery pod awatarem" value="Obrót kamery w dół" />
+ </rows>
+ <rows name="edit_avatar_move_forward">
+ <columns name="lst_action" value="Kamera w przód" />
+ </rows>
+ <rows name="edit_avatar_move_backward">
+ <columns name="lst_action" value="Kamera w tył" />
+ </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/pl/control_table_contents_media.xml b/indra/newview/skins/default/xui/pl/control_table_contents_media.xml
new file mode 100644
index 0000000000000000000000000000000000000000..042e37963d817b47a039fdd4856bc302f09ecb7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/control_table_contents_media.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+ <rows name="media_actions">
+ <columns label="Dźwięk i media" name="lst_action" />
+ </rows>
+ <rows name="toggle_pause_media">
+ <columns name="lst_action" value="Odtwórz / wstrzymaj media" />
+ </rows>
+ <rows name="toggle_enable_media">
+ <columns name="lst_action" value="Odtwórz / zatrzymaj wszystkie media" />
+ </rows>
+ <rows name="voice_follow_key">
+ <columns name="lst_action" value="GÅ‚os" />
+ </rows>
+ <rows name="toggle_voice">
+ <columns name="lst_action" value="Przełącz głos" />
+ </rows>
+ <rows name="start_chat">
+ <columns name="lst_action" value="Rozpocznij czat" />
+ </rows>
+ <rows name="start_gesture">
+ <columns name="lst_action" value="Odtwórz gest" />
+ </rows>
+ <rows name="script_trigger_lbutton">
+ <columns name="lst_action" value="Interakcja (LMB)" />
+ </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/pl/control_table_contents_movement.xml b/indra/newview/skins/default/xui/pl/control_table_contents_movement.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93dd24f0d560ff729696aec8cc4ae9d534fda801
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/control_table_contents_movement.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+ <rows name="move_actions">
+ <columns label="Ruch" name="lst_action" />
+ </rows>
+ <rows name="walk_to">
+ <columns name="lst_action" tool_tip="Podejdź do miejsca, której wskazuje kursor myszy." value="Podejdź do" />
+ </rows>
+ <rows name="teleport_to">
+ <columns name="lst_action" tool_tip="Teleportuj się do miejsca, które wskazuje kursor myszy - nie wszystkie lokalizacje pozwalają na bezpośrednią teleportację, więc zamiast tego możesz zostać teleportowana/y w pobliże celu." value="Teleportuj do" />
+ </rows>
+ <rows name="push_forward">
+ <columns name="lst_action" value="Idź w przód" />
+ </rows>
+ <rows name="push_backward">
+ <columns name="lst_action" value="Idź do tyłu" />
+ </rows>
+ <rows name="turn_left">
+ <columns name="lst_action" value="Obrót w lewo" />
+ </rows>
+ <rows name="turn_right">
+ <columns name="lst_action" value="Obrót w prawo" />
+ </rows>
+ <rows name="slide_left">
+ <columns name="lst_action" value="Idź w lewo" />
+ </rows>
+ <rows name="slide_right">
+ <columns name="lst_action" value="Idź w prawo" />
+ </rows>
+ <rows name="jump">
+ <columns name="lst_action" value="Skok / W górę" />
+ </rows>
+ <rows name="push_down">
+ <columns name="lst_action" value="W dół" />
+ </rows>
+ <rows name="run_forward">
+ <columns name="lst_action" value="Bieg w przód" />
+ </rows>
+ <rows name="run_backward">
+ <columns name="lst_action" value="Bieg w tył" />
+ </rows>
+ <rows name="run_left">
+ <columns name="lst_action" value="Bieg w lewo" />
+ </rows>
+ <rows name="run_right">
+ <columns name="lst_action" value="Bieg w prawo" />
+ </rows>
+ <rows name="toggle_run">
+ <columns name="lst_action" value="Zawsze biegaj" />
+ </rows>
+ <rows name="toggle_fly">
+ <columns name="lst_action" value="Lataj / Przestań" />
+ </rows>
+ <rows name="toggle_sit">
+ <columns name="lst_action" value="Usiądź / Wstań" />
+ </rows>
+ <rows name="stop_moving">
+ <columns name="lst_action" value="Wstrzymaj ruch" />
+ </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/pl/floater_360capture.xml b/indra/newview/skins/default/xui/pl/floater_360capture.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0a49d1bdeb17c77233fe49e272e6b8eea9e2dc0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_360capture.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater name="360capture" title="Zdjęcie 360°">
+ <panel name="ui_panel_left">
+ <text name="quality_level_label">
+ Poziom detali
+ </text>
+ <radio_group name="360_quality_selection">
+ <radio_item label="Podgląd (szybkie)" name="preview_quality" tool_tip="Najsłabsza jakość" />
+ <radio_item label="Średni" name="medium_quality" tool_tip="Średnia jakość" />
+ <radio_item label="Wysoki" name="high_quality" tool_tip="Wysoka jakość" />
+ <radio_item label="Maksymalny" name="maximum_quality" tool_tip="Maksymalna jakość" />
+ </radio_group>
+ <check_box label="Ukryj awatary" name="360_hide_avatar" />
+ <button label="Stwórz obraz 360" name="capture_button" />
+ <button label="Zapisz jako..." name="save_local_button" />
+ </panel>
+ <panel name="ui_panel_right">
+ <text name="statusbar">
+ Przeciągaj obraz, aby przesunąć widok
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_add_payment_method.xml b/indra/newview/skins/default/xui/pl/floater_add_payment_method.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ef78d3d35f6bab00207c7134c599f619f57acac
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_add_payment_method.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_add_payment_method">
+ <panel name="wrapper_panel">
+ <text name="title_txt">
+ Dodaj metodę płatności, aby kupić Lindeny i lepiej doświadczać Second Life.
+ </text>
+ <button label="Rozpocznij" name="continue_btn" />
+ <button label="Później" name="close_btn" />
+ <text name="image_left_desc">
+ Stwórz awatara, którego pokochasz. Wybieraj spośród milionów sklepów i Second Life Marketplace. Twój styl jest tutaj.
+ </text>
+ <text name="image_center_desc">
+ Wspieraj swoich ulubionych wykonawców i gospodarzy. Pomożesz im tworzyć wspaniałe doświadczenia.
+ </text>
+ <text name="image_right_desc">
+ Stwórz dom swoich marzeń. Miliony przedmiotów dostępnych do kupienia mogą uczynić Twoje gniazdko wyjątkowym.
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_adjust_environment.xml b/indra/newview/skins/default/xui/pl/floater_adjust_environment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33dd99e491bb425410cbcd1398f21a13afeb79c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_adjust_environment.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="env_adjust_snapshot" title="Własne oświetlenie">
+ <layout_stack name="outer_stack">
+ <layout_panel name="env_controls">
+ <layout_stack name="settings_stack">
+ <layout_panel name="lp_1">
+ <text name="ambient_lbl">
+ Otoczenie:
+ </text>
+ <text name="blue_horizon_lbl">
+ Hor. błękitu:
+ </text>
+ <text name="blue_density_lbl">
+ Gęst. błękitu:
+ </text>
+ <button label="Reset" tool_tip="Zamknij i zresetuj do otoczenia współdzielonego" name="btn_reset" />
+ <text name="sun_color_lbl">
+ Kolor Słońca:
+ </text>
+ <text name="cloud_color_lbl">
+ Kolor chmur:
+ </text>
+ <text name="cloud_map_label">
+ Obraz chmur:
+ </text>
+ <text name="water_map_label">
+ Obraz wody:
+ </text>
+ </layout_panel>
+ <layout_panel name="lp_2">
+ <text name="haze_horizon_label">
+ Horyzont mgły:
+ </text>
+ <text name="haze_density_label">
+ Gęstość mgły:
+ </text>
+ <text name="cloud_coverage_label">
+ Zachmurzenie:
+ </text>
+ <text name="cloud_scale_label">
+ Rozmiar chmur:
+ </text>
+ <text name="scene_gamma_label">
+ Gamma sceny:
+ </text>
+ </layout_panel>
+ <layout_panel name="lp_3">
+ <text name="label">
+ Słońce:
+ </text>
+ <text name="sun_azimuth_label">
+ Azymut:
+ </text>
+ <text name="sun_elevation_label">
+ Elewacja:
+ </text>
+ <check_box label="Pokaż emiter" name="sunbeacon" />
+ <text name="scale_label">
+ Rozmiar:
+ </text>
+ <text name="glow_focus_label">
+ Ostrość blasku:
+ </text>
+ <text name="glow_size_label">
+ Rozmiar blasku:
+ </text>
+ <text name="star_brightness_label">
+ Jasność gwiazd:
+ </text>
+ </layout_panel>
+ <layout_panel name="lp_4">
+ <text name="label">
+ Księżyc:
+ </text>
+ <text name="moon_azimuth_label">
+ Azymut:
+ </text>
+ <text name="moon_elevation_label">
+ Elewacja:
+ </text>
+ <check_box label="Pokaż emiter" name="moonbeacon" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fcf39b94ff5970972eaf3dc5f7a3a8924145ff90
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_avatar_render_settings" title="USTAWIENIA RENDEROWANIA AWATARÓW">
+ <string name="av_never_render" value="Nigdy" />
+ <string name="av_always_render" value="Zawsze" />
+ <filter_editor label="Filtruj ludzi" name="people_filter_input" />
+ <menu_button name="plus_btn" tool_tip="Działania na wybranej osobie" />
+ <name_list name="render_settings_list">
+ <name_list.columns label="ImiÄ™" name="name" />
+ <name_list.columns label="Renderowanie" name="setting" />
+ <name_list.columns label="Dodano" name="timestamp" />
+ </name_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_ban_duration.xml b/indra/newview/skins/default/xui/pl/floater_ban_duration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4768960d3af08a8a38044f348dec758828b6b84
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_ban_duration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="ban_duration" title="Czas trwania bana">
+ <text name="duration_textbox">
+ Czas trwania bana:
+ </text>
+ <radio_group name="ban_duration_radio">
+ <radio_item label="Na zawsze" name="always_radio">
+ Na zawsze
+ </radio_item>
+ <radio_item label="Tymczasowo" name="temporary_radio">
+ Tymczasowo
+ </radio_item>
+ </radio_group>
+ <text name="hours_textbox">
+ godzin.
+ </text>
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera_presets.xml b/indra/newview/skins/default/xui/pl/floater_camera_presets.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22b46f811f0db015f86da1a6a7b09c1b19a636eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_camera_presets.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater title="USTAWIENIA KAMERY" name="floater_camera_presets" />
diff --git a/indra/newview/skins/default/xui/pl/floater_classified.xml b/indra/newview/skins/default/xui/pl/floater_classified.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fa139983e862ca78e845bb6cecc9277b83d9b8b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_classified.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_classified" title="REKLAMA" />
diff --git a/indra/newview/skins/default/xui/pl/floater_create_landmark.xml b/indra/newview/skins/default/xui/pl/floater_create_landmark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aef0ba125f6d4b03212dc5933927dc697b29495b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_create_landmark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="create_landmark">
+ <string name="favorites_bar">
+ Pasek ulubionych
+ </string>
+ <text name="title_label" value="Dodany landmark" />
+ <text name="name_label" value="Nazwa" />
+ <text name="folder_label" value="Zapisz landmark w:" />
+ <text name="new_folder_textbox">
+ [secondlife:/// Stwórz nowy folder]
+ </text>
+ <text name="notes_label" value="Notatki" />
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f9d75ef39da9fe86684aaf53f2b854e16e909566
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<floater name="delete_pref_preset" title="USUŃ USTAWIENIE">
+ <string name="title_graphic">
+ Usuń ustawienie graficzne
+ </string>
+ <string name="title_camera">
+ Usuń ustawienie kamery
+ </string>
+ <text name="Preset">
+ Wybierz ustawienie
+ </text>
+ <button label="Usuń" name="delete" />
+ <button label="Anuluj" name="cancel" />
+</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
deleted file mode 100644
index 9d3a0701915a505074fd4fea7c8dc6ddcd556fa4..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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_ext_day_cycle.xml b/indra/newview/skins/default/xui/pl/floater_edit_ext_day_cycle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b85cbf26c3d9a4e02ea5bbbdd072e1df816f94d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_edit_ext_day_cycle.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="env_edit_extdaycycle" 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="sky_track_label">Niebo [ALT]</string>
+ <string name="sky_label">Niebo</string>
+ <string name="water_label">Woda</string>
+ <string name="commit_parcel">Zastosuj do działki</string>
+ <string name="commit_region">Zastosuj do regionu</string>
+ <layout_stack name="outer_stack">
+ <layout_panel name="name_and_import">
+ <text name="label">
+ Nazwa cyklu dnia:
+ </text>
+ <button label="Importuj" name="btn_import" tool_tip="Zaimportuj starsze ustawienia z dysku." />
+ </layout_panel>
+ <layout_panel name="content">
+ <layout_stack name="content_stack">
+ <layout_panel name="timeline_track_selection">
+ <panel name="timeline_layers">
+ <button label="Niebo 4" name="sky4_track" />
+ <button label="Niebo 3" name="sky3_track" />
+ <button label="Niebo 2" name="sky2_track" />
+ <button label="Poziom ziemi" name="sky1_track" />
+ <button label="Woda" name="water_track" />
+ </panel>
+ <panel name="timeline">
+ <layout_stack name="track_options_ls">
+ <layout_panel name="track_options_lp">
+ <button label="Klonuj ścieżkę z" name="copy_track" />
+ <button label="Wczytaj ścieżkę z" name="load_track" />
+ <button label="Czyść ścieżkę" name="clear_track" />
+ </layout_panel>
+ <layout_panel name="track_progress_lp">
+ <layout_stack name="progress_control">
+ <layout_panel name="skip_back">
+ <button name="skip_back_btn" tool_tip="Krok wstecz" />
+ </layout_panel>
+ <layout_panel name="skip_forward">
+ <button name="skip_forward_btn" tool_tip="Krok w przód" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="frames_lp">
+ <button label="Dodaj [FRAME]" name="add_frame" />
+ <button label="Wczytaj [FRAME]" name="btn_load_frame" />
+ <button label="Usuń [FRAME]" name="delete_frame" />
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </layout_panel>
+ <layout_panel name="frame_edit_controls">
+ <text name="icn_lock_edit">
+ Wybierz klatkę kluczową z osi czasu, aby edytować ustawienia.
+ </text>
+ </layout_panel>
+ <layout_panel name="frame_settings_water">
+ <tab_container name="water_tabs">
+ <panel label="Woda" name="water_panel" />
+ </tab_container>
+ </layout_panel>
+ <layout_panel name="frame_settings_sky">
+ <tab_container name="sky_tabs">
+ <panel label="Atmosfera i światła" name="atmosphere_panel" />
+ <panel label="Chmury" name="clouds_panel" />
+ <panel label="Słońce i Księżyc" name="moon_panel" />
+ <!-- <panel label="Gęstość" name="density_panel" /> -->
+ </tab_container>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ <layout_panel name="buttons">
+ <button label="Zapisz" name="save_btn" />
+ <button label="Anuluj" name="cancel_btn" />
+ </layout_panel>
+ </layout_stack>
+</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
deleted file mode 100644
index 6a30ac4ed99f534bf7be54377faf3bbdd6e67b2a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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
deleted file mode 100644
index fb3846cd215d2a071bd1cd2e2c4ba0eaec356dc6..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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
deleted file mode 100644
index 8a13ece8f597cbe71cbc0f15e920dbe784f15cb6..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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_experience_search.xml b/indra/newview/skins/default/xui/pl/floater_experience_search.xml
new file mode 100644
index 0000000000000000000000000000000000000000..44955e9e355c171cfa076048c68f923af7ec7cef
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_experience_search.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="experiencepicker" title="Wybierz PrzygodÄ™" />
diff --git a/indra/newview/skins/default/xui/pl/floater_experienceprofile.xml b/indra/newview/skins/default/xui/pl/floater_experienceprofile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9b24515e9838c69ccdc5c2054d41cf4fcc53675
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_experienceprofile.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="experience_profile" title="Profil przygody">
+ <floater.string name="empty_slurl">
+ (brak)
+ </floater.string>
+ <text name="edit_title" value="Profil przygody" />
+ <tab_container name="tab_container">
+ <panel name="panel_experience_info">
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack name="ls1">
+ <layout_panel name="top panel">
+ <button label="Edytuj" name="edit_btn" />
+ </layout_panel>
+ <layout_panel name="maturity panel">
+ <text name="ContentRating">
+ Treści:
+ </text>
+ </layout_panel>
+ <layout_panel name="location panel">
+ <text name="Location">
+ Miejsce:
+ </text>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Marketplace">
+ Sklep Marketplace:
+ </text>
+ </layout_panel>
+ <layout_panel name="owner panel">
+ <text name="Owner">
+ Właściciel:
+ </text>
+ </layout_panel>
+ <layout_panel name="group_panel">
+ <text name="Group">
+ Grupa:
+ </text>
+ </layout_panel>
+ <layout_panel name="perm panel">
+ <button label="Zezwól" name="allow_btn" />
+ <button label="Zapomnij" name="forget_btn" />
+ <button label="Zablokuj" name="block_btn" />
+ <text name="privileged">
+ Ta przygoda jest włączona dla wszystkich rezydentów.
+ </text>
+ <button width="100" left="104" label="Zgłoś nadużycie" name="report_btn" />
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+ </panel>
+ <panel name="edit_panel_experience_info">
+ <scroll_container name="edit_xp_scroll">
+ <panel name="edit_scrolling_panel">
+ <text name="edit_experience_title_label" value="Nazwa:" />
+ <text name="edit_experience_desc_label" value="Opis:" />
+ <button name="Group_btn" label="Grupa" />
+ <text name="edit_ContentRating">
+ Treści:
+ </text>
+ <icons_combo_box tool_tip="Zwiększenie poziomu limitu klasyfikacji treści dla przygody zresetuje zezwolenia wszystkim rezydentom, którzy zezwolili na nią." name="edit_ContentRatingText">
+ <icons_combo_box.item label="Adult (dla dorosłych)" name="Adult" />
+ <icons_combo_box.item label="Moderate (umiarkowane)" name="Mature" />
+ <icons_combo_box.item label="General (dla wszystkich)" name="PG" />
+ </icons_combo_box>
+ <text name="edit_Location">
+ Miejsce:
+ </text>
+ <button name="location_btn" label="Ustaw na obecne" />
+ <button name="clear_btn" label="Wyczyść" />
+ <text name="edit_marketplace">
+ Sklep Marketplace:
+ </text>
+ <check_box label="Aktywuj przygodÄ™" name="edit_enable_btn" />
+ <check_box label="Ukryj w wyszukiwarce" name="edit_private_btn" />
+ <text name="changes" value="Może minąć kilka minut zanim zmiany w przygodzie staną się widoczne w regionach." />
+ <button label="Wstecz" name="cancel_btn" />
+ <button label="Zapisz" name="save_btn" />
+ </panel>
+ </scroll_container>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_experiences.xml b/indra/newview/skins/default/xui/pl/floater_experiences.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8dab8adb61764f7327d98c8a03989584b38a4485
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_experiences.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater name="floater_experiences" title="Przygody"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_facebook.xml b/indra/newview/skins/default/xui/pl/floater_facebook.xml
deleted file mode 100644
index 588285ea7bfa73b7f96a9315d17fdc2a308170dc..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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_fixedenvironment.xml b/indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd5fa4c5d49316a06f4ca598be686111b12bf767
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Fixed Environment" title="Stałe otoczenie">
+ <string name="edit_sky">
+ Edytuj niebo:
+ </string>
+ <string name="edit_water">
+ Edytuj wodÄ™:
+ </string>
+ <layout_stack name="floater_stack">
+ <layout_panel name="info_panel">
+ <text name="info_panel_label">
+ Nazwa:
+ </text>
+ <button label="Wczytaj" name="btn_load" tool_tip="Wczytaj ustawienia z szafy" />
+ <button label="Importuj" name="btn_import" tool_tip="Zaimportuj starsze ustawienia z dysku." />
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <layout_stack name="button_bar_ls">
+ <layout_panel name="save_btn_lp">
+ <button label="Zapisz" name="btn_commit" />
+ </layout_panel>
+ <layout_panel name="revert_btn_lp">
+ <button label="Anuluj" name="btn_cancel" tool_tip="Przywróć ostatnią zapisaną wersję" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_flickr.xml b/indra/newview/skins/default/xui/pl/floater_flickr.xml
deleted file mode 100644
index 9522695e3cada1cea5d893f0a9bf253212cfbb9a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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_forget_user.xml b/indra/newview/skins/default/xui/pl/floater_forget_user.xml
new file mode 100644
index 0000000000000000000000000000000000000000..149342ef6fe1d897cd411e9378154ed974b03362
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_forget_user.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="ZAPAMIĘTANI UŻYTKOWNICY">
+ <button label="Zapomnij" label_selected="Zapomnij" name="forget" />
+ <check_box label="Usuń także dane lokalne tego użytkownika" name="delete_data" tool_tip="Usuwa lokalne pliki: historia czatu, zrzut ekranu z ostatniej sesji, pliki cookie przeglądarki, historia teleportacji, ustawienia paska narzędzi itp. Niektóre pliki lokalne są współdzielone pomiędzy światami."/>
+</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
deleted file mode 100644
index e908e30705ff3e36704062ceadf3e0b15fab3dee..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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 (wolniej!)" name="ani" />
- <text name="Antialiasing:">
- Antyaliasing:
- </text>
- <combo_box label="Antyaliasing" name="fsaa">
- <combo_box.item label="Wyłączony" name="FSAADisabled" />
- </combo_box>
- <text name="antialiasing restart">
- (Restart wymagany)
- </text>
- <text name="(brightness, lower is brighter)">
- (0 = domyślna jasność, niżej = jaśniej)
- </text>
- <text name="Enable VBO:">
- WÅ‚Ä…cz VBO:
- </text>
- <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_linkreplace.xml b/indra/newview/skins/default/xui/pl/floater_linkreplace.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c17e76eafa024b9f94d99fd73b494d73236085c4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_linkreplace.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="linkreplace" title="ZASTÄ„P LINKI W SZAFIE">
+ <string name="Ready">
+ Gotowy...
+ </string>
+ <string name="TargetNotFound">
+ Obiekt docelowy nie został znaleziony.
+ </string>
+ <string name="ItemsIdentical">
+ Obiekty źródłowy i docelowy są identyczne.
+ </string>
+ <string name="ItemsFound">
+ Znaleziono [NUM] linków w Szafie.
+ </string>
+ <string name="ItemsRemaining">
+ Linków pozostało: [NUM]
+ </string>
+ <string name="ReplaceFinished">
+ Zakończono zastępowanie linków.
+ </string>
+ <text name="source_label">
+ Stary:
+ </text>
+ <inventory_link_replace_drop_target name="source_uuid_editor" tool_tip="Przeciągnij i upuść tutaj przedmiot, którego linki chcesz zastąpić." />
+ <text name="target_label">
+ Nowy:
+ </text>
+ <inventory_link_replace_drop_target name="target_uuid_editor" tool_tip="Przeciągnij i upuść tutaj przedmiot, którego linki zastąpią linki do przedmiotu pierwotnego." />
+ <text name="status_text">
+ Gotowy...
+ </text>
+ <button name="btn_refresh" label="Odśwież" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f9fe6d9ebeb9c5df1ec2b697f301d07bb2ad0e21
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<floater name="load_pref_preset" title="WCZYTAJ USTAWIENIE">
+ <string name="title_graphic">
+ Wczytaj ustawienie graficzne
+ </string>
+ <string name="title_camera">
+ Wczytaj ustawienie kamery
+ </string>
+ <text name="Preset">
+ Wybierz ustawienie
+ </text>
+ <button label="Anuluj" name="cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mfa.xml b/indra/newview/skins/default/xui/pl/floater_mfa.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bef6810007954cbe2dc5918220627292d2337a9e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_mfa.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater title="Wymagany token MFA" name="mfa_challenge">
+ <text name="token_prompt_text">
+ token
+ </text>
+ <button label="Kontynuuj" name="continue_btn" />
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_environments.xml b/indra/newview/skins/default/xui/pl/floater_my_environments.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b64cb42e6f40296a97a533e248de78b5af237f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_my_environments.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="my_environments" title="MOJE OTOCZENIA" label="Miejsca">
+ <layout_stack name="main_layout">
+ <layout_panel name="filter_panel" label="Filtr">
+ <check_box label="Dzień" name="chk_days" />
+ <check_box label="Niebo" name="chk_skies" />
+ <check_box label="Woda" name="chk_water" />
+ <filter_editor label="Filtruj otoczenia" name="flt_search" />
+ </layout_panel>
+ <layout_panel name="list_panel" label="Otoczenia" />
+ <layout_panel name="lp_showfolders">
+ <check_box label="Wszystkie foldery" name="chk_showfolders" />
+ </layout_panel>
+ <layout_panel name="pnl_control">
+ <panel name="pnl_bottom">
+ <menu_button name="btn_gear" tool_tip="Więcej opcji" />
+ <menu_button name="btn_newsettings" tool_tip="Stwórz nowe ustawienie" />
+ <button name="btn_del" tool_tip="Usuń wybrany element" />
+ </panel>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_scripts.xml b/indra/newview/skins/default/xui/pl/floater_my_scripts.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b83a34ec5b1871469d8c630368b8bd6b9ff1fc25
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_my_scripts.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="myscripts" title="SKRYPTY" />
diff --git a/indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a02666b6a1ce888a995ba01aa52e6bf30349a7ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="POWIADOMIENIA">
+ <floater.string name="system_tab_title">
+ Systemowe ([COUNT])
+ </floater.string>
+ <floater.string name="transactions_tab_title">
+ Transakcje ([COUNT])
+ </floater.string>
+ <floater.string name="group_invitations_tab_title">
+ Zaproszenia ([COUNT])
+ </floater.string>
+ <floater.string name="group_notices_tab_title">
+ Grupowe ([COUNT])
+ </floater.string>
+ <string name="title_notification_tabbed_window">
+ Powiadomienia
+ </string>
+ <layout_stack name="TabButtonsStack">
+ <layout_panel name="TabButtonsLayoutPanel">
+ <tab_container name="notifications_tab_container">
+ <panel label="Systemowe (0)" name="system_notification_list_tab" />
+ <panel label="Transakcje (0)" name="transaction_notifications_tab" />
+ <panel label="Zaproszenia (0)" name="group_invite_notifications_tab" />
+ <panel label="Grupowe (0)" name="group_notice_notifications_tab" />
+ </tab_container>
+ <layout_stack name="ButtonsStack">
+ <layout_panel name="CondenseAllButtonPanel">
+ <button label="Zwiń wszystkie" name="collapse_all_button" />
+ </layout_panel>
+ <layout_panel name="DeleteAllButtonPanel">
+ <button label="Usuń wszystkie" name="delete_all_button" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c7de8e34eed041f536551120aa9247cf7d7e398
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_outfit_photo_preview.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="outfit_photo_preview">
+ <floater.string name="Title">
+ Tekstura: [NAME]
+ </floater.string>
+ <floater.string name="exceed_limits">
+ Maks. rozmiar zdjęcia stroju to [MAX_WIDTH]*[MAX_HEIGHT]. Wybierz inną teksturę.
+ </floater.string>
+ <floater.string name="photo_confirmation">
+ Ustawić to zdjęcie dla stroju [OUTFIT]?
+ </floater.string>
+ <button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pick_track.xml b/indra/newview/skins/default/xui/pl/floater_pick_track.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0150e67ea1aedc7c190b8814e5c70f5900aa1b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_pick_track.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="track picker" title="WYBIERZ ŚCIEŻKĘ">
+ <layout_stack name="adjuster">
+ <layout_panel name="pnl_desc">
+ <text name="select_description">
+ Wybierz niebo:
+ </text>
+ </layout_panel>
+ <layout_panel name="pnl_traks">
+ <radio_group name="track_selection">
+ <radio_item label="Niebo4 [ALT]" name="radio_sky4" />
+ <radio_item label="Niebo3 [ALT]" name="radio_sky3" />
+ <radio_item label="Niebo2 [ALT]" name="radio_sky2" />
+ <radio_item label="Ziemia" name="radio_sky1" />
+ </radio_group>
+ </layout_panel>
+ <layout_panel name="pnl_ok_cancel">
+ <button label="Anuluj" label_selected="Anuluj" name="btn_cancel" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb1411cd42a43877f80e12b3cd193d9997a83697
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="prefs_graphics_advanced" title="ZAAWANSOWANE USTAWIENIA GRAFICZNE">
+ <text name="GeneralText">
+ Ogólne
+ </text>
+ <slider label="Pole widzenia:" name="DrawDistance" />
+ <slider label="Maks. ilość cząsteczek:" name="MaxParticleCount" />
+ <slider label="Jakość post-procesu:" name="RenderPostProcess" />
+ <text name="PostProcessText">
+ Niska
+ </text>
+ <check_box label="Włącz VSync" name="vsync" tool_tip="Synchronizuje liczbę klatek na sekundę z częstotliwością odświeżania monitora, może skutkować zmniejszeniem widocznej płynności i opóźnieniami." />
+ <text name="AvatarText">
+ Awatar
+ </text>
+ <slider tool_tip="Kontroluje w jakim momencie awatar, który jest graficznie złożony zostanie zastąpiony przez mniej obciążającą komputer formę (tzw. JellyDoll)" label="Maks. szczegółowość awatarów:" name="IndirectMaxComplexity" />
+ <slider label="Maks. il. wyświetlanych awatarów:" name="IndirectMaxNonImpostors" />
+ <slider label="Detale:" name="AvatarMeshDetail" />
+ <text name="AvatarMeshDetailText">
+ Mało
+ </text>
+ <slider label="Fizyka:" name="AvatarPhysicsDetail" />
+ <text name="AvatarPhysicsDetailText">
+ Mało
+ </text>
+ <text name="HardwareText">
+ Sprzętowe
+ </text>
+ <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 na systemach 32 bitowych lub 2048 MB na 64 bitowych. Zmniejszenie tej wartości może spowodować wzrost wydajności, ale tekstury będą bardziej rozmazane." />
+ <slider label="Stosunek odległości dla mgły:" name="fog" />
+ <text name="(brightness, lower is brighter)">
+ (0 = domyślna jasność, niżej = jaśniej)
+ </text>
+ <check_box label="Filtrowanie anizotropowe (wolniej, gdy włączone)" name="ani" />
+ <check_box label="Włącz stratną kompresję tekstur (wymaga restartu)" name="texture compression" tool_tip="Kompresuje tekstury w pamięci wideo. Umożliwi to ładowanie tekstur w wyższej rozdzielczości / większej ich ilości, ale kosztem jakości obrazu." />
+ <check_box label="Włącz wsparcie dla ekranów HiDPI (wymaga restartu)" name="use HiDPI" tool_tip="Włącz funkcje OpenGL dla rysowania w wysokich rozdzielczościach." />
+ <text name="antialiasing label">
+ Antyaliasing:
+ </text>
+ <combo_box label="Antyaliasing" name="fsaa">
+ <combo_box.item label="Wyłączony" name="FSAADisabled" />
+ </combo_box>
+ <text name="antialiasing restart">
+ (wymaga restartu)
+ </text>
+ <text name="MeshText">
+ Mesz
+ </text>
+ <slider label="Szczegóły terenu:" name="TerrainMeshDetail" />
+ <text name="TerrainMeshDetailText">
+ Mało
+ </text>
+ <slider label="Drzewa:" name="TreeMeshDetail" />
+ <text name="TreeMeshDetailText">
+ Mało
+ </text>
+ <slider label="Obiekty i skulpty:" name="ObjectMeshDetail" />
+ <text name="ObjectMeshDetailText">
+ Mało
+ </text>
+ <slider label="Obiekty elastyczne:" name="FlexibleMeshDetail" />
+ <text name="FlexibleMeshDetailText">
+ Mało
+ </text>
+ <text name="ShadersText">
+ Cieniowanie
+ </text>
+ <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" />
+ <slider label="Szczegóły terenu:" name="TerrainDetail" />
+ <text name="TerrainDetailText">
+ Mało
+ </text>
+ <check_box label="Elastyczne tkaniny ubrań" name="AvatarCloth" />
+ <text name="ReflectionsText">
+ Odbicia w wodzie:
+ </text>
+ <combo_box name="Reflections">
+ <combo_box.item label="Żadne; nieprzezroczyste" name="-2" />
+ <combo_box.item label="Żadne; przezroczyste" name="-1" />
+ <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>
+ <check_box label="Shadery atmosfery" name="WindLightUseAtmosShaders" />
+ <slider label="Niebo:" name="SkyMeshDetail" />
+ <text name="SkyMeshDetailText">
+ Nisko
+ </text>
+ <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" />
+ <check_box label="Zaawansowana atmosfera" name="UseAdvancedAtmo" />
+ <text name="RenderShadowDetailText">
+ Cienie:
+ </text>
+ <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>
+ <button label="Zresetuj wartości ustawień grafiki" name="Defaults" />
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2e9cba33a26f10def35175725bca09856be7172
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterpreferencesviewadvanced" title="POZYCJA KAMERY">
+ <text name="camera_offset_lbl">
+ Przesun. kamery:
+ </text>
+ <text name="focus_offset_lbl">
+ Przesun. ostrości:
+ </text>
+ <text name="offset_scale_lbl">
+ Skala przesunięcia kamery:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_trash.xml b/indra/newview/skins/default/xui/pl/floater_preview_trash.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4f535e0546840de2480119b57e715e9b14c29a1f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_trash.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_preview_trash" title="KOSZ">
+ <layout_stack name="button_panel_ls">
+ <layout_panel name="empty_btn_lp">
+ <button label="Opróżnij kosz" name="empty_btn" />
+ </layout_panel>
+ <layout_panel name="share_btn_lp">
+ <button label="Anuluj" name="cancel_btn" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_profile.xml b/indra/newview/skins/default/xui/pl/floater_profile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4992bb2312f056d335fe3549abf81f8b7da513eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_profile.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarinfo" title="Profil">
+ <panel name="panel_profile_view">
+ <tab_container name="panel_profile_tabs">
+ <panel name="panel_profile_secondlife" label="REZYDENT" />
+ <panel name="panel_profile_web" label="SIEĆ" />
+ <panel name="panel_profile_picks" label="MIEJSCA" />
+ <panel name="panel_profile_classifieds" label="REKLAMY" />
+ <panel name="panel_profile_firstlife" label="WIĘCEJ" />
+ <panel name="panel_profile_notes" label="NOTATKI" />
+ </tab_container>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_profile_permissions.xml b/indra/newview/skins/default/xui/pl/floater_profile_permissions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..140f688cb19de1590c0c4ea6c587aef1f9e695d6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_profile_permissions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="profile_permissions">
+ <string name="description_string" value="Zezwól [AGENT_NAME] na:" />
+ <text name="perm_description" value="Zezwól tej osobie:" />
+ <check_box name="online_check" label="Widzieć gdy jestem online" />
+ <check_box name="map_check" label="Znajdować mnie na mapie" />
+ <check_box name="objects_check" label="Edytować, usuwać lub zabierać moje obiekty" />
+ <button name="perms_btn_cancel" label="Anuluj" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_profile_texture.xml b/indra/newview/skins/default/xui/pl/floater_profile_texture.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad1d9a6305df3635cdedf560871095234f3e5f8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_profile_texture.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="profile_texture">
+ <layout_stack name="preview_stack">
+ <layout_panel name="buttons_panel">
+ <layout_stack name="buttons_stack">
+ <layout_panel name="close_panel">
+ <button label="Zamknij" name="close_btn" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/pl/floater_save_camera_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0fbd3771397c222d7f7ab5acb9199529fc68a922
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_save_camera_preset.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater name="save_camera_preset" title="Zapisz ustawienie kamery">
+ <string name="btn_label_save">
+ Zapisz
+ </string>
+ <string name="btn_label_replace">
+ ZastÄ…p
+ </string>
+ <radio_group name="radio_save_preset">
+ <radio_item label="Zapisz jako nowe ustawienie" name="new_preset" />
+ <radio_item label="ZastÄ…p ustawienie" name="replace_preset" />
+ </radio_group>
+ <button label="Zapisz" name="save" />
+ <button label="Anuluj" name="cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/pl/floater_save_pref_preset.xml
new file mode 100644
index 0000000000000000000000000000000000000000..54841442dde2f78be1bb98a08f61c260765d7d63
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_save_pref_preset.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater name="save_pref_preset" title="Zapisz ustawienie graficzne">
+ <text name="Preset">
+ Wpisz nazwę ustawienia lub wybierz już istniejące.
+ </text>
+ <button label="Zapisz" name="save" />
+ <button label="Anuluj" name="cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_picker.xml b/indra/newview/skins/default/xui/pl/floater_settings_picker.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8f64d70fab7533dcc05a0d294af4b54ed9246d7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_settings_picker.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="settings picker" title="WYBÓR OTOCZENIA">
+ <floater.string name="pick title">
+ Wybierz:
+ </floater.string>
+ <floater.string name="pick_track">
+ WYBÓR ŚCIEŻKI
+ </floater.string>
+ <floater.string name="pick_settings">
+ WYBÓR OTOCZENIA
+ </floater.string>
+ <floater.string name="track_water">
+ Woda
+ </floater.string>
+ <floater.string name="track_ground">
+ Ziemia
+ </floater.string>
+ <floater.string name="track_sky">
+ Niebo[NUM]
+ </floater.string>
+ <layout_stack name="test_stack">
+ <layout_panel name="inv_list">
+ <filter_editor label="Filtruj otoczenia" name="flt_inventory_search" />
+ </layout_panel>
+ <layout_panel name="temp">
+ <button label="Anuluj" label_selected="Anuluj" name="btn_cancel" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a60b557b29144adbda49ee0d0eba557a01ff927
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="simple_outfit_snapshot" title="ZDJĘCIE STROJU">
+ <button label="Zrób zdjęcie" name="new_snapshot_btn" />
+ <button label="Zapisz ([UPLOAD_COST]L$)" name="save_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
deleted file mode 100644
index 2e228041abaa80def96a0ccf039245d221463266..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e10aa115540002cbd774cd4cadb48d9bbadc4c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu name="Settings">
+ <menu_item_check label="Domyślne" name="default" />
+ <menu_item_check label="Zawsze renderuj" name="always_render" />
+ <menu_item_check label="Nigdy nie renderuj" name="never_render" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a4f72de93d98ac01ec8ca9482fc251f68d2d2576
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_settings_add.xml">
+ <menu_item_call label="Zawsze renderuj rezydenta..." name="add_avatar_always_render" />
+ <menu_item_call label="Nigdy nie renderuj rezydenta..." name="add_avatar_never_render" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb7da5678d784e653e93fc3261242350d692e93b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Color Menu">
+ <menu_item_call label="Kopiuj" name="params_copy" />
+ <menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d578f14a879517c4cd471ea0684049a83536e3ff
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_features.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Features Menu">
+ <menu_item_call label="Kopiuj" name="params_copy" />
+ <menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a94f0dbe999572ecdda160303251fa0ba7d0a5d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Light Menu">
+ <menu_item_call label="Kopiuj" name="params_copy" />
+ <menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d366c1e5978796df8d0f441f9b69ca87320a54d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_object.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Object Menu">
+ <menu_item_call label="Kopiuj" name="params_copy" />
+ <menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3665c38f6293819590909f0540125252201a7bc3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_pos.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Position Menu">
+ <menu_item_call label="Kopiuj wszystko" name="psr_copy" />
+ <menu_item_call label="Kopiuj pozycjÄ™" name="pos_copy" />
+ <menu_item_call label="Wklej wszystko" name="psr_paste" />
+ <menu_item_call label="Wklej pozycjÄ™" name="pos_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cee65d7db52eedc4ef676c7fc083f183d7ce4234
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_rot.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Rotation Menu">
+ <menu_item_call label="Kopiuj wszystko" name="psr_copy" />
+ <menu_item_call label="Wklej obrót" name="rot_copy" />
+ <menu_item_call label="Wklej wszystko" name="psr_paste" />
+ <menu_item_call label="Wklej obrót" name="rot_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml
new file mode 100644
index 0000000000000000000000000000000000000000..605eb69a723effb7dd7a082e2f2e899fb328f91d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_size.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Size Menu">
+ <menu_item_call label="Kopiuj wszystko" name="psr_copy" />
+ <menu_item_call label="Wklej rozmiar" name="size_copy" />
+ <menu_item_call label="Wklej wszystko" name="psr_paste" />
+ <menu_item_call label="Wklej rozmiar" name="size_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml
new file mode 100644
index 0000000000000000000000000000000000000000..90444cdb0f8396925dc31b6a77c3b6f91a9e64c4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_copy_paste_texture.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Copy Paste Texture Menu">
+ <menu_item_call label="Kopiuj" name="params_copy" />
+ <menu_item_call label="Wklej" name="params_paste" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_gallery_outfit_tab.xml
new file mode 100644
index 0000000000000000000000000000000000000000..56ee2f02d93bd800e497653ba9aee2d6a2424ac5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_gallery_outfit_tab.xml
@@ -0,0 +1,33 @@
+<?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="Prześlij zdjęcie ([UPLOAD_COST] L$)" name="upload_photo" />
+ <menu_item_call label="Wybierz zdjęcie" name="select_photo" />
+ <menu_item_call label="Zrób zdjęcie" name="take_snapshot" />
+ <menu_item_call label="Usuń zdjęcie" name="remove_photo" />
+ <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 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>
+ <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_inventory_search_visibility.xml b/indra/newview/skins/default/xui/pl/menu_inventory_search_visibility.xml
new file mode 100644
index 0000000000000000000000000000000000000000..254c9acb4cc6eff55afbc74c9a707e76c54c2c70
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_search_visibility.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_search_visibility">
+ <menu_item_check label="Szukaj w koszu" name="search_trash" />
+ <menu_item_check label="Szukaj w Bibliotece" name="search_library" />
+ <menu_item_check label="Uwzględniaj linki" name="include_links" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_sorting.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_sorting.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ccf4af7efbfe034d4e089a025c036607d46b6341
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_places_gear_sorting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_sorter_gear">
+ <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_profile_other.xml b/indra/newview/skins/default/xui/pl/menu_profile_other.xml
new file mode 100644
index 0000000000000000000000000000000000000000..84ef54fc8f16938ab6853f306606e8fa27fa1805
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_profile_other.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Avatar Profile Menu">
+ <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="ZaproÅ› do grupy..." name="invite_to_group" />
+ <menu_item_call label="Uprawnienia" name="agent_permissions" />
+ <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" />
+ <menu_item_call label="Kopiuj Wyświetlane Imię" name="copy_display_name" />
+ <menu_item_call label="Kopiuj imiÄ™" name="copy_name" />
+ <menu_item_call label="Kopiuj UUID" name="copy_id" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_profile_self.xml b/indra/newview/skins/default/xui/pl/menu_profile_self.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1da838fafd0db42695eafa2152d0701b99dbd627
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_profile_self.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="Avatar Profile Menu Self">
+ <menu_item_call label="Edytuj Wyświetlane Imię" name="edit_display_name" />
+ <menu_item_call label="Edytuj partnera" name="edit_partner" />
+ <menu_item_call label="Prześlij obraz" name="upload_photo" />
+ <menu_item_call label="Zmień obraz" name="change_photo" />
+ <menu_item_call label="Usuń obraz" name="remove_photo" />
+ <menu_item_call label="Kopiuj Wyświetlane Imię" name="copy_display_name" />
+ <menu_item_call label="Kopiuj imiÄ™" name="copy_name" />
+ <menu_item_call label="Kopiuj UUID" name="copy_id" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_save_settings.xml b/indra/newview/skins/default/xui/pl/menu_save_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..918fc7518471d35f5248d602e3ac96c579440e55
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_save_settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="save_settings_menu">
+ <menu_item_check name="save_settings" label="Zapisz" />
+ <menu_item_check name="save_as_new_settings" label="Zapisz jako" />
+ <menu_item_check name="commit_changes" label="Zastosuj" />
+ <menu_item_check name="apply_local" label="Stosuj tylko dla mnie" />
+ <menu_item_check name="apply_parcel" label="Stosuj dla działki" />
+ <menu_item_check name="apply_region" label="Stosuj dla regionu" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_settings_add.xml b/indra/newview/skins/default/xui/pl/menu_settings_add.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6cb3a688980b1495563ebcd117230c4cf63e2393
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_settings_add.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_settings_add">
+ <menu_item_call label="Nowe niebo" name="New Sky" />
+ <menu_item_call label="Nowa woda" name="New Water" />
+ <menu_item_call label="Nowy cykl dnia" name="New Day Cycle" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_settings_gear.xml b/indra/newview/skins/default/xui/pl/menu_settings_gear.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a002d3c236c7f4224bc86cd4e05541a1c9dd6cdb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_settings_gear.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu name="menu_settings_gear">
+ <menu_item_call label="Edycja" name="edit_settings" />
+ <menu_item_call name="Settings Apply Local" label="Stosuj tylko dla mnie" />
+ <menu_item_call name="Settings Apply Parcel" label="Stosuj dla działki" />
+ <menu_item_call name="Settings Apply Region" label="Stosuj dla regionu" />
+ <menu_item_call label="Kopiuj" name="copy_settings" />
+ <menu_item_call label="Wklej" name="paste_settings" />
+ <menu_item_call label="Kopiuj UUID" name="copy_uuid" />
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_email.xml b/indra/newview/skins/default/xui/pl/menu_url_email.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2d1f8c8e36d729a51ffc70405aa26932658ed99
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/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="Utwórz nowego e-maila w zewnętrznym programie" name="email_open_external" />
+ <menu_item_call label="Kopiuj e-mail do schowka" name="email_copy" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_experience.xml b/indra/newview/skins/default/xui/pl/menu_url_experience.xml
new file mode 100644
index 0000000000000000000000000000000000000000..747039e94dbba21d6118f53eeedd8e57160755ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_url_experience.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu name="Url Popup">
+ <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/pl/panel_camera_preset_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6d619f20718b47f13a11c5af103b72265a24f765
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_camera_preset_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="camera_preset_item">
+ <text name="preset_name" value="Domyślne" />
+ <button name="delete_btn" tool_tip="Usuń ustawienie" />
+ <button name="reset_btn" tool_tip="Zresetuj ustawienie do wartości domyślnych" />
+</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
deleted file mode 100644
index 2d442b054d0c3ca694c22ceb156d1c7410c54220..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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>
- <string name="publish_label">
- Publikuj
- </string>
- <string name="save_label">
- Zapisz
- </string>
- <text name="title">
- Edytuj reklamÄ™
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon name="edit_icon" tool_tip="Kliknij by wybrać teksturę" />
- </panel>
- <text name="Name:">
- Tytuł:
- </text>
- <text name="description_label">
- Opis:
- </text>
- <text name="location_label">
- Lokalizacja:
- </text>
- <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:" />
- <icons_combo_box label="Treść General" name="content_type">
- <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="Koszt listowania:" />
- <spinner name="price_for_listing" tool_tip="Koszt listowania reklamy." />
- </panel>
- </scroll_container>
- <panel name="bottom_panel">
- <layout_stack name="bottom_panel_ls">
- <layout_panel name="show_on_map_btn_lp">
- <button label="Anuluj" name="cancel_btn" />
- </layout_panel>
- </layout_stack>
- </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
deleted file mode 100644
index 15838e53b1eb70073053b8a710e1c76b4a95fe7a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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 Miejsce
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon name="edit_icon" tool_tip="Kliknij aby wybrać teksturę" />
- <text name="Name:">
- Tytuł:
- </text>
- <text name="description_label">
- Opis:
- </text>
- <text name="location_label">
- Lokalizacja:
- </text>
- <text name="pick_location">
- Å‚adowanie...
- </text>
- <button label="Ustaw na bieżącą lokalizację" name="set_to_curr_location_btn" />
- </panel>
- </scroll_container>
- <panel name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Zapisz Miejsce" name="save_changes_btn" />
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Anuluj" name="cancel_btn" />
- </layout_panel>
- </layout_stack>
- </panel>
-</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
deleted file mode 100644
index 4e48c6a27cb39eddd0a1873b1e262247c17e8ea3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Edycja profilu" name="edit_profile_panel">
- <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ś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 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="Åšwiat realny:" />
- </panel>
- <icon name="real_world_edit_icon" tool_tip="Kliknij, aby wybrać obrazek" />
- <text name="title_homepage_text">
- Strona www:
- </text>
- <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="(pobieranie)" name="partner_text" />
- </panel>
- <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" />
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Anuluj" name="cancel_btn" />
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_universal.xml b/indra/newview/skins/default/xui/pl/panel_edit_universal.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f98cf927860ce590cb77f55a1e0ea1991aeb643d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_edit_universal.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_universal_panel">
+ <scroll_container name="avatar_universal_scroll">
+ <panel name="avatar_universal_color_panel">
+ <texture_picker label="Tatuaż głowy" name="Head Universal Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: górny tułów" name="Upper Universal Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: dolny tułów" name="Lower Universal Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: spódnica" name="Skirt Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: włosy" name="Hair Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: oczy" name="Eyes Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: lewe ramię" name="Left Arm Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: lewa noga" name="Left Leg Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: Aux1" name="Aux1 Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: Aux2" name="Aux2 Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <texture_picker label="Tatuaż: Aux3" name="Aux3 Tattoo" tool_tip="Kliknij by wybrać grafikę" />
+ <color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" />
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_experience_info.xml b/indra/newview/skins/default/xui/pl/panel_experience_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..406904e9a2245413d3555467986074d6718c17d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_experience_info.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_experience_info">
+ <text name="title" value="Profil przygody" />
+ <scroll_container name="xp_scroll">
+ <panel name="scrolling_panel">
+ <layout_stack name="ls1">
+ <layout_panel name="location panel">
+ <text name="Location">
+ Miejsce:
+ </text>
+ <button label="Teleportuj" name="teleport_btn"/>
+ <button label="Mapa" name="map_btn"/>
+ </layout_panel>
+ <layout_panel name="marketplace panel">
+ <text name="Location">
+ Sklep Marketplace:
+ </text>
+ </layout_panel>
+ <layout_panel name="details panel">
+ <text name="ContentRating">
+ Klasyfikacja:
+ </text>
+ <text name="Owner">
+ Właściciel:
+ </text>
+ <button label="Edytuj" name="edit_btn"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/pl/panel_experience_list_editor.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c314139a81d0a3ba568b59029ef8a63d4ed0edc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_experience_list_editor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="experince_list_editor">
+ <panel.string name="loading">
+ wczytywanie...
+ </panel.string>
+ <panel.string name="panel_allowed">
+ Przygody dozwolone:
+ </panel.string>
+ <panel.string name="panel_blocked">
+ Przygody blokowane:
+ </panel.string>
+ <panel.string name="panel_trusted">
+ Przygody kluczowe:
+ </panel.string>
+ <panel.string name="no_results">
+ (puste)
+ </panel.string>
+ <text name="text_name">
+ Lista przygód
+ </text>
+ <name_list name="experience_list">
+ <name_list.columns name="experience_name" label="Nazwa" />
+ </name_list>
+ <button name="btn_add" label="Dodaj" />
+ <button name="btn_remove" label="Usuń" />
+ <button name="btn_profile" label="Profil" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_experience_list_item.xml b/indra/newview/skins/default/xui/pl/panel_experience_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..866d3f6112671ef2dc59090fc9ff2bfbb2fab148
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_experience_list_item.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_experience_list_item" label="Przygody" />
diff --git a/indra/newview/skins/default/xui/pl/panel_experience_log.xml b/indra/newview/skins/default/xui/pl/panel_experience_log.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5bd5467adc365b24a238b3f3b95c1895d07536af
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_experience_log.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_experience_log" label="Zdarzenia">
+ <string name="no_events" value="Brak zdarzeń."/>
+ <string name="loading" value="wczytywanie..."/>
+ <layout_stack name="ls1">
+ <layout_panel name="list panel">
+ <scroll_list name="experience_log_list">
+ <columns name="time" label="Czas"/>
+ <columns name="event" label="Zdarzenie"/>
+ <columns name="experience_name" label="Przygoda"/>
+ <columns name="object_name" label="Obiekt"/>
+ </scroll_list>
+ <button name="btn_notify" label="Powiadom"/>
+ <button name="btn_profile_xp" label="Profil"/>
+ <button name="btn_report_xp" label="Zgłoś"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <check_box width="175" label="Powiadom o wszystkich (dni)" name="notify_all" />
+ <button name="btn_clear" label="Wyczyść"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_experience_search.xml b/indra/newview/skins/default/xui/pl/panel_experience_search.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96113c87cfa2ff227e5db6cda63ad3a5f8484540
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_experience_search.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_experience_search" label="Wyszukiwanie">
+ <string name="not_found">
+ Nie znaleziono: '[TEXT]'
+ </string>
+ <string name="no_results">
+ Brak wyników
+ </string>
+ <string name="searching">
+ Szukam...
+ </string>
+ <string name="loading">
+ Wczytywanie...
+ </string>
+ <panel name="search_panel">
+ <text name="lbl name part">
+ Wpisz fragment nazwy:
+ </text>
+ <button label="Szukaj" name="find"/>
+ <text name="lbl max content rating">
+ Maksymalna klasyfikacja:
+ </text>
+ <icons_combo_box label="Moderate (umiarkowana)" name="maturity">
+ <icons_combo_box.item label="Adult (dla dorosłych)" name="Adult" />
+ <icons_combo_box.item label="Moderate (umiarkowana)" name="Mature" />
+ <icons_combo_box.item label="General (dla wszystkich)" name="PG" />
+ </icons_combo_box>
+ <scroll_list name="search_results">
+ <columns name="experience_name" label="Nazwa" />
+ <columns name="owner" label="Właściciel" />
+ </scroll_list>
+ <button label="Anuluj" name="cancel_btn" />
+ <button label="Pokaż profil" name="profile_btn" />
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_experiences.xml b/indra/newview/skins/default/xui/pl/panel_experiences.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e66fc0a1a2306469d4cab6c7faa829991ec1448f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_experiences.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_experiences" label="Przygody">
+ <string name="loading_experiences" value="Åadowanie przygód..." />
+ <string name="no_experiences" value="Brak przygód." />
+ <string name="acquire" value="Zyskaj przygodÄ™" />
+</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
deleted file mode 100644
index 97e2db704fc83b06179bae7d905b76cdc5011e93..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
deleted file mode 100644
index 5ecd6482095d9ece02899c84da40ab47198e8a9c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_facebook_photo.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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
deleted file mode 100644
index 0514f4c326ebafe0d2fc1395b40996e5012f7c5f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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
deleted file mode 100644
index 5c0052e1f121e253058778024cfaa0e1641fb2ab..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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
deleted file mode 100644
index 43ce268d770c1d1c5c3dde64f9fe6ebc42db9101..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index a76d16f743adfb956786c15fa3f6f2336efb59d7..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
deleted file mode 100644
index 6ea8a4d8199c647724bc31425fe40693c2131910..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_pick_info">
- <text name="title" value="Info o Miejscu" />
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <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" />
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn" />
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Edytuj" name="edit_btn" />
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
deleted file mode 100644
index 8e70f533b2dab150bcdf57773ac54da32341bd2d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="Miejsca" />
- <accordion_tab name="tab_classifieds" title="Reklamy" />
- </accordion>
- <panel name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <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 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" />
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż obszar na mapie świata" />
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_presets_camera_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7417b011f9c0e601d33aee170d42c383ec704b2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_presets_camera_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="presets_camera_pulldown">
+ <text name="Camera Presets">
+ Ustawienia kamery
+ </text>
+ <button name="open_prefs_btn" label="Otwórz sterowanie kamerą" tool_tip="Otwiera okno sterowania kamerą" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_presets_pulldown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e0b1f9a896f1a335ce3d074567fde21f0d378ef2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/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">
+ Ustawienia graficzne
+ </text>
+ <button name="open_prefs_btn" label="Otwórz preferencje graficzne" tool_tip="Otwórz kartę preferencji graficznych" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_progress.xml b/indra/newview/skins/default/xui/pl/panel_progress.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22b6a8fcf50b73d8d965dd8c44f99474d1104629
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_progress.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="login_progress_panel">
+ <layout_stack name="horizontal_centering">
+ <layout_panel name="center">
+ <layout_stack name="vertical_centering">
+ <layout_panel name="panel4">
+ <layout_stack name="vertical_centering">
+ <layout_panel name="panel_icons">
+ <text name="logos_lbl">
+ Second Life używa
+ </text>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a21f9cd20d0b9074b24d18253f676fcf6e8f1ea0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Atmosfera i światła" name="panel_settings_sky_atmos">
+ <layout_stack name="main_ls">
+ <layout_panel name="top_lp">
+ <text name="ambient_color_label">
+ Kolor otoczenia:
+ </text>
+ <text name="blue_horizon_label">
+ Horyzont błękitu:
+ </text>
+ <text name="blue_density_label">
+ Gęstość błękitu:
+ </text>
+ </layout_panel>
+ <layout_panel name="bottom_lp">
+ <layout_stack name="atmosphere1">
+ <layout_panel name="left_lp">
+ <text name="haze_horizon_label">
+ Horyzont mgły:
+ </text>
+ <text name="haze_density_label">
+ Gęstość mgły:
+ </text>
+ <text name="moisture_level_label">
+ Poziom wilgoci:
+ </text>
+ <text name="droplet_radius_label">
+ Promień kropli:
+ </text>
+ <text name="ice_level_label">
+ Poziom lodu:
+ </text>
+ <text name="scene_gamma_label">
+ Gamma sceny:
+ </text>
+ </layout_panel>
+ <layout_panel name="right_lp">
+ <text name="density_multiplier_label">
+ Mnożnik gęstości:
+ </text>
+ <text name="distance_multiplier_label">
+ Mnożnik odległ.:
+ </text>
+ <text name="maximum_altitude_label">
+ Maksymalna wys.:
+ </text>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a4b6933444486d68990d65b8041f2883b89c4d4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Chmury" name="panel_settings_sky_clouds">
+ <layout_stack name="main_ls">
+ <layout_panel name="left_lp">
+ <text name="cloud_color_label">
+ Kolor chmur:
+ </text>
+ <text name="cloud_coverage_label">
+ Zachmurzenie:
+ </text>
+ <text name="cloud_scale_label">
+ Rozmiar chmur:
+ </text>
+ <text name="cloud_variance_label">
+ Zmienność:
+ </text>
+ <text name="cloud_scroll_label">
+ Przewijanie:
+ </text>
+ <text name="cloud_image_label">
+ Obraz chmur:
+ </text>
+ </layout_panel>
+ <layout_panel name="right_lp">
+ <text name="cloud_density_label">
+ Gęstość chmur:
+ </text>
+ <slider label="G" name="cloud_density_d" />
+ <text name="cloud_detail_label">
+ Detale chmur:
+ </text>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/pl/panel_settings_sky_density.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f5cfec4d22a92eb6c63abeb2d87ca6a53454ad9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_sky_density.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Gęstość" name="panel_settings_sky_density">
+ <layout_stack name="main_ls">
+ <layout_panel name="lp_1">
+ <slider name="rayleigh_exponential" label="Okres wykładniczy Rayleigha:" />
+ <slider name="rayleigh_exponential_scale" label="Skala wykładnicza Rayleigha:" />
+ <slider name="rayleigh_linear" label="Okres liniowy Rayleigha:" />
+ <slider name="rayleigh_constant" label="Okres stały Rayleigha:" />
+ <slider name="rayleigh_max_altitude" label="Maks. wysokość Rayleigha:" />
+ </layout_panel>
+ <layout_panel name="lp_2">
+ <slider name="mie_exponential" label="Okres wykładniczy Mie:" />
+ <slider name="mie_exponential_scale" label="Skala wykładnicza Mie:" />
+ <slider name="mie_linear" label="Okres liniowy Mie:" />
+ <slider name="mie_constant" label="Okres stały Mie:" />
+ <slider name="mie_aniso_factor" label="Współczynnik aniso Mie:" />
+ <slider name="mie_max_altitude" label="Maks. wysokość Mie:" />
+ </layout_panel>
+ <layout_panel name="lp_3">
+ <slider name="absorption_exponential" label="Okres wykładniczy absorpcji:" />
+ <slider name="absorption_exponential_scale" label="Skala wykładnicza absorpcji:" />
+ <slider name="absorption_linear" label="Okres liniowy absorpcji:" />
+ <slider name="absorption_constant" label="Okres stały absorpcji:" />
+ <slider name="absorption_max_altitude" label="Maks. wysokość absorpcji:" />
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f807148617c0f3148f1f5a4f48131c29073830d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Słońce i Księżyc" name="panel_settings_sky_hbodies">
+ <layout_stack name="main_ls">
+ <layout_panel name="sun_layout">
+ <text name="sun_stars_label">
+ Słońce i Księżyc
+ </text>
+ <text name="position_label">
+ Pozycja:
+ </text>
+ <text name="image_label">
+ Obraz:
+ </text>
+ <text name="scale_label">
+ Skala:
+ </text>
+ <text name="color_label">
+ Kolor:
+ </text>
+ <text name="sun_azimuth_label">
+ Azymut:
+ </text>
+ <text name="sun_elevation_label">
+ Elewacja:
+ </text>
+ <text name="glow_focus_label">
+ Ostrość blasku:
+ </text>
+ <text name="glow_size_label">
+ Skala blasku:
+ </text>
+ <text name="star_brightness_label">
+ Jasność gwiazd:
+ </text>
+ <check_box label="Pokaż emiter" name="sunbeacon" />
+ </layout_panel>
+ <layout_panel name="moon_layout">
+ <layout_stack name="moon_stack">
+ <layout_panel name="moon_layout">
+ <text name="moon_label">
+ Księżyc
+ </text>
+ <text name="position_label">
+ Pozycja:
+ </text>
+ <text name="moon_image_label">
+ Obraz:
+ </text>
+ <text name="scale_label">
+ Skala:
+ </text>
+ <text name="moon_azimuth_label">
+ Azymut:
+ </text>
+ <text name="moon_elevation_label">
+ Elewacja:
+ </text>
+ <text name="brightness_label">
+ Jasność:
+ </text>
+ <check_box label="Pokaż emiter" name="moonbeacon" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_water.xml b/indra/newview/skins/default/xui/pl/panel_settings_water.xml
new file mode 100644
index 0000000000000000000000000000000000000000..928c9ce358a8be505212721e1a615b51167bd6e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_settings_water.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Woda" name="panel_settings_water">
+ <layout_stack name="water_stack1">
+ <layout_panel name="lp_top">
+ <text name="water_fog_label">
+ Mgła wodna:
+ </text>
+ <text name="color_label">
+ Kolor:
+ </text>
+ <text name="density_exponent_label">
+ Wykładnik gęstości:
+ </text>
+ <text name="underwater_modifier_label">
+ Modyfikator pod wodÄ…:
+ </text>
+ <text name="FresnelScaleText">
+ Skala Fresnela:
+ </text>
+ <text name="FresnelOffsetText">
+ Przesun. Fresnela:
+ </text>
+ </layout_panel>
+ <layout_panel name="lp_bottom">
+ <layout_stack name="water_stack2">
+ <layout_panel name="lp_left">
+ <text name="normal_map_label">
+ Mapa normalnych
+ </text>
+ <text name="large_wave_speed_label">
+ Prędkość dużej fali
+ </text>
+ <text name="small_wave_speed_label">
+ Prędkość małej fali
+ </text>
+ <text name="reflection_wavelet_scale_label">
+ Skala odbicia falkowego
+ </text>
+ </layout_panel>
+ <layout_panel name="lp_right">
+ <text name="refraction_and_blur_label">
+ Refrakcja i rozmycie:
+ </text>
+ <text name="refraction_scale_above_label">
+ Skala refrakcji (powyżej)
+ </text>
+ <text name="refraction_scale_below_label">
+ Skala refrakcji (poniżej)
+ </text>
+ <text name="blur_multiplier_label">
+ Mnożnik rozmycia
+ </text>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
+</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
deleted file mode 100644
index c8f60b0dc61108c22fab5a019eb130c4af5bb2ae..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index 0716d891f5c9a72e3e0d2b71e2393b2ff4c1633d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/panel_twitter_photo.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/pl/widgets/density_ctrl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fcd7de9eca7ed4e99da8a75d221004219c10138b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/widgets/density_ctrl.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<densityctrl label="Gęstość" name="density_ctrl">
+ <text name="exponential_term_label">
+ Okres wykładniczy
+ </text>
+ <text name="exponential_scale_factor_label">
+ Współczynnik skali wykładn.
+ </text>
+ <text name="linear_term_label">
+ Okres liniowy
+ </text>
+ <text name="constant_term_label">
+ Okres stały
+ </text>
+ <text name="max_altitude_label">
+ Maks. wysokość
+ </text>
+ <text name="aniso_factor_label">
+ Współczynnik anizotropii
+ </text>
+</densityctrl>
diff --git a/indra/newview/skins/default/xui/pl/widgets/person_view.xml b/indra/newview/skins/default/xui/pl/widgets/person_view.xml
index 2ebe5974d61d12e80c57d499f523ba821f38c02a..7df1663fe05bcf8af0a7eab6d93c5f632d2c95b9 100644
--- a/indra/newview/skins/default/xui/pl/widgets/person_view.xml
+++ b/indra/newview/skins/default/xui/pl/widgets/person_view.xml
@@ -1,6 +1,5 @@
<?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" />
diff --git a/indra/newview/skins/default/xui/pl/widgets/texture_picker.xml b/indra/newview/skins/default/xui/pl/widgets/texture_picker.xml
deleted file mode 100644
index fc35ac714d71e562075d95bec2010800f7e3b1ba..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pl/widgets/texture_picker.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
deleted file mode 100644
index 9e25938986d18410bf94eaafb967a5abac251d86..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Editar ciclo dos dias">
- <string name="title_new">
- Criar novo ciclo de dias
- </string>
- <string name="title_edit">
- Editar ciclo dos dias
- </string>
- <string name="hint_new">
- Dê um nome ao seu ciclo dos dias, ajuste os controles para criá-lo e clique em "Salvar".
- </string>
- <string name="hint_edit">
- Para editar sua configuração do dia, ajuste os controles e clique em "Salvar".
- </string>
- <string name="combo_label">
- -Selecione uma pré-configuração-
- </string>
- <text name="label">
- Nome:
- </text>
- <text name="note">
- Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a uma pré-configuração atual.
- </text>
- <text name="hint_item1">
- - Clique em uma guia para editar as configurações e horário de um céu.
- </text>
- <text name="hint_item2">
- - Clique e arraste as guias para definir as transições.
- </text>
- <text name="hint_item3">
- - Use a seta para rever o ciclo dos dias.
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
- <button label="Excluir chave" label_selected="Excluir chave" name="WLDeleteKey"/>
- <text name="WL12am">
- 24:00
- </text>
- <text name="WL3am">
- 03:00
- </text>
- <text name="WL6am">
- 06:00
- </text>
- <text name="WL9amHash">
- 09: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>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Configuração do céu:
- </text>
- <combo_box label="Pré-configuração" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- Hora:
- </text>
- <time name="time" value="06:00"/>
- <check_box label="Usar como novo ciclo de dias" name="make_default_cb"/>
- <button label="Salvar" name="save"/>
- <button label="Cancelar" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 6c663e2da841c5ee69ea5a70b1bc06f60494505c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Editar predefinição de céu">
- <string name="title_new">
- Criar uma nova predefinição de céu
- </string>
- <string name="title_edit">
- Editar predefinição de céu
- </string>
- <string name="hint_new">
- Nomeie sua predefinição, ajuste os controles para criá-la e clique em “Salvarâ€.
- </string>
- <string name="hint_edit">
- Para editar a sua predefinição de céu, ajuste os controles e clique em “Salvarâ€.
- </string>
- <string name="combo_label">
- -Selecionar uma prefefinição-
- </string>
- <text name="hint">
- Para editar a sua predefinição, ajuste os controles e clique em “Salvarâ€.
- </text>
- <text name="label">
- Nome predefinido:
- </text>
- <text name="note">
- Note: se você alterar o nome da sua predefinição, você criará uma nova predefinição e a predefinição existente não será alterada.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ATMOSFERA" name="Atmosphere">
- <text name="BHText">
- Horizonte azul
- </text>
- <text name="BDensText">
- Horizonte de neblina
- </text>
- <text name="BDensText2">
- Densidade azul
- </text>
- <text name="HDText">
- Densidade da neblina
- </text>
- <text name="DensMultText">
- Múltipla densidade
- </text>
- <text name="WLDistanceMultText">
- Múltipla distância
- </text>
- <text name="MaxAltText">
- Altitude máx.
- </text>
- </panel>
- <panel label="ILUMINAÇÃO" name="Lighting">
- <text name="SLCText">
- Cor do sol/lua
- </text>
- <text name="WLAmbientText">
- Ambiente
- </text>
- <text name="SunGlowText">
- Brilho do sol
- </text>
- <slider label="Enfocar" name="WLGlowB"/>
- <slider label="Tamanho" name="WLGlowR"/>
- <text name="WLStarText">
- Brilho da estrela
- </text>
- <text name="SceneGammaText">
- Gama da cena
- </text>
- <text name="TODText">
- Posição do sol/lua
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 12am
- </text>
- <text name="WL6am">
- 6am
- </text>
- <text name="WL12pmHash">
- 12pm
- </text>
- <text name="WL6pm">
- 6pm
- </text>
- <text name="WL12am2">
- 12am
- </text>
- <time name="WLDayTime" value="6:00 AM"/>
- <text name="WLEastAngleText">
- Ângulo leste
- </text>
- </panel>
- <panel label="NUVENS" name="Clouds">
- <text name="WLCloudColorText">
- Cor da nuvem
- </text>
- <text name="WLCloudColorText2">
- Nuvem XY/Densidade
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- Cobertura da nuvem
- </text>
- <text name="WLCloudScaleText">
- Escala da nuvem
- </text>
- <text name="WLCloudDetailText">
- Detalhe da Nuvem (XY/Densidade)
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Rolagem na nuvem X
- </text>
- <check_box label="Bloquear" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Rolagem na nuvem Y
- </text>
- <check_box label="Bloquear" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Tornar esta predefinição minha nova configuração de céu" name="make_default_cb"/>
- <button label="Salvar" name="save"/>
- <button label="Cancelar" name="cancel"/>
-</floater>
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
deleted file mode 100644
index f94f78c8ae12c146e6eff5712b28daccc843352a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Editar predefinição da água">
- <string name="title_new">
- Criar uma nova predefinição da água
- </string>
- <string name="title_edit">
- Editar uma predefinição da água
- </string>
- <string name="hint_new">
- Nomeie sua predefinição, ajuste os controles para criá-la e clique em “Salvarâ€.
- </string>
- <string name="hint_edit">
- Para editar a sua predefinição da água, ajuste os controles e clique em “Salvarâ€.
- </string>
- <string name="combo_label">
- -Selecionar uma prefefinição-
- </string>
- <text name="hint">
- Para editar a sua predefinição, ajuste os controles e clique em “Salvarâ€.
- </text>
- <text name="label">
- Nome predefinido:
- </text>
- <text name="note">
- Note: se você alterar o nome da sua predefinição, você criará uma nova predefinição e a predefinição existente não será alterada.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Cor da névoa da água
- </text>
- <text name="water_fog_density_label">
- Exponente de densidade da névoa
- </text>
- <text name="underwater_fog_modifier_label">
- Modificador da névoa embaixo da água
- </text>
- <text name="BHText">
- Direção da grande onda
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- Escala da reflexão da onda
- </text>
- <text name="HDText">
- Escala fresnel
- </text>
- <text name="FresnelOffsetText">
- Offset fresnel
- </text>
- <text name="BHText2">
- Direção da pequena onda
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Escala de Refratar Acima
- </text>
- <text name="WaterScaleBelowText">
- Escala de Refratar Abaixo
- </text>
- <text name="MaxAltText">
- Múltiplo desfoque
- </text>
- <text name="BHText3">
- Mapa normal
- </text>
- </panel>
- <check_box label="Tornar esta predefinição minha nova configuração da água" name="make_default_cb"/>
- <button label="Salvar" name="save"/>
- <button label="Cancelar" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
deleted file mode 100644
index 40be4dbff430a959f2443dba8930bccff9fad2b6..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="CONFIGURAÇÕES DE AMBIENTE">
- <text name="note">
- Use a opção abaixo para personalizar as configurações de ambiente para o seu visualizador.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="Use as configurações da região" name="use_region_settings"/>
- <radio_item label="Personalizar meu ambiente" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Nota: suas configurações personalizadas não estarão visÃveis para outros usuários.
- </text>
- <text name="water_settings_title">
- Configurações da água
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Selecionar uma prefefinição-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Céu / Ciclo de dias
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="Céu fixo" name="my_sky_settings"/>
- <radio_item label="Ciclos de dias" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Selecionar uma prefefinição-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Selecionar uma prefefinição-" name="item0"/>
- </combo_box>
- </panel>
- <button label="OK" name="ok_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_facebook.xml b/indra/newview/skins/default/xui/pt/floater_facebook.xml
deleted file mode 100644
index af3058223793b1158012b7b0665858eb1acc262c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="PUBLICAR NO FACEBOOK">
- <tab_container name="tabs">
- <panel label="STATUS" name="panel_facebook_status"/>
- <panel label="FOTO" name="panel_facebook_photo"/>
- <panel label="FAZER CHECK IN" name="panel_facebook_place"/>
- <panel label="AMIGOS" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Erro
- </text>
- <text name="connection_loading_text">
- Carregando...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_flickr.xml b/indra/newview/skins/default/xui/pt/floater_flickr.xml
deleted file mode 100644
index d048dbb6582e780702065e80f79a50029a25742c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="COMPARTILHAR NO FLICKR">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="FOTO" name="panel_flickr_photo"/>
- <panel label="CONTA" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Erro
- </text>
- <text name="connection_loading_text">
- Carregando...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
deleted file mode 100644
index 1204fb93e2794075ffafb9b3908a1b93e809e487..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="CONFIGURAÇÃO DO HARDWARE">
- <text name="Filtering:">
- Filtragem:
- </text>
- <check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>
- <text name="antialiasing label">
- Suavização:
- </text>
- <combo_box label="Suavização" name="fsaa" width="94">
- <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>
- <spinner label="Gama:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (0 = brilho padrão, menor = mais brilho)
- </text>
- <text name="Enable VBO:">
- Habilitar VBO:
- </text>
- <check_box initial_value="true" label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
- <text name="tc label">
- Habilitar S3TC:
- </text>
- <check_box initial_value="true" label="Habilitar compressão de texturas (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."/>
- <slider label="Memória de texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Quanto da memória deve ser alocado para texturas. O padrão é definido pela memória da placa de vÃdeo. Reduzir este valor pode melhorar o desempenho, mas as texturas podem fica fora de foco."/>
- <spinner label="Relação de Distância de Nevoeiro:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_twitter.xml b/indra/newview/skins/default/xui/pt/floater_twitter.xml
deleted file mode 100644
index 14bee3ffc382d74331e91cfd7d31959248d246b0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="REDIGIR" name="panel_twitter_photo"/>
- <panel label="CONTA" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Erro
- </text>
- <text name="connection_loading_text">
- Carregando...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
deleted file mode 100644
index 7b27c811f53a9a6b52b648c0c8e129669c44afde..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Editar anúncio" name="panel_edit_classified">
- <panel.string name="location_notice">
- (salvar para atualizar)
- </panel.string>
- <string name="publish_label">
- Publicar
- </string>
- <string name="save_label">
- Salvar
- </string>
- <text name="title">
- Editar anúncio
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/>
- </panel>
- <text name="Name:">
- Cargo:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <text name="location_label">
- Localização:
- </text>
- <text name="classified_location">
- Carregando...
- </text>
- <button label="Usar configuração local" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Categoria:"/>
- <text name="content_type_label" value="Tipo de conteúdo:"/>
- <icons_combo_box label="Público geral" name="content_type">
- <icons_combo_box.item label="Moderado" name="mature_ci" value="Adulto"/>
- <icons_combo_box.item label="Público geral" name="pg_ci" value="Adequado para menores"/>
- </icons_combo_box>
- <check_box label="Renovação automática semanal" name="auto_renew"/>
- <text name="price_for_listing_label" value="Preço do anúncio:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Preço do anúncio" value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Cancelar" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
deleted file mode 100644
index 5eb9987e71e793a8cc21c9e3dbae673f55a81574..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Editar destaques" name="panel_edit_pick">
- <panel.string name="location_notice">
- (salvar para atualizar)
- </panel.string>
- <text name="title">
- Editar destaques
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/>
- <text name="Name:">
- Cargo:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <text name="location_label">
- Localização:
- </text>
- <text name="pick_location">
- Carregando...
- </text>
- <button label="Usar configuração local" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Salvar destaque" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Cancelar" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
deleted file mode 100644
index 0ba73828456c582b7438b2e9663641fecf669bc1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Editar perfil" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Residente"/>
- <string name="AcctTypeTrial" value="Teste"/>
- <string name="AcctTypeCharterMember" value="Estatuto do membro"/>
- <string name="AcctTypeEmployee" value="Contratado da Linden Lab"/>
- <string name="PaymentInfoUsed" value="Infor. de pagamento utilizadas"/>
- <string name="PaymentInfoOnFile" value="Infor. de pagamento no arquivo"/>
- <string name="NoPaymentInfoOnFile" value="Sem infor. de pagamento no arquivo"/>
- <string name="AgeVerified" value="Idade Verificada"/>
- <string name="NotAgeVerified" value="Idade não Verificada"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=pt
- </string>
- <string name="no_partner_text" value="Nenhum"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Nome de tela:"/>
- <text name="solo_username_label" value="Nome de usuário:"/>
- <button name="set_name" tool_tip="Definir nome de tela"/>
- <text name="user_label" value="Nome de usuário:"/>
- <panel name="lifes_images_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Selecione uma imagem"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Mundo real:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Selecione uma imagem"/>
- <text name="title_homepage_text">
- Página web:
- </text>
- <check_box label="Mostrar nos resultados de busca" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Minha conta:"/>
- <text_editor name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
- <text name="my_account_link" value="[[URL] Abrir meu painel]"/>
- <text name="title_partner_text" value="Parceiro(a):"/>
- <panel name="partner_data_panel">
- <text initial_value="(pesquisando)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Editar]"/>
- </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="Salvar alterações" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Cancelar" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml b/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml
deleted file mode 100644
index 8c5c24d08bc6890cd98d6fd5a4eab43e8035e88c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="No momento, você não tem amigos do Facebook que também são residentes do Second Life. Convide seus amigos do Facebook para ingressar no Second Life hoje mesmo!"/>
- <string name="facebook_friends_no_connected" value="No momento, você não está conectado ao Facebook. Vá para a aba Status para se conectar e ativar esse recurso."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="Amigos do SL"/>
- <accordion_tab name="tab_suggested_friends" title="Adicionar essas pessoas como amigos do SL"/>
- </accordion>
- <text name="facebook_friends_status">
- Não conectado ao Facebook.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml b/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml
deleted file mode 100644
index cdf322209231d59cce881347e266062eb04522dd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
- <combo_box.item label="Janela atual" 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="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
- <combo_box.item label="Sem filtro" name="NoFilter"/>
- </combo_box>
- <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
- <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
- <text name="caption_label">
- Comentário (opcional):
- </text>
- <button label="Postar" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_place.xml b/indra/newview/skins/default/xui/pt/panel_facebook_place.xml
deleted file mode 100644
index aa8b51d64b647437c5a0bbe7771b17eed6c2f45a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Diga algo sobre onde você está:
- </text>
- <check_box initial_value="false" label="Incluir vista abstrata da localização" name="add_place_view_cb"/>
- <button label="Postar" name="post_place_btn"/>
- <button label="Cancelar" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_facebook_status.xml b/indra/newview/skins/default/xui/pt/panel_facebook_status.xml
deleted file mode 100644
index 0bbaf1086c6d0b913e2648c05d79b37574c84542..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Você está conectado ao Facebook como:"/>
- <string name="facebook_disconnected" value="Não conectado ao Facebook"/>
- <text name="account_caption_label">
- Não conectado ao Facebook.
- </text>
- <panel name="panel_buttons">
- <button label="Conectar..." name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Aprenda a publicar no Facebook]
- </text>
- </panel>
- <text name="status_caption_label">
- No que você está pensando?
- </text>
- <button label="Postar" name="post_status_btn"/>
- <button label="Cancelar" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_flickr_account.xml b/indra/newview/skins/default/xui/pt/panel_flickr_account.xml
deleted file mode 100644
index ed240b0013bdb37eb05809df3e08316f6798c940..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Você está conectado ao Flickr como:"/>
- <string name="flickr_disconnected" value="Não conectado ao Flickr"/>
- <text name="account_caption_label">
- Não conectado ao Flickr.
- </text>
- <panel name="panel_buttons">
- <button label="Conectar..." name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Aprenda a publicar no Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml b/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml
deleted file mode 100644
index 66a4f3ee3eb9bf409df1058436376ce9753d8615..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
- <combo_box.item label="Janela atual" 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>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
- <combo_box.item label="Sem filtro" name="NoFilter"/>
- </combo_box>
- <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
- <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
- <text name="title_label">
- TÃtulo:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <check_box initial_value="true" label="Incluir localização do SL no final da descrição" name="add_location_cb"/>
- <text name="tags_label">
- Tags:
- </text>
- <text name="tags_help_label">
- Separe as tags com espaços
-Use "" para tags com várias palavras
- </text>
- <combo_box name="rating_combobox" tool_tip="Classificação de conteúdo do Flickr">
- <combo_box.item label="Classificação segura do Flickr" name="SafeRating"/>
- <combo_box.item label="Classificação moderada do Flickr" name="ModerateRating"/>
- <combo_box.item label="Classificação restrita do Flickr" name="RestrictedRating"/>
- </combo_box>
- <button label="Compartilhar" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index caa140a245264684243a9f312a7d95bf5c8580e4..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Detalhes do destaque"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[NAME]"/>
- <text_editor name="pick_location" value="[carregando...]"/>
- <text_editor name="pick_desc" value="[descrição]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Teletransportar" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Editar" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml
deleted file mode 100644
index 2ff1eed62415ef9909adfa9833b28847fea22a66..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Destaques" name="panel_picks">
- <string name="no_picks" value="Sem destaques"/>
- <string name="no_classifieds" value="Sem classificados"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Destaques"/>
- <accordion_tab name="tab_classifieds" title="Classificados"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Criar um novo destaque ou classificado na localização atual"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Info" name="info_btn" tool_tip="Exibir dados do destaque"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área correspondente"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Mapa" name="show_on_map_btn" tool_tip="Exibir a área correspondente no Mapa Mundi"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_twitter_account.xml b/indra/newview/skins/default/xui/pt/panel_twitter_account.xml
deleted file mode 100644
index 32ab437786a2a74a5740368c4acac71a3a965105..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Você está conectado ao Twitter como:"/>
- <string name="twitter_disconnected" value="Não conectado ao Twitter"/>
- <text name="account_caption_label">
- Não conectado ao Twitter.
- </text>
- <panel name="panel_buttons">
- <button label="Conectar..." name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Aprenda a publicar no Twitter]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml b/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml
deleted file mode 100644
index 7c4990f71e456048d1062715170fd5c3a764d367..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- Próximas etapas?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Incluir localização do SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Incluir uma foto" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Resolução da imagem">
- <combo_box.item label="Janela atual" 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>
- <combo_box name="filters_combobox" tool_tip="Filtros de imagem">
- <combo_box.item label="Sem filtro" name="NoFilter"/>
- </combo_box>
- <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/>
- <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/>
- <button label="Enviar tweet" name="post_photo_btn"/>
- <button label="Cancelar" name="cancel_photo_btn"/>
-</panel>
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
deleted file mode 100644
index 61d708c567b459dfe13c87cb322f804c0c6e26c9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Изменить Ñуточный цикл">
- <string name="title_new">
- Создать Ñуточный цикл
- </string>
- <string name="title_edit">
- Изменить Ñуточный цикл
- </string>
- <string name="hint_new">
- Введите Ð¸Ð¼Ñ Ñуточного цикла, задайте его параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </string>
- <string name="hint_edit">
- Чтобы изменить Ñуточный цикл, задайте его параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ и нажмите кнопку «Сохранить».
- </string>
- <string name="combo_label">
- -Выбор наÑтройки-
- </string>
- <text name="label">
- Ð˜Ð¼Ñ Ð½Ð°Ñтройки:
- </text>
- <text name="note">
- Примечание. ЕÑли изменить Ð¸Ð¼Ñ Ð½Ð°Ñтройки, будет Ñоздана Ð½Ð¾Ð²Ð°Ñ Ð½Ð°Ñтройка, а Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ÑущеÑтвующей не будут Ñохранены.
- </text>
- <text name="hint_item1">
- - Ð”Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°Ñтроек неба и времени выберите ÑоответÑтвующую вкладку.
- </text>
- <text name="hint_item2">
- - Чтобы задать Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð¾Ð², перетаÑкивайте вкладки.
- </text>
- <text name="hint_item3">
- - Скребок Ñлужит Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñуточного цикла.
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="+ отметку" label_selected="+ отметку" name="WLAddKey"/>
- <button label="- отметку" label_selected="- отметку" name="WLDeleteKey"/>
- <text name="WL12am">
- 12 ночи
- </text>
- <text name="WL3am">
- 3 ночи
- </text>
- <text name="WL6am">
- 6 утра
- </text>
- <text name="WL9amHash">
- 9 утра
- </text>
- <text name="WL12pmHash">
- 12 днÑ
- </text>
- <text name="WL3pm">
- 3 днÑ
- </text>
- <text name="WL6pm">
- 6 вечера
- </text>
- <text name="WL9pm">
- 9 вечера
- </text>
- <text name="WL12am2">
- 12 ночи
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Ðебо:
- </text>
- <combo_box label="Стандарт" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- ВремÑ:
- </text>
- <time name="time" value="6:00"/>
- <check_box label="УÑтановить как новый Ñуточный цикл" name="make_default_cb"/>
- <button label="Сохранить" name="save"/>
- <button label="Отмена" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 041474f659d180635b1949f16b26234636ffabc9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Изменить наÑтройку неба">
- <string name="title_new">
- Создать наÑтройку неба
- </string>
- <string name="title_edit">
- Изменить наÑтройку неба
- </string>
- <string name="hint_new">
- Введите Ð¸Ð¼Ñ Ð½Ð°Ñтройки, задайте ее параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </string>
- <string name="hint_edit">
- Чтобы изменить наÑтройку неба, задайте ее параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </string>
- <string name="combo_label">
- -Выбор наÑтройки-
- </string>
- <text name="hint">
- Чтобы изменить наÑтройку, задайте ее параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </text>
- <text name="label">
- Ð˜Ð¼Ñ Ð½Ð°Ñтройки:
- </text>
- <text name="note">
- Примечание: еÑли изменить Ð¸Ð¼Ñ Ð½Ð°Ñтройки, будет Ñоздана Ð½Ð¾Ð²Ð°Ñ Ð½Ð°Ñтройка, а ÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð½Ð°Ñтройка оÑтанетÑÑ Ð±ÐµÐ· изменениÑ.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ÐТМОСФЕРÐ" name="Atmosphere">
- <text name="BHText">
- Голубой горизонт
- </text>
- <text name="BDensText">
- Дымка на горизонте
- </text>
- <text name="BDensText2">
- ÐаÑыщенноÑÑ‚ÑŒ голубого
- </text>
- <text name="HDText">
- ПлотноÑÑ‚ÑŒ дымки
- </text>
- <text name="DensMultText">
- КоÑффициент плотноÑти
- </text>
- <text name="WLDistanceMultText">
- КоÑффициент раÑÑтоÑниÑ
- </text>
- <text name="MaxAltText">
- МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ñ‹Ñота
- </text>
- </panel>
- <panel label="ОСВЕЩЕÐИЕ" name="Lighting">
- <text name="SLCText">
- Цвет Ñолнца/луны
- </text>
- <text name="WLAmbientText">
- ÐžÐºÑ€ÑƒÐ¶Ð°ÑŽÑ‰Ð°Ñ Ñреда
- </text>
- <text name="SunGlowText">
- СиÑние Ñолнца
- </text>
- <slider label="ФокуÑ" name="WLGlowB"/>
- <slider label="Размер" name="WLGlowR"/>
- <text name="WLStarText">
- ЯркоÑÑ‚ÑŒ звезд
- </text>
- <text name="SceneGammaText">
- Гамма-ÐºÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ñцены
- </text>
- <text name="TODText">
- Положение Ñолнца/луны
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 12 чаÑов ночи
- </text>
- <text name="WL6am">
- 6 чаÑов утра
- </text>
- <text name="WL12pmHash">
- 12 чаÑов пополудни
- </text>
- <text name="WL6pm">
- 6 чаÑов вечера
- </text>
- <text name="WL12am2">
- 12 чаÑов ночи
- </text>
- <time name="WLDayTime" value="6:00 чаÑов утра"/>
- <text name="WLEastAngleText">
- Смещение отноÑительно воÑтока
- </text>
- </panel>
- <panel label="ОБЛÐКÐ" name="Clouds">
- <text name="WLCloudColorText">
- Цвет облака
- </text>
- <text name="WLCloudColorText2">
- Координаты XY/плотноÑÑ‚ÑŒ облака
- </text>
- <slider label="Ð¥" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- ОблачноÑÑ‚ÑŒ
- </text>
- <text name="WLCloudScaleText">
- Шкала облачноÑти
- </text>
- <text name="WLCloudDetailText">
- Ð”ÐµÑ‚Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¾Ð±Ð»Ð°ÐºÐ° (координаты XY/плотноÑÑ‚ÑŒ)
- </text>
- <slider label="Ð¥" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Перемещение облака по координате X
- </text>
- <check_box label="ФикÑациÑ" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Перемещение облака по координате Y
- </text>
- <check_box label="ФикÑациÑ" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Применить Ñту наÑтройку неба" name="make_default_cb"/>
- <button label="Сохранить" name="save"/>
- <button label="Отмена" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 2ebbb11fce00bf8f438e33d8490696d0bf0e6510..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Изменить наÑтройку воды">
- <string name="title_new">
- Создать новую наÑтройку воды
- </string>
- <string name="title_edit">
- Изменение наÑтройки воды
- </string>
- <string name="hint_new">
- Введите Ð¸Ð¼Ñ Ð½Ð°Ñтройки, задайте ее параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </string>
- <string name="hint_edit">
- Чтобы изменить наÑтройку воды, задайте параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </string>
- <string name="combo_label">
- -Выбор наÑтройки-
- </string>
- <text name="hint">
- Чтобы изменить наÑтройку, задайте ее параметры Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлементов ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ нажмите кнопку «Сохранить».
- </text>
- <text name="label">
- Ð˜Ð¼Ñ Ð½Ð°Ñтройки:
- </text>
- <text name="note">
- Примечание: еÑли изменить Ð¸Ð¼Ñ Ð½Ð°Ñтройки, будет Ñоздана Ð½Ð¾Ð²Ð°Ñ Ð½Ð°Ñтройка, а ÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð½Ð°Ñтройка оÑтанетÑÑ Ð±ÐµÐ· изменениÑ.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Цвет водÑного тумана
- </text>
- <text name="water_fog_density_label">
- Показатель плотноÑти тумана
- </text>
- <text name="underwater_fog_modifier_label">
- Модификатор тумана подземных вод
- </text>
- <text name="BHText">
- Ðаправление больших волн
- </text>
- <slider label="Ð¥" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- МаÑштаб отражённого импульÑа
- </text>
- <text name="HDText">
- ФренелевÑкий маÑштаб
- </text>
- <text name="FresnelOffsetText">
- Ð£Ð³Ð»Ð¾Ð²Ð°Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑ‚ÑŒ
- </text>
- <text name="BHText2">
- Ðаправление Ñ€Ñби
- </text>
- <slider label="Ð¥" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Преломление (над водой)
- </text>
- <text name="WaterScaleBelowText">
- Преломление (под водой)
- </text>
- <text name="MaxAltText">
- КоÑффициент размытиÑ
- </text>
- <text name="BHText3">
- Карта нормалей
- </text>
- </panel>
- <check_box label="Применить Ñту новую наÑтройку воды" name="make_default_cb"/>
- <button label="Сохранить" name="save"/>
- <button label="Отмена" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
deleted file mode 100644
index 226f07faceb56b6208a4139d9fec4d9495c0de77..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ÐÐСТРОЙКИ СРЕДЫ">
- <text name="note">
- Приведенные ниже параметры позволÑÑŽÑ‚ наÑтроить окружающую Ñреду Ð´Ð»Ñ ÑредÑтва проÑмотра.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="ИÑпользовать наÑтройки региона" name="use_region_settings"/>
- <radio_item label="ÐаÑтроить Ñреду" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Примечание: ваши наÑтройки не будут видны другим пользователÑм.
- </text>
- <text name="water_settings_title">
- ÐаÑтройка воды
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Выбор наÑтройки-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Ðебо/Ñуточный цикл
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="ЗафикÑированное небо" name="my_sky_settings"/>
- <radio_item label="Суточный цикл" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Выбор наÑтройки-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Выбор наÑтройки-" name="item0"/>
- </combo_box>
- </panel>
- <button label="ОК" name="ok_btn"/>
- <button label="Отмена" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_facebook.xml b/indra/newview/skins/default/xui/ru/floater_facebook.xml
deleted file mode 100644
index cbf32cb682ec1c63cfa83dd2c49bc17b42ee6aaa..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="ОПУБЛИКОВÐТЬ Ð’ FACEBOOK">
- <tab_container name="tabs">
- <panel label="СТÐТУС" name="panel_facebook_status"/>
- <panel label="ФОТО" name="panel_facebook_photo"/>
- <panel label="ВХОД" name="panel_facebook_place"/>
- <panel label="ДРУЗЬЯ" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Ошибка
- </text>
- <text name="connection_loading_text">
- Загрузка...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_flickr.xml b/indra/newview/skins/default/xui/ru/floater_flickr.xml
deleted file mode 100644
index 67a3bedc6bb7d6350837695025228728fee3a929..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="ПОДЕЛИТЬСЯ В FLICKR">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="ФОТО" name="panel_flickr_photo"/>
- <panel label="ÐККÐУÐТ" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Ошибка
- </text>
- <text name="connection_loading_text">
- Загрузка...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
deleted file mode 100644
index d7da112a273e8faef0f2a26c507b05dddb3a85f3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="ÐППÐÐ ÐТÐЫЕ ÐÐСТРОЙКИ">
- <text name="Filtering:">
- ФильтрациÑ:
- </text>
- <check_box label="ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ (медленнее, еÑли включено)" name="ani"/>
- <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>
- <spinner label="Гамма:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (чем меньше, тем Ñрче. 0 – ÑркоÑÑ‚ÑŒ по умолчанию)
- </text>
- <text name="Enable VBO:">
- Включить VBO:
- </text>
- <check_box initial_value="true" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение Ñтого параметра на Ñовременном оборудовании даÑÑ‚ увеличение производительноÑти. Однако на Ñтаром оборудовании Ñто может привеÑти к Ñбою приложениÑ."/>
- <text name="tc label">
- Включить S3TC:
- </text>
- <check_box initial_value="true" label="Разрешить Ñжатие текÑтур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текÑтур в видеопамÑти, что позволÑет загружать текÑтуры большего размера за Ñчет некоторого Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‡ÐµÑтва цвета."/>
- <slider label="ПамÑÑ‚ÑŒ Ð´Ð»Ñ Ñ‚ÐµÐºÑтур (Мб):" name="GraphicsCardTextureMemory" tool_tip="КоличеÑтво памÑти, отводимое Ð´Ð»Ñ Ñ‚ÐµÐºÑтур. По умолчанию равно памÑти видеокарты. Уменьшение поможет увеличить производительноÑÑ‚ÑŒ, но текÑтуры могут Ñтать размытыми."/>
- <spinner label="ДиÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Ñ‚ÑƒÐ¼Ð°Ð½Ð°:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_twitter.xml b/indra/newview/skins/default/xui/ru/floater_twitter.xml
deleted file mode 100644
index 3b9493ce98587fa5278e8c8e26bcb07ee7090331..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="ÐÐПИСÐТЬ" name="panel_twitter_photo"/>
- <panel label="ÐККÐУÐТ" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Ошибка
- </text>
- <text name="connection_loading_text">
- Загрузка...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
deleted file mode 100644
index ec457c456535a5865715eb40f4c8e90214c6ab58..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Изменить рекламу" name="panel_edit_classified">
- <panel.string name="location_notice">
- (будет обновлено поÑле ÑохранениÑ)
- </panel.string>
- <string name="publish_label">
- Опубликовать
- </string>
- <string name="save_label">
- Сохранить
- </string>
- <text name="title">
- Изменить рекламу
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
- </panel>
- <text name="Name:">
- Ðазвание:
- </text>
- <text name="description_label">
- ОпиÑание:
- </text>
- <text name="location_label">
- МеÑто:
- </text>
- <text name="classified_location">
- загрузка...
- </text>
- <button label="ИÑпользовать текущее меÑто" name="set_to_curr_location_btn"/>
- <text name="category_label" value="КатегориÑ:"/>
- <text name="content_type_label" value="Тип контента:"/>
- <icons_combo_box label="General-контент" name="content_type">
- <icons_combo_box.item label="Moderate-контент" name="mature_ci" value="Mature-контент"/>
- <icons_combo_box.item label="General-контент" name="pg_ci" value="PG-контент"/>
- </icons_combo_box>
- <check_box label="ÐвтоматичеÑÐºÐ°Ñ Ð¾Ð¿Ð»Ð°Ñ‚Ð° каждую неделю" name="auto_renew"/>
- <text name="price_for_listing_label" value="СтоимоÑÑ‚ÑŒ размещениÑ:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="СтоимоÑÑ‚ÑŒ размещениÑ." value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Отменить" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
deleted file mode 100644
index 6be1448ac5f66c1cabaabfead9d19855adfed1aa..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Изменить подборку" name="panel_edit_pick">
- <panel.string name="location_notice">
- (будет обновлено поÑле ÑохранениÑ)
- </panel.string>
- <text name="title">
- Изменить подборку
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
- <text name="Name:">
- Ðазвание:
- </text>
- <text name="description_label">
- ОпиÑание:
- </text>
- <text name="location_label">
- МеÑто:
- </text>
- <text name="pick_location">
- загрузка…
- </text>
- <button label="ПоÑтавить текущее меÑто" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Сохранить подборку" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Отмена" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
deleted file mode 100644
index e9a6a781db055648f37950bbf34051ee40208a26..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Редактирование профилÑ" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Житель"/>
- <string name="AcctTypeTrial" value="ГоÑÑ‚ÑŒ"/>
- <string name="AcctTypeCharterMember" value="Учредитель"/>
- <string name="AcctTypeEmployee" value="Сотрудник Linden Lab"/>
- <string name="PaymentInfoUsed" value="ИÑпользована Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ платежах"/>
- <string name="PaymentInfoOnFile" value="ЗарегиÑтрирована Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ платежах"/>
- <string name="NoPaymentInfoOnFile" value="Ðе зарегиÑтрирована Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ платежах"/>
- <string name="AgeVerified" value="ВозраÑÑ‚ проверен"/>
- <string name="NotAgeVerified" value="ВозраÑÑ‚ не проверен"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=en
- </string>
- <string name="my_account_link_url">
- http://secondlife.com/my
- </string>
- <string name="no_partner_text" value="Ðет"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Ðкранное имÑ:"/>
- <text name="solo_username_label" value="Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"/>
- <button name="set_name" tool_tip="Задать Ñкранное имÑ"/>
- <text name="user_label" value="Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"/>
- <panel name="lifes_images_panel">
- <panel name="second_life_image_panel">
- <text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
- </panel>
- <icon label="" name="2nd_life_edit_icon" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Реальный мир:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
- <text name="title_homepage_text">
- ДомашнÑÑ Ñтраница:
- </text>
- <line_editor name="homepage_edit" value="http://"/>
- <text name="title_acc_status_text" value="Мой аккаунт:"/>
- <text_editor name="acc_status_text" value="Житель. В файле нет информации о платежах."/>
- <text name="my_account_link" value="[[URL] Перейти на информационную панель]"/>
- <text name="title_partner_text" value="Мой партнер:"/>
- <panel name="partner_data_panel">
- <text initial_value="(получение информации)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Редактировать]"/>
- </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="Сохранить изменениÑ" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Отмена" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml b/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
deleted file mode 100644
index 1e4d1346f7ec531d3620ad0ad6f1826ba396e4dd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ Ð½ÐµÑ‚ друзей в Facebook, которые ÑвлÑÑŽÑ‚ÑÑ Ñ‚Ð°ÐºÐ¶Ðµ жителÑми Second Life. Предложите Ñвоим друзьÑм в Facebook приÑоединитьÑÑ Ðº Second Life!"/>
- <string name="facebook_friends_no_connected" value="Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð²Ñ‹ не подключены к Facebook. Перейдите на вкладку «СтатуÑ», чтобы подключитьÑÑ Ð¸ включить Ñту функцию."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="Ð”Ñ€ÑƒÐ·ÑŒÑ Ð¿Ð¾ SL"/>
- <accordion_tab name="tab_suggested_friends" title="Добавить Ñтих людей как друзей по SL"/>
- </accordion>
- <text name="facebook_friends_status">
- Ðе подключено к Facebook.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml b/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
deleted file mode 100644
index 50296778ff2bc6da3ccec18f5455f971f613c1b8..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
- <combo_box.item label="Текущее окно" name="CurrentWindow"/>
- <combo_box.item label="640 x 480" name="640x480"/>
- <combo_box.item label="800 x 600" name="800x600"/>
- <combo_box.item label="1024 x 768" name="1024x768"/>
- <combo_box.item label="1200 x 630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
- <combo_box.item label="Без фильтра" name="NoFilter"/>
- </combo_box>
- <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкнуть Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
- <button label="ПредпроÑмотр" name="big_preview_btn" tool_tip="Щелкнуть Ð´Ð»Ñ Ñмены вида"/>
- <text name="caption_label">
- Комментарий (не обÑзательно):
- </text>
- <button label="Опубликовать" name="post_photo_btn"/>
- <button label="Отменить" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_place.xml b/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
deleted file mode 100644
index a7fadca059ab45425ff1dd7edf435d24474aee94..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Сообщите, где вы находитеÑÑŒ:
- </text>
- <check_box initial_value="false" label="Включить вид меÑта Ñверху" name="add_place_view_cb"/>
- <button label="Опубликовать" name="post_place_btn"/>
- <button label="Отменить" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_facebook_status.xml b/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
deleted file mode 100644
index 826ac6a08c6012cb42d1bccd817d0ef7db19f8f1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Ð’Ñ‹ подключилиÑÑŒ к Facebook как:"/>
- <string name="facebook_disconnected" value="Ðет Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº Facebook"/>
- <text name="account_caption_label">
- Ðет Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº Facebook.
- </text>
- <panel name="panel_buttons">
- <button label="Соединение..." name="connect_btn"/>
- <button label="Разъединить" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Узнать о публикации в Facebook]
- </text>
- </panel>
- <text name="status_caption_label">
- О чем вы думаете?
- </text>
- <button label="Опубликовать" name="post_status_btn"/>
- <button label="Отменить" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_flickr_account.xml b/indra/newview/skins/default/xui/ru/panel_flickr_account.xml
deleted file mode 100644
index 9f70bf8042ee8dce6a5beef6614b4527ac815098..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Ð’Ñ‹ подключилиÑÑŒ к Flickr как:"/>
- <string name="flickr_disconnected" value="Ðе подключено к Flickr"/>
- <text name="account_caption_label">
- Ðе подключено к Flickr.
- </text>
- <panel name="panel_buttons">
- <button label="Подключение..." name="connect_btn"/>
- <button label="Отключить" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 О публикации в Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml b/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
deleted file mode 100644
index f4cff55db2da64a2377f824a5fe5ccd27b3aeff2..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
- <combo_box.item label="Текущее окно" 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>
- <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
- <combo_box.item label="Без фильтра" name="NoFilter"/>
- </combo_box>
- <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
- <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
- <text name="title_label">
- Ðазвание:
- </text>
- <text name="description_label">
- ОпиÑание:
- </text>
- <check_box initial_value="true" label="Добавить в конец опиÑÐ°Ð½Ð¸Ñ Ñ€Ð°Ñположение в SL" name="add_location_cb"/>
- <text name="tags_label">
- Теги:
- </text>
- <text name="tags_help_label">
- РазделÑйте теги пробелами. Теги из неÑкольких Ñлов заключайте в кавычки.
- </text>
- <combo_box name="rating_combobox" tool_tip="Рейтинг контента Flickr">
- <combo_box.item label="БезопаÑный рейтинг Flickr" name="SafeRating"/>
- <combo_box.item label="Умеренный рейтинг Flickr" name="ModerateRating"/>
- <combo_box.item label="Ограниченный рейтинг Flickr" name="RestrictedRating"/>
- </combo_box>
- <button label="ПоделитьÑÑ" name="post_photo_btn"/>
- <button label="Отмена" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index 373cf211fbf407a1f4ea7be38e1b829507951392..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="О подборке"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[название]"/>
- <text_editor name="pick_location" value="[загрузка...]"/>
- <text_editor name="pick_desc" value="[опиÑание]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Телепорт" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Карта" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Изменить" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_picks.xml b/indra/newview/skins/default/xui/ru/panel_picks.xml
deleted file mode 100644
index d6770e0eeb876f736baee2e61864545e73c00f4a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Подборка" name="panel_picks">
- <string name="no_picks" value="Ðет подборки"/>
- <string name="no_classifieds" value="Ðет рекламы"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Подборка"/>
- <accordion_tab name="tab_classifieds" title="Реклама"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Создать подборку или рекламу на Ñтом меÑте"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Данные" name="info_btn" tool_tip="Показать данные о подборке"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="ТелепортироватьÑÑ" name="teleport_btn" tool_tip="Ð¢ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ñ Ð² ÑоответÑтвующую облаÑÑ‚ÑŒ"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Карта" name="show_on_map_btn" tool_tip="Показать ÑоответÑтвующую облаÑÑ‚ÑŒ на карте мира"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_twitter_account.xml b/indra/newview/skins/default/xui/ru/panel_twitter_account.xml
deleted file mode 100644
index 140554f5c61bb6f82499128ee124bc512b169251..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Ð’Ñ‹ подключилиÑÑŒ к Twitter как:"/>
- <string name="twitter_disconnected" value="Ðе подключено к Twitter"/>
- <text name="account_caption_label">
- Ðе подключено к Twitter.
- </text>
- <panel name="panel_buttons">
- <button label="Подключение..." name="connect_btn"/>
- <button label="Отключить" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 О публикации в Twitter]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml b/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml
deleted file mode 100644
index 6c9035323ad99f5ab4d0b59c4f4ce957a9ea9007..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ru/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- Что ÑлучилоÑÑŒ?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="Включить раÑположение в SL" name="add_location_cb"/>
- <check_box initial_value="true" label="Включить фото" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Разрешение изображениÑ">
- <combo_box.item label="Текущее окно" 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>
- <combo_box name="filters_combobox" tool_tip="Фильтры изображений">
- <combo_box.item label="Без фильтра" name="NoFilter"/>
- </combo_box>
- <button label="Обновить" name="new_snapshot_btn" tool_tip="Щелкните Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"/>
- <button label="ПроÑмотр" name="big_preview_btn" tool_tip="Щелкните Ð´Ð»Ñ Ñмены вида"/>
- <button label="Твит" name="post_photo_btn"/>
- <button label="Отмена" name="cancel_photo_btn"/>
-</panel>
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
deleted file mode 100644
index 4be1068dcc4abcd74675f1fe3c876fe2d02f9fc2..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="Gün Döngüsünü Düzenle">
- <string name="title_new">
- Yeni Bir Gün Döngüsü Oluştur
- </string>
- <string name="title_edit">
- Gün Döngüsünü Düzenle
- </string>
- <string name="hint_new">
- Gün döngünüzü adlandırın, bunu oluşturmak için denetimleri ayarlayın ve "Kaydet" üzerine tıklayın.
- </string>
- <string name="hint_edit">
- Gün döngünüzü düzenlemek için alttaki denetimleri ayarlayın ve "Kaydet" üzerine tıklayın.
- </string>
- <string name="combo_label">
- -Bir ön ayar seçin-
- </string>
- <text name="label">
- Ön Ayar Adı:
- </text>
- <text name="note">
- Not: Ön ayarınızın adını değiştirirseniz, yeni bir ön ayar oluşturursunuz ve mevcut ön ayar değişmez.
- </text>
- <text name="hint_item1">
- - Birine tıklayarak gökyüzü ayarlarını/zamanı düzenleyin.
- </text>
- <text name="hint_item2">
- - Sekmelere tıklayıp sürükleyerek geçiş sürlrn. ayarlayın.
- </text>
- <text name="hint_item3">
- - Gün döngünüzü önizlemek için fırçayı kullanın.
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="Anahtar Ekle" label_selected="Anahtar Ekle" name="WLAddKey"/>
- <button label="Anahtarı Sil" label_selected="Anahtarı Sil" name="WLDeleteKey"/>
- <text name="WL12am">
- 12
- </text>
- <text name="WL3am">
- 3
- </text>
- <text name="WL6am">
- 6
- </text>
- <text name="WL9amHash">
- 9
- </text>
- <text name="WL12pmHash">
- 24
- </text>
- <text name="WL3pm">
- 15
- </text>
- <text name="WL6pm">
- 18
- </text>
- <text name="WL9pm">
- 21
- </text>
- <text name="WL12am2">
- 12
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- Gökyüzü Ayarı:
- </text>
- <combo_box label="Ön Ayar" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- Zaman:
- </text>
- <time name="time" value="6:00"/>
- <check_box label="Bunu yeni gün döngüm yap" name="make_default_cb"/>
- <button label="Kaydet" name="save"/>
- <button label="Ä°ptal" name="cancel"/>
-</floater>
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
deleted file mode 100644
index b09115332b23e8b42ba6ec4fd67eb8733750c54d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="Gökyüzü Ön Ayarını Düzenle">
- <string name="title_new">
- Yeni bir Gökyüzü Ön Ayarı Oluştur
- </string>
- <string name="title_edit">
- Gökyüzü Ön Ayarını Düzenle
- </string>
- <string name="hint_new">
- Ön ayarınızı adlandırın, bunu oluşturmak için denetimleri ayarlayın ve "Kaydet" düğmesine tıklayın.
- </string>
- <string name="hint_edit">
- Gökyüzü ön ayarınızı düzenlemek için, denetimleri ayarlayın ve "Kaydet" düğmesine tıklayın.
- </string>
- <string name="combo_label">
- -Bir ön ayar seçin-
- </string>
- <text name="hint">
- Ön ayarınızı düzenlemek için, denetimleri ayarlayın, sonra "Kaydet» düğmesine tıklayın.
- </text>
- <text name="label">
- Ön Ayar Adı:
- </text>
- <text name="note">
- Not: ön ayarınızın adını değiştirirseniz, yeni bir ön ayar oluşturursunuz ve mevcut ön ayar değişmez.
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="ATMOSFER" name="Atmosphere">
- <text name="BHText">
- Mavi Ufuk
- </text>
- <text name="BDensText">
- Puslu Ufuk
- </text>
- <text name="BDensText2">
- Mavi YoÄŸunluÄŸu
- </text>
- <text name="HDText">
- Pus YoÄŸunluÄŸu
- </text>
- <text name="DensMultText">
- Yoğunluk Çarpanı
- </text>
- <text name="WLDistanceMultText">
- Mesafe Çarpanı
- </text>
- <text name="MaxAltText">
- Maks. Ä°rtifa
- </text>
- </panel>
- <panel label="AYDINLATMA" name="Lighting">
- <text name="SLCText">
- Güneş/Ay Rengi
- </text>
- <text name="WLAmbientText">
- Ortam
- </text>
- <text name="SunGlowText">
- Güneş Parıltısı
- </text>
- <slider label="Odak" name="WLGlowB"/>
- <slider label="Büyüklük" name="WLGlowR"/>
- <text name="WLStarText">
- Yıldız Parlaklığı
- </text>
- <text name="SceneGammaText">
- Sahne Gama Ayarı
- </text>
- <text name="TODText">
- Güneş/Ay Konumu
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- 00:00
- </text>
- <text name="WL6am">
- 06:00
- </text>
- <text name="WL12pmHash">
- 12:00
- </text>
- <text name="WL6pm">
- 18:00
- </text>
- <text name="WL12am2">
- 00:00
- </text>
- <time name="WLDayTime" value="06:00"/>
- <text name="WLEastAngleText">
- Doğu Açısı
- </text>
- </panel>
- <panel label="BULUTLAR" name="Clouds">
- <text name="WLCloudColorText">
- Bulut Rengi
- </text>
- <text name="WLCloudColorText2">
- Bulut XY/YoÄŸunluÄŸu
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- Bulut Örtüsü
- </text>
- <text name="WLCloudScaleText">
- Bulut Hacmi
- </text>
- <text name="WLCloudDetailText">
- Bulut Ayrıntısı (XY/Yoğunluğu)
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- Bulut Kaydırma X
- </text>
- <check_box label="Kilitle" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Bulut Kaydırma Y
- </text>
- <check_box label="Kilitle" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="Bu ön ayarı yeni gökyüzü ayarım yap" name="make_default_cb"/>
- <button label="Kaydet" name="save"/>
- <button label="Ä°ptal Et" name="cancel"/>
-</floater>
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
deleted file mode 100644
index f44af3c6e6ce53d8b16f208e1f307b01d0ae92c0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="Su Ön Ayarını Düzenle">
- <string name="title_new">
- Yeni bir Su Ön Ayarı Oluştur
- </string>
- <string name="title_edit">
- Bir Su Ön Ayarını Düzenle
- </string>
- <string name="hint_new">
- Ön ayarınızı adlandırın, bunu oluşturmak için denetimleri ayarlayın ve "Kaydet" düğmesine tıklayın.
- </string>
- <string name="hint_edit">
- Su ön ayarınızı düzenlemek için, denetimleri ayarlayın ve "Kaydet" düğmesine tıklayın.
- </string>
- <string name="combo_label">
- -Bir ön ayar seçin-
- </string>
- <text name="hint">
- Ön ayarınızı düzenlemek için, denetimleri ayarlayın, sonra "Kaydet» düğmesine tıklayın.
- </text>
- <text name="label">
- Ön Ayar Adı:
- </text>
- <text name="note">
- Not: ön ayarınızın adını değiştirirseniz, yeni bir ön ayar oluşturursunuz ve mevcut ön ayar değişmez.
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- Su Sisi Rengi
- </text>
- <text name="water_fog_density_label">
- Sis Yoğunluğu Üssü
- </text>
- <text name="underwater_fog_modifier_label">
- Sualtı Sis Değiştiricisi
- </text>
- <text name="BHText">
- Büyük Dalga Yönü
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- Yansıma Dalgacığı Ölçeği
- </text>
- <text name="HDText">
- Fresnel Ölçeği
- </text>
- <text name="FresnelOffsetText">
- Fresnel Dengeleme
- </text>
- <text name="BHText2">
- Küçük Dalga Yönü
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- Yukarıdan Kırılma Ölçeği
- </text>
- <text name="WaterScaleBelowText">
- Aşağıdan Kırılma Ölçeği
- </text>
- <text name="MaxAltText">
- Bulanıklaştırma Çarpanı
- </text>
- <text name="BHText3">
- Normal Harita
- </text>
- </panel>
- <check_box label="Bu ön ayarı yeni su ayarım yap" name="make_default_cb"/>
- <button label="Kaydet" name="save"/>
- <button label="Ä°ptal Et" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
deleted file mode 100644
index 0ddd46994b0d0ba5ac4bc5ba583aa8489cfba15e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ORTAM AYARLARI">
- <text name="note">
- Görüntüleyicinizin ortam ayarlarını özelleştirmek için aşağıdaki seçenekleri kullanın.
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="Bölge ayarlarını kullan" name="use_region_settings"/>
- <radio_item label="Ortamımı özelleştir" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- Not: özel ayarlarınız diğer kullanıcılar tarafından görülmez.
- </text>
- <text name="water_settings_title">
- Su Ayarı
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-Bir ön ayar seçin-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- Gökyüzü / Gün Döngüsü
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="Sabit gökyüzü" name="my_sky_settings"/>
- <radio_item label="Gün döngüsü" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-Bir ön ayar seçin-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-Bir ön ayar seçin-" name="item0"/>
- </combo_box>
- </panel>
- <button label="Tamam" name="ok_btn"/>
- <button label="Ä°ptal Et" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_facebook.xml b/indra/newview/skins/default/xui/tr/floater_facebook.xml
deleted file mode 100644
index d8cbd84ed16f9491268ba4ad68212d9d89fc5b41..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="FACEBOOK'TA YAYINLA">
- <tab_container name="tabs">
- <panel label="DURUM" name="panel_facebook_status"/>
- <panel label="FOTOÄžRAF" name="panel_facebook_photo"/>
- <panel label="GÄ°RÄ°Åž YAP" name="panel_facebook_place"/>
- <panel label="ARKADAÅžLAR" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- Hata
- </text>
- <text name="connection_loading_text">
- Yükleniyor...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_flickr.xml b/indra/newview/skins/default/xui/tr/floater_flickr.xml
deleted file mode 100644
index f559808f44ce474d076cf66300bdbd05e08adf76..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="FLICKR'DA PAYLAÅž">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="FOTOÄžRAF" name="panel_flickr_photo"/>
- <panel label="HESAP" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- Hata
- </text>
- <text name="connection_loading_text">
- Yükleniyor...
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
deleted file mode 100644
index b204389083fb98bb0f53b8420697872d283ca2bb..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="DONANIM AYARLARI">
- <text name="Filtering:">
- Filtreleme:
- </text>
- <check_box label="Anisotropik Filtreleme (etkinken daha yavaÅŸ)" name="ani"/>
- <text name="antialiasing label">
- Düzgünleştirme:
- </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">
- (görüntülemeyi eniden başlatma gerekir)
- </text>
- <spinner label="Gama:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (0 = varsayılan parlaklık, düşük = daha parlak)
- </text>
- <text name="Enable VBO:">
- VBO EtkinleÅŸtir:
- </text>
- <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."/>
- <text name="tc label">
- S3TC'ü Etkinleştir:
- </text>
- <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."/>
- <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."/>
- <spinner label="Sis Mesafe Oranı:" name="fog"/>
- <button label="Tamam" label_selected="Tamam" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_twitter.xml b/indra/newview/skins/default/xui/tr/floater_twitter.xml
deleted file mode 100644
index 93c1b0b073dbef9b2a1add0261587db5b2b9d01d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="TWITTER">
- <tab_container name="tabs">
- <panel label="OLUÅžTUR" name="panel_twitter_photo"/>
- <panel label="HESAP" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- Hata
- </text>
- <text name="connection_loading_text">
- Yükleniyor...
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
deleted file mode 100644
index 78c34a3ac0415abf5ba716baa5fb088ad1cfa834..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="İlanı Düzenle" name="panel_edit_classified">
- <panel.string name="location_notice">
- (kaydedildikten sonra güncelleştirilir)
- </panel.string>
- <string name="publish_label">
- Yayınla
- </string>
- <string name="save_label">
- Kaydet
- </string>
- <text name="title">
- İlanı Düzenle
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="Bir görüntü seçmek için tıklayın"/>
- </panel>
- <text name="Name:">
- Başlık:
- </text>
- <text name="description_label">
- Açıklama:
- </text>
- <text name="location_label">
- Konum:
- </text>
- <text name="classified_location">
- yükleniyor...
- </text>
- <button label="Geçerli Konuma Ayarla" name="set_to_curr_location_btn"/>
- <text name="category_label" value="Kategori:"/>
- <text name="content_type_label" value="İçerik türü:"/>
- <icons_combo_box label="Genel İçerik" name="content_type">
- <icons_combo_box.item label="Orta Seviyede İçerik" name="mature_ci" value="Orta Seviyede"/>
- <icons_combo_box.item label="Genel İçerik" name="pg_ci" value="PG"/>
- </icons_combo_box>
- <check_box label="Her hafta otomatik yenile" name="auto_renew"/>
- <text name="price_for_listing_label" value="İlan ücreti:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="İlan ücreti." value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="Ä°ptal Et" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
deleted file mode 100644
index 98b02d27df28e5813eb4710b0a8ae8d26736f7d3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Favori Düzenle" name="panel_edit_pick">
- <panel.string name="location_notice">
- (kaydedildikten sonra güncelleştirilir)
- </panel.string>
- <text name="title">
- Seçme Düzenle
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Bir görüntü seçmek için tıklayın"/>
- <text name="Name:">
- Başlık:
- </text>
- <text name="description_label">
- Açıklama:
- </text>
- <text name="location_label">
- Konum:
- </text>
- <text name="pick_location">
- yükleniyor...
- </text>
- <button label="Geçerli Konuma Ayarla" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Seçme Kaydet" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="Ä°ptal" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
deleted file mode 100644
index 21f4e419bc90abc68bc55c447dc98be029323b6e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profil Düzenlemesi" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="Sakin"/>
- <string name="AcctTypeTrial" value="Deneme"/>
- <string name="AcctTypeCharterMember" value="Ayrıcalıklı Üye"/>
- <string name="AcctTypeEmployee" value="Linden Lab Çalışanı"/>
- <string name="PaymentInfoUsed" value="Kullanılan Ödeme Bilgisi"/>
- <string name="PaymentInfoOnFile" value="Dosyadaki Ödeme Bilgisi"/>
- <string name="NoPaymentInfoOnFile" value="Dosyada Ödeme Bilgisi Yok"/>
- <string name="AgeVerified" value="Yaşı Doğrulanmış"/>
- <string name="NotAgeVerified" value="Yaşı Doğrulanmamış"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=en
- </string>
- <string name="my_account_link_url">
- http://secondlife.com/my
- </string>
- <string name="no_partner_text" value="Hiçbiri"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="Ekran Adı:"/>
- <text name="solo_username_label" value="Kullanıcı Adı:"/>
- <button name="set_name" tool_tip="Ekran Adını Ayarla"/>
- <text name="user_label" value="Kullanıcı Adı:"/>
- <panel name="lifes_images_panel">
- <panel name="second_life_image_panel">
- <text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
- </panel>
- <icon label="" name="2nd_life_edit_icon" tool_tip="Bir görüntü seçmek için tıklayın"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Gerçek Dünya:"/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="Bir görüntü seçmek için tıklayın"/>
- <text name="title_homepage_text">
- Ana sayfa:
- </text>
- <line_editor name="homepage_edit" value="http://"/>
- <text name="title_acc_status_text" value="Hesabım:"/>
- <text_editor name="acc_status_text" value="Sakin. Dosyada ödeme bilgisi yok."/>
- <text name="my_account_link" value="[[URL] Kontrol Panelime Git]"/>
- <text name="title_partner_text" value="Partnerim:"/>
- <panel name="partner_data_panel">
- <text initial_value="(alınıyor)" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] Düzenle]"/>
- </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="DeÄŸiÅŸiklikleri Kaydet" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Ä°ptal" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml b/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
deleted file mode 100644
index edbe87d74c5bd9a46d1212d75100e64c1ac4ca54..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="Şu anda aynı zamanda bir Second Life sakini olan hiçbir Facebook arkadaşınız yok. Facebook arkadaşlarınızdan bugün Second Life'a katılmalarını isteyin!"/>
- <string name="facebook_friends_no_connected" value="Şu anda Facebook'a bağlı değilsiniz. Bağlanmak ve bu özelliği etkinleştirmek için lütfen Durum sekmesine gidin."/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="SL arkadaşları"/>
- <accordion_tab name="tab_suggested_friends" title="Bu kişileri SL arkadaşları olarak ekle"/>
- </accordion>
- <text name="facebook_friends_status">
- Facebook'a bağlanılamadı.
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml b/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
deleted file mode 100644
index e3150f258d5da6b3d726a8104083bb5f8c403fcc..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
- <combo_box.item label="Geçerli Pencere" 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="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
- <combo_box.item label="Filtre Yok" name="NoFilter"/>
- </combo_box>
- <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
- <button label="Önizleme" name="big_preview_btn" tool_tip="Önizlemeye geçmek için tıklayın"/>
- <text name="caption_label">
- Yorum (isteğe bağlı):
- </text>
- <button label="Yayınla" name="post_photo_btn"/>
- <button label="Ä°ptal Et" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_place.xml b/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
deleted file mode 100644
index 96c34d03d00b083b2abbb528cb5c6b6d59ac1223..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- Bulunduğunuz yer hakkında bir şeyler söyleyin:
- </text>
- <check_box initial_value="false" label="Konumun üstten görünümünü ekle" name="add_place_view_cb"/>
- <button label="Yayınla" name="post_place_btn"/>
- <button label="Ä°ptal Et" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_facebook_status.xml b/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
deleted file mode 100644
index f5dba088de6448e59adfdb306b6406edc350559e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="Facebook'a şu kimlikle bağlandınız:"/>
- <string name="facebook_disconnected" value="Facebook'a bağlanılamadı"/>
- <text name="account_caption_label">
- Facebook'a bağlanılamadı.
- </text>
- <panel name="panel_buttons">
- <button label="BaÄŸlan..." name="connect_btn"/>
- <button label="Bağlantıyı kes" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Facebook'ta içerik yayınlama hakkında bilgi edinin]
- </text>
- </panel>
- <text name="status_caption_label">
- Aklınızdan ne geçiyor?
- </text>
- <button label="Yayınla" name="post_status_btn"/>
- <button label="Ä°ptal Et" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_flickr_account.xml b/indra/newview/skins/default/xui/tr/panel_flickr_account.xml
deleted file mode 100644
index 57b940d5f12195389d2dca0f1343d02d1bd0c8e0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="Flickr'a şu kimlikle bağlandınız:"/>
- <string name="flickr_disconnected" value="Flickr'la bağlantı kurulmadı"/>
- <text name="account_caption_label">
- Flickr'la bağlantı kurulmadı.
- </text>
- <panel name="panel_buttons">
- <button label="BaÄŸlan..." name="connect_btn"/>
- <button label="Bağlantıyı kes" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Flickr'da içerik yayınlama hakkında bilgi edinin]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml b/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml
deleted file mode 100644
index c34f608e3c10b540a0e9194a2da282c61585f726..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
- <combo_box.item label="Mevcut Pencere" 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>
- <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
- <combo_box.item label="Filtre Yok" name="NoFilter"/>
- </combo_box>
- <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
- <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
- <text name="title_label">
- Başlık:
- </text>
- <text name="description_label">
- Açıklama:
- </text>
- <check_box initial_value="true" label="Açıklamanın sonuna SL konumunu ekle" name="add_location_cb"/>
- <text name="tags_label">
- Etiketler:
- </text>
- <text name="tags_help_label">
- Etiketleri boşlukla ayır
-Birden çok kelime içeren etiketler için "" kullan
- </text>
- <combo_box name="rating_combobox" tool_tip="Filckr içerik seviyesi">
- <combo_box.item label="Güvenli Flickr seviyesi" name="SafeRating"/>
- <combo_box.item label="Orta Flickr seviyesi" name="ModerateRating"/>
- <combo_box.item label="Kısıtlı Flickr seviyesi" name="RestrictedRating"/>
- </combo_box>
- <button label="PaylaÅŸ" name="post_photo_btn"/>
- <button label="Ä°ptal" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index f2bbfac232e3e930c711f9172194142894e4b8ad..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="Seçme Bilgileri"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <text_editor name="pick_name" value="[ad]"/>
- <text_editor name="pick_location" value="[yükleniyor...]"/>
- <text_editor name="pick_desc" value="[açıklama]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="Işınla" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Harita" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="Düzenle" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_picks.xml b/indra/newview/skins/default/xui/tr/panel_picks.xml
deleted file mode 100644
index 26beac7854891238371a4a4b4325398fa2c4e201..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Favorilerim" name="panel_picks">
- <string name="no_picks" value="Seçme Yok"/>
- <string name="no_classifieds" value="Ä°lan Yok"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="Seçmelerim"/>
- <accordion_tab name="tab_classifieds" title="Ä°lanlar"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="Mevcut konumda yeni bir seçme veya ilan oluşturun"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="Bilgi" name="info_btn" tool_tip="Seçme bilgilerini göster"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="Işınla" name="teleport_btn" tool_tip="İlişkili alana ışınlanın"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="Harita" name="show_on_map_btn" tool_tip="İlişkili alanı Dünya Haritasında göster"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_twitter_account.xml b/indra/newview/skins/default/xui/tr/panel_twitter_account.xml
deleted file mode 100644
index 704027e1ba108241c2c2ce2327d8894b370ba9cd..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="Twitter'a şu kimlikle bağlandınız:"/>
- <string name="twitter_disconnected" value="Twitter'la bağlantı kurulmadı"/>
- <text name="account_caption_label">
- Twitter'la bağlantı kurulmadı.
- </text>
- <panel name="panel_buttons">
- <button label="BaÄŸlan..." name="connect_btn"/>
- <button label="Bağlantıyı kes" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Tweet atma hakkında bilgi edinin]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml b/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml
deleted file mode 100644
index 511ecb690d9188c721efac1cd37038fb30bcd73c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/tr/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- Neler oluyor?
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="SL konumunu dahil et" name="add_location_cb"/>
- <check_box initial_value="true" label="FotoÄŸraf ekle" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="Görüntü çözünürlüğü">
- <combo_box.item label="Mevcut Pencere" 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>
- <combo_box name="filters_combobox" tool_tip="Görüntü filtreleri">
- <combo_box.item label="Filtre Yok" name="NoFilter"/>
- </combo_box>
- <button label="Yenile" name="new_snapshot_btn" tool_tip="Yenilemek için tıklayın"/>
- <button label="Önizleme" name="big_preview_btn" tool_tip="Önizleme ayarları arasında geçiş yapmak için tıklayın"/>
- <button label="Tweet" name="post_photo_btn"/>
- <button label="Ä°ptal" name="cancel_photo_btn"/>
-</panel>
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
deleted file mode 100644
index b84a4027eabf7823166b039a684478db557f1ef4..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Day cycle" title="編輯日循環">
- <string name="title_new">
- 新建一個日循環
- </string>
- <string name="title_edit">
- 編輯日循環
- </string>
- <string name="hint_new">
- 為日循環定å，調整å„é …æŽ§åˆ¶ç¢ºå®šç´°ç¯€ï¼Œå†é»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </string>
- <string name="hint_edit">
- è‹¥è¦ç·¨è¼¯ä½ 的日循環，請調整下方å„é …æŽ§åˆ¶ï¼Œå†é»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </string>
- <string name="combo_label">
- -é¸æ“‡ä¸€å€‹è‡ªè¨‚é…ç½®-
- </string>
- <text name="label">
- 自訂é…ç½®å稱：
- </text>
- <text name="note">
- 注æ„：更改自訂é…置的å稱將會新建一個自訂é…置，ä¸æœƒæ”¹è®ŠåŽŸæœ‰çš„自訂é…置。
- </text>
- <text name="hint_item1">
- - 點按一個é 籤，編輯特定的天空è¨å®šå’Œæ™‚間。
- </text>
- <text name="hint_item2">
- - 點按並拖曳å„個é 籤，å³å¯è¨å®šéŽæ¸¡æ™‚間。
- </text>
- <text name="hint_item3">
- - 使用 scrubber é è¦½ä½ çš„æ—¥å¾ªç’°ã€‚
- </text>
- <panel name="day_cycle_slider_panel">
- <multi_slider initial_value="0" name="WLTimeSlider"/>
- <multi_slider initial_value="0" name="WLDayCycleKeys"/>
- <button label="新增éµ" label_selected="新增éµ" name="WLAddKey"/>
- <button label="刪除éµ" label_selected="刪除éµ" name="WLDeleteKey"/>
- <text name="WL12am">
- åˆå¤œ 12 點
- </text>
- <text name="WL3am">
- 凌晨 3 點
- </text>
- <text name="WL6am">
- ä¸Šåˆ 6 點
- </text>
- <text name="WL9amHash">
- ä¸Šåˆ 9 點
- </text>
- <text name="WL12pmHash">
- ä¸åˆ 12 點
- </text>
- <text name="WL3pm">
- ä¸‹åˆ 3 點
- </text>
- <text name="WL6pm">
- ä¸‹åˆ 6 點
- </text>
- <text name="WL9pm">
- ä¸‹åˆ 9 點
- </text>
- <text name="WL12am2">
- åˆå¤œ 12 點
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- </panel>
- <text name="WLCurKeyPresetText">
- 天空è¨å®šï¼š
- </text>
- <combo_box label="é è¨å€¼" name="WLSkyPresets"/>
- <text name="WLCurKeyTimeText">
- 時間：
- </text>
- <time name="time" value="ä¸Šåˆ 6 點"/>
- <check_box label="æ ¹æ“šé€™è¨å®šè®Šæ›´æˆ‘的日循環" name="make_default_cb"/>
- <button label="儲å˜" name="save"/>
- <button label="å–消" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 18e6cfb9d234d81cffbb3c0ca739816dd73f13f5..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Sky Preset" title="編輯天空自訂é…ç½®">
- <string name="title_new">
- 建立新的天空自訂é…ç½®
- </string>
- <string name="title_edit">
- 編輯天空自訂é…ç½®
- </string>
- <string name="hint_new">
- 為自訂é…置定å，調整å„é …æŽ§åˆ¶ç¢ºå®šé…置細節，完æˆå¾Œé»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </string>
- <string name="hint_edit">
- è‹¥è¦ç·¨è¼¯ä½ 的天空自訂é…置，請調整å„é …æŽ§åˆ¶ï¼Œå†é»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </string>
- <string name="combo_label">
- -é¸æ“‡ä¸€å€‹è‡ªè¨‚é…ç½®-
- </string>
- <text name="hint">
- è‹¥è¦ç·¨è¼¯ä½ 的自訂é…置，請調整å„é …æŽ§åˆ¶ï¼Œå†é»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </text>
- <text name="label">
- 自訂é…ç½®å稱：
- </text>
- <text name="note">
- 注æ„：更改自訂é…置的å稱將會新建一個自訂é…置，ä¸æœƒæ”¹è®ŠåŽŸæœ‰çš„自訂é…置。
- </text>
- <tab_container name="WindLight Tabs">
- <panel label="大氣" name="Atmosphere">
- <text name="BHText">
- è—天水平線
- </text>
- <text name="BDensText">
- 陰霾水平線
- </text>
- <text name="BDensText2">
- è—天密度
- </text>
- <text name="HDText">
- 陰霾密度
- </text>
- <text name="DensMultText">
- 密度å€å¢ž
- </text>
- <text name="WLDistanceMultText">
- è·é›¢å€å¢ž
- </text>
- <text name="MaxAltText">
- 最大高度
- </text>
- </panel>
- <panel label="照明" name="Lighting">
- <text name="SLCText">
- æ—¥ï¼æœˆ é¡è‰²
- </text>
- <text name="WLAmbientText">
- 環境光
- </text>
- <text name="SunGlowText">
- 太陽光è¼
- </text>
- <slider label="èšç„¦" name="WLGlowB"/>
- <slider label="尺寸" name="WLGlowR"/>
- <text name="WLStarText">
- 星空亮度
- </text>
- <text name="SceneGammaText">
- å ´æ™¯ Gamma 值
- </text>
- <text name="TODText">
- æ—¥ï¼æœˆä½ç½®
- </text>
- <multi_slider initial_value="0" name="WLSunPos"/>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <text name="WL12am">
- åˆå¤œ 12 點
- </text>
- <text name="WL6am">
- ä¸Šåˆ 6 點
- </text>
- <text name="WL12pmHash">
- ä¸åˆ 12 點
- </text>
- <text name="WL6pm">
- ä¸‹åˆ 6 點
- </text>
- <text name="WL12am2">
- åˆå¤œ 12 點
- </text>
- <time name="WLDayTime" value="ä¸Šåˆ 6 點"/>
- <text name="WLEastAngleText">
- æ±å‡è§’度
- </text>
- </panel>
- <panel label="雲彩" name="Clouds">
- <text name="WLCloudColorText">
- 雲彩é¡è‰²
- </text>
- <text name="WLCloudColorText2">
- 雲彩 XY 軸ï¼å¯†åº¦
- </text>
- <slider label="X" name="WLCloudX"/>
- <slider label="Y" name="WLCloudY"/>
- <slider label="D" name="WLCloudDensity"/>
- <text name="WLCloudCoverageText">
- 雲彩覆蓋
- </text>
- <text name="WLCloudScaleText">
- 雲彩è¦æ¨¡
- </text>
- <text name="WLCloudDetailText">
- 雲彩細節（XY 軸ï¼å¯†åº¦ï¼‰
- </text>
- <slider label="X" name="WLCloudDetailX"/>
- <slider label="Y" name="WLCloudDetailY"/>
- <slider label="D" name="WLCloudDetailDensity"/>
- <text name="WLCloudScrollXText">
- 雲彩 X 滾軸
- </text>
- <check_box label="鎖定" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- 雲彩 Y 滾軸
- </text>
- <check_box label="鎖定" name="WLCloudLockY"/>
- </panel>
- </tab_container>
- <check_box label="æ ¹æ“šé€™è‡ªè¨‚é…置變更我的天空è¨å®š" name="make_default_cb"/>
- <button label="儲å˜" name="save"/>
- <button label="å–消" name="cancel"/>
-</floater>
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
deleted file mode 100644
index 7943866e726a9d1ae47c2df09fa00da6e739ba56..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Edit Water Preset" title="編輯水的自訂é…ç½®">
- <string name="title_new">
- 新建水的自訂é…ç½®
- </string>
- <string name="title_edit">
- 編輯水的自訂é…ç½®
- </string>
- <string name="hint_new">
- 為自訂é…置定å，調整å„é …æŽ§åˆ¶ç¢ºå®šé…置細節，完æˆå¾Œé»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </string>
- <string name="hint_edit">
- è‹¥è¦ç·¨è¼¯æ°´çš„自訂é…置，請調整å„é …æŽ§åˆ¶ï¼Œå†é»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </string>
- <string name="combo_label">
- -é¸æ“‡ä¸€å€‹è‡ªè¨‚é…ç½®-
- </string>
- <text name="hint">
- è‹¥è¦ç·¨è¼¯ä½ 的自訂é…置，請調整å„é …æŽ§åˆ¶ï¼Œå†é»žæŒ‰ã€Œå„²å˜ã€ã€‚
- </text>
- <text name="label">
- 自訂é…ç½®å稱：
- </text>
- <text name="note">
- 注æ„：更改自訂é…置的å稱將會新建一個自訂é…置，ä¸æœƒæ”¹è®ŠåŽŸæœ‰çš„自訂é…置。
- </text>
- <panel name="panel_water_preset">
- <text name="water_color_label">
- 水霧é¡è‰²
- </text>
- <text name="water_fog_density_label">
- 霧密度指數
- </text>
- <text name="underwater_fog_modifier_label">
- 水底霧修飾元
- </text>
- <text name="BHText">
- 大波浪方å‘
- </text>
- <slider label="X" name="WaterWave1DirX"/>
- <slider label="Y" name="WaterWave1DirY"/>
- <text name="BDensText">
- åå°„å波比例
- </text>
- <text name="HDText">
- è²æ¶…耳比例
- </text>
- <text name="FresnelOffsetText">
- è²æ¶…耳åè·
- </text>
- <text name="BHText2">
- å°æ³¢æµªæ–¹å‘
- </text>
- <slider label="X" name="WaterWave2DirX"/>
- <slider label="Y" name="WaterWave2DirY"/>
- <text name="DensMultText">
- 上折射比例
- </text>
- <text name="WaterScaleBelowText">
- 下折射比例
- </text>
- <text name="MaxAltText">
- 模糊å€æ•¸
- </text>
- <text name="BHText3">
- æ£å¸¸åœ°åœ–
- </text>
- </panel>
- <check_box label="æ ¹æ“šé€™è‡ªè¨‚é…置變更我水的è¨å®š" name="make_default_cb"/>
- <button label="儲å˜" name="save"/>
- <button label="å–消" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
deleted file mode 100644
index 862c576dc073c107f2a19935f787ac6486d350a3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="環境è¨å®š">
- <text name="note">
- 使用以下的é¸é …è‡ªè¨‚ä½ Viewer 的環境è¨å®šã€‚
- </text>
- <radio_group name="region_settings_radio_group">
- <radio_item label="使用地å€è¨å®š" name="use_region_settings"/>
- <radio_item label="自訂我的環境" name="use_my_settings"/>
- </radio_group>
- <panel name="user_environment_settings">
- <text name="note">
- 注æ„ï¼šä½ çš„è‡ªè¨‚è¨å®šä¸æœƒè¢«å…¶ä»–使用者看見。
- </text>
- <text name="water_settings_title">
- æ°´çš„è¨å®š
- </text>
- <combo_box name="water_settings_preset_combo">
- <combo_box.item label="-é¸æ“‡ä¸€å€‹è‡ªè¨‚é…ç½®-" name="item0"/>
- </combo_box>
- <text name="sky_dayc_settings_title">
- 天空ï¼æ—¥å¾ªç’°
- </text>
- <radio_group name="sky_dayc_settings_radio_group">
- <radio_item label="固定天空" name="my_sky_settings"/>
- <radio_item label="日循環" name="my_dayc_settings"/>
- </radio_group>
- <combo_box name="sky_settings_preset_combo">
- <combo_box.item label="-é¸æ“‡ä¸€å€‹è‡ªè¨‚é…ç½®-" name="item0"/>
- </combo_box>
- <combo_box name="dayc_settings_preset_combo">
- <combo_box.item label="-é¸æ“‡ä¸€å€‹è‡ªè¨‚é…ç½®-" name="item0"/>
- </combo_box>
- </panel>
- <button label="確定" name="ok_btn"/>
- <button label="å–消" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_facebook.xml b/indra/newview/skins/default/xui/zh/floater_facebook.xml
deleted file mode 100644
index 9a71a26333b776eb85d753f9f903a88384ea4ad4..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_facebook.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_facebook" title="發佈到臉書">
- <tab_container name="tabs">
- <panel label="狀態" name="panel_facebook_status"/>
- <panel label="相片" name="panel_facebook_photo"/>
- <panel label="打å¡" name="panel_facebook_place"/>
- <panel label="朋å‹" name="panel_facebook_friends"/>
- </tab_container>
- <text name="connection_error_text">
- 錯誤
- </text>
- <text name="connection_loading_text">
- 載入ä¸â€¦
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_flickr.xml b/indra/newview/skins/default/xui/zh/floater_flickr.xml
deleted file mode 100644
index c4576baea51d10e784f97f7c12ac600a49835780..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_flickr.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_flickr" title="分享到FLICKR">
- <panel name="background">
- <tab_container name="tabs">
- <panel label="相片" name="panel_flickr_photo"/>
- <panel label="帳號" name="panel_flickr_account"/>
- </tab_container>
- <panel name="connection_status_panel">
- <text name="connection_error_text">
- 錯誤
- </text>
- <text name="connection_loading_text">
- 載入ä¸â€¦
- </text>
- </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
deleted file mode 100644
index 9e3bb88ac0de76329c3ee336e453026b030336ce..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="硬體è¨å®š">
- <text name="Filtering:">
- éŽæ¿¾ï¼š
- </text>
- <check_box label="å„å‘異性éŽæ¿¾ï¼ˆè‹¥å•Ÿç”¨æœƒè®Šæ…¢ï¼‰" name="ani"/>
- <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>
- <spinner label="伽瑪值：" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- （0 = é è¨äº®åº¦ï¼›å€¼è¶Šå° = 亮度越高）
- </text>
- <text name="Enable VBO:">
- å•Ÿç”¨é ‚é»žç·©è¡ç‰©ä»¶(VBO)：
- </text>
- <check_box initial_value="true" label="啟用 OpenGL é ‚é»žç·©è¡ç‰©ä»¶(VBO)" name="vbo" tool_tip="在較新硬體上啟用，å¯æå‡æ•ˆèƒ½ã€‚ 但是，較舊硬體的 VBO 實作ä¸ä½³ï¼Œè‹¥å•Ÿç”¨å¯èƒ½å°Žè‡´ç•¶æ©Ÿã€‚"/>
- <text name="tc label">
- 啟用 S3TC：
- </text>
- <check_box initial_value="true" label="啟用æè³ªå£“ç¸®ï¼ˆé ˆé‡æ–°å•Ÿå‹•ï¼‰" name="texture compression" tool_tip="在影片記憶體ä¸å£“縮æ質，讓高解æžåº¦æ質å¯ä»¥è¼‰å…¥ï¼Œä½†è‰²å½©å“質ç¨å·®ã€‚"/>
- <slider label="æ質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="é…置給æ質使用的記憶體é‡ã€‚ é è¨ç‚ºé¡¯åƒå¡è¨˜æ†¶é«”。 é™ä½Žæ¤å€¼å¯ä»¥æå‡æ•ˆèƒ½ï¼Œä½†æ質也會變模糊。"/>
- <spinner label="霧è·é›¢æ¯”率：" name="fog"/>
- <button label="確定" label_selected="確定" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_twitter.xml b/indra/newview/skins/default/xui/zh/floater_twitter.xml
deleted file mode 100644
index ac49b2a9678b57c2bb06c75484dfbf9cb309b26f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/floater_twitter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_twitter" title="推特">
- <tab_container name="tabs">
- <panel label="編撰" name="panel_twitter_photo"/>
- <panel label="帳號" name="panel_twitter_account"/>
- </tab_container>
- <text name="connection_error_text">
- 錯誤
- </text>
- <text name="connection_loading_text">
- 載入ä¸â€¦
- </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
deleted file mode 100644
index 4d3248db46ab517c5036b99d299908337b13764c..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="編輯個人廣告" name="panel_edit_classified">
- <panel.string name="location_notice">
- （儲å˜å¾Œå°‡æœƒæ›´æ–°ï¼‰
- </panel.string>
- <string name="publish_label">
- 發布
- </string>
- <string name="save_label">
- 儲å˜
- </string>
- <text name="title">
- 編輯個人廣告
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="snapshot_panel">
- <icon label="" name="edit_icon" tool_tip="點按以é¸æ“‡åœ–åƒ"/>
- </panel>
- <text name="Name:">
- 標題：
- </text>
- <text name="description_label">
- æ述：
- </text>
- <text name="location_label">
- ä½ç½®ï¼š
- </text>
- <text name="classified_location">
- 載入ä¸...
- </text>
- <button label="è¨å®šç‚ºç›®å‰ä½ç½®" name="set_to_curr_location_btn"/>
- <text name="category_label" value="分類："/>
- <text name="content_type_label" value="內容類型："/>
- <icons_combo_box label="一般普級內容" name="content_type">
- <icons_combo_box.item label="é©åº¦æˆäººå…§å®¹" name="mature_ci" value="é©åº¦æˆäºº"/>
- <icons_combo_box.item label="一般普級內容" name="pg_ci" value="一般普級"/>
- </icons_combo_box>
- <check_box label="æ¯æ˜ŸæœŸè‡ªå‹•çºŒè¨‚" name="auto_renew"/>
- <text name="price_for_listing_label" value="刊登費："/>
- <spinner label="L$" name="price_for_listing" tool_tip="刊登費。" value="50"/>
- </panel>
- </scroll_container>
- <panel label="bottom_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="cancel_btn_lp">
- <button label="å–消" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
deleted file mode 100644
index faee42fd0e3e44a0834220375191f60f8d961cb1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="編輯精é¸åœ°é»ž" name="panel_edit_pick">
- <panel.string name="location_notice">
- （儲å˜å¾Œå°‡æœƒæ›´æ–°ï¼‰
- </panel.string>
- <text name="title">
- 編輯精é¸åœ°é»ž
- </text>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="點按以é¸æ“‡åœ–åƒ"/>
- <text name="Name:">
- 標題：
- </text>
- <text name="description_label">
- æ述：
- </text>
- <text name="location_label">
- ä½ç½®ï¼š
- </text>
- <text name="pick_location">
- 載入ä¸...
- </text>
- <button label="è¨å®šç‚ºç›®å‰ä½ç½®" name="set_to_curr_location_btn"/>
- </panel>
- </scroll_container>
- <panel label="bottom_panel" name="bottom_panel">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="儲å˜ç²¾é¸åœ°é»ž" name="save_changes_btn"/>
- </layout_panel>
- <layout_panel name="layout_panel2">
- <button label="å–消" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
deleted file mode 100644
index 849b82c71aa9cf9cf0f26813b2956b731de4395b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="檔案編輯" name="edit_profile_panel">
- <string name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string name="AcctTypeResident" value="å±…æ°‘"/>
- <string name="AcctTypeTrial" value="試用"/>
- <string name="AcctTypeCharterMember" value="è€ç‰Œ Charter æˆå“¡"/>
- <string name="AcctTypeEmployee" value="林登實驗室員工"/>
- <string name="PaymentInfoUsed" value="使用的付款資料"/>
- <string name="PaymentInfoOnFile" value="é 留付款資料"/>
- <string name="NoPaymentInfoOnFile" value="未é 留付款資料"/>
- <string name="AgeVerified" value="通éŽå¹´é½¡é©—è‰"/>
- <string name="NotAgeVerified" value="未通éŽå¹´é½¡é©—è‰"/>
- <string name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=en
- </string>
- <string name="my_account_link_url">
- http://secondlife.com/my
- </string>
- <string name="no_partner_text" value="ç„¡"/>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="data_panel">
- <text name="display_name_label" value="顯示å稱："/>
- <text name="solo_username_label" value="使用者å稱："/>
- <button name="set_name" tool_tip="è¨å®šé¡¯ç¤ºå稱"/>
- <text name="user_label" value="使用者å稱："/>
- <panel name="lifes_images_panel">
- <panel name="second_life_image_panel">
- <text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
- </panel>
- <icon label="" name="2nd_life_edit_icon" tool_tip="點按以é¸æ“‡åœ–åƒ"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="真實世界："/>
- </panel>
- <icon label="" name="real_world_edit_icon" tool_tip="點按以é¸æ“‡åœ–åƒ"/>
- <text name="title_homepage_text">
- 首é ：
- </text>
- <line_editor name="homepage_edit" value="http://"/>
- <text name="title_acc_status_text" value="我的帳戶："/>
- <text_editor name="acc_status_text" value="居民。 未é 留付款資料。"/>
- <text name="my_account_link" value="[[URL] å‰å¾€æˆ‘的塗鴉牆]"/>
- <text name="title_partner_text" value="我的é…å¶ï¼š"/>
- <panel name="partner_data_panel">
- <text initial_value="（檢索ä¸ï¼‰" name="partner_text"/>
- </panel>
- <text name="partner_edit_link" value="[[URL] 編輯]"/>
- </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="儲å˜è®Šæ›´" name="save_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="å–消" name="cancel_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_friends.xml b/indra/newview/skins/default/xui/zh/panel_facebook_friends.xml
deleted file mode 100644
index 2cf3eb0cf56f827d84c4595589124ff3a16a477e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_facebook_friends.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_friends">
- <string name="facebook_friends_empty" value="ä½ çš„è‡‰æ›¸æœ‹å‹ä¸ï¼Œæ²’有åŒæ™‚也是第二人生居民的人。 ä»Šå¤©å°±è«‹ä½ çš„è‡‰æ›¸æœ‹å‹åŠ 入第二人生ï¼"/>
- <string name="facebook_friends_no_connected" value="ä½ ç›®å‰å°šæœªé€£çµè‡‰æ›¸ã€‚ 請到「帳戶ã€é ç±¤é–‹å•Ÿé€™é …åŠŸèƒ½ä¸¦é€²è¡Œé€£çµã€‚"/>
- <accordion name="friends_accordion">
- <accordion_tab name="tab_second_life_friends" title="第二人生的朋å‹"/>
- <accordion_tab name="tab_suggested_friends" title="æŠŠé€™äº›äººåŠ ç‚ºç¬¬äºŒäººç”Ÿçš„æœ‹å‹"/>
- </accordion>
- <text name="facebook_friends_status">
- 未連通臉書。
- </text>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml b/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml
deleted file mode 100644
index 85d2ac36f311b88e7d30d3d721ab8a72dfde5684..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_facebook_photo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_photo">
- <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
- <combo_box.item label="ç›®å‰è¦–窗" 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="1200x630" name="1200x630"/>
- </combo_box>
- <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
- <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
- </combo_box>
- <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
- <button label="é 覽" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é 覽"/>
- <text name="caption_label">
- 說明（å¯ç•™ç©ºï¼‰ï¼š
- </text>
- <button label="發佈" name="post_photo_btn"/>
- <button label="å–消" name="cancel_photo_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_place.xml b/indra/newview/skins/default/xui/zh/panel_facebook_place.xml
deleted file mode 100644
index 56d4d687eff055e59a53870e76edbc00afebd6c9..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_facebook_place.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_place">
- <text name="place_caption_label">
- æè¿°ä¸€ä¸‹ä½ æ‰€åœ¨çš„åœ°æ–¹ï¼š
- </text>
- <check_box initial_value="false" label="包括地點的俯瞰圖" name="add_place_view_cb"/>
- <button label="發佈" name="post_place_btn"/>
- <button label="å–消" name="cancel_place_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_status.xml b/indra/newview/skins/default/xui/zh/panel_facebook_status.xml
deleted file mode 100644
index 3a7cbd07b07aee710e33bd58245c6a4bf0681209..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_facebook_status.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_status">
- <string name="facebook_connected" value="å·²æˆåŠŸé€£é€šè‡‰æ›¸ï¼Œèº«åˆ†ç‚ºï¼š"/>
- <string name="facebook_disconnected" value="未連通臉書"/>
- <text name="account_caption_label">
- 未連通臉書。
- </text>
- <panel name="panel_buttons">
- <button label="連通…" name="connect_btn"/>
- <button label="ä¸æ–·" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 如何發佈到臉書]
- </text>
- </panel>
- <text name="status_caption_label">
- ä½ åœ¨æƒ³äº›ä»€éº¼ï¼Ÿ
- </text>
- <button label="發佈" name="post_status_btn"/>
- <button label="å–消" name="cancel_status_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_flickr_account.xml b/indra/newview/skins/default/xui/zh/panel_flickr_account.xml
deleted file mode 100644
index 63cd547cd022d3b349e9aaf65b088f4bb148ea06..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_flickr_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_account">
- <string name="flickr_connected" value="ä½ å·²æˆåŠŸé€£é€š Flickr，身分為："/>
- <string name="flickr_disconnected" value="尚未連通 Flickr"/>
- <text name="account_caption_label">
- 尚未連通 Flickr。
- </text>
- <panel name="panel_buttons">
- <button label="連通…" name="connect_btn"/>
- <button label="ä¸æ–·" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2435609 çžè§£å¦‚何發佈到 Flickr]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
deleted file mode 100644
index 928fd4c6408d1d9f63230cb3bdb3911498f3f149..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_flickr_photo">
- <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
- <combo_box.item label="ç›®å‰è¦–窗" 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>
- <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
- <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
- </combo_box>
- <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
- <button label="é 覽" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é 覽"/>
- <text name="title_label">
- 標題：
- </text>
- <text name="description_label">
- æ述：
- </text>
- <check_box initial_value="true" label="在æè¿°çµå°¾åŠ 上第二人生的地點" name="add_location_cb"/>
- <text name="tags_label">
- 標籤：
- </text>
- <text name="tags_help_label">
- ä¸åŒæ¨™ç±¤ä¹‹é–“以åŠå½¢ç©ºæ ¼åˆ†éš”
-標籤若å«ç©ºæ ¼ï¼Œç”¨ "" åŠå½¢ç¬¦è™Ÿæ‹¬ä½
- </text>
- <combo_box name="rating_combobox" tool_tip="Flickr 內容分級">
- <combo_box.item label="安全級 Flickr 內容" name="SafeRating"/>
- <combo_box.item label="é©ä¸ç´š Flickr 內容" name="ModerateRating"/>
- <combo_box.item label="é™åˆ¶ç´š Flickr 內容" name="RestrictedRating"/>
- </combo_box>
- <button label="分享" name="post_photo_btn"/>
- <button label="å–消" name="cancel_photo_btn"/>
-</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
deleted file mode 100644
index cd4cdbf999b3422363cef73348cfabb6397e3d39..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_pick_info">
- <text name="title" value="ç²¾é¸åœ°é»žè³‡è¨Š"/>
- <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]"/>
- </panel>
- </scroll_container>
- <panel name="buttons">
- <layout_stack name="layout_stack1">
- <layout_panel name="layout_panel1">
- <button label="瞬間傳é€" name="teleport_btn"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="地圖" name="show_on_map_btn"/>
- </layout_panel>
- <layout_panel name="edit_btn_lp">
- <button label="編輯" name="edit_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
deleted file mode 100644
index 98d36eaea07bf8c83b2dedf9b58182c9481bad7d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="ç²¾é¸åœ°é»ž" name="panel_picks">
- <string name="no_picks" value="ç„¡ç²¾é¸åœ°é»ž"/>
- <string name="no_classifieds" value="ç¦æ¢å€‹äººå»£å‘Š"/>
- <accordion name="accordion">
- <accordion_tab name="tab_picks" title="ç²¾é¸åœ°é»ž"/>
- <accordion_tab name="tab_classifieds" title="個人廣告"/>
- </accordion>
- <panel label="bottom_panel" name="edit_panel">
- <layout_stack name="edit_panel_ls">
- <layout_panel name="gear_menu_btn">
- <button name="new_btn" tool_tip="以目å‰ä½ç½®å»ºç«‹æ–°çš„ç²¾é¸åœ°é»žæˆ–個人廣告"/>
- </layout_panel>
- </layout_stack>
- </panel>
- <panel name="buttons_cucks">
- <layout_stack name="buttons_cucks_ls">
- <layout_panel name="info_btn_lp">
- <button label="資訊" name="info_btn" tool_tip="顯示精é¸åœ°é»žè³‡è¨Š"/>
- </layout_panel>
- <layout_panel name="teleport_btn_lp">
- <button label="瞬間傳é€" name="teleport_btn" tool_tip="瞬間傳é€åˆ°çš„å€åŸŸ"/>
- </layout_panel>
- <layout_panel name="show_on_map_btn_lp">
- <button label="地圖" name="show_on_map_btn" tool_tip="在世界地圖上顯示相å°æ‡‰çš„å€åŸŸ"/>
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_twitter_account.xml b/indra/newview/skins/default/xui/zh/panel_twitter_account.xml
deleted file mode 100644
index a8b57d74532c4125bec2f27b0a241864e02ea3c0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_twitter_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_account">
- <string name="twitter_connected" value="ä½ å·²æˆåŠŸé€£é€šæŽ¨ç‰¹ï¼Œèº«åˆ†ç‚ºï¼š"/>
- <string name="twitter_disconnected" value="尚未連通推特。"/>
- <text name="account_caption_label">
- 尚未連通推特。
- </text>
- <panel name="panel_buttons">
- <button label="連通…" name="connect_btn"/>
- <button label="ä¸æ–·" name="disconnect_btn"/>
- <text name="account_learn_more_label">
- [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2435453 çžè§£å¦‚何發佈到推特]
- </text>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml b/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml
deleted file mode 100644
index 19eb23eac7a2c65d3ace63f42b1a803233a2f8ec..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/zh/panel_twitter_photo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_twitter_photo">
- <text name="status_label">
- èªªä¸€èªªä½ æ£åœ¨åšä»€éº¼
- </text>
- <text name="status_counter_label">
- 140
- </text>
- <check_box initial_value="true" label="åŠ å…¥æ‰€åœ¨ä½ç½®" name="add_location_cb"/>
- <check_box initial_value="true" label="附上照片" name="add_photo_cb"/>
- <combo_box name="resolution_combobox" tool_tip="圖åƒè§£æžåº¦">
- <combo_box.item label="ç›®å‰è¦–窗" 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>
- <combo_box name="filters_combobox" tool_tip="圖åƒæ¿¾é¡">
- <combo_box.item label="ä¸ç”¨æ¿¾é¡" name="NoFilter"/>
- </combo_box>
- <button label="刷新" name="new_snapshot_btn" tool_tip="點按å³å¯åˆ·æ–°"/>
- <button label="é 覽" name="big_preview_btn" tool_tip="點按å³å¯åˆ‡æ›é 覽"/>
- <button label="發到推特" name="post_photo_btn"/>
- <button label="å–消" name="cancel_photo_btn"/>
-</panel>
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index 4c6449954ba694dd5c2a79bdeac38a7ba5564ada..ee8492db5e34be59a55e9eec4ae490d09ce625e4 100755
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -232,7 +232,7 @@ def run(sysargs):
""")
parser.add_option(
'-u', '--master_url', type='string', dest='master_url',
- default='https://bitbucket.org/lindenlab/master-message-template-git/raw/master/message_template.msg',
+ default='https://github.com/secondlife/master-message-template/raw/master/message_template.msg',
help="""The url of the master message template.""")
parser.add_option(
'-c', '--cache_master', action='store_true', dest='cache_master',