Automated merge with tip of viewer64 *plus* update to CEF 3.3202.1686 / Dullahan 901

Mon, 11 Dec 2017 10:09:44 -0800

author
callum_linden <callum@lindenlab.com>
date
Mon, 11 Dec 2017 10:09:44 -0800
changeset 55041
ba9d98c4a18c
parent 55040
22010f096dca
parent 54574
05df4153079e
child 55042
6745802f81bd

Automated merge with tip of viewer64 *plus* update to CEF 3.3202.1686 / Dullahan 901

autobuild.xml file | annotate | diff | revisions
     1.1 --- a/.hgtags	Tue Nov 21 09:46:31 2017 -0800
     1.2 +++ b/.hgtags	Mon Dec 11 10:09:44 2017 -0800
     1.3 @@ -530,3 +530,4 @@
     1.4  3e5035dfd8af49bd4c0009f0a76ef46a15991a45 5.0.6-release
     1.5  abcab37e1b29414ab8c03af9ca2ab489d809788a 5.0.7-release
     1.6  505a492f30bd925bb48e2e093ae77c3c2b4c740f 5.0.8-release
     1.7 +40ca7118765be85a043b31b011e4ee6bd9e33c95 5.0.9-release
     2.1 --- a/autobuild.xml	Tue Nov 21 09:46:31 2017 -0800
     2.2 +++ b/autobuild.xml	Mon Dec 11 10:09:44 2017 -0800
     2.3 @@ -556,9 +556,9 @@
     2.4              <key>archive</key>
     2.5              <map>
     2.6                <key>hash</key>
     2.7 -              <string>7b15c464cfa7c10281842a755417e948</string>
     2.8 +              <string>6a0977e833aaeeba3603b2f8fab702cd</string>
     2.9                <key>url</key>
    2.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11002/61105/dullahan-1.1.888_3.3202.1686.gd665578-darwin64-510883.tar.bz2</string>
    2.11 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11410/64519/dullahan-1.1.901_3.3202.1686.gd665578-darwin64-511200.tar.bz2</string>
    2.12              </map>
    2.13              <key>name</key>
    2.14              <string>darwin64</string>
    2.15 @@ -568,9 +568,9 @@
    2.16              <key>archive</key>
    2.17              <map>
    2.18                <key>hash</key>
    2.19 -              <string>588614c46b080939af64fd062ca1efba</string>
    2.20 +              <string>bc7fead36b6ff9905af1005485b3e293</string>
    2.21                <key>url</key>
    2.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11004/61115/dullahan-1.1.888_3.3202.1686.gd665578-windows-510883.tar.bz2</string>
    2.23 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11413/64532/dullahan-1.1.901_3.3202.1686.gd665578-windows-511200.tar.bz2</string>
    2.24              </map>
    2.25              <key>name</key>
    2.26              <string>windows</string>
    2.27 @@ -580,16 +580,16 @@
    2.28              <key>archive</key>
    2.29              <map>
    2.30                <key>hash</key>
    2.31 -              <string>8d89bb3be1d1e91748e5fc93f0122a6e</string>
    2.32 +              <string>32acc396c6d7a369f0d2dc49b953dc89</string>
    2.33                <key>url</key>
    2.34 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11003/61113/dullahan-1.1.888_3.3202.1686.gd665578-windows64-510883.tar.bz2</string>
    2.35 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11412/64535/dullahan-1.1.901_3.3202.1686.gd665578-windows64-511200.tar.bz2</string>
    2.36              </map>
    2.37              <key>name</key>
    2.38              <string>windows64</string>
    2.39            </map>
    2.40          </map>
    2.41          <key>version</key>
    2.42 -        <string>1.1.888_3.3202.1686.gd665578</string>
    2.43 +        <string>1.1.901_3.3202.1686.gd665578</string>
    2.44        </map>
    2.45        <key>elfio</key>
    2.46        <map>
    2.47 @@ -3231,9 +3231,9 @@
    2.48              <key>archive</key>
    2.49              <map>
    2.50                <key>hash</key>
    2.51 -              <string>2eb437006a918ea1e9915d5ae47412e7</string>
    2.52 +              <string>92235fabdca2d3865014f7ec630e2688</string>
    2.53                <key>url</key>
    2.54 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10361/53495/viewer_manager-1.0.510348-darwin64-510348.tar.bz2</string>
    2.55 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11444/64857/viewer_manager-1.0.511221-darwin64-511221.tar.bz2</string>
    2.56              </map>
    2.57              <key>name</key>
    2.58              <string>darwin64</string>
    2.59 @@ -3255,9 +3255,9 @@
    2.60              <key>archive</key>
    2.61              <map>
    2.62                <key>hash</key>
    2.63 -              <string>56c56241ef88fb97bea3501e66e3644b</string>
    2.64 +              <string>bfea9c61d0b29d741081c0c8a315d364</string>
    2.65                <key>url</key>
    2.66 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10363/53501/viewer_manager-1.0.510348-windows-510348.tar.bz2</string>
    2.67 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11446/64863/viewer_manager-1.0.511221-windows-511221.tar.bz2</string>
    2.68              </map>
    2.69              <key>name</key>
    2.70              <string>windows</string>
    2.71 @@ -3268,7 +3268,7 @@
    2.72          <key>source_type</key>
    2.73          <string>hg</string>
    2.74          <key>version</key>
    2.75 -        <string>1.0.510348</string>
    2.76 +        <string>1.0.511221</string>
    2.77        </map>
    2.78        <key>vlc-bin</key>
    2.79        <map>
     3.1 --- a/doc/contributions.txt	Tue Nov 21 09:46:31 2017 -0800
     3.2 +++ b/doc/contributions.txt	Mon Dec 11 10:09:44 2017 -0800
     3.3 @@ -215,6 +215,7 @@
     3.4  	MAINT-7028
     3.5  	MAINT-7059
     3.6  	MAINT-6519
     3.7 +	MAINT-7899
     3.8  	STORM-2105
     3.9  Aralara Rajal
    3.10  Arare Chantilly
    3.11 @@ -825,6 +826,7 @@
    3.12  	MAINT-6568
    3.13  	STORM-2149
    3.14  	MAINT-7581
    3.15 +	MAINT-7081
    3.16  Kolor Fall
    3.17  Komiko Okamoto
    3.18  Korvel Noh
     4.1 --- a/indra/lib/python/indra/util/llmanifest.py	Tue Nov 21 09:46:31 2017 -0800
     4.2 +++ b/indra/lib/python/indra/util/llmanifest.py	Mon Dec 11 10:09:44 2017 -0800
     4.3 @@ -529,7 +529,7 @@
     4.4          print "Running command:", command
     4.5          sys.stdout.flush()
     4.6          try:
     4.7 -            subprocess.check_call(command, shell=True)
     4.8 +            subprocess.check_call(command)
     4.9          except subprocess.CalledProcessError as err:
    4.10              raise ManifestError( "Command %s returned non-zero status (%s)"
    4.11                                  % (command, err.returncode) )
    4.12 @@ -545,6 +545,7 @@
    4.13      def put_in_file(self, contents, dst, src=None):
    4.14          # write contents as dst
    4.15          dst_path = self.dst_path_of(dst)
    4.16 +        self.cmakedirs(os.path.dirname(dst_path))
    4.17          f = open(dst_path, "wb")
    4.18          try:
    4.19              f.write(contents)
     5.1 --- a/indra/llcommon/llcoros.cpp	Tue Nov 21 09:46:31 2017 -0800
     5.2 +++ b/indra/llcommon/llcoros.cpp	Mon Dec 11 10:09:44 2017 -0800
     5.3 @@ -40,6 +40,10 @@
     5.4  #include "stringize.h"
     5.5  #include "llexception.h"
     5.6  
     5.7 +#if LL_WINDOWS
     5.8 +#include <excpt.h>
     5.9 +#endif
    5.10 +
    5.11  namespace {
    5.12  void no_op() {}
    5.13  } // anonymous namespace
    5.14 @@ -276,6 +280,43 @@
    5.15      mStackSize = stacksize;
    5.16  }
    5.17  
    5.18 +#if LL_WINDOWS
    5.19 +
    5.20 +static const U32 STATUS_MSC_EXCEPTION = 0xE06D7363; // compiler specific
    5.21 +
    5.22 +U32 exception_filter(U32 code, struct _EXCEPTION_POINTERS *exception_infop)
    5.23 +{
    5.24 +    if (code == STATUS_MSC_EXCEPTION)
    5.25 +    {
    5.26 +        // C++ exception, go on
    5.27 +        return EXCEPTION_CONTINUE_SEARCH;
    5.28 +    }
    5.29 +    else
    5.30 +    {
    5.31 +        // handle it
    5.32 +        return EXCEPTION_EXECUTE_HANDLER;
    5.33 +    }
    5.34 +}
    5.35 +
    5.36 +void LLCoros::winlevel(const callable_t& callable)
    5.37 +{
    5.38 +    __try
    5.39 +    {
    5.40 +        callable();
    5.41 +    }
    5.42 +    __except (exception_filter(GetExceptionCode(), GetExceptionInformation()))
    5.43 +    {
    5.44 +        // convert to C++ styled exception
    5.45 +        // Note: it might be better to use _se_set_translator
    5.46 +        // if you want exception to inherit full callstack
    5.47 +        char integer_string[32];
    5.48 +        sprintf(integer_string, "SEH, code: %lu\n", GetExceptionCode());
    5.49 +        throw std::exception(integer_string);
    5.50 +    }
    5.51 +}
    5.52 +
    5.53 +#endif
    5.54 +
    5.55  // Top-level wrapper around caller's coroutine callable. This function accepts
    5.56  // the coroutine library's implicit coro::self& parameter and saves it, but
    5.57  // does not pass it down to the caller's callable.
    5.58 @@ -286,7 +327,11 @@
    5.59      // run the code the caller actually wants in the coroutine
    5.60      try
    5.61      {
    5.62 +#if LL_WINDOWS
    5.63 +        winlevel(callable);
    5.64 +#else
    5.65          callable();
    5.66 +#endif
    5.67      }
    5.68      catch (const LLContinueError&)
    5.69      {
     6.1 --- a/indra/llcommon/llcoros.h	Tue Nov 21 09:46:31 2017 -0800
     6.2 +++ b/indra/llcommon/llcoros.h	Mon Dec 11 10:09:44 2017 -0800
     6.3 @@ -182,6 +182,9 @@
     6.4      bool cleanup(const LLSD&);
     6.5      struct CoroData;
     6.6      static void no_cleanup(CoroData*);
     6.7 +#if LL_WINDOWS
     6.8 +    static void winlevel(const callable_t& callable);
     6.9 +#endif
    6.10      static void toplevel(coro::self& self, CoroData* data, const callable_t& callable);
    6.11      static CoroData& get_CoroData(const std::string& caller);
    6.12  
     7.1 --- a/indra/llimage/llimage.cpp	Tue Nov 21 09:46:31 2017 -0800
     7.2 +++ b/indra/llimage/llimage.cpp	Mon Dec 11 10:09:44 2017 -0800
     7.3 @@ -1536,7 +1536,7 @@
     7.4      if ((old_width == new_width) && (old_height == new_height))
     7.5      {
     7.6          result = new LLImageRaw(old_width, old_height, components);
     7.7 -        if (!result)
     7.8 +        if (!result || result->isBufferInvalid())
     7.9          {
    7.10              LL_WARNS() << "Failed to allocate new image" << LL_ENDL;
    7.11              return result;
    7.12 @@ -1550,7 +1550,7 @@
    7.13          if (new_data_size > 0)
    7.14          {
    7.15              result = new LLImageRaw(new_width, new_height, components);
    7.16 -            if (!result)
    7.17 +            if (!result || result->isBufferInvalid())
    7.18              {
    7.19                  LL_WARNS() << "Failed to allocate new image" << LL_ENDL;
    7.20                  return result;
     8.1 --- a/indra/llmath/llvolume.cpp	Tue Nov 21 09:46:31 2017 -0800
     8.2 +++ b/indra/llmath/llvolume.cpp	Mon Dec 11 10:09:44 2017 -0800
     8.3 @@ -2032,13 +2032,8 @@
     8.4  	setSkew(params.getSkew());
     8.5  }
     8.6  
     8.7 -S32 profile_delete_lock = 1 ; 
     8.8  LLProfile::~LLProfile()
     8.9  {
    8.10 -	if(profile_delete_lock)
    8.11 -	{
    8.12 -		LL_ERRS() << "LLProfile should not be deleted here!" << LL_ENDL ;
    8.13 -	}
    8.14  }
    8.15  
    8.16  
    8.17 @@ -2103,9 +2098,7 @@
    8.18  	sNumMeshPoints -= mMesh.size();
    8.19  	delete mPathp;
    8.20  
    8.21 -	profile_delete_lock = 0 ;
    8.22  	delete mProfilep;
    8.23 -	profile_delete_lock = 1 ;
    8.24  
    8.25  	mPathp = NULL;
    8.26  	mProfilep = NULL;
     9.1 --- a/indra/llmath/llvolume.h	Tue Nov 21 09:46:31 2017 -0800
     9.2 +++ b/indra/llmath/llvolume.h	Mon Dec 11 10:09:44 2017 -0800
     9.3 @@ -681,6 +681,8 @@
     9.4  
     9.5  class LLProfile
     9.6  {
     9.7 +	friend class LLVolume;
     9.8 +
     9.9  public:
    9.10  	LLProfile()
    9.11  		: mOpen(FALSE),
    9.12 @@ -691,8 +693,6 @@
    9.13  	{
    9.14  	}
    9.15  
    9.16 -	~LLProfile();
    9.17 -
    9.18  	S32	 getTotal() const								{ return mTotal; }
    9.19  	S32	 getTotalOut() const							{ return mTotalOut; }	// Total number of outside points
    9.20  	BOOL isFlat(S32 face) const							{ return (mFaces[face].mCount == 2); }
    9.21 @@ -725,6 +725,8 @@
    9.22  	friend std::ostream& operator<<(std::ostream &s, const LLProfile &profile);
    9.23  
    9.24  protected:
    9.25 +	~LLProfile();
    9.26 +
    9.27  	static S32 getNumNGonPoints(const LLProfileParams& params, S32 sides, F32 offset=0.0f, F32 bevel = 0.0f, F32 ang_scale = 1.f, S32 split = 0);
    9.28  	void genNGon(const LLProfileParams& params, S32 sides, F32 offset=0.0f, F32 bevel = 0.0f, F32 ang_scale = 1.f, S32 split = 0);
    9.29  
    10.1 --- a/indra/llprimitive/lldaeloader.cpp	Tue Nov 21 09:46:31 2017 -0800
    10.2 +++ b/indra/llprimitive/lldaeloader.cpp	Mon Dec 11 10:09:44 2017 -0800
    10.3 @@ -862,16 +862,26 @@
    10.4  	setLoadState( READING_FILE );
    10.5  
    10.6  	//no suitable slm exists, load from the .dae file
    10.7 +
    10.8 +	// Collada expects file and folder names to be escaped
    10.9 +	// Note: cdom::nativePathToUri()
   10.10 +	const char* allowed =
   10.11 +		"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
   10.12 +		"abcdefghijklmnopqrstuvwxyz"
   10.13 +		"0123456789"
   10.14 +		"%-._~:\"|\\/";
   10.15 +	std::string uri_filename = LLURI::escape(filename, allowed);
   10.16 +
   10.17  	DAE dae;
   10.18  	domCOLLADA* dom;
   10.19  	if (mPreprocessDAE)
   10.20  	{
   10.21 -		dom = dae.openFromMemory(filename, preprocessDAE(filename).c_str());
   10.22 +		dom = dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str());
   10.23  	}
   10.24  	else
   10.25  	{
   10.26  		LL_INFOS() << "Skipping dae preprocessing" << LL_ENDL;
   10.27 -		dom = dae.open(filename);
   10.28 +		dom = dae.open(uri_filename);
   10.29  	}
   10.30  	
   10.31  	if (!dom)
   10.32 @@ -900,7 +910,7 @@
   10.33  	
   10.34  	daeInt count = db->getElementCount(NULL, COLLADA_TYPE_MESH);
   10.35  	
   10.36 -	daeDocument* doc = dae.getDoc(filename);
   10.37 +	daeDocument* doc = dae.getDoc(uri_filename);
   10.38  	if (!doc)
   10.39  	{
   10.40  		LL_WARNS() << "can't find internal doc" << LL_ENDL;
    11.1 --- a/indra/llrender/llvertexbuffer.cpp	Tue Nov 21 09:46:31 2017 -0800
    11.2 +++ b/indra/llrender/llvertexbuffer.cpp	Mon Dec 11 10:09:44 2017 -0800
    11.3 @@ -1065,7 +1065,14 @@
    11.4  	sVertexCount -= mNumVerts;
    11.5  	sIndexCount -= mNumIndices;
    11.6  
    11.7 -	llassert_always(!mMappedData && !mMappedIndexData);
    11.8 +	if (mMappedData)
    11.9 +	{
   11.10 +		LL_ERRS() << "Failed to clear vertex buffer's vertices" << LL_ENDL;
   11.11 +	}
   11.12 +	if (mMappedIndexData)
   11.13 +	{
   11.14 +		LL_ERRS() << "Failed to clear vertex buffer's indices" << LL_ENDL;
   11.15 +	}
   11.16  };
   11.17  
   11.18  void LLVertexBuffer::placeFence() const
   11.19 @@ -1167,7 +1174,7 @@
   11.20  	sGLCount--;
   11.21  }
   11.22  
   11.23 -void LLVertexBuffer::createGLBuffer(U32 size)
   11.24 +bool LLVertexBuffer::createGLBuffer(U32 size)
   11.25  {
   11.26  	if (mGLBuffer)
   11.27  	{
   11.28 @@ -1176,9 +1183,11 @@
   11.29  
   11.30  	if (size == 0)
   11.31  	{
   11.32 -		return;
   11.33 +		return true;
   11.34  	}
   11.35  
   11.36 +	bool sucsess = true;
   11.37 +
   11.38  	mEmpty = true;
   11.39  
   11.40  	mMappedDataUsingVBOs = useVBOs();
   11.41 @@ -1196,9 +1205,15 @@
   11.42  		mSize = size;
   11.43  		claimMem(mSize);
   11.44  	}
   11.45 +
   11.46 +	if (!mMappedData)
   11.47 +	{
   11.48 +		sucsess = false;
   11.49 +	}
   11.50 +	return sucsess;
   11.51  }
   11.52  
   11.53 -void LLVertexBuffer::createGLIndices(U32 size)
   11.54 +bool LLVertexBuffer::createGLIndices(U32 size)
   11.55  {
   11.56  	if (mGLIndices)
   11.57  	{
   11.58 @@ -1207,9 +1222,11 @@
   11.59  	
   11.60  	if (size == 0)
   11.61  	{
   11.62 -		return;
   11.63 +		return true;
   11.64  	}
   11.65  
   11.66 +	bool sucsess = true;
   11.67 +
   11.68  	mEmpty = true;
   11.69  
   11.70  	//pad by 16 bytes for aligned copies
   11.71 @@ -1230,6 +1247,12 @@
   11.72  		mGLIndices = ++gl_buffer_idx;
   11.73  		mIndicesSize = size;
   11.74  	}
   11.75 +
   11.76 +	if (!mMappedIndexData)
   11.77 +	{
   11.78 +		sucsess = false;
   11.79 +	}
   11.80 +	return sucsess;
   11.81  }
   11.82  
   11.83  void LLVertexBuffer::destroyGLBuffer()
   11.84 @@ -1272,10 +1295,12 @@
   11.85  	//unbind();
   11.86  }
   11.87  
   11.88 -void LLVertexBuffer::updateNumVerts(S32 nverts)
   11.89 +bool LLVertexBuffer::updateNumVerts(S32 nverts)
   11.90  {
   11.91  	llassert(nverts >= 0);
   11.92  
   11.93 +	bool sucsess = true;
   11.94 +
   11.95  	if (nverts > 65536)
   11.96  	{
   11.97  		LL_WARNS() << "Vertex buffer overflow!" << LL_ENDL;
   11.98 @@ -1286,31 +1311,37 @@
   11.99  
  11.100  	if (needed_size > mSize || needed_size <= mSize/2)
  11.101  	{
  11.102 -		createGLBuffer(needed_size);
  11.103 +		sucsess &= createGLBuffer(needed_size);
  11.104  	}
  11.105  
  11.106  	sVertexCount -= mNumVerts;
  11.107  	mNumVerts = nverts;
  11.108  	sVertexCount += mNumVerts;
  11.109 +
  11.110 +	return sucsess;
  11.111  }
  11.112  
  11.113 -void LLVertexBuffer::updateNumIndices(S32 nindices)
  11.114 +bool LLVertexBuffer::updateNumIndices(S32 nindices)
  11.115  {
  11.116  	llassert(nindices >= 0);
  11.117  
  11.118 +	bool sucsess = true;
  11.119 +
  11.120  	U32 needed_size = sizeof(U16) * nindices;
  11.121  
  11.122  	if (needed_size > mIndicesSize || needed_size <= mIndicesSize/2)
  11.123  	{
  11.124 -		createGLIndices(needed_size);
  11.125 +		sucsess &= createGLIndices(needed_size);
  11.126  	}
  11.127  
  11.128  	sIndexCount -= mNumIndices;
  11.129  	mNumIndices = nindices;
  11.130  	sIndexCount += mNumIndices;
  11.131 +
  11.132 +	return sucsess;
  11.133  }
  11.134  
  11.135 -void LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create)
  11.136 +bool LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create)
  11.137  {
  11.138  	stop_glerror();
  11.139  
  11.140 @@ -1320,13 +1351,15 @@
  11.141  		LL_ERRS() << "Bad vertex buffer allocation: " << nverts << " : " << nindices << LL_ENDL;
  11.142  	}
  11.143  
  11.144 -	updateNumVerts(nverts);
  11.145 -	updateNumIndices(nindices);
  11.146 +	bool sucsess = true;
  11.147 +
  11.148 +	sucsess &= updateNumVerts(nverts);
  11.149 +	sucsess &= updateNumIndices(nindices);
  11.150  	
  11.151  	if (create && (nverts || nindices))
  11.152  	{
  11.153  		//actually allocate space for the vertex buffer if using VBO mapping
  11.154 -		flush();
  11.155 +		flush(); //unmap
  11.156  
  11.157  		if (gGLManager.mHasVertexArrayObject && useVBOs() && sUseVAO)
  11.158  		{
  11.159 @@ -1336,6 +1369,8 @@
  11.160  			setupVertexArray();
  11.161  		}
  11.162  	}
  11.163 +
  11.164 +	return sucsess;
  11.165  }
  11.166  
  11.167  static LLTrace::BlockTimerStatHandle FTM_SETUP_VERTEX_ARRAY("Setup VAO");
  11.168 @@ -1466,23 +1501,27 @@
  11.169  	unbind();
  11.170  }
  11.171  
  11.172 -void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
  11.173 +bool LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
  11.174  {
  11.175  	llassert(newnverts >= 0);
  11.176  	llassert(newnindices >= 0);
  11.177  
  11.178 -	updateNumVerts(newnverts);		
  11.179 -	updateNumIndices(newnindices);
  11.180 +	bool sucsess = true;
  11.181 +
  11.182 +	sucsess &= updateNumVerts(newnverts);		
  11.183 +	sucsess &= updateNumIndices(newnindices);
  11.184  	
  11.185  	if (useVBOs())
  11.186  	{
  11.187 -		flush();
  11.188 +		flush(); //unmap
  11.189  
  11.190  		if (mGLArray)
  11.191  		{ //if size changed, offsets changed
  11.192  			setupVertexArray();
  11.193  		}
  11.194  	}
  11.195 +
  11.196 +	return sucsess;
  11.197  }
  11.198  
  11.199  bool LLVertexBuffer::useVBOs() const
    12.1 --- a/indra/llrender/llvertexbuffer.h	Tue Nov 21 09:46:31 2017 -0800
    12.2 +++ b/indra/llrender/llvertexbuffer.h	Mon Dec 11 10:09:44 2017 -0800
    12.3 @@ -214,12 +214,12 @@
    12.4  	bool	bindGLArray();
    12.5  	void	releaseBuffer();
    12.6  	void	releaseIndices();
    12.7 -	void	createGLBuffer(U32 size);
    12.8 -	void	createGLIndices(U32 size);
    12.9 +	bool	createGLBuffer(U32 size);
   12.10 +	bool	createGLIndices(U32 size);
   12.11  	void 	destroyGLBuffer();
   12.12  	void 	destroyGLIndices();
   12.13 -	void	updateNumVerts(S32 nverts);
   12.14 -	void	updateNumIndices(S32 nindices); 
   12.15 +	bool	updateNumVerts(S32 nverts);
   12.16 +	bool	updateNumIndices(S32 nindices); 
   12.17  	void	unmapBuffer();
   12.18  		
   12.19  public:
   12.20 @@ -235,8 +235,8 @@
   12.21  	virtual void	setBuffer(U32 data_mask); 	// calls  setupVertexBuffer() if data_mask is not 0
   12.22  	void flush(); //flush pending data to GL memory
   12.23  	// allocate buffer
   12.24 -	void	allocateBuffer(S32 nverts, S32 nindices, bool create);
   12.25 -	virtual void resizeBuffer(S32 newnverts, S32 newnindices);
   12.26 +	bool	allocateBuffer(S32 nverts, S32 nindices, bool create);
   12.27 +	virtual bool resizeBuffer(S32 newnverts, S32 newnindices);
   12.28  			
   12.29  	// Only call each getVertexPointer, etc, once before calling unmapBuffer()
   12.30  	// call unmapBuffer() after calls to getXXXStrider() before any cals to setBuffer()
    13.1 --- a/indra/llui/llbutton.cpp	Tue Nov 21 09:46:31 2017 -0800
    13.2 +++ b/indra/llui/llbutton.cpp	Mon Dec 11 10:09:44 2017 -0800
    13.3 @@ -808,11 +808,12 @@
    13.4  		}
    13.5  		else
    13.6  		{
    13.7 -			imagep->draw(0, 0, (enabled ? mImageColor.get() : disabled_color) % alpha );
    13.8 +			S32 y = getLocalRect().getHeight() - imagep->getHeight();
    13.9 +			imagep->draw(0, y, (enabled ? mImageColor.get() : disabled_color) % alpha);
   13.10  			if (mCurGlowStrength > 0.01f)
   13.11  			{
   13.12  				gGL.setSceneBlendType(glow_type);
   13.13 -				imagep->drawSolid(0, 0, glow_color % (mCurGlowStrength * alpha));
   13.14 +				imagep->drawSolid(0, y, glow_color % (mCurGlowStrength * alpha));
   13.15  				gGL.setSceneBlendType(LLRender::BT_ALPHA);
   13.16  			}
   13.17  		}
   13.18 @@ -954,7 +955,8 @@
   13.19  	}
   13.20  	else
   13.21  	{
   13.22 -		imagep->drawBorder(0, 0, color, size);
   13.23 +		S32 y = getLocalRect().getHeight() - imagep->getHeight();
   13.24 +		imagep->drawBorder(0, y, color, size);
   13.25  	}
   13.26  }
   13.27  
    14.1 --- a/indra/llui/llfloater.cpp	Tue Nov 21 09:46:31 2017 -0800
    14.2 +++ b/indra/llui/llfloater.cpp	Mon Dec 11 10:09:44 2017 -0800
    14.3 @@ -1145,11 +1145,11 @@
    14.4  			{
    14.5  				setDocked( false, false);
    14.6  			}
    14.7 -		storeRectControl();
    14.8  		mPositioning = LLFloaterEnums::POSITIONING_RELATIVE;
    14.9  		LLRect screen_rect = calcScreenRect();
   14.10  		mPosition = LLCoordGL(screen_rect.getCenterX(), screen_rect.getCenterY()).convert();
   14.11 -	}
   14.12 +		}
   14.13 +		storeRectControl();
   14.14  
   14.15  		// gather all snapped dependents
   14.16  		for(handle_set_iter_t dependent_it = mDependents.begin();
    15.1 --- a/indra/newview/llagent.cpp	Tue Nov 21 09:46:31 2017 -0800
    15.2 +++ b/indra/newview/llagent.cpp	Mon Dec 11 10:09:44 2017 -0800
    15.3 @@ -47,7 +47,9 @@
    15.4  #include "llfloatercamera.h"
    15.5  #include "llfloaterimcontainer.h"
    15.6  #include "llfloaterperms.h"
    15.7 +#include "llfloaterpreference.h"
    15.8  #include "llfloaterreg.h"
    15.9 +#include "llfloatersnapshot.h"
   15.10  #include "llfloatertools.h"
   15.11  #include "llgroupactions.h"
   15.12  #include "llgroupmgr.h"
   15.13 @@ -4334,14 +4336,144 @@
   15.14  
   15.15  void LLAgent::sendAgentUserInfoRequest()
   15.16  {
   15.17 -	if(getID().isNull())
   15.18 -		return; // not logged in
   15.19 -	gMessageSystem->newMessageFast(_PREHASH_UserInfoRequest);
   15.20 -	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
   15.21 -	gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
   15.22 -	gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
   15.23 -	sendReliableMessage();
   15.24 -}
   15.25 +    std::string cap;
   15.26 +
   15.27 +    if (getID().isNull())
   15.28 +        return; // not logged in
   15.29 +
   15.30 +    if (mRegionp)
   15.31 +        cap = mRegionp->getCapability("UserInfo");
   15.32 +
   15.33 +    if (!cap.empty())
   15.34 +    {
   15.35 +        LLCoros::instance().launch("requestAgentUserInfoCoro",
   15.36 +            boost::bind(&LLAgent::requestAgentUserInfoCoro, this, cap));
   15.37 +    }
   15.38 +    else
   15.39 +    { 
   15.40 +        sendAgentUserInfoRequestMessage();
   15.41 +    }
   15.42 +}
   15.43 +
   15.44 +void LLAgent::requestAgentUserInfoCoro(std::string capurl)
   15.45 +{
   15.46 +    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
   15.47 +    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
   15.48 +        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("requestAgentUserInfoCoro", httpPolicy));
   15.49 +    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
   15.50 +    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
   15.51 +    LLCore::HttpHeaders::ptr_t httpHeaders;
   15.52 +
   15.53 +    httpOpts->setFollowRedirects(true);
   15.54 +
   15.55 +    LLSD result = httpAdapter->getAndSuspend(httpRequest, capurl, httpOpts, httpHeaders);
   15.56 +
   15.57 +    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
   15.58 +    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
   15.59 +
   15.60 +    if (!status)
   15.61 +    {
   15.62 +        LL_WARNS("UserInfo") << "Failed to get user information." << LL_ENDL;
   15.63 +        return;
   15.64 +    }
   15.65 +    else if (!result["success"].asBoolean())
   15.66 +    {
   15.67 +        LL_WARNS("UserInfo") << "Failed to get user information: " << result["message"] << LL_ENDL;
   15.68 +        return;
   15.69 +    }
   15.70 +
   15.71 +    bool im_via_email;
   15.72 +    bool is_verified_email;
   15.73 +    std::string email;
   15.74 +    std::string dir_visibility;
   15.75 +
   15.76 +    im_via_email = result["im_via_email"].asBoolean();
   15.77 +    is_verified_email = result["is_verified"].asBoolean();
   15.78 +    email = result["email"].asString();
   15.79 +    dir_visibility = result["directory_visibility"].asString();
   15.80 +
   15.81 +    // TODO: This should probably be changed.  I'm not entirely comfortable 
   15.82 +    // having LLAgent interact directly with the UI in this way.
   15.83 +    LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, is_verified_email);
   15.84 +    LLFloaterSnapshot::setAgentEmail(email);
   15.85 +}
   15.86 +
   15.87 +void LLAgent::sendAgentUpdateUserInfo(bool im_via_email, const std::string& directory_visibility)
   15.88 +{
   15.89 +    std::string cap;
   15.90 +
   15.91 +    if (getID().isNull())
   15.92 +        return; // not logged in
   15.93 +
   15.94 +    if (mRegionp)
   15.95 +        cap = mRegionp->getCapability("UserInfo");
   15.96 +
   15.97 +    if (!cap.empty())
   15.98 +    {
   15.99 +        LLCoros::instance().launch("updateAgentUserInfoCoro",
  15.100 +            boost::bind(&LLAgent::updateAgentUserInfoCoro, this, cap, im_via_email, directory_visibility));
  15.101 +    }
  15.102 +    else
  15.103 +    {
  15.104 +        sendAgentUpdateUserInfoMessage(im_via_email, directory_visibility);
  15.105 +    }
  15.106 +}
  15.107 +
  15.108 +
  15.109 +void LLAgent::updateAgentUserInfoCoro(std::string capurl, bool im_via_email, std::string directory_visibility)
  15.110 +{
  15.111 +    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
  15.112 +    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
  15.113 +        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("requestAgentUserInfoCoro", httpPolicy));
  15.114 +    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
  15.115 +    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
  15.116 +    LLCore::HttpHeaders::ptr_t httpHeaders;
  15.117 +
  15.118 +    httpOpts->setFollowRedirects(true);
  15.119 +    LLSD body(LLSDMap
  15.120 +        ("dir_visibility",  LLSD::String(directory_visibility))
  15.121 +        ("im_via_email",    LLSD::Boolean(im_via_email)));
  15.122 +
  15.123 +    LLSD result = httpAdapter->postAndSuspend(httpRequest, capurl, body, httpOpts, httpHeaders);
  15.124 +
  15.125 +    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
  15.126 +    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
  15.127 +
  15.128 +    if (!status)
  15.129 +    {
  15.130 +        LL_WARNS("UserInfo") << "Failed to set user information." << LL_ENDL;
  15.131 +    }
  15.132 +    else if (!result["success"].asBoolean())
  15.133 +    {
  15.134 +        LL_WARNS("UserInfo") << "Failed to set user information: " << result["message"] << LL_ENDL;
  15.135 +    }
  15.136 +}
  15.137 +
  15.138 +// deprecated:
  15.139 +// May be removed when UserInfo cap propagates to all simhosts in grid
  15.140 +void LLAgent::sendAgentUserInfoRequestMessage()
  15.141 +{
  15.142 +    gMessageSystem->newMessageFast(_PREHASH_UserInfoRequest);
  15.143 +    gMessageSystem->nextBlockFast(_PREHASH_AgentData);
  15.144 +    gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
  15.145 +    gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
  15.146 +    sendReliableMessage();
  15.147 +}
  15.148 +
  15.149 +void LLAgent::sendAgentUpdateUserInfoMessage(bool im_via_email, const std::string& directory_visibility)
  15.150 +{
  15.151 +    gMessageSystem->newMessageFast(_PREHASH_UpdateUserInfo);
  15.152 +    gMessageSystem->nextBlockFast(_PREHASH_AgentData);
  15.153 +    gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
  15.154 +    gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
  15.155 +    gMessageSystem->nextBlockFast(_PREHASH_UserData);
  15.156 +    gMessageSystem->addBOOLFast(_PREHASH_IMViaEMail, im_via_email);
  15.157 +    gMessageSystem->addString("DirectoryVisibility", directory_visibility);
  15.158 +    gAgent.sendReliableMessage();
  15.159 +
  15.160 +}
  15.161 +// end deprecated
  15.162 +//------
  15.163  
  15.164  void LLAgent::observeFriends()
  15.165  {
  15.166 @@ -4410,18 +4542,6 @@
  15.167  	slurl = *mTeleportSourceSLURL;
  15.168  }
  15.169  
  15.170 -void LLAgent::sendAgentUpdateUserInfo(bool im_via_email, const std::string& directory_visibility )
  15.171 -{
  15.172 -	gMessageSystem->newMessageFast(_PREHASH_UpdateUserInfo);
  15.173 -	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
  15.174 -	gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
  15.175 -	gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
  15.176 -	gMessageSystem->nextBlockFast(_PREHASH_UserData);
  15.177 -	gMessageSystem->addBOOLFast(_PREHASH_IMViaEMail, im_via_email);
  15.178 -	gMessageSystem->addString("DirectoryVisibility", directory_visibility);
  15.179 -	gAgent.sendReliableMessage();
  15.180 -}
  15.181 -
  15.182  // static
  15.183  void LLAgent::dumpGroupInfo()
  15.184  {
    16.1 --- a/indra/newview/llagent.h	Tue Nov 21 09:46:31 2017 -0800
    16.2 +++ b/indra/newview/llagent.h	Mon Dec 11 10:09:44 2017 -0800
    16.3 @@ -912,9 +912,17 @@
    16.4  	void			sendReliableMessage();
    16.5  	void 			sendAgentDataUpdateRequest();
    16.6  	void 			sendAgentUserInfoRequest();
    16.7 -	// IM to Email and Online visibility
    16.8 +
    16.9 +// IM to Email and Online visibility
   16.10  	void			sendAgentUpdateUserInfo(bool im_to_email, const std::string& directory_visibility);
   16.11  
   16.12 +private:
   16.13 +    void            requestAgentUserInfoCoro(std::string capurl);
   16.14 +    void            updateAgentUserInfoCoro(std::string capurl, bool im_via_email, std::string directory_visibility);
   16.15 +    // DEPRECATED: may be removed when User Info cap propagates 
   16.16 +    void 			sendAgentUserInfoRequestMessage();
   16.17 +    void            sendAgentUpdateUserInfoMessage(bool im_via_email, const std::string& directory_visibility);
   16.18 +
   16.19  	//--------------------------------------------------------------------
   16.20  	// Receive
   16.21  	//--------------------------------------------------------------------
    17.1 --- a/indra/newview/llappviewer.cpp	Tue Nov 21 09:46:31 2017 -0800
    17.2 +++ b/indra/newview/llappviewer.cpp	Mon Dec 11 10:09:44 2017 -0800
    17.3 @@ -685,7 +685,6 @@
    17.4  	mSavePerAccountSettings(false),		// don't save settings on logout unless login succeeded.
    17.5  	mQuitRequested(false),
    17.6  	mLogoutRequestSent(false),
    17.7 -	mYieldTime(-1),
    17.8  	mLastAgentControlFlags(0),
    17.9  	mLastAgentForceUpdate(0),
   17.10  	mMainloopTimeout(NULL),
   17.11 @@ -1449,10 +1448,11 @@
   17.12  			LL_RECORD_BLOCK_TIME(FTM_SLEEP);
   17.13  			
   17.14  			// yield some time to the os based on command line option
   17.15 -			if(mYieldTime >= 0)
   17.16 +			static LLCachedControl<S32> yield_time(gSavedSettings, "YieldTime", -1);
   17.17 +			if(yield_time >= 0)
   17.18  			{
   17.19  				LL_RECORD_BLOCK_TIME(FTM_YIELD);
   17.20 -				ms_sleep(mYieldTime);
   17.21 +				ms_sleep(yield_time);
   17.22  			}
   17.23  
   17.24  			// yield cooperatively when not running as foreground window
   17.25 @@ -2738,8 +2738,6 @@
   17.26  		}
   17.27  	}
   17.28  
   17.29 -    mYieldTime = gSavedSettings.getS32("YieldTime");
   17.30 -
   17.31  
   17.32  	// Display splash screen.  Must be after above check for previous
   17.33  	// crash as this dialog is always frontmost.
    18.1 --- a/indra/newview/llappviewer.h	Tue Nov 21 09:46:31 2017 -0800
    18.2 +++ b/indra/newview/llappviewer.h	Mon Dec 11 10:09:44 2017 -0800
    18.3 @@ -289,7 +289,6 @@
    18.4  
    18.5      bool mQuitRequested;				// User wants to quit, may have modified documents open.
    18.6      bool mLogoutRequestSent;			// Disconnect message sent to simulator, no longer safe to send messages to the sim.
    18.7 -    S32 mYieldTime;
    18.8  	U32 mLastAgentControlFlags;
    18.9  	F32 mLastAgentForceUpdate;
   18.10  	struct SettingsFiles* mSettingsLocationList;
    19.1 --- a/indra/newview/llcommandhandler.cpp	Tue Nov 21 09:46:31 2017 -0800
    19.2 +++ b/indra/newview/llcommandhandler.cpp	Mon Dec 11 10:09:44 2017 -0800
    19.3 @@ -134,7 +134,11 @@
    19.4  			{
    19.5  				break;
    19.6  			}
    19.7 -
    19.8 +			//skip initial request from external browser before STATE_BROWSER_INIT
    19.9 +			if (LLStartUp::getStartupState() == STATE_FIRST)
   19.10 +			{
   19.11 +				return true;
   19.12 +			}
   19.13  			cur_time = LLTimer::getElapsedSeconds();
   19.14  			if (cur_time < last_throttle_time + THROTTLE_PERIOD)
   19.15  			{
    20.1 --- a/indra/newview/llconversationlog.cpp	Tue Nov 21 09:46:31 2017 -0800
    20.2 +++ b/indra/newview/llconversationlog.cpp	Mon Dec 11 10:09:44 2017 -0800
    20.3 @@ -196,8 +196,6 @@
    20.4  		keep_log_ctrlp->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
    20.5  		if (log_mode > 0)
    20.6  		{
    20.7 -			loadFromFile(getFileName());
    20.8 -
    20.9  			enableLogging(log_mode);
   20.10  		}
   20.11  	}
   20.12 @@ -483,16 +481,15 @@
   20.13  		// examples of two file entries
   20.14  		// [1343221177] 0 1 0 John Doe| 7e4ec5be-783f-49f5-71dz-16c58c64c145 4ec62a74-c246-0d25-2af6-846beac2aa55 john.doe|
   20.15  		// [1343222639] 2 0 0 Ad-hoc Conference| c3g67c89-c479-4c97-b21d-32869bcfe8rc 68f1c33e-4135-3e3e-a897-8c9b23115c09 Ad-hoc Conference hash597394a0-9982-766d-27b8-c75560213b9a|
   20.16 -
   20.17  		fprintf(fp, "[%lld] %d %d %d %s| %s %s %s|\n",
   20.18  				(S64)conv_it->getTime().value(),
   20.19  				(S32)conv_it->getConversationType(),
   20.20  				(S32)0,
   20.21  				(S32)conv_it->hasOfflineMessages(),
   20.22 -				     conv_it->getConversationName().c_str(),
   20.23 +				conv_it->getConversationName().c_str(),
   20.24  				participant_id.c_str(),
   20.25  				conversation_id.c_str(),
   20.26 -				conv_it->getHistoryFileName().c_str());
   20.27 +				LLURI::escape(conv_it->getHistoryFileName()).c_str());
   20.28  	}
   20.29  	fclose(fp);
   20.30  	return true;
   20.31 @@ -511,6 +508,7 @@
   20.32  		LL_WARNS() << "Couldn't open call log list" << filename << LL_ENDL;
   20.33  		return false;
   20.34  	}
   20.35 +	bool purge_required = false;
   20.36  
   20.37  	char buffer[MAX_STRING];
   20.38  	char conv_name_buffer[MAX_STRING];
   20.39 @@ -546,7 +544,7 @@
   20.40  			.conversation_name(conv_name_buffer)
   20.41  			.participant_id(LLUUID(part_id_buffer))
   20.42  			.session_id(LLUUID(conv_id_buffer))
   20.43 -			.history_filename(history_file_name);
   20.44 +			.history_filename(LLURI::unescape(history_file_name));
   20.45  
   20.46  		LLConversation conversation(params);
   20.47  
   20.48 @@ -555,6 +553,7 @@
   20.49  		// being over 30 days old should be purged from the conversation log text file on login.
   20.50  		if (conversation.isOlderThan(CONVERSATION_LIFETIME))
   20.51  		{
   20.52 +			purge_required = true;
   20.53  			continue;
   20.54  		}
   20.55  
   20.56 @@ -562,8 +561,11 @@
   20.57  	}
   20.58  	fclose(fp);
   20.59  
   20.60 -	LLFile::remove(filename);
   20.61 -	cache();
   20.62 +	if(purge_required)
   20.63 +	{
   20.64 +		LLFile::remove(filename);
   20.65 +		cache();
   20.66 +	}
   20.67  
   20.68  	notifyObservers();
   20.69  	return true;
    21.1 --- a/indra/newview/lldrawpoolavatar.cpp	Tue Nov 21 09:46:31 2017 -0800
    21.2 +++ b/indra/newview/lldrawpoolavatar.cpp	Mon Dec 11 10:09:44 2017 -0800
    21.3 @@ -1485,15 +1485,34 @@
    21.4  		{
    21.5  			buffer = new LLVertexBuffer(data_mask, GL_STREAM_DRAW_ARB);
    21.6  		}
    21.7 -		buffer->allocateBuffer(vol_face.mNumVertices, vol_face.mNumIndices, true);
    21.8 +
    21.9 +		if (!buffer->allocateBuffer(vol_face.mNumVertices, vol_face.mNumIndices, true))
   21.10 +		{
   21.11 +			LL_WARNS("LLDrawPoolAvatar") << "Failed to allocate Vertex Buffer to "
   21.12 +				<< vol_face.mNumVertices << " vertices and "
   21.13 +				<< vol_face.mNumIndices << " indices" << LL_ENDL;
   21.14 +			// allocate dummy triangle
   21.15 +			buffer->allocateBuffer(1, 3, true);
   21.16 +			memset((U8*)buffer->getMappedData(), 0, buffer->getSize());
   21.17 +			memset((U8*)buffer->getMappedIndices(), 0, buffer->getIndicesSize());
   21.18 +		}
   21.19  	}
   21.20  	else
   21.21  	{
   21.22          //resize existing buffer
   21.23 -		buffer->resizeBuffer(vol_face.mNumVertices, vol_face.mNumIndices);
   21.24 +		if(!buffer->resizeBuffer(vol_face.mNumVertices, vol_face.mNumIndices))
   21.25 +		{
   21.26 +			LL_WARNS("LLDrawPoolAvatar") << "Failed to resize Vertex Buffer to "
   21.27 +				<< vol_face.mNumVertices << " vertices and "
   21.28 +				<< vol_face.mNumIndices << " indices" << LL_ENDL;
   21.29 +			// allocate dummy triangle
   21.30 +			buffer->resizeBuffer(1, 3);
   21.31 +			memset((U8*)buffer->getMappedData(), 0, buffer->getSize());
   21.32 +			memset((U8*)buffer->getMappedIndices(), 0, buffer->getIndicesSize());
   21.33 +		}
   21.34  	}
   21.35  
   21.36 -	face->setSize(vol_face.mNumVertices, vol_face.mNumIndices);
   21.37 +	face->setSize(buffer->getNumVerts(), buffer->getNumIndices());
   21.38  	face->setVertexBuffer(buffer);
   21.39  
   21.40  	U16 offset = 0;
   21.41 @@ -1594,6 +1613,14 @@
   21.42  		}
   21.43  	}
   21.44  
   21.45 +	if (buffer.isNull() ||
   21.46 +		buffer->getNumVerts() != vol_face.mNumVertices ||
   21.47 +		buffer->getNumIndices() != vol_face.mNumIndices)
   21.48 +	{
   21.49 +		// Allocation failed
   21.50 +		return;
   21.51 +	}
   21.52 +
   21.53  	if (sShaderLevel <= 0 && face->mLastSkinTime < avatar->getLastSkinTime())
   21.54  	{
   21.55  		//perform software vertex skinning for this face
    22.1 --- a/indra/newview/llfloaterimagepreview.cpp	Tue Nov 21 09:46:31 2017 -0800
    22.2 +++ b/indra/newview/llfloaterimagepreview.cpp	Mon Dec 11 10:09:44 2017 -0800
    22.3 @@ -801,7 +801,13 @@
    22.4  	U32 num_vertices = vf.mNumVertices;
    22.5  
    22.6  	mVertexBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD0, 0);
    22.7 -	mVertexBuffer->allocateBuffer(num_vertices, num_indices, TRUE);
    22.8 +	if (!mVertexBuffer->allocateBuffer(num_vertices, num_indices, TRUE))
    22.9 +	{
   22.10 +		LL_WARNS() << "Failed to allocate Vertex Buffer for image preview to"
   22.11 +			<< num_vertices << " vertices and "
   22.12 +			<< num_indices << " indices" << LL_ENDL;
   22.13 +		// We are likely to crash on getTexCoord0Strider()
   22.14 +	}
   22.15  
   22.16  	LLStrider<LLVector3> vertex_strider;
   22.17  	LLStrider<LLVector3> normal_strider;
    23.1 --- a/indra/newview/llfloatermodelpreview.cpp	Tue Nov 21 09:46:31 2017 -0800
    23.2 +++ b/indra/newview/llfloatermodelpreview.cpp	Mon Dec 11 10:09:44 2017 -0800
    23.3 @@ -2568,13 +2568,21 @@
    23.4  
    23.5  				if (sizes[i*2+1] > 0 && sizes[i*2] > 0)
    23.6  				{
    23.7 -					buff->allocateBuffer(sizes[i*2+1], sizes[i*2], true);
    23.8 +					if (!buff->allocateBuffer(sizes[i * 2 + 1], sizes[i * 2], true))
    23.9 +					{
   23.10 +						// Todo: find a way to stop preview in this case instead of crashing
   23.11 +						LL_ERRS() << "Failed buffer allocation during preview LOD generation."
   23.12 +							<< " Vertices: " << sizes[i * 2 + 1]
   23.13 +							<< " Indices: " << sizes[i * 2] << LL_ENDL;
   23.14 +					}
   23.15  					buff->setBuffer(type_mask);
   23.16  					glodFillElements(mObject[base], names[i], GL_UNSIGNED_SHORT, (U8*) buff->getIndicesPointer());
   23.17  					stop_gloderror();
   23.18  				}
   23.19  				else
   23.20 -				{ //this face was eliminated, create a dummy triangle (one vertex, 3 indices, all 0)
   23.21 +				{
   23.22 +					// This face was eliminated or we failed to allocate buffer,
   23.23 +					// attempt to create a dummy triangle (one vertex, 3 indices, all 0)
   23.24  					buff->allocateBuffer(1, 3, true);
   23.25  					memset((U8*) buff->getMappedData(), 0, buff->getSize());
   23.26  					memset((U8*) buff->getIndicesPointer(), 0, buff->getIndicesSize());
   23.27 @@ -3322,7 +3330,13 @@
   23.28  
   23.29  			vb = new LLVertexBuffer(mask, 0);
   23.30  
   23.31 -			vb->allocateBuffer(num_vertices, num_indices, TRUE);
   23.32 +			if (!vb->allocateBuffer(num_vertices, num_indices, TRUE))
   23.33 +			{
   23.34 +				// We are likely to crash due this failure, if this happens, find a way to gracefully stop preview
   23.35 +				LL_WARNS() << "Failed to allocate Vertex Buffer for model preview "
   23.36 +					<< num_vertices << " vertices and "
   23.37 +					<< num_indices << " indices" << LL_ENDL;
   23.38 +			}
   23.39  
   23.40  			LLStrider<LLVector3> vertex_strider;
   23.41  			LLStrider<LLVector3> normal_strider;
    24.1 --- a/indra/newview/llfloaterpreference.cpp	Tue Nov 21 09:46:31 2017 -0800
    24.2 +++ b/indra/newview/llfloaterpreference.cpp	Mon Dec 11 10:09:44 2017 -0800
    24.3 @@ -1016,12 +1016,12 @@
    24.4  }
    24.5  
    24.6  // static 
    24.7 -void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email)
    24.8 +void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email)
    24.9  {
   24.10  	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
   24.11  	if (instance)
   24.12  	{
   24.13 -		instance->setPersonalInfo(visibility, im_via_email);	
   24.14 +        instance->setPersonalInfo(visibility, im_via_email, is_verified_email);
   24.15  	}
   24.16  }
   24.17  
   24.18 @@ -1830,7 +1830,7 @@
   24.19  	return true;
   24.20  }
   24.21  
   24.22 -void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email)
   24.23 +void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email)
   24.24  {
   24.25  	mGotPersonalInfo = true;
   24.26  	mOriginalIMViaEmail = im_via_email;
   24.27 @@ -1855,8 +1855,16 @@
   24.28  	getChildView("friends_online_notify_checkbox")->setEnabled(TRUE);
   24.29  	getChild<LLUICtrl>("online_visibility")->setValue(mOriginalHideOnlineStatus); 	 
   24.30  	getChild<LLUICtrl>("online_visibility")->setLabelArg("[DIR_VIS]", mDirectoryVisibility);
   24.31 -	getChildView("send_im_to_email")->setEnabled(TRUE);
   24.32 -	getChild<LLUICtrl>("send_im_to_email")->setValue(im_via_email);
   24.33 +	getChildView("send_im_to_email")->setEnabled(is_verified_email);
   24.34 +
   24.35 +    std::string tooltip;
   24.36 +    if (!is_verified_email)
   24.37 +        tooltip = getString("email_unverified_tooltip");
   24.38 +
   24.39 +    getChildView("send_im_to_email")->setToolTip(tooltip);
   24.40 +
   24.41 +    // *TODO: Show or hide verify email text here based on is_verified_email
   24.42 +    getChild<LLUICtrl>("send_im_to_email")->setValue(im_via_email);
   24.43  	getChildView("favorites_on_login_check")->setEnabled(TRUE);
   24.44  	getChildView("log_path_button")->setEnabled(TRUE);
   24.45  	getChildView("chat_font_size")->setEnabled(TRUE);
    25.1 --- a/indra/newview/llfloaterpreference.h	Tue Nov 21 09:46:31 2017 -0800
    25.2 +++ b/indra/newview/llfloaterpreference.h	Mon Dec 11 10:09:44 2017 -0800
    25.3 @@ -75,7 +75,7 @@
    25.4  	/*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
    25.5  
    25.6  	// static data update, called from message handler
    25.7 -	static void updateUserInfo(const std::string& visibility, bool im_via_email);
    25.8 +	static void updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
    25.9  
   25.10  	// refresh all the graphics preferences menus
   25.11  	static void refreshEnabledGraphics();
   25.12 @@ -147,7 +147,7 @@
   25.13  	void onClickLogPath();
   25.14  	bool moveTranscriptsAndLog();
   25.15  	void enableHistory();
   25.16 -	void setPersonalInfo(const std::string& visibility, bool im_via_email);
   25.17 +	void setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
   25.18  	void refreshEnabledState();
   25.19  	void onCommitWindowedMode();
   25.20  	void refresh();	// Refresh enable/disable
    26.1 --- a/indra/newview/llfloatertos.cpp	Tue Nov 21 09:46:31 2017 -0800
    26.2 +++ b/indra/newview/llfloatertos.cpp	Mon Dec 11 10:09:44 2017 -0800
    26.3 @@ -74,7 +74,7 @@
    26.4  	}
    26.5  
    26.6  	// disable Agree to TOS radio button until the page has fully loaded
    26.7 -	updateAgreeEnabled(false);
    26.8 +        updateAgreeEnabled(false);
    26.9  
   26.10  	// hide the SL text widget if we're displaying TOS with using a browser widget.
   26.11  	LLUICtrl *editor = getChild<LLUICtrl>("tos_text");
   26.12 @@ -148,6 +148,8 @@
   26.13  			// normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
   26.14  			// but if the page is unavailable, we need to do this now
   26.15  			updateAgreeEnabled(true);
   26.16 +			LLTextBox* tos_list = getChild<LLTextBox>("agree_list");
   26.17 +			tos_list->setEnabled(true);
   26.18  		}
   26.19  	}
   26.20  #endif
    27.1 --- a/indra/newview/llfolderviewmodelinventory.cpp	Tue Nov 21 09:46:31 2017 -0800
    27.2 +++ b/indra/newview/llfolderviewmodelinventory.cpp	Mon Dec 11 10:09:44 2017 -0800
    27.3 @@ -232,8 +232,9 @@
    27.4  		return true;
    27.5  	}
    27.6       */
    27.7 -    
    27.8 -	const bool passed_filter_folder = (getInventoryType() == LLInventoryType::IT_CATEGORY) ? filter.checkFolder(this) : true;
    27.9 +
   27.10 +	bool is_folder = (getInventoryType() == LLInventoryType::IT_CATEGORY);
   27.11 +	const bool passed_filter_folder = is_folder ? filter.checkFolder(this) : true;
   27.12  	setPassedFolderFilter(passed_filter_folder, filter_generation);
   27.13  
   27.14  	bool continue_filtering = true;
   27.15 @@ -258,7 +259,7 @@
   27.16  	{
   27.17          // This is where filter check on the item done (CHUI-849)
   27.18  		const bool passed_filter = filter.check(this);
   27.19 -		if (passed_filter && mChildren.empty()) // Update the latest filter generation for empty folders
   27.20 +		if (passed_filter && mChildren.empty() && is_folder) // Update the latest filter generation for empty folders
   27.21  		{
   27.22  			LLFolderViewModelItemInventory* view_model = this;
   27.23  			while (view_model && view_model->mMostFilteredDescendantGeneration < filter_generation)
    28.1 --- a/indra/newview/llinventorybridge.cpp	Tue Nov 21 09:46:31 2017 -0800
    28.2 +++ b/indra/newview/llinventorybridge.cpp	Mon Dec 11 10:09:44 2017 -0800
    28.3 @@ -1876,17 +1876,11 @@
    28.4  	{
    28.5  		mDisplayName.assign(LLStringUtil::null);
    28.6  	}
    28.7 -	S32 old_length = mSearchableName.length();
    28.8 -	S32 new_length = mDisplayName.length() + getLabelSuffix().length();
    28.9  
   28.10  	mSearchableName.assign(mDisplayName);
   28.11  	mSearchableName.append(getLabelSuffix());
   28.12  	LLStringUtil::toUpper(mSearchableName);
   28.13  	
   28.14 -	if ((old_length > new_length) && getInventoryFilter())
   28.15 -	{
   28.16 -		getInventoryFilter()->setModified(LLFolderViewFilter::FILTER_MORE_RESTRICTIVE);
   28.17 -	}
   28.18  	//Name set, so trigger a sort
   28.19  	if(mParent)
   28.20  	{
    29.1 --- a/indra/newview/llinventoryfunctions.cpp	Tue Nov 21 09:46:31 2017 -0800
    29.2 +++ b/indra/newview/llinventoryfunctions.cpp	Mon Dec 11 10:09:44 2017 -0800
    29.3 @@ -264,7 +264,9 @@
    29.4      // is limited to 4.
    29.5      // We also take care of degenerated cases so we don't update all folders in the inventory by mistake.
    29.6  
    29.7 -    if (cur_uuid.isNull())
    29.8 +    if (cur_uuid.isNull()
    29.9 +        || gInventory.getCategory(cur_uuid) == NULL
   29.10 +        || gInventory.getCategory(cur_uuid)->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
   29.11      {
   29.12          return;
   29.13      }
   29.14 @@ -275,9 +277,13 @@
   29.15      {
   29.16          // Retrieve the listing uuid this object is in
   29.17          LLUUID listing_uuid = nested_parent_id(cur_uuid, depth);
   29.18 +        LLViewerInventoryCategory* listing_cat = gInventory.getCategory(listing_uuid);
   29.19 +        bool listing_cat_loaded = listing_cat != NULL && listing_cat->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN;
   29.20      
   29.21          // Verify marketplace data consistency for this listing
   29.22 -        if (perform_consistency_enforcement && LLMarketplaceData::instance().isListed(listing_uuid))
   29.23 +        if (perform_consistency_enforcement
   29.24 +            && listing_cat_loaded
   29.25 +            && LLMarketplaceData::instance().isListed(listing_uuid))
   29.26          {
   29.27              LLUUID version_folder_uuid = LLMarketplaceData::instance().getVersionFolder(listing_uuid);
   29.28              S32 version_depth = depth_nesting_in_marketplace(version_folder_uuid);
   29.29 @@ -299,7 +305,9 @@
   29.30          }
   29.31      
   29.32          // Check if the count on hand needs to be updated on SLM
   29.33 -        if (perform_consistency_enforcement && (compute_stock_count(listing_uuid) != LLMarketplaceData::instance().getCountOnHand(listing_uuid)))
   29.34 +        if (perform_consistency_enforcement
   29.35 +            && listing_cat_loaded
   29.36 +            && (compute_stock_count(listing_uuid) != LLMarketplaceData::instance().getCountOnHand(listing_uuid)))
   29.37          {
   29.38              LLMarketplaceData::instance().updateCountOnHand(listing_uuid,1);
   29.39          }
    30.1 --- a/indra/newview/llinventorymodel.cpp	Tue Nov 21 09:46:31 2017 -0800
    30.2 +++ b/indra/newview/llinventorymodel.cpp	Mon Dec 11 10:09:44 2017 -0800
    30.3 @@ -2058,11 +2058,6 @@
    30.4  					// correct contents the next time the viewer opens the folder.
    30.5  					tcat->setVersion(NO_VERSION);
    30.6  				}
    30.7 -                else if (tcat->getPreferredType() == LLFolderType::FT_MARKETPLACE_STOCK)
    30.8 -                {
    30.9 -                    // Do not trust stock folders being updated
   30.10 -                    tcat->setVersion(NO_VERSION);
   30.11 -                }
   30.12  				else
   30.13  				{
   30.14  					cached_ids.insert(tcat->getUUID());
    31.1 --- a/indra/newview/llinventorypanel.cpp	Tue Nov 21 09:46:31 2017 -0800
    31.2 +++ b/indra/newview/llinventorypanel.cpp	Mon Dec 11 10:09:44 2017 -0800
    31.3 @@ -495,6 +495,11 @@
    31.4  
    31.5  					view_item->refresh();
    31.6  				}
    31.7 +				LLFolderViewFolder* parent = view_item->getParentFolder();
    31.8 +				if(parent)
    31.9 +				{
   31.10 +					parent->getViewModelItem()->dirtyDescendantsFilter();
   31.11 +				}
   31.12  			}
   31.13  		}
   31.14  
    32.1 --- a/indra/newview/llmediactrl.cpp	Tue Nov 21 09:46:31 2017 -0800
    32.2 +++ b/indra/newview/llmediactrl.cpp	Mon Dec 11 10:09:44 2017 -0800
    32.3 @@ -805,44 +805,8 @@
    32.4  			F32 max_u = ( F32 )media_plugin->getWidth() / ( F32 )media_plugin->getTextureWidth();
    32.5  			F32 max_v = ( F32 )media_plugin->getHeight() / ( F32 )media_plugin->getTextureHeight();
    32.6  
    32.7 -			LLRect r = getRect();
    32.8 -			S32 width, height;
    32.9 -			S32 x_offset = 0;
   32.10 -			S32 y_offset = 0;
   32.11 -			
   32.12 -			if(mStretchToFill)
   32.13 -			{
   32.14 -				if(mMaintainAspectRatio)
   32.15 -				{
   32.16 -					F32 media_aspect = (F32)(media_plugin->getWidth()) / (F32)(media_plugin->getHeight());
   32.17 -					F32 view_aspect = (F32)(r.getWidth()) / (F32)(r.getHeight());
   32.18 -					if(media_aspect > view_aspect)
   32.19 -					{
   32.20 -						// max width, adjusted height
   32.21 -						width = r.getWidth();
   32.22 -						height = llmin(llmax(ll_round(width / media_aspect), 0), r.getHeight());
   32.23 -					}
   32.24 -					else
   32.25 -					{
   32.26 -						// max height, adjusted width
   32.27 -						height = r.getHeight();
   32.28 -						width = llmin(llmax(ll_round(height * media_aspect), 0), r.getWidth());
   32.29 -					}
   32.30 -				}
   32.31 -				else
   32.32 -				{
   32.33 -					width = r.getWidth();
   32.34 -					height = r.getHeight();
   32.35 -				}
   32.36 -			}
   32.37 -			else
   32.38 -			{
   32.39 -				width = llmin(media_plugin->getWidth(), r.getWidth());
   32.40 -				height = llmin(media_plugin->getHeight(), r.getHeight());
   32.41 -			}
   32.42 -			
   32.43 -			x_offset = (r.getWidth() - width) / 2;
   32.44 -			y_offset = (r.getHeight() - height) / 2;		
   32.45 +			S32 x_offset, y_offset, width, height;
   32.46 +			calcOffsetsAndSize(&x_offset, &y_offset, &width, &height);
   32.47  
   32.48  			// draw the browser
   32.49  			gGL.begin( LLRender::QUADS );
   32.50 @@ -901,8 +865,56 @@
   32.51  
   32.52  ////////////////////////////////////////////////////////////////////////////////
   32.53  //
   32.54 +void LLMediaCtrl::calcOffsetsAndSize(S32 *x_offset, S32 *y_offset, S32 *width, S32 *height)
   32.55 +{
   32.56 +	const LLRect &r = getRect();
   32.57 +	*x_offset = *y_offset = 0;
   32.58 +
   32.59 +	if (mStretchToFill)
   32.60 +	{
   32.61 +		if (mMaintainAspectRatio && mMediaSource && mMediaSource->getMediaPlugin())
   32.62 +		{
   32.63 +			F32 media_aspect = (F32)(mMediaSource->getMediaPlugin()->getWidth()) / (F32)(mMediaSource->getMediaPlugin()->getHeight());
   32.64 +			F32 view_aspect = (F32)(r.getWidth()) / (F32)(r.getHeight());
   32.65 +			if (media_aspect > view_aspect)
   32.66 +			{
   32.67 +				// max width, adjusted height
   32.68 +				*width = r.getWidth();
   32.69 +				*height = llmin(llmax(ll_round(*width / media_aspect), 0), r.getHeight());
   32.70 +			}
   32.71 +			else
   32.72 +			{
   32.73 +				// max height, adjusted width
   32.74 +				*height = r.getHeight();
   32.75 +				*width = llmin(llmax(ll_round(*height * media_aspect), 0), r.getWidth());
   32.76 +			}
   32.77 +		}
   32.78 +		else
   32.79 +		{
   32.80 +			*width = r.getWidth();
   32.81 +			*height = r.getHeight();
   32.82 +		}
   32.83 +	}
   32.84 +	else
   32.85 +	{
   32.86 +		*width = llmin(mMediaSource->getMediaPlugin()->getWidth(), r.getWidth());
   32.87 +		*height = llmin(mMediaSource->getMediaPlugin()->getHeight(), r.getHeight());
   32.88 +	}
   32.89 +
   32.90 +	*x_offset = (r.getWidth() - *width) / 2;
   32.91 +	*y_offset = (r.getHeight() - *height) / 2;
   32.92 +}
   32.93 +
   32.94 +////////////////////////////////////////////////////////////////////////////////
   32.95 +//
   32.96  void LLMediaCtrl::convertInputCoords(S32& x, S32& y)
   32.97  {
   32.98 +	S32 x_offset, y_offset, width, height;
   32.99 +	calcOffsetsAndSize(&x_offset, &y_offset, &width, &height);
  32.100 +
  32.101 +	x -= x_offset;
  32.102 +	y -= y_offset;
  32.103 +
  32.104  	bool coords_opengl = false;
  32.105  	
  32.106  	if(mMediaSource && mMediaSource->hasMedia())
    33.1 --- a/indra/newview/llmediactrl.h	Tue Nov 21 09:46:31 2017 -0800
    33.2 +++ b/indra/newview/llmediactrl.h	Mon Dec 11 10:09:44 2017 -0800
    33.3 @@ -181,6 +181,9 @@
    33.4  	protected:
    33.5  		void convertInputCoords(S32& x, S32& y);
    33.6  
    33.7 +    private:
    33.8 +		void calcOffsetsAndSize(S32 *x_offset, S32 *y_offset, S32 *width, S32 *height);
    33.9 +
   33.10  	private:
   33.11  		void onVisibilityChanged ( const LLSD& new_visibility );
   33.12  		void onPopup(const LLSD& notification, const LLSD& response);
    34.1 --- a/indra/newview/lloutfitgallery.cpp	Tue Nov 21 09:46:31 2017 -0800
    34.2 +++ b/indra/newview/lloutfitgallery.cpp	Mon Dec 11 10:09:44 2017 -0800
    34.3 @@ -72,6 +72,7 @@
    34.4        mItemsAddedCount(0),
    34.5        mOutfitLinkPending(NULL),
    34.6        mOutfitRenamePending(NULL),
    34.7 +      mSnapshotFolderID(NULL),
    34.8        mRowPanelHeight(p.row_panel_height),
    34.9        mVerticalGap(p.vertical_gap),
   34.10        mHorizontalGap(p.horizontal_gap),
   34.11 @@ -1011,8 +1012,8 @@
   34.12  void LLOutfitGallery::loadPhotos()
   34.13  {
   34.14      //Iterate over inventory
   34.15 -    LLUUID textures = gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE);
   34.16 -    LLViewerInventoryCategory* textures_category = gInventory.getCategory(textures);
   34.17 +    mSnapshotFolderID = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE);
   34.18 +    LLViewerInventoryCategory* textures_category = gInventory.getCategory(mSnapshotFolderID);
   34.19      if (!textures_category)
   34.20          return;
   34.21      if (mTexturesObserver == NULL)
   34.22 @@ -1022,12 +1023,26 @@
   34.23      }
   34.24  
   34.25      // Start observing changes in "Textures" category.
   34.26 -    mTexturesObserver->addCategory(textures,
   34.27 -        boost::bind(&LLOutfitGallery::refreshTextures, this, textures));
   34.28 -    
   34.29 +    mTexturesObserver->addCategory(mSnapshotFolderID,
   34.30 +        boost::bind(&LLOutfitGallery::refreshTextures, this, mSnapshotFolderID));
   34.31 +
   34.32      textures_category->fetch();
   34.33  }
   34.34  
   34.35 +void LLOutfitGallery::updateSnapshotFolderObserver()
   34.36 +{
   34.37 +    if(mSnapshotFolderID != gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE))
   34.38 +    {
   34.39 +        if (gInventory.containsObserver(mTexturesObserver))
   34.40 +        {
   34.41 +            gInventory.removeObserver(mTexturesObserver);
   34.42 +        }
   34.43 +        delete mTexturesObserver;
   34.44 +        mTexturesObserver = NULL;
   34.45 +        loadPhotos();
   34.46 +    }
   34.47 +}
   34.48 +
   34.49  void LLOutfitGallery::refreshOutfit(const LLUUID& category_id)
   34.50  {
   34.51      LLViewerInventoryCategory* category = gInventory.getCategory(category_id);
   34.52 @@ -1200,7 +1215,7 @@
   34.53  
   34.54              LLViewerInventoryCategory *outfit_cat = gInventory.getCategory(outfit_id);
   34.55              if (!outfit_cat) return;
   34.56 -
   34.57 +            updateSnapshotFolderObserver();
   34.58              checkRemovePhoto(outfit_id);
   34.59              std::string upload_pending_name = outfit_id.asString();
   34.60              std::string upload_pending_desc = "";
   34.61 @@ -1372,6 +1387,7 @@
   34.62      if (!selected_outfit_id.isNull())
   34.63      {
   34.64          checkRemovePhoto(selected_outfit_id);
   34.65 +        updateSnapshotFolderObserver();
   34.66      }
   34.67  }
   34.68  
    35.1 --- a/indra/newview/lloutfitgallery.h	Tue Nov 21 09:46:31 2017 -0800
    35.2 +++ b/indra/newview/lloutfitgallery.h	Mon Dec 11 10:09:44 2017 -0800
    35.3 @@ -130,6 +130,7 @@
    35.4  private:
    35.5      void loadPhotos();
    35.6      void uploadPhoto(LLUUID outfit_id);
    35.7 +    void updateSnapshotFolderObserver();
    35.8      LLUUID getPhotoAssetId(const LLUUID& outfit_id);
    35.9      LLUUID getDefaultPhoto();
   35.10      void linkPhotoToOutfit(LLUUID outfit_id, LLUUID photo_id);
   35.11 @@ -168,6 +169,7 @@
   35.12      LLPanel* mLastRowPanel;
   35.13      LLUUID mOutfitLinkPending;
   35.14      LLUUID mOutfitRenamePending;
   35.15 +    LLUUID mSnapshotFolderID;
   35.16      LLTextBox* mMessageTextBox;
   35.17      bool mGalleryCreated;
   35.18      int mRowCount;
    36.1 --- a/indra/newview/llpanelface.cpp	Tue Nov 21 09:46:31 2017 -0800
    36.2 +++ b/indra/newview/llpanelface.cpp	Mon Dec 11 10:09:44 2017 -0800
    36.3 @@ -1623,6 +1623,15 @@
    36.4  			}
    36.5  		}
    36.6  	}
    36.7 +	else
    36.8 +	{
    36.9 +		if (shiny_texture_ID.isNull() && comboShiny && comboShiny->itemExists(USE_TEXTURE))
   36.10 +		{
   36.11 +			comboShiny->remove(SHINY_TEXTURE);
   36.12 +			comboShiny->selectFirstItem();
   36.13 +		}
   36.14 +	}
   36.15 +
   36.16  
   36.17  	LLComboBox* combo_matmedia = getChild<LLComboBox>("combobox matmedia");
   36.18  	LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
   36.19 @@ -2368,8 +2377,8 @@
   36.20  void LLPanelFace::onTextureSelectionChanged(LLInventoryItem* itemp)
   36.21  {
   36.22  	LL_DEBUGS("Materials") << "item asset " << itemp->getAssetUUID() << LL_ENDL;
   36.23 -	LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
   36.24 -	if(radio_mat_type)
   36.25 +	LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type");
   36.26 +	if(!radio_mat_type)
   36.27  	{
   36.28  	    return;
   36.29  	}
    37.1 --- a/indra/newview/llpanellogin.cpp	Tue Nov 21 09:46:31 2017 -0800
    37.2 +++ b/indra/newview/llpanellogin.cpp	Mon Dec 11 10:09:44 2017 -0800
    37.3 @@ -75,6 +75,7 @@
    37.4  
    37.5  LLPanelLogin *LLPanelLogin::sInstance = NULL;
    37.6  BOOL LLPanelLogin::sCapslockDidNotification = FALSE;
    37.7 +BOOL LLPanelLogin::sCredentialSet = FALSE;
    37.8  
    37.9  class LLLoginLocationAutoHandler : public LLCommandHandler
   37.10  {
   37.11 @@ -176,6 +177,7 @@
   37.12  	setBackgroundOpaque(TRUE);
   37.13  
   37.14  	mPasswordModified = FALSE;
   37.15 +
   37.16  	LLPanelLogin::sInstance = this;
   37.17  
   37.18  	LLView* login_holder = gViewerWindow->getLoginPanelHolder();
   37.19 @@ -458,6 +460,7 @@
   37.20  		LL_WARNS() << "Attempted fillFields with no login view shown" << LL_ENDL;
   37.21  		return;
   37.22  	}
   37.23 +	sCredentialSet = TRUE;
   37.24  	LL_INFOS("Credentials") << "Setting login fields to " << *credential << LL_ENDL;
   37.25  
   37.26  	LLSD identifier = credential->getIdentifier();
   37.27 @@ -680,10 +683,8 @@
   37.28  			}
   37.29  			if ( new_start_slurl.getLocationString().length() )
   37.30  			{
   37.31 -				if (location_combo->getCurrentIndex() == -1)
   37.32 -				{
   37.33 -					location_combo->setLabel(new_start_slurl.getLocationString());
   37.34 -				}
   37.35 +					
   37.36 +				location_combo->setLabel(new_start_slurl.getLocationString());
   37.37  				sInstance->mLocationLength = new_start_slurl.getLocationString().length();
   37.38  				sInstance->updateLoginButtons();
   37.39  			}
   37.40 @@ -862,6 +863,7 @@
   37.41  		}
   37.42  		else
   37.43  		{
   37.44 +			sCredentialSet = FALSE;
   37.45  			LLPointer<LLCredential> cred;
   37.46  			BOOL remember;
   37.47  			getFields(cred, remember);
    38.1 --- a/indra/newview/llpanellogin.h	Tue Nov 21 09:46:31 2017 -0800
    38.2 +++ b/indra/newview/llpanellogin.h	Mon Dec 11 10:09:44 2017 -0800
    38.3 @@ -56,8 +56,10 @@
    38.4  		void* callback_data);
    38.5  
    38.6  	static void setFields(LLPointer<LLCredential> credential, BOOL remember);
    38.7 +  
    38.8 +	static void getFields(LLPointer<LLCredential>& credential, BOOL& remember);
    38.9  
   38.10 -	static void getFields(LLPointer<LLCredential>& credential, BOOL& remember);
   38.11 +	static BOOL isCredentialSet() { return sCredentialSet; }
   38.12  
   38.13  	static BOOL areCredentialFieldsDirty();
   38.14  	static void setLocation(const LLSLURL& slurl);
   38.15 @@ -115,6 +117,8 @@
   38.16  	static LLPanelLogin* sInstance;
   38.17  	static BOOL		sCapslockDidNotification;
   38.18  	bool			mFirstLoginThisInstall;
   38.19 +    
   38.20 +    static BOOL sCredentialSet;
   38.21  
   38.22  	unsigned int mUsernameLength;
   38.23  	unsigned int mPasswordLength;
    39.1 --- a/indra/newview/llpanelmaininventory.cpp	Tue Nov 21 09:46:31 2017 -0800
    39.2 +++ b/indra/newview/llpanelmaininventory.cpp	Mon Dec 11 10:09:44 2017 -0800
    39.3 @@ -162,6 +162,7 @@
    39.4  		recent_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
    39.5  		LLInventoryFilter& recent_filter = recent_items_panel->getFilter();
    39.6  		recent_filter.setFilterObjectTypes(recent_filter.getFilterObjectTypes() & ~(0x1 << LLInventoryType::IT_CATEGORY));
    39.7 +		recent_filter.setEmptyLookupMessage("InventoryNoMatchingRecentItems");
    39.8  		recent_filter.markDefault();
    39.9  		recent_items_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, recent_items_panel, _1, _2));
   39.10  	}
    40.1 --- a/indra/newview/llpanelmaininventory.h	Tue Nov 21 09:46:31 2017 -0800
    40.2 +++ b/indra/newview/llpanelmaininventory.h	Mon Dec 11 10:09:44 2017 -0800
    40.3 @@ -91,6 +91,8 @@
    40.4  
    40.5  	static void newWindow();
    40.6  
    40.7 +	void toggleFindOptions();
    40.8 +
    40.9  protected:
   40.10  	//
   40.11  	// Misc functions
   40.12 @@ -98,7 +100,6 @@
   40.13  	void setFilterTextFromFilter();
   40.14  	void startSearch();
   40.15  	
   40.16 -	void toggleFindOptions();
   40.17  	void onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, BOOL user_action);
   40.18  
   40.19  	static BOOL filtersVisible(void* user_data);
   40.20 @@ -111,7 +112,7 @@
   40.21  
   40.22  	const std::string getFilterSubString();
   40.23  	void setFilterSubString(const std::string& string);
   40.24 -	
   40.25 +
   40.26  	// menu callbacks
   40.27  	void doToSelected(const LLSD& userdata);
   40.28  	void closeAllFolders();
   40.29 @@ -144,6 +145,7 @@
   40.30  	LLComboBox*					mSearchTypeCombo;
   40.31  
   40.32  
   40.33 +
   40.34  	//////////////////////////////////////////////////////////////////////////////////
   40.35  	// List Commands                                                                //
   40.36  protected:
    41.1 --- a/indra/newview/llpaneloutfitsinventory.cpp	Tue Nov 21 09:46:31 2017 -0800
    41.2 +++ b/indra/newview/llpaneloutfitsinventory.cpp	Mon Dec 11 10:09:44 2017 -0800
    41.3 @@ -68,7 +68,7 @@
    41.4  
    41.5  LLPanelOutfitsInventory::~LLPanelOutfitsInventory()
    41.6  {
    41.7 -	if (mAppearanceTabs)
    41.8 +	if (mAppearanceTabs && mInitialized)
    41.9  	{
   41.10  		gSavedSettings.setS32("LastAppearanceTab", mAppearanceTabs->getCurrentPanelIndex());
   41.11  	}
    42.1 --- a/indra/newview/llpanelvolume.cpp	Tue Nov 21 09:46:31 2017 -0800
    42.2 +++ b/indra/newview/llpanelvolume.cpp	Mon Dec 11 10:09:44 2017 -0800
    42.3 @@ -710,22 +710,20 @@
    42.4  void LLPanelVolume::onLightCancelTexture(const LLSD& data)
    42.5  {
    42.6  	LLTextureCtrl* LightTextureCtrl = getChild<LLTextureCtrl>("light texture control");
    42.7 +	LLVOVolume *volobjp = (LLVOVolume *) mObject.get();
    42.8  
    42.9 -	if (LightTextureCtrl)
   42.10 -	{
   42.11 -        LightTextureCtrl->setImageAssetID(mLightSavedTexture);
   42.12 -	}
   42.13 -
   42.14 -	LLVOVolume *volobjp = (LLVOVolume *) mObject.get();
   42.15 -	if(volobjp)
   42.16 +	if (volobjp && LightTextureCtrl)
   42.17  	{
   42.18  		// Cancel the light texture as requested
   42.19  		// NORSPEC-292
   42.20 -		//
   42.21 +        //
   42.22 +        // Texture picker triggers cancel both in case of actual cancel and in case of
   42.23 +        // selection of "None" texture.
   42.24 +        LLUUID tex_id = LightTextureCtrl->getImageAssetID();
   42.25          bool is_spotlight = volobjp->isLightSpotlight();
   42.26 -        volobjp->setLightTextureID(mLightSavedTexture); //updates spotlight
   42.27 +        volobjp->setLightTextureID(tex_id); //updates spotlight
   42.28  
   42.29 -        if (!is_spotlight && mLightSavedTexture.notNull())
   42.30 +        if (!is_spotlight && tex_id.notNull())
   42.31          {
   42.32              LLVector3 spot_params = volobjp->getSpotLightParams();
   42.33              getChild<LLUICtrl>("Light FOV")->setValue(spot_params.mV[0]);
   42.34 @@ -769,7 +767,6 @@
   42.35  	{
   42.36  		LLUUID id = LightTextureCtrl->getImageAssetID();
   42.37  		volobjp->setLightTextureID(id);
   42.38 -		mLightSavedTexture = id;
   42.39  	}
   42.40  }
   42.41  
    43.1 --- a/indra/newview/llpanelvolume.h	Tue Nov 21 09:46:31 2017 -0800
    43.2 +++ b/indra/newview/llpanelvolume.h	Mon Dec 11 10:09:44 2017 -0800
    43.3 @@ -111,7 +111,6 @@
    43.4  	
    43.5  
    43.6  	LLColor4		mLightSavedColor;
    43.7 -	LLUUID			mLightSavedTexture;
    43.8  	LLPointer<LLViewerObject> mObject;
    43.9  	LLPointer<LLViewerObject> mRootObject;
   43.10  
    44.1 --- a/indra/newview/llphysicsmotion.cpp	Tue Nov 21 09:46:31 2017 -0800
    44.2 +++ b/indra/newview/llphysicsmotion.cpp	Mon Dec 11 10:09:44 2017 -0800
    44.3 @@ -171,8 +171,8 @@
    44.4                                                     F32 behavior_maxeffect);
    44.5  
    44.6          F32 toLocal(const LLVector3 &world);
    44.7 -        F32 calculateVelocity_local();
    44.8 -        F32 calculateAcceleration_local(F32 velocity_local);
    44.9 +        F32 calculateVelocity_local(const F32 time_delta);
   44.10 +        F32 calculateAcceleration_local(F32 velocity_local, const F32 time_delta);
   44.11  private:
   44.12          const std::string mParamDriverName;
   44.13          const std::string mParamControllerName;
   44.14 @@ -425,23 +425,22 @@
   44.15          return world * dir_world;
   44.16  }
   44.17  
   44.18 -F32 LLPhysicsMotion::calculateVelocity_local()
   44.19 +F32 LLPhysicsMotion::calculateVelocity_local(const F32 time_delta)
   44.20  {
   44.21  	const F32 world_to_model_scale = 100.0f;
   44.22          LLJoint *joint = mJointState->getJoint();
   44.23          const LLVector3 position_world = joint->getWorldPosition();
   44.24          const LLVector3 last_position_world = mPosition_world;
   44.25  	const LLVector3 positionchange_world = (position_world-last_position_world) * world_to_model_scale;
   44.26 -        const LLVector3 velocity_world = positionchange_world;
   44.27 -        const F32 velocity_local = toLocal(velocity_world);
   44.28 +        const F32 velocity_local = toLocal(positionchange_world) / time_delta;
   44.29          return velocity_local;
   44.30  }
   44.31  
   44.32 -F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local)
   44.33 +F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local, const F32 time_delta)
   44.34  {
   44.35  //        const F32 smoothing = getParamValue("Smoothing");
   44.36          static const F32 smoothing = 3.0f; // Removed smoothing param since it's probably not necessary
   44.37 -        const F32 acceleration_local = velocity_local - mVelocityJoint_local;
   44.38 +        const F32 acceleration_local = (velocity_local - mVelocityJoint_local) / time_delta;
   44.39          
   44.40          const F32 smoothed_acceleration_local = 
   44.41                  acceleration_local * 1.0/smoothing + 
   44.42 @@ -544,9 +543,9 @@
   44.43  	// Calculate velocity and acceleration in parameter space.
   44.44  	//
   44.45          
   44.46 -	//const F32 velocity_joint_local = calculateVelocity_local(time_iteration_step);
   44.47 -	const F32 velocity_joint_local = calculateVelocity_local();
   44.48 -	const F32 acceleration_joint_local = calculateAcceleration_local(velocity_joint_local);
   44.49 +    const F32 joint_local_factor = 30.0;
   44.50 +    const F32 velocity_joint_local = calculateVelocity_local(time_delta * joint_local_factor);
   44.51 +    const F32 acceleration_joint_local = calculateAcceleration_local(velocity_joint_local, time_delta * joint_local_factor);
   44.52  	
   44.53  	//
   44.54  	// End velocity and acceleration
    45.1 --- a/indra/newview/llpreviewnotecard.cpp	Tue Nov 21 09:46:31 2017 -0800
    45.2 +++ b/indra/newview/llpreviewnotecard.cpp	Mon Dec 11 10:09:44 2017 -0800
    45.3 @@ -163,6 +163,16 @@
    45.4  	}
    45.5  }
    45.6  
    45.7 +/* virtual */
    45.8 +void LLPreviewNotecard::setObjectID(const LLUUID& object_id)
    45.9 +{
   45.10 +	LLPreview::setObjectID(object_id);
   45.11 +
   45.12 +	LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
   45.13 +	editor->setNotecardObjectID(mObjectUUID);
   45.14 +	editor->makePristine();
   45.15 +}
   45.16 +
   45.17  const LLInventoryItem* LLPreviewNotecard::getDragItem()
   45.18  {
   45.19  	LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
    46.1 --- a/indra/newview/llpreviewnotecard.h	Tue Nov 21 09:46:31 2017 -0800
    46.2 +++ b/indra/newview/llpreviewnotecard.h	Mon Dec 11 10:09:44 2017 -0800
    46.3 @@ -47,6 +47,7 @@
    46.4  	virtual ~LLPreviewNotecard();
    46.5  	
    46.6  	bool saveItem();
    46.7 +	void setObjectID(const LLUUID& object_id);
    46.8  
    46.9  	// llview
   46.10  	virtual void draw();
    47.1 --- a/indra/newview/llscriptfloater.cpp	Tue Nov 21 09:46:31 2017 -0800
    47.2 +++ b/indra/newview/llscriptfloater.cpp	Mon Dec 11 10:09:44 2017 -0800
    47.3 @@ -349,8 +349,8 @@
    47.4  //////////////////////////////////////////////////////////////////////////
    47.5  
    47.6  LLScriptFloaterManager::LLScriptFloaterManager()
    47.7 +		: mDialogLimitationsSlot()
    47.8  {
    47.9 -	gSavedSettings.getControl("ScriptDialogLimitations")->getCommitSignal()->connect(boost::bind(&clearScriptNotifications));
   47.10  }
   47.11  
   47.12  void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
   47.13 @@ -361,6 +361,19 @@
   47.14  		return;
   47.15  	}
   47.16  
   47.17 +	if (!mDialogLimitationsSlot.connected())
   47.18 +	{
   47.19 +		LLPointer<LLControlVariable> cntrl_ptr = gSavedSettings.getControl("ScriptDialogLimitations");
   47.20 +		if (cntrl_ptr.notNull())
   47.21 +		{
   47.22 +			mDialogLimitationsSlot = cntrl_ptr->getCommitSignal()->connect(boost::bind(&clearScriptNotifications));
   47.23 +		}
   47.24 +		else
   47.25 +		{
   47.26 +			LL_WARNS() << "Unable to set signal on setting 'ScriptDialogLimitations'" << LL_ENDL;
   47.27 +		}
   47.28 +	}
   47.29 +
   47.30  	// get scripted Object's ID
   47.31  	LLUUID object_id = notification_id_to_object_id(notification_id);
   47.32  	
    48.1 --- a/indra/newview/llscriptfloater.h	Tue Nov 21 09:46:31 2017 -0800
    48.2 +++ b/indra/newview/llscriptfloater.h	Mon Dec 11 10:09:44 2017 -0800
    48.3 @@ -139,6 +139,7 @@
    48.4  	typedef std::map<LLUUID, FloaterPositionInfo> floater_position_map_t;
    48.5  
    48.6  	floater_position_map_t mFloaterPositions;
    48.7 +	boost::signals2::connection mDialogLimitationsSlot;
    48.8  };
    48.9  
   48.10  /**
    49.1 --- a/indra/newview/llspatialpartition.cpp	Tue Nov 21 09:46:31 2017 -0800
    49.2 +++ b/indra/newview/llspatialpartition.cpp	Mon Dec 11 10:09:44 2017 -0800
    49.3 @@ -448,16 +448,32 @@
    49.4  				(group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs))
    49.5  			{
    49.6  				group->mVertexBuffer = createVertexBuffer(mVertexDataMask, group->mBufferUsage);
    49.7 -				group->mVertexBuffer->allocateBuffer(vertex_count, index_count, true);
    49.8 +				if (!group->mVertexBuffer->allocateBuffer(vertex_count, index_count, true))
    49.9 +				{
   49.10 +					LL_WARNS() << "Failed to allocate Vertex Buffer on rebuild to "
   49.11 +						<< vertex_count << " vertices and "
   49.12 +						<< index_count << " indices" << LL_ENDL;
   49.13 +					group->mVertexBuffer = NULL;
   49.14 +					group->mBufferMap.clear();
   49.15 +				}
   49.16  				stop_glerror();
   49.17  			}
   49.18  			else
   49.19  			{
   49.20 -				group->mVertexBuffer->resizeBuffer(vertex_count, index_count);
   49.21 +				if (!group->mVertexBuffer->resizeBuffer(vertex_count, index_count))
   49.22 +				{
   49.23 +					// Is likely to cause a crash. If this gets triggered find a way to avoid it (don't forget to reset face)
   49.24 +					LL_WARNS() << "Failed to resize Vertex Buffer on rebuild to "
   49.25 +						<< vertex_count << " vertices and "
   49.26 +						<< index_count << " indices" << LL_ENDL;
   49.27 +					group->mVertexBuffer = NULL;
   49.28 +					group->mBufferMap.clear();
   49.29 +				}
   49.30  				stop_glerror();
   49.31  			}
   49.32  		}
   49.33  
   49.34 +		if (group->mVertexBuffer)
   49.35  		{
   49.36  			LL_RECORD_BLOCK_TIME(FTM_GET_GEOMETRY);
   49.37  			getGeometry(group);
    50.1 --- a/indra/newview/llstartup.cpp	Tue Nov 21 09:46:31 2017 -0800
    50.2 +++ b/indra/newview/llstartup.cpp	Mon Dec 11 10:09:44 2017 -0800
    50.3 @@ -766,7 +766,7 @@
    50.4  			// Show the login dialog
    50.5  			login_show();
    50.6  			// connect dialog is already shown, so fill in the names
    50.7 -			if (gUserCredential.notNull())
    50.8 +			if (gUserCredential.notNull() && !LLPanelLogin::isCredentialSet())
    50.9  			{
   50.10  				LLPanelLogin::setFields( gUserCredential, gRememberPassword);
   50.11  			}
   50.12 @@ -2766,6 +2766,7 @@
   50.13  	stateInfo["str"] = getStartupStateString();
   50.14  	stateInfo["enum"] = gStartupState;
   50.15  	sStateWatcher->post(stateInfo);
   50.16 +	gDebugInfo["StartupState"] = getStartupStateString();
   50.17  }
   50.18  
   50.19  
    51.1 --- a/indra/newview/lltexturecache.cpp	Tue Nov 21 09:46:31 2017 -0800
    51.2 +++ b/indra/newview/lltexturecache.cpp	Mon Dec 11 10:09:44 2017 -0800
    51.3 @@ -387,22 +387,35 @@
    51.4  		}
    51.5  		// Allocate read buffer
    51.6  		mReadData = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize);
    51.7 -		S32 bytes_read = LLAPRFile::readEx(local_filename, 
    51.8 -											 mReadData, mOffset, mDataSize, mCache->getLocalAPRFilePool());
    51.9 -		if (bytes_read != mDataSize)
   51.10 +
   51.11 +		if (mReadData)
   51.12  		{
   51.13 - 			LL_WARNS() << "Error reading file from local cache: " << local_filename
   51.14 - 					<< " Bytes: " << mDataSize << " Offset: " << mOffset
   51.15 +			S32 bytes_read = LLAPRFile::readEx( local_filename,
   51.16 +												mReadData,
   51.17 +												mOffset,
   51.18 +												mDataSize,
   51.19 +												mCache->getLocalAPRFilePool());
   51.20 +
   51.21 +			if (bytes_read != mDataSize)
   51.22 +			{
   51.23 + 				LL_WARNS() << "Error reading file from local cache: " << local_filename
   51.24 + 						<< " Bytes: " << mDataSize << " Offset: " << mOffset
   51.25   					<< " / " << mDataSize << LL_ENDL;
   51.26 -			mDataSize = 0;
   51.27 -			FREE_MEM(LLImageBase::getPrivatePool(), mReadData);
   51.28 -			mReadData = NULL;
   51.29 +				mDataSize = 0;
   51.30 +				FREE_MEM(LLImageBase::getPrivatePool(), mReadData);
   51.31 +				mReadData = NULL;
   51.32 +			}
   51.33 +			else
   51.34 +			{
   51.35 +				mImageSize = local_size;
   51.36 +				mImageLocal = TRUE;
   51.37 +			}
   51.38  		}
   51.39  		else
   51.40  		{
   51.41 -			//LL_INFOS() << "texture " << mID.asString() << " found in local_assets" << LL_ENDL;
   51.42 -			mImageSize = local_size;
   51.43 -			mImageLocal = TRUE;
   51.44 + 			LL_WARNS() << "Error allocating memory for cache: " << local_filename
   51.45 + 					<< " of size: " << mDataSize << LL_ENDL;
   51.46 +			mDataSize = 0;
   51.47  		}
   51.48  		// We're done...
   51.49  		done = true;
   51.50 @@ -477,44 +490,55 @@
   51.51  			
   51.52  			// Reserve the whole data buffer first
   51.53  			U8* data = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), mDataSize);
   51.54 +			if (data)
   51.55 +			{
   51.56 +				// Set the data file pointers taking the read offset into account. 2 cases:
   51.57 +				if (mOffset < TEXTURE_CACHE_ENTRY_SIZE)
   51.58 +				{
   51.59 +					// Offset within the header record. That means we read something from the header cache.
   51.60 +					// Note: most common case is (mOffset = 0), so this is the "normal" code path.
   51.61 +					data_offset = TEXTURE_CACHE_ENTRY_SIZE - mOffset;	// i.e. TEXTURE_CACHE_ENTRY_SIZE if mOffset nul (common case)
   51.62 +					file_offset = 0;
   51.63 +					file_size = mDataSize - data_offset;
   51.64 +					// Copy the raw data we've been holding from the header cache into the new sized buffer
   51.65 +					llassert_always(mReadData);
   51.66 +					memcpy(data, mReadData, data_offset);
   51.67 +					FREE_MEM(LLImageBase::getPrivatePool(), mReadData);
   51.68 +					mReadData = NULL;
   51.69 +				}
   51.70 +				else
   51.71 +				{
   51.72 +					// Offset bigger than the header record. That means we haven't read anything yet.
   51.73 +					data_offset = 0;
   51.74 +					file_offset = mOffset - TEXTURE_CACHE_ENTRY_SIZE;
   51.75 +					file_size = mDataSize;
   51.76 +					// No data from header cache to copy in that case, we skipped it all
   51.77 +				}
   51.78  
   51.79 -			// Set the data file pointers taking the read offset into account. 2 cases:
   51.80 -			if (mOffset < TEXTURE_CACHE_ENTRY_SIZE)
   51.81 -			{
   51.82 -				// Offset within the header record. That means we read something from the header cache.
   51.83 -				// Note: most common case is (mOffset = 0), so this is the "normal" code path.
   51.84 -				data_offset = TEXTURE_CACHE_ENTRY_SIZE - mOffset;	// i.e. TEXTURE_CACHE_ENTRY_SIZE if mOffset nul (common case)
   51.85 -				file_offset = 0;
   51.86 -				file_size = mDataSize - data_offset;
   51.87 -				// Copy the raw data we've been holding from the header cache into the new sized buffer
   51.88 -				llassert_always(mReadData);
   51.89 -				memcpy(data, mReadData, data_offset);
   51.90 -				FREE_MEM(LLImageBase::getPrivatePool(), mReadData);
   51.91 -				mReadData = NULL;
   51.92 +				// Now use that buffer as the object read buffer
   51.93 +				llassert_always(mReadData == NULL);
   51.94 +				mReadData = data;
   51.95 +
   51.96 +				// Read the data at last
   51.97 +				S32 bytes_read = LLAPRFile::readEx(filename, 
   51.98 +												 mReadData + data_offset,
   51.99 +												 file_offset, file_size,
  51.100 +												 mCache->getLocalAPRFilePool());
  51.101 +				if (bytes_read != file_size)
  51.102 +				{
  51.103 +					LL_WARNS() << "LLTextureCacheWorker: "  << mID
  51.104 +							<< " incorrect number of bytes read from body: " << bytes_read
  51.105 +							<< " / " << file_size << LL_ENDL;
  51.106 +					FREE_MEM(LLImageBase::getPrivatePool(), mReadData);
  51.107 +					mReadData = NULL;
  51.108 +					mDataSize = -1; // failed
  51.109 +					done = true;
  51.110 +				}
  51.111  			}
  51.112  			else
  51.113  			{
  51.114 -				// Offset bigger than the header record. That means we haven't read anything yet.
  51.115 -				data_offset = 0;
  51.116 -				file_offset = mOffset - TEXTURE_CACHE_ENTRY_SIZE;
  51.117 -				file_size = mDataSize;
  51.118 -				// No data from header cache to copy in that case, we skipped it all
  51.119 -			}
  51.120 -
  51.121 -			// Now use that buffer as the object read buffer
  51.122 -			llassert_always(mReadData == NULL);
  51.123 -			mReadData = data;
  51.124 -
  51.125 -			// Read the data at last
  51.126 -			S32 bytes_read = LLAPRFile::readEx(filename, 
  51.127 -											 mReadData + data_offset,
  51.128 -											 file_offset, file_size,
  51.129 -											 mCache->getLocalAPRFilePool());
  51.130 -			if (bytes_read != file_size)
  51.131 -			{
  51.132  				LL_WARNS() << "LLTextureCacheWorker: "  << mID
  51.133 -						<< " incorrect number of bytes read from body: " << bytes_read
  51.134 -						<< " / " << file_size << LL_ENDL;
  51.135 +					<< " failed to allocate memory for reading: " << mDataSize << LL_ENDL;
  51.136  				FREE_MEM(LLImageBase::getPrivatePool(), mReadData);
  51.137  				mReadData = NULL;
  51.138  				mDataSize = -1; // failed
  51.139 @@ -550,9 +574,11 @@
  51.140  	{
  51.141  		if ((mOffset != 0) // We currently do not support write offsets
  51.142  			|| (mDataSize <= 0) // Things will go badly wrong if mDataSize is nul or negative...
  51.143 -			|| (mImageSize < mDataSize))
  51.144 +			|| (mImageSize < mDataSize)
  51.145 +			|| (mRawDiscardLevel < 0)
  51.146 +			|| (mRawImage->isBufferInvalid())) // decode failed or malfunctioned, don't write
  51.147  		{
  51.148 -			LL_WARNS() << "INIT state check failed" << LL_ENDL;
  51.149 +			LL_WARNS() << "INIT state check failed for image: " << mID << " Size: " << mImageSize << " DataSize: " << mDataSize << " Discard:" << mRawDiscardLevel << LL_ENDL;
  51.150  			mDataSize = -1; // failed
  51.151  			done = true;
  51.152  		}
  51.153 @@ -577,15 +603,12 @@
  51.154  			idx = mCache->setHeaderCacheEntry(mID, entry, mImageSize, mDataSize); // create the new entry.
  51.155  			if(idx >= 0)
  51.156  			{
  51.157 -				// (almost always) write to the fast cache.
  51.158 -				if (mRawImage->getDataSize())
  51.159 +				// write to the fast cache.
  51.160 +				if(!mCache->writeToFastCache(idx, mRawImage, mRawDiscardLevel))
  51.161  				{
  51.162 -					if(!mCache->writeToFastCache(idx, mRawImage, mRawDiscardLevel))
  51.163 -					{
  51.164 -						LL_WARNS() << "writeToFastCache failed" << LL_ENDL;
  51.165 -						mDataSize = -1; // failed
  51.166 -						done = true;
  51.167 -					}
  51.168 +					LL_WARNS() << "writeToFastCache failed" << LL_ENDL;
  51.169 +					mDataSize = -1; // failed
  51.170 +					done = true;
  51.171  				}
  51.172  			}
  51.173  		}
  51.174 @@ -936,7 +959,7 @@
  51.175  //////////////////////////////////////////////////////////////////////////////
  51.176  
  51.177  //static
  51.178 -F32 LLTextureCache::sHeaderCacheVersion = 1.7f;
  51.179 +F32 LLTextureCache::sHeaderCacheVersion = 1.71f;
  51.180  U32 LLTextureCache::sCacheMaxEntries = 1024 * 1024; //~1 million textures.
  51.181  S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
  51.182  std::string LLTextureCache::sHeaderCacheEncoderVersion = LLImageJ2C::getEngineInfo();
  51.183 @@ -1793,24 +1816,30 @@
  51.184  S32 LLTextureCache::setHeaderCacheEntry(const LLUUID& id, Entry& entry, S32 imagesize, S32 datasize)
  51.185  {
  51.186  	mHeaderMutex.lock();
  51.187 -	S32 idx = openAndReadEntry(id, entry, true);
  51.188 +	S32 idx = openAndReadEntry(id, entry, true); // read or create
  51.189  	mHeaderMutex.unlock();
  51.190  
  51.191 +	if(idx < 0) // retry once
  51.192 +	{
  51.193 +		readHeaderCache(); // We couldn't write an entry, so refresh the LRU
  51.194 +
  51.195 +		mHeaderMutex.lock();
  51.196 +		idx = openAndReadEntry(id, entry, true);
  51.197 +		mHeaderMutex.unlock();
  51.198 +	}
  51.199 +
  51.200  	if (idx >= 0)
  51.201  	{
  51.202  		updateEntry(idx, entry, imagesize, datasize);				
  51.203  	}
  51.204 +	else
  51.205 +	{
  51.206 +		LL_WARNS() << "Failed to set cache entry for image: " << id << LL_ENDL;
  51.207 +		// We couldn't write to file, switch to read only mode and clear data
  51.208 +		setReadOnly(true);
  51.209 +		clearCorruptedCache(); // won't remove files due to "read only"
  51.210 +	}
  51.211  
  51.212 -	if(idx < 0) // retry
  51.213 -	{
  51.214 -		readHeaderCache(); // We couldn't write an entry, so refresh the LRU
  51.215 -	
  51.216 -		mHeaderMutex.lock();
  51.217 -		llassert_always(!mLRU.empty() || mHeaderEntriesInfo.mEntries < sCacheMaxEntries);
  51.218 -		mHeaderMutex.unlock();
  51.219 -
  51.220 -		idx = setHeaderCacheEntry(id, entry, imagesize, datasize); // assert above ensures no inf. recursion
  51.221 -	}
  51.222  	return idx;
  51.223  }
  51.224  
  51.225 @@ -1962,7 +1991,7 @@
  51.226  bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 discardlevel)
  51.227  {
  51.228  	//rescale image if needed
  51.229 -	if (raw.isNull() || !raw->getData())
  51.230 +	if (raw.isNull() || raw->isBufferInvalid() || !raw->getData())
  51.231  	{
  51.232  		LL_ERRS() << "Attempted to write NULL raw image to fastcache" << LL_ENDL;
  51.233  		return false;
    52.1 --- a/indra/newview/lltexturefetch.cpp	Tue Nov 21 09:46:31 2017 -0800
    52.2 +++ b/indra/newview/lltexturefetch.cpp	Mon Dec 11 10:09:44 2017 -0800
    52.3 @@ -1890,11 +1890,10 @@
    52.4  
    52.5  			if (mDecodedDiscard < 0)
    52.6  			{
    52.7 -				LL_DEBUGS(LOG_TXT) << mID << ": Failed to Decode." << LL_ENDL;
    52.8  				if (mCachedSize > 0 && !mInLocalCache && mRetryAttempt == 0)
    52.9  				{
   52.10  					// Cache file should be deleted, try again
   52.11 - 					LL_WARNS(LOG_TXT) << mID << ": Decode of cached file failed (removed), retrying" << LL_ENDL;
   52.12 + 					LL_DEBUGS(LOG_TXT) << mID << ": Decode of cached file failed (removed), retrying" << LL_ENDL;
   52.13  					llassert_always(mDecodeHandle == 0);
   52.14  					mFormattedImage = NULL;
   52.15  					++mRetryAttempt;
   52.16 @@ -1904,7 +1903,7 @@
   52.17  				}
   52.18  				else
   52.19  				{
   52.20 -// 					LL_WARNS(LOG_TXT) << "UNABLE TO LOAD TEXTURE: " << mID << " RETRIES: " << mRetryAttempt << LL_ENDL;
   52.21 +					LL_DEBUGS(LOG_TXT) << "Failed to Decode image " << mID << " after " << mRetryAttempt << " retries" << LL_ENDL;
   52.22  					setState(DONE); // failed
   52.23  				}
   52.24  			}
    53.1 --- a/indra/newview/lltoolmorph.cpp	Tue Nov 21 09:46:31 2017 -0800
    53.2 +++ b/indra/newview/lltoolmorph.cpp	Mon Dec 11 10:09:44 2017 -0800
    53.3 @@ -162,8 +162,16 @@
    53.4  	// Calling LLCharacter version, as we don't want position/height changes to cause the avatar to jump
    53.5  	// up and down when we're doing preview renders. -Nyx
    53.6  	gAgentAvatarp->LLCharacter::updateVisualParams();
    53.7 -	gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable);
    53.8 -	gAgentAvatarp->updateLOD();
    53.9 +
   53.10 +	if (gAgentAvatarp->mDrawable.notNull())
   53.11 +	{
   53.12 +		gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable);
   53.13 +		gAgentAvatarp->updateLOD();
   53.14 +	}
   53.15 +	else
   53.16 +	{
   53.17 +		LL_WARNS() << "Attempting to update avatar's geometry, but drawable doesn't exist yet" << LL_ENDL;
   53.18 +	}
   53.19  
   53.20  	LLViewerDynamicTexture::preRender(clear_depth);
   53.21  }
    54.1 --- a/indra/newview/llviewerdisplay.cpp	Tue Nov 21 09:46:31 2017 -0800
    54.2 +++ b/indra/newview/llviewerdisplay.cpp	Mon Dec 11 10:09:44 2017 -0800
    54.3 @@ -441,6 +441,7 @@
    54.4  			gAgent.setTeleportMessage(
    54.5  				LLAgent::sTeleportProgressMessages["requesting"]);
    54.6  			gViewerWindow->setProgressString(LLAgent::sTeleportProgressMessages["requesting"]);
    54.7 +			gViewerWindow->setProgressMessage(gAgent.mMOTD);
    54.8  			break;
    54.9  
   54.10  		case LLAgent::TELEPORT_REQUESTED:
   54.11 @@ -518,6 +519,7 @@
   54.12  		}
   54.13  		
   54.14  		gViewerWindow->setProgressPercent( percent_done );
   54.15 +		gViewerWindow->setProgressMessage(std::string());
   54.16  	}
   54.17  	else
   54.18  	if (gRestoreGL)
   54.19 @@ -539,6 +541,7 @@
   54.20  			
   54.21  			gViewerWindow->setProgressPercent( percent_done );
   54.22  		}
   54.23 +		gViewerWindow->setProgressMessage(std::string());
   54.24  	}
   54.25  
   54.26  	//////////////////////////
    55.1 --- a/indra/newview/llviewerinventory.cpp	Tue Nov 21 09:46:31 2017 -0800
    55.2 +++ b/indra/newview/llviewerinventory.cpp	Mon Dec 11 10:09:44 2017 -0800
    55.3 @@ -60,7 +60,9 @@
    55.4  #include "llappearancemgr.h"
    55.5  #include "llcommandhandler.h"
    55.6  #include "llviewermessage.h"
    55.7 +#include "llpanelmaininventory.h"
    55.8  #include "llsidepanelappearance.h"
    55.9 +#include "llsidepanelinventory.h"
   55.10  #include "llavatarnamecache.h"
   55.11  #include "llavataractions.h"
   55.12  #include "lllogininstance.h"
   55.13 @@ -248,6 +250,20 @@
   55.14  			return true;
   55.15  		}
   55.16  
   55.17 +		if (params[0].asString() == "filters")
   55.18 +		{
   55.19 +			LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
   55.20 +			if (sidepanel_inventory)
   55.21 +			{
   55.22 +				LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
   55.23 +				if (main_inventory)
   55.24 +				{
   55.25 +					main_inventory->toggleFindOptions();
   55.26 +				}
   55.27 +			}
   55.28 +			return true;
   55.29 +		}
   55.30 +
   55.31  		// otherwise, we need a UUID and a verb...
   55.32  		if (params.size() < 2) 
   55.33  		{
    56.1 --- a/indra/newview/llviewermessage.cpp	Tue Nov 21 09:46:31 2017 -0800
    56.2 +++ b/indra/newview/llviewermessage.cpp	Mon Dec 11 10:09:44 2017 -0800
    56.3 @@ -5664,7 +5664,8 @@
    56.4  		args["NAME"] = source_slurl;
    56.5  		is_name_group = is_source_group;
    56.6  		name_id = source_id;
    56.7 -		if (!reason.empty())
    56.8 +
    56.9 +		if (!reason.empty() && !LLMuteList::getInstance()->isMuted(source_id))
   56.10  		{
   56.11  			message = LLTrans::getString("paid_you_ldollars" + gift_suffix, args);
   56.12  		}
   56.13 @@ -7258,7 +7259,7 @@
   56.14  	gAgent.sendReliableMessage();
   56.15  }
   56.16  
   56.17 -
   56.18 +// Deprecated in favor of cap "UserInfo"
   56.19  void process_user_info_reply(LLMessageSystem* msg, void**)
   56.20  {
   56.21  	LLUUID agent_id;
   56.22 @@ -7276,7 +7277,8 @@
   56.23  	std::string dir_visibility;
   56.24  	msg->getString( "UserData", "DirectoryVisibility", dir_visibility);
   56.25  
   56.26 -	LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email);
   56.27 +    // For Message based user info information the is_verified is assumed to be false.
   56.28 +	LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, false);   
   56.29  	LLFloaterSnapshot::setAgentEmail(email);
   56.30  }
   56.31  
    57.1 --- a/indra/newview/llviewerobject.cpp	Tue Nov 21 09:46:31 2017 -0800
    57.2 +++ b/indra/newview/llviewerobject.cpp	Mon Dec 11 10:09:44 2017 -0800
    57.3 @@ -2214,7 +2214,9 @@
    57.4  		LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mesgsys->getSender());
    57.5  		if (cdp)
    57.6  		{
    57.7 -			F32 ping_delay = 0.5f * time_dilation * ( ((F32)cdp->getPingDelay().valueInUnits<LLUnits::Seconds>()) + gFrameDTClamped);
    57.8 +			// Note: delay is U32 and usually less then second,
    57.9 +			// converting it into seconds with valueInUnits will result in 0
   57.10 +			F32 ping_delay = 0.5f * time_dilation * ( ((F32)cdp->getPingDelay().value()) * 0.001f + gFrameDTClamped);
   57.11  			LLVector3 diff = getVelocity() * ping_delay; 
   57.12  			new_pos_parent += diff;
   57.13  		}
    58.1 --- a/indra/newview/llviewerregion.cpp	Tue Nov 21 09:46:31 2017 -0800
    58.2 +++ b/indra/newview/llviewerregion.cpp	Mon Dec 11 10:09:44 2017 -0800
    58.3 @@ -2896,6 +2896,7 @@
    58.4  	capabilityNames.append("UpdateScriptAgent");
    58.5  	capabilityNames.append("UpdateScriptTask");
    58.6  	capabilityNames.append("UploadBakedTexture");
    58.7 +    capabilityNames.append("UserInfo");
    58.8  	capabilityNames.append("ViewerAsset"); 
    58.9  	capabilityNames.append("ViewerMetrics");
   58.10  	capabilityNames.append("ViewerStartAuction");
    59.1 --- a/indra/newview/llviewerstats.cpp	Tue Nov 21 09:46:31 2017 -0800
    59.2 +++ b/indra/newview/llviewerstats.cpp	Mon Dec 11 10:09:44 2017 -0800
    59.3 @@ -445,8 +445,6 @@
    59.4  	
    59.5  	LLViewerStats::instance().getRecording().pause();
    59.6  
    59.7 -	body["session_id"] = gAgentSessionID;
    59.8 -	
    59.9  	LLSD &agent = body["agent"];
   59.10  	
   59.11  	time_t ltime;
   59.12 @@ -600,9 +598,13 @@
   59.13  	
   59.14  	body["MinimalSkin"] = false;
   59.15  
   59.16 +	LL_INFOS("LogViewerStatsPacket") << "Sending viewer statistics: " << body << LL_ENDL;
   59.17 +
   59.18 +	// The session ID token must never appear in logs
   59.19 +	body["session_id"] = gAgentSessionID;
   59.20 +
   59.21  	LLViewerStats::getInstance()->addToMessage(body);
   59.22  
   59.23 -	LL_INFOS("LogViewerStatsPacket") << "Sending viewer statistics: " << body << LL_ENDL;
   59.24      LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, body,
   59.25          "Statistics posted to sim", "Failed to post statistics to sim");
   59.26  	LLViewerStats::instance().getRecording().resume();
    60.1 --- a/indra/newview/llviewertexteditor.h	Tue Nov 21 09:46:31 2017 -0800
    60.2 +++ b/indra/newview/llviewertexteditor.h	Mon Dec 11 10:09:44 2017 -0800
    60.3 @@ -71,7 +71,8 @@
    60.4  		mObjectID = object_id;
    60.5  		mPreviewID = preview_id;
    60.6  	}
    60.7 -	
    60.8 +	void setNotecardObjectID(const LLUUID& object_id){ mObjectID = object_id;}
    60.9 +
   60.10  	void setASCIIEmbeddedText(const std::string& instr);
   60.11  	void setEmbeddedText(const std::string& instr);
   60.12  	std::string getEmbeddedText();
    61.1 --- a/indra/newview/llviewerwindow.cpp	Tue Nov 21 09:46:31 2017 -0800
    61.2 +++ b/indra/newview/llviewerwindow.cpp	Mon Dec 11 10:09:44 2017 -0800
    61.3 @@ -4381,6 +4381,8 @@
    61.4  	else
    61.5  		pick_type = LLFilePicker::FFSAVE_ALL; // ???
    61.6  	
    61.7 +	BOOL is_snapshot_name_loc_set = isSnapshotLocSet();
    61.8 +
    61.9  	// Get a base file location if needed.
   61.10  	if (force_picker || !isSnapshotLocSet())
   61.11  	{
   61.12 @@ -4429,7 +4431,12 @@
   61.13  		filepath = sSnapshotDir;
   61.14  		filepath += gDirUtilp->getDirDelimiter();
   61.15  		filepath += sSnapshotBaseName;
   61.16 -		filepath += llformat("_%.3d",i);
   61.17 +
   61.18 +		if (is_snapshot_name_loc_set)
   61.19 +		{
   61.20 +			filepath += llformat("_%.3d",i);
   61.21 +		}		
   61.22 +
   61.23  		filepath += extension;
   61.24  
   61.25  		llstat stat_info;
    62.1 --- a/indra/newview/llvoavatar.cpp	Tue Nov 21 09:46:31 2017 -0800
    62.2 +++ b/indra/newview/llvoavatar.cpp	Mon Dec 11 10:09:44 2017 -0800
    62.3 @@ -2085,7 +2085,17 @@
    62.4  			if(!facep->getVertexBuffer())
    62.5  			{
    62.6  				buff = new LLVertexBufferAvatar();
    62.7 -				buff->allocateBuffer(num_vertices, num_indices, TRUE);
    62.8 +				if (!buff->allocateBuffer(num_vertices, num_indices, TRUE))
    62.9 +				{
   62.10 +					LL_WARNS() << "Failed to allocate Vertex Buffer for Mesh to "
   62.11 +						<< num_vertices << " vertices and "
   62.12 +						<< num_indices << " indices" << LL_ENDL;
   62.13 +					// Attempt to create a dummy triangle (one vertex, 3 indices, all 0)
   62.14 +					facep->setSize(1, 3);
   62.15 +					buff->allocateBuffer(1, 3, true);
   62.16 +					memset((U8*) buff->getMappedData(), 0, buff->getSize());
   62.17 +					memset((U8*) buff->getMappedIndices(), 0, buff->getIndicesSize());
   62.18 +				}
   62.19  				facep->setVertexBuffer(buff);
   62.20  			}
   62.21  			else
   62.22 @@ -2097,7 +2107,15 @@
   62.23  				}
   62.24  				else
   62.25  				{
   62.26 -					buff->resizeBuffer(num_vertices, num_indices);
   62.27 +					if (!buff->resizeBuffer(num_vertices, num_indices))
   62.28 +					{
   62.29 +						LL_WARNS() << "Failed to allocate vertex buffer for Mesh, Substituting" << LL_ENDL;
   62.30 +						// Attempt to create a dummy triangle (one vertex, 3 indices, all 0)
   62.31 +						facep->setSize(1, 3);
   62.32 +						buff->resizeBuffer(1, 3);
   62.33 +						memset((U8*) buff->getMappedData(), 0, buff->getSize());
   62.34 +						memset((U8*) buff->getMappedIndices(), 0, buff->getIndicesSize());
   62.35 +					}
   62.36  				}
   62.37  			}
   62.38  			
   62.39 @@ -2109,20 +2127,24 @@
   62.40  				LL_ERRS() << "non-zero geom index: " << facep->getGeomIndex() << " in LLVOAvatar::restoreMeshData" << LL_ENDL;
   62.41  			}
   62.42  
   62.43 -			for(S32 k = j ; k < part_index ; k++)
   62.44 -			{
   62.45 -				bool rigid = false;
   62.46 -				if (k == MESH_ID_EYEBALL_LEFT ||
   62.47 -					k == MESH_ID_EYEBALL_RIGHT)
   62.48 -				{ //eyeballs can't have terse updates since they're never rendered with
   62.49 -					//the hardware skinning shader
   62.50 -					rigid = true;
   62.51 -				}
   62.52 +			if (num_vertices == buff->getNumVerts() && num_indices == buff->getNumIndices())
   62.53 +			{
   62.54 +				for(S32 k = j ; k < part_index ; k++)
   62.55 +				{
   62.56 +					bool rigid = false;
   62.57 +					if (k == MESH_ID_EYEBALL_LEFT ||
   62.58 +						k == MESH_ID_EYEBALL_RIGHT)
   62.59 +					{
   62.60 +						//eyeballs can't have terse updates since they're never rendered with
   62.61 +						//the hardware skinning shader
   62.62 +						rigid = true;
   62.63 +					}
   62.64  				
   62.65 -				LLViewerJoint* mesh = getViewerJoint(k);
   62.66 -				if (mesh)
   62.67 -				{
   62.68 -					mesh->updateFaceData(facep, mAdjustedPixelArea, k == MESH_ID_HAIR, terse_update && !rigid);
   62.69 +					LLViewerJoint* mesh = getViewerJoint(k);
   62.70 +					if (mesh)
   62.71 +					{
   62.72 +						mesh->updateFaceData(facep, mAdjustedPixelArea, k == MESH_ID_HAIR, terse_update && !rigid);
   62.73 +					}
   62.74  				}
   62.75  			}
   62.76  
   62.77 @@ -7025,7 +7047,7 @@
   62.78  	record["elapsed"] = elapsed;
   62.79  	record["completed"] = completed;
   62.80  	U32 grid_x(0), grid_y(0);
   62.81 -	if (getRegion())
   62.82 +	if (getRegion() && LLWorld::instance().isRegionListed(getRegion()))
   62.83  	{
   62.84  		record["central_bake_version"] = LLSD::Integer(getRegion()->getCentralBakeVersion());
   62.85  		grid_from_region_handle(getRegion()->getHandle(), &grid_x, &grid_y);
    63.1 --- a/indra/newview/llvoground.cpp	Tue Nov 21 09:46:31 2017 -0800
    63.2 +++ b/indra/newview/llvoground.cpp	Mon Dec 11 10:09:44 2017 -0800
    63.3 @@ -94,7 +94,12 @@
    63.4  	{
    63.5  		face->setSize(5, 12);
    63.6  		LLVertexBuffer* buff = new LLVertexBuffer(LLDrawPoolGround::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
    63.7 -		buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE);
    63.8 +		if (!buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE))
    63.9 +		{
   63.10 +			LL_WARNS() << "Failed to allocate Vertex Buffer for VOGround to "
   63.11 +				<< face->getGeomCount() << " vertices and "
   63.12 +				<< face->getIndicesCount() << " indices" << LL_ENDL;
   63.13 +		}
   63.14  		face->setGeomIndex(0);
   63.15  		face->setIndicesIndex(0);
   63.16  		face->setVertexBuffer(buff);
    64.1 --- a/indra/newview/llvopartgroup.cpp	Tue Nov 21 09:46:31 2017 -0800
    64.2 +++ b/indra/newview/llvopartgroup.cpp	Mon Dec 11 10:09:44 2017 -0800
    64.3 @@ -61,7 +61,15 @@
    64.4  	//TODO: optimize out binormal mask here.  Specular and normal coords as well.
    64.5  	sVB = new LLVertexBuffer(VERTEX_DATA_MASK | LLVertexBuffer::MAP_TANGENT | LLVertexBuffer::MAP_TEXCOORD1 | LLVertexBuffer::MAP_TEXCOORD2, GL_STREAM_DRAW_ARB);
    64.6  	U32 count = LL_MAX_PARTICLE_COUNT;
    64.7 -	sVB->allocateBuffer(count*4, count*6, true);
    64.8 +	if (!sVB->allocateBuffer(count*4, count*6, true))
    64.9 +	{
   64.10 +		LL_WARNS() << "Failed to allocate Vertex Buffer to "
   64.11 +			<< count*4 << " vertices and "
   64.12 +			<< count * 6 << " indices" << LL_ENDL;
   64.13 +		// we are likelly to crash at following getTexCoord0Strider(), so unref and return
   64.14 +		sVB = NULL;
   64.15 +		return;
   64.16 +	}
   64.17  
   64.18  	//indices and texcoords are always the same, set once
   64.19  	LLStrider<U16> indicesp;
   64.20 @@ -764,7 +772,7 @@
   64.21  	addGeometryCount(group, vertex_count, index_count);
   64.22  	
   64.23  
   64.24 -	if (vertex_count > 0 && index_count > 0)
   64.25 +	if (vertex_count > 0 && index_count > 0 && LLVOPartGroup::sVB)
   64.26  	{ 
   64.27  		group->mBuilt = 1.f;
   64.28  		//use one vertex buffer for all groups
    65.1 --- a/indra/newview/llvosky.cpp	Tue Nov 21 09:46:31 2017 -0800
    65.2 +++ b/indra/newview/llvosky.cpp	Mon Dec 11 10:09:44 2017 -0800
    65.3 @@ -1462,7 +1462,12 @@
    65.4  	{
    65.5  		facep->setSize(4, 6);	
    65.6  		LLVertexBuffer* buff = new LLVertexBuffer(LLDrawPoolSky::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
    65.7 -		buff->allocateBuffer(facep->getGeomCount(), facep->getIndicesCount(), TRUE);
    65.8 +		if (!buff->allocateBuffer(facep->getGeomCount(), facep->getIndicesCount(), TRUE))
    65.9 +		{
   65.10 +			LL_WARNS() << "Failed to allocate Vertex Buffer for vosky to "
   65.11 +				<< facep->getGeomCount() << " vertices and "
   65.12 +				<< facep->getIndicesCount() << " indices" << LL_ENDL;
   65.13 +		}
   65.14  		facep->setGeomIndex(0);
   65.15  		facep->setIndicesIndex(0);
   65.16  		facep->setVertexBuffer(buff);
   65.17 @@ -1869,7 +1874,12 @@
   65.18  	{
   65.19  		face->setSize(quads * 4, quads * 6);
   65.20  		LLVertexBuffer* buff = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
   65.21 -		buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE);
   65.22 +		if (!buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE))
   65.23 +		{
   65.24 +			LL_WARNS() << "Failed to allocate Vertex Buffer for vosky to "
   65.25 +				<< face->getGeomCount() << " vertices and "
   65.26 +				<< face->getIndicesCount() << " indices" << LL_ENDL;
   65.27 +		}
   65.28  		face->setIndicesIndex(0);
   65.29  		face->setGeomIndex(0);
   65.30  		face->setVertexBuffer(buff);
    66.1 --- a/indra/newview/llvotree.cpp	Tue Nov 21 09:46:31 2017 -0800
    66.2 +++ b/indra/newview/llvotree.cpp	Mon Dec 11 10:09:44 2017 -0800
    66.3 @@ -525,7 +525,14 @@
    66.4  		}
    66.5  
    66.6  		mReferenceBuffer = new LLVertexBuffer(LLDrawPoolTree::VERTEX_DATA_MASK, 0);
    66.7 -		mReferenceBuffer->allocateBuffer(max_vertices, max_indices, TRUE);
    66.8 +		if (!mReferenceBuffer->allocateBuffer(max_vertices, max_indices, TRUE))
    66.9 +		{
   66.10 +			LL_WARNS() << "Failed to allocate Vertex Buffer on update to "
   66.11 +				<< max_vertices << " vertices and "
   66.12 +				<< max_indices << " indices" << LL_ENDL;
   66.13 +			mReferenceBuffer = NULL; //unref
   66.14 +			return TRUE;
   66.15 +		}
   66.16  
   66.17  		LLStrider<LLVector3> vertices;
   66.18  		LLStrider<LLVector3> normals;
   66.19 @@ -883,7 +890,21 @@
   66.20  	LLFace* facep = mDrawable->getFace(0);
   66.21  	if (!facep) return;
   66.22  	LLVertexBuffer* buff = new LLVertexBuffer(LLDrawPoolTree::VERTEX_DATA_MASK, GL_STATIC_DRAW_ARB);
   66.23 -	buff->allocateBuffer(vert_count, index_count, TRUE);
   66.24 +	if (!buff->allocateBuffer(vert_count, index_count, TRUE))
   66.25 +	{
   66.26 +		LL_WARNS() << "Failed to allocate Vertex Buffer on mesh update to "
   66.27 +			<< vert_count << " vertices and "
   66.28 +			<< index_count << " indices" << LL_ENDL;
   66.29 +		buff->allocateBuffer(1, 3, true);
   66.30 +		memset((U8*)buff->getMappedData(), 0, buff->getSize());
   66.31 +		memset((U8*)buff->getMappedIndices(), 0, buff->getIndicesSize());
   66.32 +		facep->setSize(1, 3);
   66.33 +		facep->setVertexBuffer(buff);
   66.34 +		mReferenceBuffer->flush();
   66.35 +		buff->flush();
   66.36 +		return;
   66.37 +	}
   66.38 +
   66.39  	facep->setVertexBuffer(buff);
   66.40  	
   66.41  	LLStrider<LLVector3> vertices;
    67.1 --- a/indra/newview/llvovolume.cpp	Tue Nov 21 09:46:31 2017 -0800
    67.2 +++ b/indra/newview/llvovolume.cpp	Mon Dec 11 10:09:44 2017 -0800
    67.3 @@ -5638,18 +5638,25 @@
    67.4  		}
    67.5  
    67.6  		//create vertex buffer
    67.7 -		LLVertexBuffer* buffer = NULL;
    67.8 +		LLPointer<LLVertexBuffer> buffer;
    67.9  
   67.10  		{
   67.11  			LL_RECORD_BLOCK_TIME(FTM_GEN_DRAW_INFO_ALLOCATE);
   67.12  			buffer = createVertexBuffer(mask, buffer_usage);
   67.13 -			buffer->allocateBuffer(geom_count, index_count, TRUE);
   67.14 -		}
   67.15 -
   67.16 -		group->mGeometryBytes += buffer->getSize() + buffer->getIndicesSize();
   67.17 -
   67.18 -
   67.19 -		buffer_map[mask][*face_iter].push_back(buffer);
   67.20 +			if(!buffer->allocateBuffer(geom_count, index_count, TRUE))
   67.21 +			{
   67.22 +				LL_WARNS() << "Failed to allocate group Vertex Buffer to "
   67.23 +					<< geom_count << " vertices and "
   67.24 +					<< index_count << " indices" << LL_ENDL;
   67.25 +				buffer = NULL;
   67.26 +			}
   67.27 +		}
   67.28 +
   67.29 +		if (buffer)
   67.30 +		{
   67.31 +			group->mGeometryBytes += buffer->getSize() + buffer->getIndicesSize();
   67.32 +			buffer_map[mask][*face_iter].push_back(buffer);
   67.33 +		}
   67.34  
   67.35  		//add face geometry
   67.36  
   67.37 @@ -5657,8 +5664,17 @@
   67.38  		U16 index_offset = 0;
   67.39  
   67.40  		while (face_iter < i)
   67.41 -		{ //update face indices for new buffer
   67.42 +		{
   67.43 +			//update face indices for new buffer
   67.44  			facep = *face_iter;
   67.45 +			if (buffer.isNull())
   67.46 +			{
   67.47 +				// Bulk allocation failed
   67.48 +				facep->setVertexBuffer(buffer);
   67.49 +				facep->setSize(0, 0); // mark as no geometry
   67.50 +				++face_iter;
   67.51 +				continue;
   67.52 +			}
   67.53  			facep->setIndicesIndex(indices_index);
   67.54  			facep->setGeomIndex(index_offset);
   67.55  			facep->setVertexBuffer(buffer);	
   67.56 @@ -5983,7 +5999,10 @@
   67.57  			++face_iter;
   67.58  		}
   67.59  
   67.60 -		buffer->flush();
   67.61 +		if (buffer)
   67.62 +		{
   67.63 +			buffer->flush();
   67.64 +		}
   67.65  	}
   67.66  
   67.67  	group->mBufferMap[mask].clear();
    68.1 --- a/indra/newview/llvowater.cpp	Tue Nov 21 09:46:31 2017 -0800
    68.2 +++ b/indra/newview/llvowater.cpp	Mon Dec 11 10:09:44 2017 -0800
    68.3 @@ -155,14 +155,22 @@
    68.4  	if (!buff || !buff->isWriteable())
    68.5  	{
    68.6  		buff = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_DYNAMIC_DRAW_ARB);
    68.7 -		buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE);
    68.8 +		if (!buff->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE))
    68.9 +		{
   68.10 +			LL_WARNS() << "Failed to allocate Vertex Buffer on water update to "
   68.11 +				<< face->getGeomCount() << " vertices and "
   68.12 +				<< face->getIndicesCount() << " indices" << LL_ENDL;
   68.13 +		}
   68.14  		face->setIndicesIndex(0);
   68.15  		face->setGeomIndex(0);
   68.16  		face->setVertexBuffer(buff);
   68.17  	}
   68.18  	else
   68.19  	{
   68.20 -		buff->resizeBuffer(face->getGeomCount(), face->getIndicesCount());
   68.21 +		if (!buff->resizeBuffer(face->getGeomCount(), face->getIndicesCount()))
   68.22 +		{
   68.23 +			LL_WARNS() << "Failed to resize Vertex Buffer" << LL_ENDL;
   68.24 +		}
   68.25  	}
   68.26  		
   68.27  	index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
    69.1 --- a/indra/newview/llvowlsky.cpp	Tue Nov 21 09:46:31 2017 -0800
    69.2 +++ b/indra/newview/llvowlsky.cpp	Mon Dec 11 10:09:44 2017 -0800
    69.3 @@ -313,7 +313,12 @@
    69.4  #if DOME_SLICES
    69.5  	{
    69.6  		mFanVerts = new LLVertexBuffer(LLDrawPoolWLSky::SKY_VERTEX_DATA_MASK, GL_STATIC_DRAW_ARB);
    69.7 -		mFanVerts->allocateBuffer(getFanNumVerts(), getFanNumIndices(), TRUE);
    69.8 +		if (!mFanVerts->allocateBuffer(getFanNumVerts(), getFanNumIndices(), TRUE))
    69.9 +		{
   69.10 +			LL_WARNS() << "Failed to allocate Vertex Buffer on sky update to "
   69.11 +				<< getFanNumVerts() << " vertices and "
   69.12 +				<< getFanNumIndices() << " indices" << LL_ENDL;
   69.13 +		}
   69.14  
   69.15  		BOOL success = mFanVerts->getVertexStrider(vertices)
   69.16  			&& mFanVerts->getTexCoord0Strider(texCoords)
   69.17 @@ -375,7 +380,12 @@
   69.18  			const U32 num_indices_this_seg = 1+num_stacks_this_seg*(2+2*verts_per_stack);
   69.19  			llassert(num_indices_this_seg * sizeof(U16) <= max_buffer_bytes);
   69.20  
   69.21 -			segment->allocateBuffer(num_verts_this_seg, num_indices_this_seg, TRUE);
   69.22 +			if (!segment->allocateBuffer(num_verts_this_seg, num_indices_this_seg, TRUE))
   69.23 +			{
   69.24 +				LL_WARNS() << "Failed to allocate Vertex Buffer on update to "
   69.25 +					<< num_verts_this_seg << " vertices and "
   69.26 +					<< num_indices_this_seg << " indices" << LL_ENDL;
   69.27 +			}
   69.28  
   69.29  			// lock the buffer
   69.30  			BOOL success = segment->getVertexStrider(vertices)
   69.31 @@ -777,7 +787,10 @@
   69.32  	if (mStarsVerts.isNull() || !mStarsVerts->isWriteable())
   69.33  	{
   69.34  		mStarsVerts = new LLVertexBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK, GL_DYNAMIC_DRAW);
   69.35 -		mStarsVerts->allocateBuffer(getStarsNumVerts()*6, 0, TRUE);
   69.36 +		if (!mStarsVerts->allocateBuffer(getStarsNumVerts()*6, 0, TRUE))
   69.37 +		{
   69.38 +			LL_WARNS() << "Failed to allocate Vertex Buffer for Sky to " << getStarsNumVerts() * 6 << " vertices" << LL_ENDL;
   69.39 +		}
   69.40  	}
   69.41   
   69.42  	BOOL success = mStarsVerts->getVertexStrider(verticesp)
    70.1 --- a/indra/newview/pipeline.cpp	Tue Nov 21 09:46:31 2017 -0800
    70.2 +++ b/indra/newview/pipeline.cpp	Mon Dec 11 10:09:44 2017 -0800
    70.3 @@ -3903,7 +3903,14 @@
    70.4  	}
    70.5  	
    70.6  	//flush particle VB
    70.7 -	LLVOPartGroup::sVB->flush();
    70.8 +	if (LLVOPartGroup::sVB)
    70.9 +	{
   70.10 +		LLVOPartGroup::sVB->flush();
   70.11 +	}
   70.12 +	else
   70.13 +	{
   70.14 +		LL_WARNS_ONCE() << "Missing particle buffer" << LL_ENDL;
   70.15 +	}
   70.16  
   70.17  	/*bool use_transform_feedback = gTransformPositionProgram.mProgramObject && !mMeshDirtyGroup.empty();
   70.18  
    71.1 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
    71.2 +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
    71.3 @@ -433,13 +433,10 @@
    71.4  			<panel.string name="estate_override">
    71.5  				Eine oder mehrere dieser Optionen gelten auf Grundbesitzebene
    71.6  			</panel.string>
    71.7 -			<check_box label="Öffentlichen Zugang gestatten (bei Deaktivierung dieser Option werden Bannlinien generiert)" name="public_access"/>
    71.8 -			<text name="Only Allow" width="400">
    71.9 -				Zugang nur Einwohnern gestatten, die:
   71.10 -			</text>
   71.11 -			<check_box label="Zahlungsinformationen hinterlegt haben [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Um diese Parzelle besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
   71.12 -			<check_box label="Sind mindestens 18 Jahre alt [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diese Parzelle betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
   71.13 -			<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
   71.14 +			<check_box label="Alle Besucher sind zugelassen (Bei Deaktivierung dieser Option werden Bannlinien generiert)" name="public_access"/>
   71.15 +			<check_box label="Muss 18+ sein [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diese Parzelle betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
   71.16 +			<check_box label="Muss über Zahlungsinfo in Datei [ESTATE_PAYMENT_LIMIT] verfügen" name="limit_payment" tool_tip="Um diese Parzelle besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
   71.17 +			<check_box label="Gruppe [GROUP] ohne Beschränkungen zulassen" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
   71.18  			<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
   71.19  			<combo_box name="pass_combo">
   71.20  				<combo_box.item label="Jeden" name="Anyone"/>
   71.21 @@ -447,9 +444,12 @@
   71.22  			</combo_box>
   71.23  			<spinner label="Preis in L$:" name="PriceSpin"/>
   71.24  			<spinner label="Online-Zeit:" name="HoursSpin"/>
   71.25 +			<text name="OwnerLimited">
   71.26 +				(Der Grundbesitzer kann diese Auswahl eingeschränkt haben)
   71.27 +			</text>
   71.28  			<panel name="Allowed_layout_panel">
   71.29  				<text label="Immer erlauben" name="AllowedText">
   71.30 -					Zulässige Einwohner ([COUNT], max. [MAX])
   71.31 +					Immer zulässig ([COUNT], max. [MAX])
   71.32  				</text>
   71.33  				<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
   71.34  				<button label="Hinzufügen" name="add_allowed"/>
   71.35 @@ -457,7 +457,7 @@
   71.36  			</panel>
   71.37  			<panel name="Banned_layout_panel">
   71.38  				<text label="Verbannen" name="BanCheck">
   71.39 -					Verbannte Einwohner ([COUNT], max. [MAX])
   71.40 +					Immer verbannt ([COUNT], max. [MAX])
   71.41  				</text>
   71.42  				<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
   71.43  				<button label="Hinzufügen" name="add_banned"/>
    72.1 --- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
    72.2 +++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
    72.3 @@ -3,6 +3,9 @@
    72.4  	<floater.string name="not_found">
    72.5  		„[TEXT]“ nicht gefunden
    72.6  	</floater.string>
    72.7 +	<floater.string name="not_found_text">
    72.8 +		Einwohner nicht gefunden.
    72.9 +	</floater.string>
   72.10  	<floater.string name="no_one_near">
   72.11  		Keiner in der Nähe
   72.12  	</floater.string>
    73.1 --- a/indra/newview/skins/default/xui/de/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
    73.2 +++ b/indra/newview/skins/default/xui/de/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
    73.3 @@ -7,5 +7,6 @@
    73.4  	<name_list name="render_settings_list">
    73.5  		<name_list.columns label="Name" name="name"/>
    73.6  		<name_list.columns label="Darstellungseinstellung" name="setting"/>
    73.7 +		<name_list.columns label="Hinzugefügt am" name="timestamp"/>
    73.8  	</name_list>
    73.9  </floater>
    74.1 --- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
    74.2 +++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
    74.3 @@ -15,6 +15,8 @@
    74.4  	<button label="Alle" label_selected="Alle" name="All"/>
    74.5  	<button label="Keine" label_selected="Keine" name="None"/>
    74.6  	<check_box label="Ordner immer anzeigen" name="check_show_empty"/>
    74.7 +	<check_box label="Von mir erstellt" name="check_created_by_me"/>
    74.8 +	<check_box label="Von anderen erstellt" name="check_created_by_others"/>
    74.9  	<check_box label="Seit Abmeldung" name="check_since_logoff"/>
   74.10  	<text name="- OR -">
   74.11  		- ODER -
    75.1 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
    75.2 +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
    75.3 @@ -1,5 +1,5 @@
    75.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    75.5 -<floater name="floater_pathfinding_linksets" title="Pathfinding-Linksets">
    75.6 +<floater name="floater_pathfinding_linksets" title="REGIONSOBJEKTE">
    75.7  	<floater.string name="messaging_get_inprogress">
    75.8  		Pathfinding-Linksets werden abgerufen...
    75.9  	</floater.string>
   75.10 @@ -16,7 +16,7 @@
   75.11  		Keine Pathfinding-Linksets.
   75.12  	</floater.string>
   75.13  	<floater.string name="messaging_complete_available">
   75.14 -		[NUM_SELECTED] Linksets von [NUM_TOTAL] ausgewählt.
   75.15 +		[NUM_SELECTED] von [NUM_TOTAL] ausgewählt.
   75.16  	</floater.string>
   75.17  	<floater.string name="messaging_not_enabled">
   75.18  		Pathfinding ist in dieser Region nicht aktiviert.
   75.19 @@ -118,7 +118,7 @@
   75.20  			<scroll_list.columns label="Geskriptet" name="scripted"/>
   75.21  			<scroll_list.columns label="Belastung" name="land_impact"/>
   75.22  			<scroll_list.columns label="Abstand" name="dist_from_you"/>
   75.23 -			<scroll_list.columns label="Linkset-Nutzung" name="linkset_use"/>
   75.24 +			<scroll_list.columns label="Pathfinding verwenden" name="linkset_use"/>
   75.25  			<scroll_list.columns label="A %" name="a_percent"/>
   75.26  			<scroll_list.columns label="B %" name="b_percent"/>
   75.27  			<scroll_list.columns label="C %" name="c_percent"/>
   75.28 @@ -133,7 +133,7 @@
   75.29  	</panel>
   75.30  	<panel name="pathfinding_linksets_actions">
   75.31  		<text name="linksets_actions_label">
   75.32 -			Aktionen für ausgewählte Linksets (wenn ein Linkset aus der Welt entfernt wird, gehen seine Attribute u. U. verloren):
   75.33 +			Aktionen für Auswahl
   75.34  		</text>
   75.35  		<check_box label="Beacon anzeigen" name="show_beacon"/>
   75.36  		<button label="Nehmen" name="take_objects"/>
   75.37 @@ -144,7 +144,7 @@
   75.38  	</panel>
   75.39  	<panel name="pathfinding_linksets_attributes">
   75.40  		<text name="linksets_attributes_label">
   75.41 -			Bearbeiten Sie die Attribute ausgewählter Linksets und klicken Sie auf die Schaltfläche, um die änderungen zu übernehmen
   75.42 +			Pathfinding-Attribute bearbeiten
   75.43  		</text>
   75.44  		<text name="walkability_coefficients_label">
   75.45  			Begehbarkeit:
    76.1 --- a/indra/newview/skins/default/xui/de/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
    76.2 +++ b/indra/newview/skins/default/xui/de/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
    76.3 @@ -6,13 +6,16 @@
    76.4  	<floater.string name="loading_url">
    76.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Wird geladen %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3EServicebedingungen%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
    76.6  	</floater.string>
    76.7 -	<button label="Weiter" label_selected="Weiter" name="Continue"/>
    76.8 -	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
    76.9 -	<check_box label="Ich stimme den Servicebedingungen und Datenschutzbestimmungen zu." name="agree_chk"/>
   76.10  	<text name="tos_heading">
   76.11 -		Lesen Sie die folgenden Servicebedingungen und Datenbestimmungen sorgfältig durch. Sie müssen den Servicebedingungen zustimmen, um sich bei [SECOND_LIFE] anmelden zu können.
   76.12 +		Bitte lesen Sie die Allgemeinen Geschäftsbedingungen, die Datenschutzrichtlinie und die Servicebedingungen von Second Life inklusive der Anforderungen zur Anwendung von Schiedsverfahren sowie zum Verzicht auf jegliche Klassen- oder Gruppenansprüche zur Beilegung von Streitigkeiten. Um sich weiterhin bei [SECOND_LIFE] anmelden zu können, müssen Sie diese Bedingungen akzeptieren.
   76.13  	</text>
   76.14  	<text name="external_tos_required">
   76.15  		Sie müssen sich unter https://my.secondlife.com anmelden und die Servicebedingungen akzeptieren, bevor Sie fortfahren können. Vielen Dank!
   76.16  	</text>
   76.17 +	<check_box label="Ich habe die" name="agree_chk"/>
   76.18 +	<text name="agree_list">
   76.19 +		Allgemeinen Geschäftsbedingungen, die Datenschutzrichtlinie sowie die Servicebedingungen inklusive der Anforderungen zur Streitschlichtung gelesen und akzeptiere diese.
   76.20 +	</text>
   76.21 +	<button label="Weiter" label_selected="Weiter" name="Continue"/>
   76.22 +	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
   76.23  </floater>
    77.1 --- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
    77.2 +++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
    77.3 @@ -21,6 +21,7 @@
    77.4  		<menu_item_check label="Standard" name="RenderNormally"/>
    77.5  		<menu_item_check label="Immer" name="AlwaysRenderFully"/>
    77.6  		<menu_item_check label="Nie" name="DoNotRender"/>
    77.7 +		<menu_item_call label="Ausnahmen..." name="RenderExceptions"/>
    77.8  	</context_menu>
    77.9  	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
   77.10  </context_menu>
    78.1 --- a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
    78.2 +++ b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
    78.3 @@ -1,8 +1,14 @@
    78.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    78.5 -<menu name="Avatar Icon Menu">
    78.6 +<toggleable_menu name="Avatar Icon Menu">
    78.7  	<menu_item_call label="Profil anzeigen" name="Show Profile"/>
    78.8  	<menu_item_call label="IM senden..." name="Send IM"/>
    78.9  	<menu_item_call label="Teleport anfordern" name="Request Teleport"/>
   78.10  	<menu_item_call label="Freund hinzufügen..." name="Add Friend"/>
   78.11  	<menu_item_call label="Freund entfernen..." name="Remove Friend"/>
   78.12 -</menu>
   78.13 +	<context_menu label="Moderationsoptionen" name="Moderator Options">
   78.14 +		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
   78.15 +		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
   78.16 +		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
   78.17 +	</context_menu>
   78.18 +	<menu_item_call label="Mitglied verbannen" name="BanMember"/>
   78.19 +</toggleable_menu>
    79.1 --- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
    79.2 +++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
    79.3 @@ -20,6 +20,7 @@
    79.4  		<menu_item_check label="Standard" name="RenderNormally"/>
    79.5  		<menu_item_check label="Immer" name="AlwaysRenderFully"/>
    79.6  		<menu_item_check label="Nie" name="DoNotRender"/>
    79.7 +		<menu_item_call label="Ausnahmen..." name="RenderExceptions"/>
    79.8  	</context_menu>
    79.9  	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
   79.10  </context_menu>
    80.1 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
    80.2 +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
    80.3 @@ -75,10 +75,12 @@
    80.4  	<menu_item_call label="Eigenschaften" name="Properties"/>
    80.5  	<menu_item_call label="Umbenennen" name="Rename"/>
    80.6  	<menu_item_call label="Asset-UUID kopieren" name="Copy Asset UUID"/>
    80.7 +	<menu_item_call label="Im Hauptfeld anzeigen" name="Show in Main Panel"/>
    80.8  	<menu_item_call label="Ausschneiden" name="Cut"/>
    80.9  	<menu_item_call label="Kopieren" name="Copy"/>
   80.10  	<menu_item_call label="Einfügen" name="Paste"/>
   80.11  	<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
   80.12 +	<menu_item_call label="Links ersetzen" name="Replace Links"/>
   80.13  	<menu_item_call label="Löschen" name="Delete"/>
   80.14  	<menu_item_call label="Systemordner löschen" name="Delete System Folder"/>
   80.15  	<menu_item_call label="Konferenz-Chat starten" name="Conference Chat Folder"/>
    81.1 --- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
    81.2 +++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
    81.3 @@ -13,5 +13,6 @@
    81.4  	<menu_item_call label="Teilen" name="Share"/>
    81.5  	<menu_item_call label="Original suchen" name="Find Original"/>
    81.6  	<menu_item_call label="Alle Links suchen" name="Find All Links"/>
    81.7 +	<menu_item_call label="Links ersetzen" name="Replace Links"/>
    81.8  	<menu_item_call label="Papierkorb ausleeren" name="empty_trash"/>
    81.9  </toggleable_menu>
    82.1 --- a/indra/newview/skins/default/xui/de/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
    82.2 +++ b/indra/newview/skins/default/xui/de/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
    82.3 @@ -2,6 +2,7 @@
    82.4  <menu_bar name="Login Menu">
    82.5  	<menu label="Ich" name="File">
    82.6  		<menu_item_call label="Einstellungen..." name="Preferences..."/>
    82.7 +		<menu_item_call label="Fenster schließen" name="Close Window"/>
    82.8  		<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
    82.9  		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
   82.10  	</menu>
    83.1 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
    83.2 +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
    83.3 @@ -121,7 +121,7 @@
    83.4  			<menu_item_call label="Nächsten Teil oder nächste Fläche einschließen" name="Include Next Part or Face"/>
    83.5  			<menu_item_call label="Vorherigen Teil oder vorherige Fläche einschließen" name="Include Previous Part or Face"/>
    83.6  		</menu>
    83.7 -		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
    83.8 +		<menu_item_call label="Regionsobjekte" name="pathfinding_linkset_menu_item"/>
    83.9  		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
   83.10  		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
   83.11  		<menu label="Objekt" name="Object">
   83.12 @@ -141,7 +141,7 @@
   83.13  			<menu_item_call label="Skripts auf nicht ausführen einstellen" name="Set Scripts to Not Running"/>
   83.14  		</menu>
   83.15  		<menu label="Pathfinding" name="Pathfinding">
   83.16 -			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
   83.17 +			<menu_item_call label="Regionsobjekte" name="pathfinding_linksets_menu_item"/>
   83.18  			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
   83.19  			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
   83.20  			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
    84.1 --- a/indra/newview/skins/default/xui/de/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
    84.2 +++ b/indra/newview/skins/default/xui/de/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
    84.3 @@ -3,6 +3,10 @@
    84.4  	<global name="skipnexttime">
    84.5  		Nicht mehr anzeigen
    84.6  	</global>
    84.7 +	<global name="skipnexttimesessiononly">
    84.8 +		Nicht mehr anzeigen 
    84.9 +(während der aktuellen Sitzung)
   84.10 +	</global>
   84.11  	<global name="alwayschoose">
   84.12  		Diese Option immer auswählen
   84.13  	</global>
   84.14 @@ -349,7 +353,7 @@
   84.15  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Beitreten"/>
   84.16  	</notification>
   84.17  	<notification name="JoinGroupNoCost">
   84.18 -		Sie treten der Gruppe [NAME] bei.
   84.19 +		Sie treten der Gruppe &lt;nolink&gt;[NAME]&lt;/nolink&gt; bei. 
   84.20  Fortfahren?
   84.21  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Beitreten"/>
   84.22  	</notification>
   84.23 @@ -363,6 +367,40 @@
   84.24  Bitte laden Sie innerhalb von 48 Stunden Mitglieder in Ihre Gruppe ein.
   84.25  		<usetemplate canceltext="Abbrechen" name="okcancelbuttons" notext="Abbrechen" yestext="Gruppe für 100 L$ erstellen"/>
   84.26  	</notification>
   84.27 +	<notification name="JoinGroupInaccessible">
   84.28 +		Diese Gruppe ist für Sie nicht verfügbar.
   84.29 +		<usetemplate name="okbutton" yestext="OK"/>
   84.30 +	</notification>
   84.31 +	<notification name="JoinGroupError">
   84.32 +		Fehler bei der Verarbeitung Ihrer Anfrage zur Gruppenmitgliedschaft.
   84.33 +		<usetemplate name="okbutton" yestext="OK"/>
   84.34 +	</notification>
   84.35 +	<notification name="JoinGroupErrorReason">
   84.36 +		Beitritt zur Gruppe nicht möglich: [reason]
   84.37 +		<usetemplate name="okbutton" yestext="OK"/>
   84.38 +	</notification>
   84.39 +	<notification name="JoinGroupTrialUser">
   84.40 +		Leider können Testbenutzer keinen Gruppen beitreten.
   84.41 +		<usetemplate name="okbutton" yestext="OK"/>
   84.42 +	</notification>
   84.43 +	<notification name="JoinGroupMaxGroups">
   84.44 +		Sie können &quot;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&quot; nicht beitreten: 
   84.45 +Sie sind bereits Mitglied in [group_count] Gruppen, die maximale zulässige Anzahl beträgt [max_groups]
   84.46 +		<usetemplate name="okbutton" yestext="OK"/>
   84.47 +	</notification>
   84.48 +	<notification name="JoinGroupClosedEnrollment">
   84.49 +		Sie können &quot;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&quot; nicht beitreten: 
   84.50 +Die Gruppe steht für freie Registrierungen nicht mehr zur Verfügung.
   84.51 +		<usetemplate name="okbutton" yestext="OK"/>
   84.52 +	</notification>
   84.53 +	<notification name="JoinGroupSuccess">
   84.54 +		Sie wurden der Gruppe hinzugefügt.
   84.55 +		<usetemplate name="okbutton" yestext="OK"/>
   84.56 +	</notification>
   84.57 +	<notification name="JoinGroupInsufficientFunds">
   84.58 +		Die erforderliche L$ [membership_fee] Mitgliedschaftsgebühr kann nicht übertragen werden.
   84.59 +		<usetemplate name="okbutton" yestext="OK"/>
   84.60 +	</notification>
   84.61  	<notification name="LandBuyPass">
   84.62  		Sie können dieses Land („[PARCEL_NAME]“) für [COST] L$
   84.63  [TIME] Stunden lang betreten.  Pass kaufen?
   84.64 @@ -385,9 +423,9 @@
   84.65  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
   84.66  	</notification>
   84.67  	<notification name="ReturnObjectsDeededToGroup">
   84.68 -		Möchten Sie alle Ihre Objekte auf dieser Parzelle, die der Gruppe „[NAME]“ gehören, zurück in das jeweilige Inventar ihrer vorherigen Eigentümer transferieren?
   84.69 +		Möchten Sie alle Ihre Objekte auf dieser Parzelle, die gemeinsam mit der Gruppe &quot;&lt;nolink&gt;[NAME]&lt;/nolink&gt;&quot; verwendet werden, zurück in das Inventar ihrer vorherigen Eigentümer transferieren? 
   84.70  
   84.71 -*WARNUNG* Alle nicht transferierbaren Objekte, die der Gruppe übertragen wurden, werden dabei gelöscht!
   84.72 +*WARNUNG* Hierdurch werden alle nicht transferierbaren Objekte gelöscht, die der Gruppe übertragen wurden. 
   84.73  
   84.74  Objekte: [N]
   84.75  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
   84.76 @@ -431,7 +469,7 @@
   84.77  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
   84.78  	</notification>
   84.79  	<notification name="ReturnObjectsNotOwnedByGroup">
   84.80 -		Objekte auf dieser Parzelle, die von der Gruppe [NAME] nicht gemeinsam genutzt werden, an ihre Eigentümer zurückgeben?
   84.81 +		Möchten Sie die Objekte auf dieser Parzelle, die NICHT gemeinsam mit der Gruppe &lt;nolink&gt;[NAME]&lt;/nolink&gt; verwendet werden, an ihre Eigentümer zurückgeben? 
   84.82  
   84.83  Objekte: [N]
   84.84  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
   84.85 @@ -479,7 +517,7 @@
   84.86  		Ein Report-Screenshot konnte aus folgendem Grund nicht hochgeladen werden: [REASON]
   84.87  	</notification>
   84.88  	<notification name="MustAgreeToLogIn">
   84.89 -		Bevor Sie sich in [SECOND_LIFE] anmelden können, müssen Sie den Nutzungsbedingungen zustimmen.
   84.90 +		Bevor Sie sich weiterhin in [SECOND_LIFE] anmelden können, müssen Sie den Allgemeinen Geschäftsbedingungen, der Datenschutzrichtlinien sowie den Servicebedingungen zustimmen.
   84.91  	</notification>
   84.92  	<notification name="CouldNotPutOnOutfit">
   84.93  		Outfit konnte nicht angezogen werden.
   84.94 @@ -732,7 +770,7 @@
   84.95  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Hinauswerfen"/>
   84.96  	</notification>
   84.97  	<notification name="EjectAvatarFromGroup">
   84.98 -		Sie haben [AVATAR_NAME] aus der Gruppe [GROUP_NAME] geworfen.
   84.99 +		Sie haben [AVATAR_NAME] aus der Gruppe &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt; entfernt.
  84.100  	</notification>
  84.101  	<notification name="AcquireErrorTooManyObjects">
  84.102  		FEHLER: Zu viele Objekte ausgewählt.
  84.103 @@ -1336,19 +1374,18 @@
  84.104  Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.
  84.105  	</notification>
  84.106  	<notification name="DeedLandToGroup">
  84.107 -		Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt.
  84.108 -Dem Eigentümer wird der Kaufpreis für das Land nicht rückerstattet. Bei Verkauf der übertragenen Parzelle wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
  84.109 +		Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt. 
  84.110 +Dem Eigentümer wird der Kaufpreis für das Land nicht zurückerstattet. Bei einem Verkauf der übertragenen Parzelle wird der Erlös zu gleichen Teilen unter den Gruppenmitgliedern aufgeteilt. 
  84.111  
  84.112 -Der Gruppe „[GROUP_NAME]“
  84.113 - [AREA] m² Land schenken?
  84.114 +Der Gruppe &quot;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&quot; diese [AREA] m² Land schenken?
  84.115  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
  84.116  	</notification>
  84.117  	<notification name="DeedLandToGroupWithContribution">
  84.118 -		Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt.
  84.119 -Die Schenkung beinhaltet eine Landübertragung an die Gruppe von „[NAME]“.
  84.120 -Dem Eigentümer wird der Kaufpreis für das Land nicht rückerstattet. Bei Verkauf der übertragenen Parzelle wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
  84.121 +		Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt. 
  84.122 +Die Schenkung beinhaltet eine Landübertragung an die Gruppe von &quot;[NAME]&quot;. 
  84.123 +Dem Eigentümer wird der Kaufpreis für das Land nicht zurückerstattet. Bei einem Verkauf der übertragenen Parzelle wird der Erlös zu gleichen Teilen unter den Gruppenmitgliedern aufgeteilt. 
  84.124  
  84.125 -Der Gruppe „[GROUP_NAME]“ [AREA] m² an Land schenken?
  84.126 +Der Gruppe &quot;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&quot; diese [AREA] m² Land schenken?
  84.127  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
  84.128  	</notification>
  84.129  	<notification name="DisplaySetToSafe">
  84.130 @@ -1759,7 +1796,7 @@
  84.131  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
  84.132  	</notification>
  84.133  	<notification name="GroupDepart">
  84.134 -		Sie haben die Gruppe „[group_name]“ verlassen.
  84.135 +		Sie haben die Gruppe &quot;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&quot; verlassen.
  84.136  	</notification>
  84.137  	<notification name="OwnerCannotLeaveGroup">
  84.138  		Sie können die Gruppe nicht verlassen, da Sie der letzte Besitzer der Gruppe sind. Weisen Sie die Besitzerrolle zuerst einem anderen Mitglied zu.
  84.139 @@ -2032,6 +2069,10 @@
  84.140  		Möchten Sie den Grundbesitzvertrag wirklich ändern?
  84.141  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
  84.142  	</notification>
  84.143 +	<notification name="EstateParcelAccessOverride">
  84.144 +		Durch Deaktivieren dieser Option können Einstellungen der Parzellenbesitzer zum Schutz vor Belästigungen, zur Aufrechterhaltung der Privatsphäre oder zum Schutz von Minderjährigen vor nicht altersgemäßen Inhalten aufgehoben werden. Bitte sprechen Sie mit den Parzellenbesitzern, falls erforderlich.
  84.145 +		<usetemplate name="okbutton" yestext="OK"/>
  84.146 +	</notification>
  84.147  	<notification name="RegionEntryAccessBlocked">
  84.148  		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
  84.149  		<usetemplate name="okbutton" yestext="OK"/>
  84.150 @@ -2373,7 +2414,17 @@
  84.151  	</notification>
  84.152  	<notification name="DeleteItems">
  84.153  		[QUESTION]
  84.154 -		<usetemplate ignoretext="Vor dem Löschen von Objekten bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
  84.155 +		<form name="form">
  84.156 +			<ignore name="ignore" text="Vor dem Löschen von Objekten bestätigen"/>
  84.157 +			<button name="Yes" text="OK"/>
  84.158 +			<button name="No" text="Abbrechen"/>
  84.159 +		</form>
  84.160 +	</notification>
  84.161 +	<notification name="DeleteFilteredItems">
  84.162 +		Ihr Inventar wird zur Zeit gefiltert, und nicht alle Objekte, die gelöscht werden sollen, sind momentan sichtbar. 
  84.163 +
  84.164 +Möchten Sie diese Objekte wirklich löschen?
  84.165 +		<usetemplate ignoretext="Vor dem Löschen gefilterter Objekte bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
  84.166  	</notification>
  84.167  	<notification name="ConfirmUnlink">
  84.168  		Dies ist eine große Auswahl mit Linksets. Wenn Sie die Verknüpfung auflösen, kann sie möglicherweise nicht erneut hergestellt werden. Als Vorsichtsmaßnahme empfiehlt es sich, Kopien von Linksets in Ihr Inventar aufzunehmen.
  84.169 @@ -2449,13 +2500,17 @@
  84.170  		Der Ordner „[FOLDERNAME]“ ist ein Systemordner. Das Löschen von Systemordnern kann zu instabiler Leistung führen.  Möchten Sie fortfahren?
  84.171  		<usetemplate ignoretext="Bestätigen, bevor ich einen Systemordner lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
  84.172  	</notification>
  84.173 +	<notification name="PurgeSelectedItems">
  84.174 +		[COUNT] Objekt(e) wird/werden dauerhaft gelöscht. Möchten Sie das/die ausgewählte(n) Objekt(e) wirklich dauerhaft aus dem Papierkorb löschen?
  84.175 +		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
  84.176 +	</notification>
  84.177  	<notification name="ConfirmEmptyTrash">
  84.178 -		Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs löschen möchten?
  84.179 -		<usetemplate ignoretext="Bestätigen, bevor der Ordner Papierkorb im Inventar geleert wird" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
  84.180 +		[COUNT] Objekte werden dauerhaft gelöscht. Möchten Sie den Inhalt Ihres Papierkorbs wirklich dauerhaft löschen?
  84.181 +		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
  84.182  	</notification>
  84.183  	<notification name="TrashIsFull">
  84.184  		Ihr Papierkorb läuft über. Dies kann zu Anmeldeproblemen führen.
  84.185 -		<usetemplate name="okcancelbuttons" notext="Papierkorb später leeren" yestext="Papierkorb jetzt leeren"/>
  84.186 +		<usetemplate name="okcancelbuttons" notext="Papierkorb später leeren" yestext="Papierkorb ansehen"/>
  84.187  	</notification>
  84.188  	<notification name="ConfirmClearBrowserCache">
  84.189  		Sind Sie sicher, dass Sie Ihren Reise-, Internet- und Suchverlauf löschen möchten?
  84.190 @@ -2584,6 +2639,9 @@
  84.191  	<notification name="AddSelfFriend">
  84.192  		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
  84.193  	</notification>
  84.194 +	<notification name="AddSelfRenderExceptions">
  84.195 +		Sie können sich nicht selbst der Rendering-Ausnahmeliste hinzufügen.
  84.196 +	</notification>
  84.197  	<notification name="UploadingAuctionSnapshot">
  84.198  		In-Welt- und Website-Fotos werden hochgeladen...
  84.199  (Dauert ca. 5 Minuten.)
  84.200 @@ -2777,9 +2835,9 @@
  84.201  		Alle Objekte auf der ausgewählten Parzelle, die Einwohner &apos;[NAME]&apos; gehören, wurden an ihren Eigentümern zurückgegeben.
  84.202  	</notification>
  84.203  	<notification name="GroupObjectsReturned">
  84.204 -		Die mit der Gruppe [GROUPNAME] gemeinsam genutzten Objekte auf dieser Parzelle wurden in das Inventar ihrer Eigentümer transferiert.
  84.205 -Transferierbare übertragene Objekte wurden an ihre früheren Eigentümer zurückgegeben.
  84.206 -Nicht transferierbare an die Gruppe übertragene Objekte wurden gelöscht.
  84.207 +		Die mit der Gruppe &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; gemeinsam verwendeten Objekte auf dieser Parzelle wurden zurück in das Inventar ihrer Eigentümer transferiert.
  84.208 +Transferierbare, an die Gruppe übertragene Objekte wurden an ihre früheren Eigentümer zurückgegeben.
  84.209 +Nicht transferierbare, an die Gruppe übertragene Objekte wurden gelöscht.
  84.210  	</notification>
  84.211  	<notification name="UnOwnedObjectsReturned">
  84.212  		Alle Objekte auf der ausgewählten Parzelle, die NICHT Ihnen gehören, wurden ihren Eigentümern zurückgegeben.
  84.213 @@ -3164,7 +3222,7 @@
  84.214  		</form>
  84.215  	</notification>
  84.216  	<notification name="ScriptDialogGroup">
  84.217 -		„&lt;nolink&gt;[TITLE]&lt;/nolink&gt;“ von [GROUPNAME]
  84.218 +		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;s &quot;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&quot; 
  84.219  [MESSAGE]
  84.220  		<form name="form">
  84.221  			<button name="Client_Side_Mute" text="Blockieren"/>
  84.222 @@ -3212,8 +3270,8 @@
  84.223  		[NAME] wurde ein Inventarobjekt angeboten und wird nicht länger ignoriert.
  84.224  	</notification>
  84.225  	<notification name="VoiceInviteGroup">
  84.226 -		[NAME] ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten.
  84.227 -Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Gespräch beizutreten, oder auf  &apos;Ablehnen &apos;, um die Einladung auszuschlagen. Klicken Sie auf Ignorieren, um diesen Anrufer zu ignorieren.
  84.228 +		[NAME] ist einem Voice-Chat mit der Gruppe &lt;nolink&gt;[GROUP]&lt;/nolink&gt; beigetreten. 
  84.229 +Klicken Sie auf „Annehmen“, um die Einladung zu akzeptieren, oder auf „Ablehnen“, um die Einladung nicht zu akzeptieren. Klicken Sie auf „Ignorieren“, um diesen Anrufer zu ignorieren.
  84.230  		<form name="form">
  84.231  			<button name="Accept" text="Akzeptieren"/>
  84.232  			<button name="Decline" text="Ablehnen"/>
  84.233 @@ -3321,6 +3379,9 @@
  84.234  	<notification name="AppearanceToXMLFailed">
  84.235  		Fehler beim Speichern des Erscheinungsbilds als XML.
  84.236  	</notification>
  84.237 +	<notification name="SnapshotToComputerFailed">
  84.238 +		Fehler beim Speichern des Bildes unter [PATH]: Zu wenig Speicherplatz auf dem Medium. [NEED_MEMORY]KB werden benötigt, es stehen jedoch nur [FREE_MEMORY]KB zur Verfügung.
  84.239 +	</notification>
  84.240  	<notification name="PresetNotSaved">
  84.241  		Fehler beim Speichern der Voreinstellung [NAME].
  84.242  	</notification>
  84.243 @@ -3358,9 +3419,14 @@
  84.244  	<notification name="ShareNotification">
  84.245  		Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten.
  84.246  	</notification>
  84.247 +	<notification name="MeshUploadErrorDetails">
  84.248 +		[LABEL] konnte nicht hochgeladen werden: [MESSAGE]
  84.249 +[DETAILS]Siehe SecondLife.log für weitere Details
  84.250 +	</notification>
  84.251  	<notification name="MeshUploadError">
  84.252 -		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER]
  84.253 -[DETAILS]Details finden Sie in SecondLife.log.
  84.254 +		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] 
  84.255 +			
  84.256 +Siehe SecondLife.log für weitere Details
  84.257  	</notification>
  84.258  	<notification name="MeshUploadPermError">
  84.259  		Fehler beim Anfordern der Berechtigungen zum Hochladen des Netzes
    85.1 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
    85.2 +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
    85.3 @@ -12,10 +12,17 @@
    85.4  	<text name="ItemcountText">
    85.5  		Objekte:
    85.6  	</text>
    85.7 -	<filter_editor label="Inventar filtern" name="inventory search editor"/>
    85.8 +	<filter_editor label="Suchtext eingeben" name="inventory search editor"/>
    85.9 +	<combo_box name="search_type">
   85.10 +		<item label="Name" name="Name" value="search_by_name"/>
   85.11 +		<item label="Ersteller" name="Creator" value="search_by_creator"/>
   85.12 +		<item label="Beschreibung" name="Description" value="search_by_description"/>
   85.13 +		<item label="UUID" name="UUID" value="search_by_UUID"/>
   85.14 +	</combo_box>
   85.15  	<tab_container name="inventory filter tabs">
   85.16  		<inventory_panel label="MEIN INVENTAR" name="All Items"/>
   85.17  		<recent_inventory_panel label="AKTUELL" name="Recent Items"/>
   85.18 +		<inventory_panel label="GETRAGEN" name="Worn Items"/>
   85.19  	</tab_container>
   85.20  	<layout_stack name="bottom_panel">
   85.21  		<layout_panel name="options_gear_btn_panel">
    86.1 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml	Tue Nov 21 09:46:31 2017 -0800
    86.2 +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml	Mon Dec 11 10:09:44 2017 -0800
    86.3 @@ -6,7 +6,7 @@
    86.4  	<text name="Cache:">
    86.5  		Cache:
    86.6  	</text>
    86.7 -	<spinner label="Cache-Größe (256 – 9.984 MB)" name="cachesizespinner"/>
    86.8 +	<spinner label="Cachegröße (256 - 9984 MB)" name="cachesizespinner"/>
    86.9  	<text name="text_box5">
   86.10  		MB
   86.11  	</text>
    87.1 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml	Tue Nov 21 09:46:31 2017 -0800
    87.2 +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml	Mon Dec 11 10:09:44 2017 -0800
    87.3 @@ -1,5 +1,6 @@
    87.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    87.5  <panel label="Text-Chat" name="chat">
    87.6 +	<check_box initial_value="true" label="Automatische Gestenvervollständigung beim Chat in der Nähe" name="auto_complete_gestures"/>
    87.7  	<panel name="general_chat_settings">
    87.8  		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
    87.9  		<check_box label="IMs per E-Mail zustellen, wenn ich offline bin" name="send_im_to_email"/>
    88.1 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml	Tue Nov 21 09:46:31 2017 -0800
    88.2 +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml	Mon Dec 11 10:09:44 2017 -0800
    88.3 @@ -15,58 +15,34 @@
    88.4  	<text name="estate_owner">
    88.5  		(unbekannt)
    88.6  	</text>
    88.7 -	<text name="Only Allow">
    88.8 -		Zugang nur Einwohnern gestatten, die:
    88.9 -	</text>
   88.10 -	<check_box label="Zahlungsinformationen hinterlegt haben" name="limit_payment" tool_tip="Um diesen Grundbesitz besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
   88.11 -	<check_box label="Sind mindestens 18 Jahre alt" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diesen Grundbesitz betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
   88.12 +	<radio_group name="externally_visible_radio">
   88.13 +		<radio_item label="Nur nachstehend aufgelistete Einwohner und Gruppen zulassen" name="estate_restricted_access"/>
   88.14 +		<radio_item label="Alle Besucher zugelassen" name="estate_public_access"/>
   88.15 +	</radio_group>
   88.16 +	<check_box label="Muss 18+ sein" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diesen Grundbesitz betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
   88.17 +	<check_box label="Muss über Zahlungsinfo in Datei verfügen" name="limit_payment" tool_tip="Um diesen Grundbesitz besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
   88.18 +	<check_box label="Parzellenbesitzer können restriktiver sein" name="parcel_access_override"/>
   88.19  	<check_box label="Voice-Chat erlauben" name="voice_chat_check"/>
   88.20 -	<button label="?" name="voice_chat_help"/>
   88.21 -	<text name="abuse_email_text" width="222">
   88.22 -		E-Mail-Adresse für Missbrauchsmeldungen:
   88.23 -	</text>
   88.24 -	<string name="email_unsupported">
   88.25 -		Funktion nicht unterstützt
   88.26 -	</string>
   88.27 -	<button label=" ?" name="abuse_email_address_help"/>
   88.28 -	<button label="?" name="estate_manager_help"/>
   88.29 -	<button label="Hinzufügen..." name="add_estate_manager_btn"/>
   88.30 -	<button label="Entfernen..." name="remove_estate_manager_btn"/>
   88.31 -	<check_box label="Globale Zeit verwenden" name="use_global_time_check"/>
   88.32 -	<button label="?" name="use_global_time_help"/>
   88.33 -	<check_box label="Sonne fest" name="fixed_sun_check"/>
   88.34 -	<button label="?" name="fixed_sun_help"/>
   88.35 -	<slider label="Phase" name="sun_hour_slider"/>
   88.36 -	<check_box label="Freien Zugang erlauben" name="externally_visible_check"/>
   88.37 -	<button label="?" name="externally_visible_help"/>
   88.38  	<check_box label="Direktteleport zulassen" name="allow_direct_teleport"/>
   88.39 -	<button label="?" name="allow_direct_teleport_help"/>
   88.40 -	<text name="region_text_lbl">
   88.41 -		Zugang nach Zahlungsstatus verweigern:
   88.42 -	</text>
   88.43 -	<check_box label="Verweigern - keine archivierte Zahlungsinfo" name="deny_anonymous"/>
   88.44 -	<check_box label="Verweigern - Zahlungsinfo archiviert" name="deny_identified"/>
   88.45 -	<check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted"/>
   88.46  	<button label="Übernehmen" name="apply_btn"/>
   88.47  	<text name="estate_manager_label">
   88.48  		Grundbesitzsverwalter:
   88.49  	</text>
   88.50  	<text name="allow_resident_label">
   88.51 -		Zulässige Einwohner:
   88.52 +		Immer zugelassen:
   88.53  	</text>
   88.54 -	<button label="?" name="allow_resident_help"/>
   88.55 +	<button label="Hinzufügen..." name="add_estate_manager_btn"/>
   88.56 +	<button label="Entfernen..." name="remove_estate_manager_btn"/>
   88.57  	<button label="Hinzufügen..." name="add_allowed_avatar_btn"/>
   88.58  	<button label="Entfernen..." name="remove_allowed_avatar_btn"/>
   88.59  	<text name="allow_group_label">
   88.60 -		Zulässige Gruppen:
   88.61 +		Immer zugelassene Gruppen:
   88.62  	</text>
   88.63 -	<button label="?" name="allow_group_help"/>
   88.64 +	<text name="ban_resident_label">
   88.65 +		Immer verbannt:
   88.66 +	</text>
   88.67  	<button label="Hinzufügen..." name="add_allowed_group_btn"/>
   88.68  	<button label="Entfernen..." name="remove_allowed_group_btn"/>
   88.69 -	<text name="ban_resident_label">
   88.70 -		Verbannte Einwohner:
   88.71 -	</text>
   88.72 -	<button label="?" name="ban_resident_help"/>
   88.73  	<button label="Hinzufügen..." name="add_banned_avatar_btn"/>
   88.74  	<button label="Entfernen..." name="remove_banned_avatar_btn"/>
   88.75  	<button label="Nachricht an Grundbesitz" name="message_estate_btn"/>
    89.1 --- a/indra/newview/skins/default/xui/de/panel_tools_texture.xml	Tue Nov 21 09:46:31 2017 -0800
    89.2 +++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml	Mon Dec 11 10:09:44 2017 -0800
    89.3 @@ -26,6 +26,7 @@
    89.4  		<radio_item label="Unebenheit (normal)" name="Bumpiness (normal)" value="1"/>
    89.5  		<radio_item label="Glanzlicht (Spiegel)" name="Shininess (specular)" value="2"/>
    89.6  	</radio_group>
    89.7 +	<check_box initial_value="false" label="Aktualisierung sperren" name="checkbox_sync_settings" tool_tip="Alle Kartenaktualisierungen gleichzeitig durchführen"/>
    89.8  	<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
    89.9  	<text name="label alphamode">
   89.10  		Alpha-Modus
    90.1 --- a/indra/newview/skins/default/xui/de/role_actions.xml	Tue Nov 21 09:46:31 2017 -0800
    90.2 +++ b/indra/newview/skins/default/xui/de/role_actions.xml	Mon Dec 11 10:09:44 2017 -0800
    90.3 @@ -38,7 +38,7 @@
    90.4  		<action description="„Terrain bearbeiten“ zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle das Terrain bearbeiten, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist." name="land allow edit land" value="23"/>
    90.5  		<action description="„Fliegen“ zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle fliegen, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist." name="land allow fly" value="24"/>
    90.6  		<action description="„Objekte erstellen“ zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle Objekte erstellen, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist." name="land allow create" value="25"/>
    90.7 -		<action description="„Landmarke erstellen“ zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können für eine gruppeneigene Parzelle eine Landmarke erstellen, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist." name="land allow landmark" value="26"/>
    90.8 +		<action description="Landepunkt ignorieren" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können sich direkt zu einer gruppeneigenen Parzelle teleportieren, auch wenn eine Landmarke erstellen, selbst unter Land-Info &gt; Optionen ein Landepunkt definiert ist." name="land allow direct teleport" value="26"/>
    90.9  		<action description="„Hier als Zuhause wählen“ auf Gruppenland zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer an diese Gruppe übertragenen Parzelle die Funktion „Welt“ &gt; „Landmarken“ &gt; „Hier als Zuhause wählen“ verwenden." name="land allow set home" value="28"/>
   90.10  		<action description="Veranstaltung von Events auf Gruppenland zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Parzellen im Gruppenbesitz als Veranstaltungsorte für Events auswählen." name="land allow host event" value="41"/>
   90.11  	</action_set>
    91.1 --- a/indra/newview/skins/default/xui/de/strings.xml	Tue Nov 21 09:46:31 2017 -0800
    91.2 +++ b/indra/newview/skins/default/xui/de/strings.xml	Mon Dec 11 10:09:44 2017 -0800
    91.3 @@ -261,9 +261,8 @@
    91.4  [TIME] Pacific Time wieder verfügbar.
    91.5  	</string>
    91.6  	<string name="LoginFailedAccountDisabled">
    91.7 -		Ihre Anfrage kann derzeit nicht bearbeitet werden.
    91.8 -Wenden Sie sich unter http://secondlife.com/support an den Second Life-Support.
    91.9 -Wenn Sie Ihr Kennwort nicht ändern können, rufen Sie die US-Nummer (866) 476-9763 an.
   91.10 +		Ihre Anfrage kann derzeit nicht bearbeitet werden. 
   91.11 +Bitte wenden Sie sich unter http://secondlife.com/support an den Second Life-Support.
   91.12  	</string>
   91.13  	<string name="LoginFailedTransformError">
   91.14  		Nicht übereinstimmende Daten bei der Anmeldung festgestellt.
   91.15 @@ -704,6 +703,19 @@
   91.16  	<string name="AssetErrorUnknownStatus">
   91.17  		Status unbekannt
   91.18  	</string>
   91.19 +	<string name="AssetUploadServerUnreacheble">
   91.20 +		Dienst nicht verfügbar.
   91.21 +	</string>
   91.22 +	<string name="AssetUploadServerDifficulties">
   91.23 +		Auf dem Server sind unerwartete Probleme aufgetreten.
   91.24 +	</string>
   91.25 +	<string name="AssetUploadServerUnavaliable">
   91.26 +		Dienst nicht verfügbar oder Zeitüberschreitung beim Upload.
   91.27 +	</string>
   91.28 +	<string name="AssetUploadRequestInvalid">
   91.29 +		Fehler bei der Upload-Anforderung. Um das Problem zu lösen, 
   91.30 +besuchen Sie bitte http://secondlife.com/support
   91.31 +	</string>
   91.32  	<string name="texture">
   91.33  		Textur
   91.34  	</string>
   91.35 @@ -2198,10 +2210,19 @@
   91.36  		alle Grundbesitze, die Sie für [OWNER] verwalten
   91.37  	</string>
   91.38  	<string name="RegionInfoAllowedResidents">
   91.39 -		Zulässige Einwohner: ([ALLOWEDAGENTS], max [MAXACCESS])
   91.40 +		Immer zulässig: ([ALLOWEDAGENTS], max. [MAXACCESS])
   91.41  	</string>
   91.42  	<string name="RegionInfoAllowedGroups">
   91.43 -		Zulässige Gruppen: ([ALLOWEDGROUPS], max [MAXACCESS])
   91.44 +		Immer zugelassene Gruppen: ([ALLOWEDGROUPS], max. [MAXACCESS])
   91.45 +	</string>
   91.46 +	<string name="RegionInfoBannedResidents">
   91.47 +		Immer verbannt: ([BANNEDAGENTS], max. [MAXBANNED])
   91.48 +	</string>
   91.49 +	<string name="RegionInfoListTypeAllowedAgents">
   91.50 +		Immer zugelassen
   91.51 +	</string>
   91.52 +	<string name="RegionInfoListTypeBannedAgents">
   91.53 +		Immer verbannt
   91.54  	</string>
   91.55  	<string name="ScriptLimitsParcelScriptMemory">
   91.56  		Parzellenskript-Speicher
    92.1 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml	Tue Nov 21 09:46:31 2017 -0800
    92.2 +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml	Mon Dec 11 10:09:44 2017 -0800
    92.3 @@ -11,6 +11,12 @@
    92.4   single_instance="true"
    92.5   title="PREFERENCES"
    92.6   width="658">
    92.7 +    <floater.string
    92.8 +     name="email_unverified_tooltip">
    92.9 +        Please verify your email to enable IM to Email by visiting
   92.10 +https://accounts.secondlife.com/change_email/
   92.11 +    </floater.string>
   92.12 + 
   92.13     <button
   92.14       follows="right|bottom"
   92.15       height="23"
    93.1 --- a/indra/newview/skins/default/xui/en/strings.xml	Tue Nov 21 09:46:31 2017 -0800
    93.2 +++ b/indra/newview/skins/default/xui/en/strings.xml	Mon Dec 11 10:09:44 2017 -0800
    93.3 @@ -2289,6 +2289,7 @@
    93.4  
    93.5  	<!-- inventory -->
    93.6  	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
    93.7 +	<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>
    93.8  	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
    93.9  	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
   93.10  	<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
    94.1 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
    94.2 +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
    94.3 @@ -435,13 +435,10 @@
    94.4  			<panel.string name="estate_override">
    94.5  				Una o más de esta opciones está configurada a nivel del estado
    94.6  			</panel.string>
    94.7 -			<check_box label="Permitir el acceso público (si no seleccionas esta opción, se crearán líneas de prohibición)" name="public_access"/>
    94.8 -			<text name="Only Allow">
    94.9 -				Permitir únicamente el acceso a los Residentes que:
   94.10 -			</text>
   94.11 -			<check_box label="Han aportado información de pago [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Para poder acceder a esta parcela los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
   94.12 -			<check_box label="Son mayores de 18 años [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Para poder acceder a esta parcela los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
   94.13 -			<check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
   94.14 +			<check_box label="Cualquiera puede visitar (Si no seleccionas esta opción, se crearán líneas de prohibición)" name="public_access"/>
   94.15 +			<check_box label="Debe ser mayor de 18 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Para poder acceder a esta parcela los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
   94.16 +			<check_box label="Debe haber información archivada sobre el pago [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Para poder acceder a esta parcela los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
   94.17 +			<check_box label="Permitir grupo [GROUP] sin restricciones" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
   94.18  			<check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
   94.19  			<combo_box name="pass_combo">
   94.20  				<combo_box.item label="Cualquiera" name="Anyone"/>
   94.21 @@ -449,9 +446,12 @@
   94.22  			</combo_box>
   94.23  			<spinner label="Precio en L$:" name="PriceSpin"/>
   94.24  			<spinner label="Horas de acceso:" name="HoursSpin"/>
   94.25 +			<text name="OwnerLimited">
   94.26 +				(El propietario del Estado puede haber restringido estas opciones)
   94.27 +			</text>
   94.28  			<panel name="Allowed_layout_panel">
   94.29  				<text label="Always Allow" name="AllowedText">
   94.30 -					Residentes admitidos ([COUNT], máx. [MAX])
   94.31 +					Siempre permitido ([COUNT], max [MAX])
   94.32  				</text>
   94.33  				<name_list name="AccessList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
   94.34  				<button label="Añadir" name="add_allowed"/>
   94.35 @@ -459,7 +459,7 @@
   94.36  			</panel>
   94.37  			<panel name="Banned_layout_panel">
   94.38  				<text label="Ban" name="BanCheck">
   94.39 -					Residentes no admitidos ([COUNT], máx. [MAX])
   94.40 +					Siempre prohibido ([COUNT], max [MAX])
   94.41  				</text>
   94.42  				<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
   94.43  				<button label="Añadir" name="add_banned"/>
    95.1 --- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
    95.2 +++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
    95.3 @@ -3,6 +3,9 @@
    95.4  	<floater.string name="not_found">
    95.5  		No se ha encontrado &apos;[TEXT]&apos;
    95.6  	</floater.string>
    95.7 +	<floater.string name="not_found_text">
    95.8 +		No se ha encontrado el residente.
    95.9 +	</floater.string>
   95.10  	<floater.string name="no_one_near">
   95.11  		No hay nadie cerca
   95.12  	</floater.string>
    96.1 --- a/indra/newview/skins/default/xui/es/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
    96.2 +++ b/indra/newview/skins/default/xui/es/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
    96.3 @@ -7,5 +7,6 @@
    96.4  	<name_list name="render_settings_list">
    96.5  		<name_list.columns label="Nombre" name="name"/>
    96.6  		<name_list.columns label="Configuración de renderizado" name="setting"/>
    96.7 +		<name_list.columns label="Fecha de ingreso" name="timestamp"/>
    96.8  	</name_list>
    96.9  </floater>
    97.1 --- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
    97.2 +++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
    97.3 @@ -15,6 +15,8 @@
    97.4  	<button label="Todos" label_selected="Todo" name="All"/>
    97.5  	<button label="Ninguno" label_selected="Nada" name="None"/>
    97.6  	<check_box label="Mostrar siempre las carpetas" name="check_show_empty"/>
    97.7 +	<check_box label="Creado por mí" name="check_created_by_me"/>
    97.8 +	<check_box label="Creado por otros" name="check_created_by_others"/>
    97.9  	<check_box bottom_delta="-36" label="Desde el fin de sesión" name="check_since_logoff"/>
   97.10  	<text name="- OR -">
   97.11  		- o -
    98.1 --- a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
    98.2 +++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
    98.3 @@ -1,5 +1,5 @@
    98.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    98.5 -<floater name="floater_pathfinding_linksets" title="Linksets de pathfinding">
    98.6 +<floater name="floater_pathfinding_linksets" title="OBJETOS DE LA REGIÓN">
    98.7  	<floater.string name="messaging_get_inprogress">
    98.8  		Consultando los linksets de pathfinding...
    98.9  	</floater.string>
   98.10 @@ -16,7 +16,7 @@
   98.11  		No hay linksets de pathfinding.
   98.12  	</floater.string>
   98.13  	<floater.string name="messaging_complete_available">
   98.14 -		[NUM_SELECTED] linksets seleccionados de [NUM_TOTAL].
   98.15 +		[NUM_SELECTED] seleccionados de [NUM_TOTAL].
   98.16  	</floater.string>
   98.17  	<floater.string name="messaging_not_enabled">
   98.18  		En esta región no está permitido el pathfinding.
   98.19 @@ -118,7 +118,7 @@
   98.20  			<scroll_list.columns label="Con scripts" name="scripted"/>
   98.21  			<scroll_list.columns label="Impacto" name="land_impact"/>
   98.22  			<scroll_list.columns label="Distancia" name="dist_from_you"/>
   98.23 -			<scroll_list.columns label="Utilización de linkset" name="linkset_use"/>
   98.24 +			<scroll_list.columns label="Uso de Pathfinding" name="linkset_use"/>
   98.25  			<scroll_list.columns label="A %" name="a_percent"/>
   98.26  			<scroll_list.columns label="B %" name="b_percent"/>
   98.27  			<scroll_list.columns label="C %" name="c_percent"/>
   98.28 @@ -133,7 +133,7 @@
   98.29  	</panel>
   98.30  	<panel name="pathfinding_linksets_actions">
   98.31  		<text name="linksets_actions_label">
   98.32 -			Acciones aplicadas a los linksets seleccionados (si se elimina un linkset de Second Life, podrían perderse sus atributos):
   98.33 +			Acciones en los elementos seleccionados
   98.34  		</text>
   98.35  		<check_box label="Mostrar baliza" name="show_beacon"/>
   98.36  		<button label="Tomar" name="take_objects"/>
   98.37 @@ -144,7 +144,7 @@
   98.38  	</panel>
   98.39  	<panel name="pathfinding_linksets_attributes">
   98.40  		<text name="linksets_attributes_label">
   98.41 -			Modifica los atributos de los linksets seleccionados y pulsa el botón para aplicar los cambios
   98.42 +			Modificar atributos de pathfinding
   98.43  		</text>
   98.44  		<text name="walkability_coefficients_label">
   98.45  			Transitabilidad:
    99.1 --- a/indra/newview/skins/default/xui/es/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
    99.2 +++ b/indra/newview/skins/default/xui/es/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
    99.3 @@ -6,13 +6,16 @@
    99.4  	<floater.string name="loading_url">
    99.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Cargando %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3Elas%20Condiciones%20del%20servicio%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
    99.6  	</floater.string>
    99.7 -	<button label="Continuar" label_selected="Continuar" name="Continue"/>
    99.8 -	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
    99.9 -	<check_box label="Acepto las Condiciones del servicio y la Política de privacidad" name="agree_chk"/>
   99.10  	<text name="tos_heading">
   99.11 -		Por favor, lee detenidamente las siguientes Condiciones del servicio y Política de privacidad. Debes aceptar el acuerdo para poder iniciar sesión en [SECOND_LIFE].
   99.12 +		Por favor, leer los Términos y Condiciones, la Política de privacidad y las Condiciones del servicio de Second Life, incluyendo el uso de arbitraje cuando fuera necesario y toda clase de renuncia o reclamos grupales para resolver disputas. Para poder iniciar sesión en [SECOND_LIFE], debes aceptar estos términos.
   99.13  	</text>
   99.14  	<text name="external_tos_required">
   99.15  		Para poder proseguir, debes iniciar sesión en https://my.secondlife.com y aceptar las Condiciones del servicio. Gracias.
   99.16  	</text>
   99.17 +	<check_box label="He leído y acepto" name="agree_chk"/>
   99.18 +	<text name="agree_list">
   99.19 +		los Términos y Condiciones, la Política de privacidad y las Condiciones del servicio de Second Life, incluyendo los requerimientos para resolver disputas.
   99.20 +	</text>
   99.21 +	<button label="Continuar" label_selected="Continuar" name="Continue"/>
   99.22 +	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
   99.23  </floater>
   100.1 --- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
   100.2 +++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
   100.3 @@ -21,6 +21,7 @@
   100.4  		<menu_item_check label="Predeterminado" name="RenderNormally"/>
   100.5  		<menu_item_check label="Siempre" name="AlwaysRenderFully"/>
   100.6  		<menu_item_check label="Nunca" name="DoNotRender"/>
   100.7 +		<menu_item_call label="Excepciones..." name="RenderExceptions"/>
   100.8  	</context_menu>
   100.9  	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
  100.10  </context_menu>
   101.1 --- a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
   101.2 +++ b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
   101.3 @@ -1,8 +1,14 @@
   101.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   101.5 -<menu name="Avatar Icon Menu">
   101.6 +<toggleable_menu name="Avatar Icon Menu">
   101.7  	<menu_item_call label="Ver el perfil" name="Show Profile"/>
   101.8  	<menu_item_call label="Enviar un MI..." name="Send IM"/>
   101.9  	<menu_item_call label="Petición de teleporte" name="Request Teleport"/>
  101.10  	<menu_item_call label="Añadir como amigo..." name="Add Friend"/>
  101.11  	<menu_item_call label="Quitar de los amigos..." name="Remove Friend"/>
  101.12 -</menu>
  101.13 +	<context_menu label="Opciones del moderador" name="Moderator Options">
  101.14 +		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
  101.15 +		<menu_item_call label="Silenciar a este participante" name="ModerateVoiceMuteSelected"/>
  101.16 +		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
  101.17 +	</context_menu>
  101.18 +	<menu_item_call label="Expulsar a miembro" name="BanMember"/>
  101.19 +</toggleable_menu>
   102.1 --- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
   102.2 +++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
   102.3 @@ -20,6 +20,7 @@
   102.4  		<menu_item_check label="Predeterminado" name="RenderNormally"/>
   102.5  		<menu_item_check label="Siempre" name="AlwaysRenderFully"/>
   102.6  		<menu_item_check label="Nunca" name="DoNotRender"/>
   102.7 +		<menu_item_call label="Excepciones..." name="RenderExceptions"/>
   102.8  	</context_menu>
   102.9  	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
  102.10  </context_menu>
   103.1 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   103.2 +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   103.3 @@ -75,9 +75,11 @@
   103.4  	<menu_item_call label="Propiedades" name="Properties"/>
   103.5  	<menu_item_call label="Renombrar" name="Rename"/>
   103.6  	<menu_item_call label="Copiar la UUID" name="Copy Asset UUID"/>
   103.7 +	<menu_item_call label="Mostrar en el panel principal" name="Show in Main Panel"/>
   103.8  	<menu_item_call label="Copiar" name="Copy"/>
   103.9  	<menu_item_call label="Pegar" name="Paste"/>
  103.10  	<menu_item_call label="Pegar como enlace" name="Paste As Link"/>
  103.11 +	<menu_item_call label="Reemplazar los links" name="Replace Links"/>
  103.12  	<menu_item_call label="Borrar" name="Delete"/>
  103.13  	<menu_item_call label="Borrar carpeta del sistema" name="Delete System Folder"/>
  103.14  	<menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/>
   104.1 --- a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
   104.2 +++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
   104.3 @@ -13,5 +13,6 @@
   104.4  	<menu_item_call label="Compartir" name="Share"/>
   104.5  	<menu_item_call label="Encontrar el original" name="Find Original"/>
   104.6  	<menu_item_call label="Encontrar todos los enlazados" name="Find All Links"/>
   104.7 +	<menu_item_call label="Reemplazar los links" name="Replace Links"/>
   104.8  	<menu_item_call label="Vaciar la Papelera" name="empty_trash"/>
   104.9  </toggleable_menu>
   105.1 --- a/indra/newview/skins/default/xui/es/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
   105.2 +++ b/indra/newview/skins/default/xui/es/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
   105.3 @@ -2,6 +2,7 @@
   105.4  <menu_bar name="Login Menu">
   105.5  	<menu label="Yo" name="File">
   105.6  		<menu_item_call label="Preferencias..." name="Preferences..."/>
   105.7 +		<menu_item_call label="Cerrar la ventana" name="Close Window"/>
   105.8  		<menu_item_check label="Mostrar selector del Grid" name="Show Grid Picker"/>
   105.9  		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
  105.10  	</menu>
   106.1 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
   106.2 +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
   106.3 @@ -121,7 +121,7 @@
   106.4  			<menu_item_call label="Incluir la parte o cara siguiente" name="Include Next Part or Face"/>
   106.5  			<menu_item_call label="Incluir la parte o cara anterior" name="Include Previous Part or Face"/>
   106.6  		</menu>
   106.7 -		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
   106.8 +		<menu_item_call label="Objetos de la región" name="pathfinding_linkset_menu_item"/>
   106.9  		<menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
  106.10  		<menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
  106.11  		<menu label="Objeto" name="Object">
  106.12 @@ -141,7 +141,7 @@
  106.13  			<menu_item_call label="Configurar scripts como no ejecutándose" name="Set Scripts to Not Running"/>
  106.14  		</menu>
  106.15  		<menu label="Pathfinding" name="Pathfinding">
  106.16 -			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
  106.17 +			<menu_item_call label="Objetos de la región" name="pathfinding_linksets_menu_item"/>
  106.18  			<menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/>
  106.19  			<menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/>
  106.20  			<menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/>
   107.1 --- a/indra/newview/skins/default/xui/es/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
   107.2 +++ b/indra/newview/skins/default/xui/es/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
   107.3 @@ -3,6 +3,10 @@
   107.4  	<global name="skipnexttime">
   107.5  		No mostrarme esto otra vez
   107.6  	</global>
   107.7 +	<global name="skipnexttimesessiononly">
   107.8 +		No deseo ver este mensaje otra vez 
   107.9 +(en la sesión actual)
  107.10 +	</global>
  107.11  	<global name="alwayschoose">
  107.12  		Elegir siempre esta opción
  107.13  	</global>
  107.14 @@ -339,7 +343,7 @@
  107.15  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/>
  107.16  	</notification>
  107.17  	<notification name="JoinGroupNoCost">
  107.18 -		Vas a entrar al grupo [NAME].
  107.19 +		Vas a entrar al grupo &lt;nolink&gt;[NAME]&lt;/nolink&gt;. 
  107.20  ¿Quieres seguir?
  107.21  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/>
  107.22  	</notification>
  107.23 @@ -353,6 +357,40 @@
  107.24  Por favor, invita a miembros en las próximas 48 horas.
  107.25  		<usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Crear un grupo por 100 L$"/>
  107.26  	</notification>
  107.27 +	<notification name="JoinGroupInaccessible">
  107.28 +		No puedes acceder a este grupo
  107.29 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.30 +	</notification>
  107.31 +	<notification name="JoinGroupError">
  107.32 +		Se produjo un error al procesar tu pedido para unirte al grupo
  107.33 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.34 +	</notification>
  107.35 +	<notification name="JoinGroupErrorReason">
  107.36 +		Imposible de unirse al grupo: [reason]
  107.37 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.38 +	</notification>
  107.39 +	<notification name="JoinGroupTrialUser">
  107.40 +		Lo sentimos, los usuarios de prueba no pueden unirse a los grupos.
  107.41 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.42 +	</notification>
  107.43 +	<notification name="JoinGroupMaxGroups">
  107.44 +		No puedes unirte al grupo &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: 
  107.45 +Ya perteneces a [group_count] grupos, la cantidad máxima es de [max_groups]
  107.46 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.47 +	</notification>
  107.48 +	<notification name="JoinGroupClosedEnrollment">
  107.49 +		No puedes unirte al grupo &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: 
  107.50 +El grupo ya no admite más miembros.
  107.51 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.52 +	</notification>
  107.53 +	<notification name="JoinGroupSuccess">
  107.54 +		Ahora formas parte del grupo
  107.55 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.56 +	</notification>
  107.57 +	<notification name="JoinGroupInsufficientFunds">
  107.58 +		No se pudo transferir los L$ [membership_fee] necesarios para pagar la membresía.
  107.59 +		<usetemplate name="okbutton" yestext="Aceptar"/>
  107.60 +	</notification>
  107.61  	<notification name="LandBuyPass">
  107.62  		Por [COST] L$ puedes entrar a este terreno (&apos;[PARCEL_NAME]&apos;) durante [TIME] horas. ¿Comprar un pase?
  107.63  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  107.64 @@ -374,9 +412,9 @@
  107.65  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  107.66  	</notification>
  107.67  	<notification name="ReturnObjectsDeededToGroup">
  107.68 -		¿Estás seguro de que quieres devolver todos los objetos de esta parcela que estén compartidos con el grupo &apos;[NAME]&apos; al inventario de su propietario anterior?
  107.69 +		¿Estás seguro de que deseas devolver todos los objetos compartidos con el grupo &apos;&lt;nolink&gt;[NAME]&lt;/nolink&gt;&apos; en esta parcela de tierra al inventario de su último dueño?
  107.70  
  107.71 -*ATENCIÓN* ¡Esto borrará los objetos no transferibles que se hayan cedido al grupo!
  107.72 +*ATENCIÓN* ¡Esto borrará los objetos no transferibles cedidos al grupo! 
  107.73  
  107.74  Objetos: [N]
  107.75  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  107.76 @@ -420,7 +458,7 @@
  107.77  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  107.78  	</notification>
  107.79  	<notification name="ReturnObjectsNotOwnedByGroup">
  107.80 -		¿Devolver a sus propietarios los objetos de esta parcela que NO estén compartidos con el grupo [NAME]?
  107.81 +		¿Devolver a sus dueños los objetos en esta parcela de tierra que NO se comparten con el grupo &lt;nolink&gt;[NAME]&lt;/nolink&gt;? 
  107.82  
  107.83  Objetos: [N]
  107.84  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  107.85 @@ -469,7 +507,7 @@
  107.86  		Hubo un problema al subir la captura de pantalla del informe por la siguiente razón: [REASON]
  107.87  	</notification>
  107.88  	<notification name="MustAgreeToLogIn">
  107.89 -		Debes estar de acuerdo con las Condiciones del Servicio para continuar el inicio de sesión en [SECOND_LIFE].
  107.90 +		Debes aceptar los Términos y Condiciones, la Política de privacidad y las Condiciones del servicio de Second Life para iniciar sesión en [SECOND_LIFE].
  107.91  	</notification>
  107.92  	<notification name="CouldNotPutOnOutfit">
  107.93  		No se ha podido poner el vestuario.
  107.94 @@ -721,7 +759,7 @@
  107.95  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar"/>
  107.96  	</notification>
  107.97  	<notification name="EjectAvatarFromGroup">
  107.98 -		Has expulsado a [AVATAR_NAME] del grupo [GROUP_NAME]
  107.99 +		Has expulsado a [AVATAR_NAME] del grupo &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;
 107.100  	</notification>
 107.101  	<notification name="AcquireErrorTooManyObjects">
 107.102  		ERROR &apos;ACQUIRE&apos;: Hay demasiados objetos seleccionados.
 107.103 @@ -1325,20 +1363,18 @@
 107.104  Por favor, selecciona un área más pequeña y vuelve a intentarlo.
 107.105  	</notification>
 107.106  	<notification name="DeedLandToGroup">
 107.107 -		Al transferir esta parcela, se requerirá al grupo que tenga y mantenga el crédito suficiente para uso de terreno.
 107.108 -El precio de compra de la parcela no se reembolsa al propietario.
 107.109 -Si se vende una parcela transferida, el precio de venta se dividirá a partes iguales entre los miembros del grupo.
 107.110 +		Al transferir esta parcela, el grupo deberá poseer y mantener el número suficiente de créditos de uso de terreno. 
 107.111 +El precio de compra del terreno no se le devolverá al propietario. Si se vende una parcela transferida, el precio de venta se dividirá en partes iguales entre los miembros del grupo. 
 107.112  
 107.113 -¿Transferir estos [AREA] m² de terreno al grupo
 107.114 -&apos;[GROUP_NAME]&apos;?
 107.115 +¿Transferir este terreno de [AREA] m² al grupo &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 107.116  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 107.117  	</notification>
 107.118  	<notification name="DeedLandToGroupWithContribution">
 107.119 -		Al transferir esta parcela, el grupo deberá poseer y mantener el número suficiente de créditos de uso de terreno.
 107.120 -El traspaso incluirá una contribución simultánea de terreno al grupo de &quot;[NAME]&quot;.
 107.121 -El precio de compra del terreno no se le devolverá al propietario. Si se vende una parcela transferida, el precio de venta se dividirá en partes iguales entre los miembros del grupo.
 107.122 +		Al transferir esta parcela, el grupo deberá poseer y mantener el número suficiente de créditos de uso de terreno. 
 107.123 +El traspaso incluirá una contribución simultánea de terreno al grupo de &quot;[NAME]&quot;. 
 107.124 +El precio de compra del terreno no se le devolverá al propietario. Si se vende una parcela transferida, el precio de venta se dividirá en partes iguales entre los miembros del grupo. 
 107.125  
 107.126 -¿Transferir este terreno de [AREA] m² al grupo &apos;[GROUP_NAME]&apos;?
 107.127 +¿Transferir este terreno de [AREA] m² al grupo &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 107.128  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 107.129  	</notification>
 107.130  	<notification name="DisplaySetToSafe">
 107.131 @@ -1753,7 +1789,7 @@
 107.132  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 107.133  	</notification>
 107.134  	<notification name="GroupDepart">
 107.135 -		Has abandonado el grupo &apos;[group_name]&apos;.
 107.136 +		Abandonaste el grupo &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;.
 107.137  	</notification>
 107.138  	<notification name="OwnerCannotLeaveGroup">
 107.139  		No es posible abandonar el grupo. No puedes abandonarlo porque eres su último propietario. Antes tienes que asignar el papel de propietario a otro miembro.
 107.140 @@ -2027,6 +2063,10 @@
 107.141  		¿Estás seguro de que quieres cambiar el contrato del estado?
 107.142  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 107.143  	</notification>
 107.144 +	<notification name="EstateParcelAccessOverride">
 107.145 +		Si esta opción no está seleccionada, se anularán las restricciones establecidas por los dueños de parcelas para evitar provocaciones, mantener la privacidad o proteger a los residentes menores de material para adultos. Por favor, consulte con los dueños de parcelas según sea necesario.
 107.146 +		<usetemplate name="okbutton" yestext="Aceptar"/>
 107.147 +	</notification>
 107.148  	<notification name="RegionEntryAccessBlocked">
 107.149  		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado.  Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 107.150  		<usetemplate name="okbutton" yestext="OK"/>
 107.151 @@ -2367,7 +2407,17 @@
 107.152  	</notification>
 107.153  	<notification name="DeleteItems">
 107.154  		[QUESTION]
 107.155 -		<usetemplate ignoretext="Confirmar antes de eliminar elementos" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 107.156 +		<form name="form">
 107.157 +			<ignore name="ignore" text="Confirmar antes de eliminar los elementos"/>
 107.158 +			<button name="Yes" text="Aceptar"/>
 107.159 +			<button name="No" text="Cancelar"/>
 107.160 +		</form>
 107.161 +	</notification>
 107.162 +	<notification name="DeleteFilteredItems">
 107.163 +		Tu inventario está filtrado y es posible que algunos de los elementos que estás por borrar no se muestren en pantalla. 
 107.164 +
 107.165 +¿Estás seguro de que deseas borrarlos?
 107.166 +		<usetemplate ignoretext="Confirmar antes de eliminar los elementos filtrados" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
 107.167  	</notification>
 107.168  	<notification name="ConfirmUnlink">
 107.169  		La selección es grande y contiene linksets. Si la desenlazas, quizás no puedas volver establecer los vínculos. Puede ser conveniente guardar copias de los linksets como medida de precaución.
 107.170 @@ -2444,13 +2494,17 @@
 107.171  		La carpeta &apos;[FOLDERNAME]&apos; pertenece al sistema,   y borrar carpetas del sistema puede provocar inestabilidad.  ¿Estás seguro de que quieres borrarla?
 107.172  		<usetemplate ignoretext="Confirmar antes de borrar una carpeta del sistema" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 107.173  	</notification>
 107.174 +	<notification name="PurgeSelectedItems">
 107.175 +		[COUNT] elemento(s) se borrarán de forma permanente. ¿Estás seguro de que quieres borrar de forma permanente el/los elemento(s) seleccionados de la Papelera?
 107.176 +		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/>
 107.177 +	</notification>
 107.178  	<notification name="ConfirmEmptyTrash">
 107.179 -		¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera?
 107.180 -		<usetemplate ignoretext="Confirmar antes de vaciar la Papelera del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 107.181 +		[COUNT] elementos serán borrados de forma permanente. ¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera?
 107.182 +		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/>
 107.183  	</notification>
 107.184  	<notification name="TrashIsFull">
 107.185  		La papelera está completamente llena. Esto puede causar problemas a la hora de iniciar sesión.
 107.186 -		<usetemplate name="okcancelbuttons" notext="Vaciaré la papelera más adelante" yestext="Vaciar la papelera"/>
 107.187 +		<usetemplate name="okcancelbuttons" notext="Vaciaré la papelera más adelante" yestext="Ver la carpeta de la papelera"/>
 107.188  	</notification>
 107.189  	<notification name="ConfirmClearBrowserCache">
 107.190  		¿Estás seguro de que quieres borrar tu historial web, de viajes y de búsquedas?
 107.191 @@ -2579,6 +2633,9 @@
 107.192  	<notification name="AddSelfFriend">
 107.193  		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
 107.194  	</notification>
 107.195 +	<notification name="AddSelfRenderExceptions">
 107.196 +		No puedes agregarte a la lista de excepciones de renderización.
 107.197 +	</notification>
 107.198  	<notification name="UploadingAuctionSnapshot">
 107.199  		Subiendo fotos del mundo y del sitio web...
 107.200  (tardará unos 5 minutos).
 107.201 @@ -2772,9 +2829,9 @@
 107.202  		Se han devuelto a su propietario los objetos seleccionados en la parcela de terreno propiedad de &apos;[NAME]&apos;.
 107.203  	</notification>
 107.204  	<notification name="GroupObjectsReturned">
 107.205 -		Se han devuelto a los inventarios de sus propietarios los objetos que estaban compartidos con el grupo [GROUPNAME] en la parcela seleccionada.
 107.206 -Los objetos transferibles que se transfirieron al grupo se han devuelto a sus propietarios anteriores.
 107.207 -Los objetos no transferibles que se transfirieron al grupo han sido borrados.
 107.208 +		Los objetos en la parcela de tierra seleccionada compartidos con el grupo &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; fueron devueltos al inventario de su dueño. 
 107.209 +Los objetos transferibles concedidos fueron devueltos a su antiguo dueño. 
 107.210 +Los objetos no transferibles que fueron cedidos al grupo han sido borrados.
 107.211  	</notification>
 107.212  	<notification name="UnOwnedObjectsReturned">
 107.213  		Se han devuelto a sus propietarios los objetos de los que NO eras propietario en la parcela seleccionada.
 107.214 @@ -3156,7 +3213,7 @@
 107.215  		<form name="form"/>
 107.216  	</notification>
 107.217  	<notification name="ScriptDialogGroup">
 107.218 -		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]
 107.219 +		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; 
 107.220  [MESSAGE]
 107.221  		<form name="form"/>
 107.222  	</notification>
 107.223 @@ -3199,8 +3256,8 @@
 107.224  		[NAME] ha dejado automáticamente de estar ignorado al ofrecerle inventario.
 107.225  	</notification>
 107.226  	<notification name="VoiceInviteGroup">
 107.227 -		[NAME] ha empezado un chat de voz con el grupo [GROUP].
 107.228 -Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar al que llama.
 107.229 +		[NAME] ha empezado un chat de voz con el grupo &lt;nolink&gt;[GROUP]&lt;/nolink&gt;. 
 107.230 +Pulsa Aceptar para unirte a la llamada o Rehusar para rechazar la invitación. Pulsa Ignorar para ignorar al que llama.
 107.231  		<form name="form">
 107.232  			<button name="Accept" text="Aceptar"/>
 107.233  			<button name="Decline" text="Rehusar"/>
 107.234 @@ -3308,6 +3365,9 @@
 107.235  	<notification name="AppearanceToXMLFailed">
 107.236  		Error al guardar el aspecto en XML.
 107.237  	</notification>
 107.238 +	<notification name="SnapshotToComputerFailed">
 107.239 +		Error al guardar la foto en [PATH]: Disco lleno. Se requieren [NEED_MEMORY]KB pero solo hay [FREE_MEMORY]KB libres.
 107.240 +	</notification>
 107.241  	<notification name="PresetNotSaved">
 107.242  		Error al guardar el valor predefinido [NAME].
 107.243  	</notification>
 107.244 @@ -3345,9 +3405,14 @@
 107.245  	<notification name="ShareNotification">
 107.246  		Selecciona los residentes con quienes deseas compartir.
 107.247  	</notification>
 107.248 +	<notification name="MeshUploadErrorDetails">
 107.249 +		[LABEL] error de carga: [MESSAGE] 
 107.250 +[DETAILS]Consulta SecondLife.log para más detalles
 107.251 +	</notification>
 107.252  	<notification name="MeshUploadError">
 107.253 -		[LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER]
 107.254 -[DETAILS]Consulta los detalles en SecondLife.log
 107.255 +		[LABEL] error de carga: [MESSAGE] 
 107.256 +
 107.257 +Consulta SecondLife.log para más detalles
 107.258  	</notification>
 107.259  	<notification name="MeshUploadPermError">
 107.260  		Error al solicitar los permisos para subir la malla.
   108.1 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   108.2 +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   108.3 @@ -12,10 +12,17 @@
   108.4  	<text name="ItemcountText">
   108.5  		Ítems:
   108.6  	</text>
   108.7 -	<filter_editor label="Filtrar" name="inventory search editor"/>
   108.8 +	<filter_editor label="Ingresar texto de búsqueda" name="inventory search editor"/>
   108.9 +	<combo_box name="search_type">
  108.10 +		<item label="Nombre" name="Name" value="search_by_name"/>
  108.11 +		<item label="Creador" name="Creator" value="search_by_creator"/>
  108.12 +		<item label="Descripción" name="Description" value="search_by_description"/>
  108.13 +		<item label="UUID" name="UUID" value="search_by_UUID"/>
  108.14 +	</combo_box>
  108.15  	<tab_container name="inventory filter tabs">
  108.16  		<inventory_panel label="Todos los ítems" name="All Items"/>
  108.17  		<recent_inventory_panel label="Ítems recientes" name="Recent Items"/>
  108.18 +		<inventory_panel label="(VESTIMENTA)" name="Worn Items"/>
  108.19  	</tab_container>
  108.20  	<layout_stack name="bottom_panel">
  108.21  		<layout_panel name="options_gear_btn_panel">
   109.1 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml	Tue Nov 21 09:46:31 2017 -0800
   109.2 +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml	Mon Dec 11 10:09:44 2017 -0800
   109.3 @@ -6,7 +6,7 @@
   109.4  	<text name="Cache:">
   109.5  		Caché:
   109.6  	</text>
   109.7 -	<spinner label="Tamaño de la caché (256 - 9984 MB)" name="cachesizespinner"/>
   109.8 +	<spinner label="Tamaño de la caché (256 - 9984MB)" name="cachesizespinner"/>
   109.9  	<text name="text_box5">
  109.10  		MB
  109.11  	</text>
   110.1 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml	Tue Nov 21 09:46:31 2017 -0800
   110.2 +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml	Mon Dec 11 10:09:44 2017 -0800
   110.3 @@ -1,5 +1,6 @@
   110.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   110.5  <panel label="Chat de texto" name="chat">
   110.6 +	<check_box initial_value="true" label="Auto completar los gestos en el chat cercano" name="auto_complete_gestures"/>
   110.7  	<panel name="general_chat_settings">
   110.8  		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
   110.9  		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
   111.1 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml	Tue Nov 21 09:46:31 2017 -0800
   111.2 +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml	Mon Dec 11 10:09:44 2017 -0800
   111.3 @@ -15,54 +15,36 @@
   111.4  	<text name="estate_owner">
   111.5  		(desconocido)
   111.6  	</text>
   111.7 -	<check_box label="Usar el horario global" name="use_global_time_check"/>
   111.8 -	<button label="?" name="use_global_time_help"/>
   111.9 -	<check_box label="Fijar el Sol" name="fixed_sun_check"/>
  111.10 -	<button label="?" name="fixed_sun_help"/>
  111.11 -	<slider label="Fase" name="sun_hour_slider"/>
  111.12 -	<check_box label="Permitir el acceso público" name="externally_visible_check"/>
  111.13 -	<button label="?" name="externally_visible_help"/>
  111.14 -	<text name="Only Allow">
  111.15 -		Permitir únicamente el acceso a los Residentes que:
  111.16 -	</text>
  111.17 -	<check_box label="Han aportado la información de pago." name="limit_payment" tool_tip="Para poder acceder a este estado los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
  111.18 -	<check_box label="Son mayores de 18 años" name="limit_age_verified" tool_tip="Para poder acceder a este estado, los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
  111.19 +	<radio_group name="externally_visible_radio">
  111.20 +		<radio_item label="Permitir únicamente a los residentes y grupos indicados a continuación" name="estate_restricted_access"/>
  111.21 +		<radio_item label="Cualquiera puede visitar" name="estate_public_access"/>
  111.22 +	</radio_group>
  111.23 +	<check_box label="Debe ser mayor de 18" name="limit_age_verified" tool_tip="Para poder acceder a este estado, los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
  111.24 +	<check_box label="Debe haber información archivada sobre el pago" name="limit_payment" tool_tip="Para poder acceder a este estado los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
  111.25 +	<check_box label="Los propietarios de parcelas pueden ser más restrictivos" name="parcel_access_override"/>
  111.26  	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
  111.27 -	<button label="?" name="voice_chat_help"/>
  111.28  	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
  111.29 -	<button label="?" name="allow_direct_teleport_help"/>
  111.30 -	<text name="abuse_email_text" width="260">
  111.31 -		Dirección de correo-e para infracciones:
  111.32 -	</text>
  111.33 -	<string name="email_unsupported">
  111.34 -		Característica no disponible
  111.35 -	</string>
  111.36 -	<button label="?" name="abuse_email_address_help"/>
  111.37  	<button label="Aplicar" name="apply_btn"/>
  111.38 -	<button label="Expulsar a un Residente del estado..." name="kick_user_from_estate_btn"/>
  111.39 -	<button label="Enviar un mensaje al estado..." name="message_estate_btn"/>
  111.40  	<text name="estate_manager_label">
  111.41  		Administradores del estado:
  111.42  	</text>
  111.43 -	<button label="?" name="estate_manager_help"/>
  111.44 +	<text name="allow_resident_label">
  111.45 +		Siempre permitido:
  111.46 +	</text>
  111.47 +	<button label="Añadir..." name="add_estate_manager_btn"/>
  111.48  	<button label="Quitar..." name="remove_estate_manager_btn"/>
  111.49 -	<button label="Añadir..." name="add_estate_manager_btn"/>
  111.50 -	<text name="allow_resident_label">
  111.51 -		Residentes autorizados:
  111.52 +	<button label="Añadir..." name="add_allowed_avatar_btn"/>
  111.53 +	<button label="Quitar..." name="remove_allowed_avatar_btn"/>
  111.54 +	<text name="allow_group_label">
  111.55 +		Grupos siempre permitidos:
  111.56  	</text>
  111.57 -	<button label="?" name="allow_resident_help"/>
  111.58 -	<button label="Quitar..." name="remove_allowed_avatar_btn"/>
  111.59 -	<button label="Añadir..." name="add_allowed_avatar_btn"/>
  111.60 -	<text name="allow_group_label">
  111.61 -		Grupos autorizados:
  111.62 +	<text name="ban_resident_label">
  111.63 +		Siempre prohibido:
  111.64  	</text>
  111.65 -	<button label="?" name="allow_group_help"/>
  111.66 +	<button label="Añadir..." name="add_allowed_group_btn"/>
  111.67  	<button label="Quitar..." name="remove_allowed_group_btn"/>
  111.68 -	<button label="Añadir..." name="add_allowed_group_btn"/>
  111.69 -	<text name="ban_resident_label">
  111.70 -		Residentes con el acceso prohibido:
  111.71 -	</text>
  111.72 -	<button label="?" name="ban_resident_help" right="476"/>
  111.73 +	<button label="Añadir..." name="add_banned_avatar_btn"/>
  111.74  	<button label="Quitar..." name="remove_banned_avatar_btn"/>
  111.75 -	<button label="Añadir..." name="add_banned_avatar_btn"/>
  111.76 +	<button label="Enviar un mensaje al estado..." name="message_estate_btn"/>
  111.77 +	<button label="Expulsar a un Residente del estado..." name="kick_user_from_estate_btn"/>
  111.78  </panel>
   112.1 --- a/indra/newview/skins/default/xui/es/panel_tools_texture.xml	Tue Nov 21 09:46:31 2017 -0800
   112.2 +++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml	Mon Dec 11 10:09:44 2017 -0800
   112.3 @@ -26,6 +26,7 @@
   112.4  		<radio_item label="Relieve (normal)" name="Bumpiness (normal)" value="1"/>
   112.5  		<radio_item label="Brillantez (especular)" name="Shininess (specular)" value="2"/>
   112.6  	</radio_group>
   112.7 +	<check_box initial_value="false" label="Bloquear repetición" name="checkbox_sync_settings" tool_tip="Ajustar todas las repeticiones de mapas simultáneamente"/>
   112.8  	<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una imagen"/>
   112.9  	<text name="label alphamode">
  112.10  		Modo alfa
   113.1 --- a/indra/newview/skins/default/xui/es/role_actions.xml	Tue Nov 21 09:46:31 2017 -0800
   113.2 +++ b/indra/newview/skins/default/xui/es/role_actions.xml	Mon Dec 11 10:09:44 2017 -0800
   113.3 @@ -38,7 +38,7 @@
   113.4  		<action description="Permitir siempre &apos;Editar el terreno&apos;" longdescription="Quien tenga un rol con esta capacidad puede editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow edit land" value="23"/>
   113.5  		<action description="Permitir siempre &apos;Volar&apos;" longdescription="Quien tenga un rol con esta capacidad puede volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow fly" value="24"/>
   113.6  		<action description="Permitir siempre &apos;Crear objetos&apos;" longdescription="Quien tenga un rol con esta capacidad puede crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow create" value="25"/>
   113.7 -		<action description="Permitir siempre &apos;Crear hitos&apos;" longdescription="Quien tenga un rol con esta capacidad puede crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow landmark" value="26"/>
   113.8 +		<action description="Ignorar punto de aterrizaje" longdescription="Los miembros en un rol con esta capacidad pueden teletransportarse directamente a una parcela que pertenece a un grupo, incluso si un punto de aterrizaje fue establecido en la pestaña Acerca del terreno &gt; Opciones." name="land allow direct teleport" value="26"/>
   113.9  		<action description="Permitir &apos;Fijar mi Base aquí&apos; en el terreno del grupo" longdescription="Los miembros que tengan un rol con esta capacidad pueden usar el menú Mundo &gt; Hitos &gt; Fijar aquí mi Base en una parcela transferida al grupo." name="land allow set home" value="28"/>
  113.10  		<action description="Permitir &quot;Organización de eventos&quot; en un terreno de grupo" longdescription="Los miembros con un rol que tenga esta capacidad pueden seleccionar parcelas propiedad de un grupo como sede de la organización de eventos." name="land allow host event" value="41"/>
  113.11  	</action_set>
   114.1 --- a/indra/newview/skins/default/xui/es/strings.xml	Tue Nov 21 09:46:31 2017 -0800
   114.2 +++ b/indra/newview/skins/default/xui/es/strings.xml	Mon Dec 11 10:09:44 2017 -0800
   114.3 @@ -252,9 +252,8 @@
   114.4  [HORA] (horario de la costa del Pacífico).
   114.5  	</string>
   114.6  	<string name="LoginFailedAccountDisabled">
   114.7 -		En este momento no podemos completar la solicitud.
   114.8 -Si deseas obtener asistencia, ponte en contacto con el departamento de soporte de Second Life a través de la página http://secondlife.com/support.
   114.9 -Si no puedes cambiar la contraseña, llama al número (866) 476-9763.
  114.10 +		En este momento no podemos completar la solicitud. 
  114.11 +Por favor solicita ayuda al personal de asistencia de Second Life en http://support.secondlife.com.
  114.12  	</string>
  114.13  	<string name="LoginFailedTransformError">
  114.14  		Se han detectado datos incorrectos en el inicio de sesión.
  114.15 @@ -692,6 +691,19 @@
  114.16  	<string name="AssetErrorUnknownStatus">
  114.17  		Estado desconocido
  114.18  	</string>
  114.19 +	<string name="AssetUploadServerUnreacheble">
  114.20 +		El servicio no está disponible.
  114.21 +	</string>
  114.22 +	<string name="AssetUploadServerDifficulties">
  114.23 +		Se detectaron errores inesperados en el servidor.
  114.24 +	</string>
  114.25 +	<string name="AssetUploadServerUnavaliable">
  114.26 +		El servicio no está disponible o se alcanzó el tiempo de carga máxima.
  114.27 +	</string>
  114.28 +	<string name="AssetUploadRequestInvalid">
  114.29 +		Error en la solicitud de carga. Por favor, ingresa a 
  114.30 +http://secondlife.com/support para obtener ayuda sobre cómo solucionar este problema.
  114.31 +	</string>
  114.32  	<string name="texture">
  114.33  		la textura
  114.34  	</string>
  114.35 @@ -2174,10 +2186,19 @@
  114.36  		todos los estados que administras para [OWNER]
  114.37  	</string>
  114.38  	<string name="RegionInfoAllowedResidents">
  114.39 -		Resientes autorizados: ([ALLOWEDAGENTS], de un máx. de [MAXACCESS])
  114.40 +		Siempre permitido: ([ALLOWEDAGENTS], de un máx. de [MAXACCESS])
  114.41  	</string>
  114.42  	<string name="RegionInfoAllowedGroups">
  114.43 -		Grupos autorizados: ([ALLOWEDGROUPS], de un máx. de [MAXACCESS])
  114.44 +		Grupos siempre permitidos: ([ALLOWEDGROUPS], de un máx. de [MAXACCESS])
  114.45 +	</string>
  114.46 +	<string name="RegionInfoBannedResidents">
  114.47 +		Siempre prohibido: ([BANNEDAGENTS], de un máx. de [MAXBANNED])
  114.48 +	</string>
  114.49 +	<string name="RegionInfoListTypeAllowedAgents">
  114.50 +		Siempre permitido
  114.51 +	</string>
  114.52 +	<string name="RegionInfoListTypeBannedAgents">
  114.53 +		Siempre prohibido
  114.54  	</string>
  114.55  	<string name="ScriptLimitsParcelScriptMemory">
  114.56  		Memoria de los scripts de la parcela
   115.1 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
   115.2 +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
   115.3 @@ -440,13 +440,10 @@
   115.4  			<panel.string name="estate_override">
   115.5  				Au moins une de ces options est définie au niveau du domaine.
   115.6  			</panel.string>
   115.7 -			<check_box label="Autoriser l&apos;accès public (des lignes d&apos;interdiction seront créées si cette case n&apos;est pas cochée)" name="public_access"/>
   115.8 -			<text name="Only Allow">
   115.9 -				Conditions d&apos;accès des résidents :
  115.10 -			</text>
  115.11 -			<check_box label="Informations de paiement enregistrées [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Pour pouvoir accéder à cette parcelle, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  115.12 -			<check_box label="Avoir plus de 18 ans [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour accéder à cette parcelle, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  115.13 -			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
  115.14 +			<check_box label="Tout le monde peut rendre visite (Des lignes d&apos;interdiction seront créées si cette case n&apos;est pas cochée)" name="public_access"/>
  115.15 +			<check_box label="Doit avoir plus de 18 ans [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour accéder à cette parcelle, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  115.16 +			<check_box label="Les infos de paiement doivent être enregistrées dans le dossier  [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Pour pouvoir accéder à cette parcelle, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  115.17 +			<check_box label="Autoriser le groupe [GROUP] sans restrictions" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
  115.18  			<check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
  115.19  			<combo_box name="pass_combo" width="110">
  115.20  				<combo_box.item label="Tout le monde" name="Anyone"/>
  115.21 @@ -454,9 +451,12 @@
  115.22  			</combo_box>
  115.23  			<spinner label="Prix en L$ :" name="PriceSpin"/>
  115.24  			<spinner label="Durée en heures :" name="HoursSpin"/>
  115.25 +			<text name="OwnerLimited">
  115.26 +				(Le propriétaire de domaine peut avoir limité ces choix)
  115.27 +			</text>
  115.28  			<panel name="Allowed_layout_panel">
  115.29  				<text label="Toujours autoriser" name="AllowedText">
  115.30 -					Résidents autorisés ([COUNT], max. [MAX])
  115.31 +					Toujours autorisé ([COUNT], max. [MAX])
  115.32  				</text>
  115.33  				<name_list name="AccessList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
  115.34  				<button label="Ajouter" name="add_allowed"/>
  115.35 @@ -464,7 +464,7 @@
  115.36  			</panel>
  115.37  			<panel name="Banned_layout_panel">
  115.38  				<text label="Bannir" name="BanCheck">
  115.39 -					Résidents bannis ([COUNT], max. [MAX])
  115.40 +					Toujours interdit ([COUNT], max. [MAX])
  115.41  				</text>
  115.42  				<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
  115.43  				<button label="Ajouter" name="add_banned"/>
   116.1 --- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
   116.2 +++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
   116.3 @@ -3,6 +3,9 @@
   116.4  	<floater.string name="not_found">
   116.5  		&apos;[TEXT]&apos; introuvable
   116.6  	</floater.string>
   116.7 +	<floater.string name="not_found_text">
   116.8 +		Le résident n&apos;a pas été trouvé.
   116.9 +	</floater.string>
  116.10  	<floater.string name="no_one_near">
  116.11  		Personne près de vous
  116.12  	</floater.string>
   117.1 --- a/indra/newview/skins/default/xui/fr/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
   117.2 +++ b/indra/newview/skins/default/xui/fr/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
   117.3 @@ -7,5 +7,6 @@
   117.4  	<name_list name="render_settings_list">
   117.5  		<name_list.columns label="Nom" name="name"/>
   117.6  		<name_list.columns label="Paramètre de rendu" name="setting"/>
   117.7 +		<name_list.columns label="Date ajoutée" name="timestamp"/>
   117.8  	</name_list>
   117.9  </floater>
   118.1 --- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
   118.2 +++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
   118.3 @@ -15,6 +15,8 @@
   118.4  	<button label="Tout" label_selected="Tout" name="All"/>
   118.5  	<button bottom_delta="0" label="Aucun" label_selected="Aucun" name="None"/>
   118.6  	<check_box label="Toujours montrer les dossiers" name="check_show_empty"/>
   118.7 +	<check_box label="Créé par moi" name="check_created_by_me"/>
   118.8 +	<check_box label="Créé par les autres" name="check_created_by_others"/>
   118.9  	<check_box label="Depuis la déconnexion" name="check_since_logoff"/>
  118.10  	<text name="- OR -">
  118.11  		Ou il y a...
   119.1 --- a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
   119.2 +++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
   119.3 @@ -1,5 +1,5 @@
   119.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   119.5 -<floater name="floater_pathfinding_linksets" title="Groupes de liens de recherche de chemin">
   119.6 +<floater name="floater_pathfinding_linksets" title="OBJETS DES RÉGIONS">
   119.7  	<floater.string name="messaging_get_inprogress">
   119.8  		Requête relative aux groupes de liens de recherche de chemin en cours...
   119.9  	</floater.string>
  119.10 @@ -16,7 +16,7 @@
  119.11  		Aucun groupe de liens de recherche de chemin.
  119.12  	</floater.string>
  119.13  	<floater.string name="messaging_complete_available">
  119.14 -		[NUM_SELECTED] groupes de liens sélectionnés sur [NUM_TOTAL].
  119.15 +		[NUM_SELECTED] sélectionnés à partir de [NUM_TOTAL].
  119.16  	</floater.string>
  119.17  	<floater.string name="messaging_not_enabled">
  119.18  		La recherche de chemin n&apos;a pas été activée pour cette région.
  119.19 @@ -118,7 +118,7 @@
  119.20  			<scroll_list.columns label="Scripté" name="scripted"/>
  119.21  			<scroll_list.columns label="Impact" name="land_impact"/>
  119.22  			<scroll_list.columns label="Distance" name="dist_from_you"/>
  119.23 -			<scroll_list.columns label="Usage du groupe de liens" name="linkset_use"/>
  119.24 +			<scroll_list.columns label="Utiliser la recherche de chemin" name="linkset_use"/>
  119.25  			<scroll_list.columns label="% A" name="a_percent"/>
  119.26  			<scroll_list.columns label="% B" name="b_percent"/>
  119.27  			<scroll_list.columns label="% C" name="c_percent"/>
  119.28 @@ -133,7 +133,7 @@
  119.29  	</panel>
  119.30  	<panel name="pathfinding_linksets_actions">
  119.31  		<text name="linksets_actions_label">
  119.32 -			Actions sur les groupes de liens sélectionnés (si un groupe de liens est supprimé du monde, ses attributs risquent d’être perdus) :
  119.33 +			Actions sur les objets sélectionnés
  119.34  		</text>
  119.35  		<check_box label="Afficher la balise" name="show_beacon"/>
  119.36  		<button label="Prendre" name="take_objects"/>
  119.37 @@ -144,7 +144,7 @@
  119.38  	</panel>
  119.39  	<panel name="pathfinding_linksets_attributes">
  119.40  		<text name="linksets_attributes_label">
  119.41 -			Modifier les attributs des groupes de liens sélectionnés et appuyer sur le bouton pour appliquer les modifications
  119.42 +			Modifier les attributs de recherche de chemin
  119.43  		</text>
  119.44  		<text name="walkability_coefficients_label">
  119.45  			Marche possible :
   120.1 --- a/indra/newview/skins/default/xui/fr/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
   120.2 +++ b/indra/newview/skins/default/xui/fr/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
   120.3 @@ -6,13 +6,16 @@
   120.4  	<floater.string name="loading_url">
   120.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Chargement %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3Eles%20Conditions%20d%27utilisation%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
   120.6  	</floater.string>
   120.7 -	<button label="Continuer" label_selected="Continuer" name="Continue"/>
   120.8 -	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
   120.9 -	<check_box label="J&apos;accepte les Conditions d&apos;utilisation et le Règlement sur le respect de la vie privée" name="agree_chk"/>
  120.10  	<text name="tos_heading">
  120.11 -		Veuillez lire attentivement les Conditions d&apos;utilisation et le Règlement sur le respect de la vie privée suivants. Vous devez les accepter pour pouvoir vous connecter à [SECOND_LIFE].
  120.12 +		Veuillez lire les termes et conditions suivants; la Politique de confidentialité et les Conditions d&apos;utilisation de Second Life, y compris l&apos;utilisation de l&apos;arbitrage et de la renonciation à toute demande de classe ou de groupe pour résoudre les différends. Vous devez les accepter pour pouvoir vous connecter à [SECOND_LIFE].
  120.13  	</text>
  120.14  	<text name="external_tos_required">
  120.15  		Vous devez vous rendre sur https://my.secondlife.com et vous connecter pour accepter les Conditions d’utilisation avant de pouvoir continuer. Merci !
  120.16  	</text>
  120.17 +	<check_box label="J&apos;ai lu et j&apos;accepte" name="agree_chk"/>
  120.18 +	<text name="agree_list">
  120.19 +		les termes et conditions; la Politique de confidentialité et les Conditions d&apos;utilisation de Second Life, y compris ls exigences de résolution des différends.
  120.20 +	</text>
  120.21 +	<button label="Continuer" label_selected="Continuer" name="Continue"/>
  120.22 +	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
  120.23  </floater>
   121.1 --- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
   121.2 +++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
   121.3 @@ -21,6 +21,7 @@
   121.4  		<menu_item_check label="Valeur par défaut" name="RenderNormally"/>
   121.5  		<menu_item_check label="Toujours" name="AlwaysRenderFully"/>
   121.6  		<menu_item_check label="Jamais" name="DoNotRender"/>
   121.7 +		<menu_item_call label="Exceptions..." name="RenderExceptions"/>
   121.8  	</context_menu>
   121.9  	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
  121.10  </context_menu>
   122.1 --- a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
   122.2 +++ b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
   122.3 @@ -1,8 +1,14 @@
   122.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   122.5 -<menu name="Avatar Icon Menu">
   122.6 +<toggleable_menu name="Avatar Icon Menu">
   122.7  	<menu_item_call label="Voir le profil" name="Show Profile"/>
   122.8  	<menu_item_call label="Envoyer IM..." name="Send IM"/>
   122.9  	<menu_item_call label="Demander téléportation" name="Request Teleport"/>
  122.10  	<menu_item_call label="Devenir amis..." name="Add Friend"/>
  122.11  	<menu_item_call label="Supprimer cet ami..." name="Remove Friend"/>
  122.12 -</menu>
  122.13 +	<context_menu label="Options du modérateur" name="Moderator Options">
  122.14 +		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
  122.15 +		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
  122.16 +		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
  122.17 +	</context_menu>
  122.18 +	<menu_item_call label="Bannir le membre" name="BanMember"/>
  122.19 +</toggleable_menu>
   123.1 --- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
   123.2 +++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
   123.3 @@ -20,6 +20,7 @@
   123.4  		<menu_item_check label="Valeur par défaut" name="RenderNormally"/>
   123.5  		<menu_item_check label="Toujours" name="AlwaysRenderFully"/>
   123.6  		<menu_item_check label="Jamais" name="DoNotRender"/>
   123.7 +		<menu_item_call label="Exceptions..." name="RenderExceptions"/>
   123.8  	</context_menu>
   123.9  	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
  123.10  </context_menu>
   124.1 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   124.2 +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   124.3 @@ -75,10 +75,12 @@
   124.4  	<menu_item_call label="Propriétés" name="Properties"/>
   124.5  	<menu_item_call label="Renommer" name="Rename"/>
   124.6  	<menu_item_call label="Copier l&apos;UUID (identifiant universel unique)" name="Copy Asset UUID"/>
   124.7 +	<menu_item_call label="Affiche le Panneau principal" name="Show in Main Panel"/>
   124.8  	<menu_item_call label="Couper" name="Cut"/>
   124.9  	<menu_item_call label="Copier" name="Copy"/>
  124.10  	<menu_item_call label="Coller" name="Paste"/>
  124.11  	<menu_item_call label="Coller comme lien" name="Paste As Link"/>
  124.12 +	<menu_item_call label="Remplacer les liens" name="Replace Links"/>
  124.13  	<menu_item_call label="Supprimer" name="Delete"/>
  124.14  	<menu_item_call label="Supprimer le dossier système" name="Delete System Folder"/>
  124.15  	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
   125.1 --- a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
   125.2 +++ b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
   125.3 @@ -13,5 +13,6 @@
   125.4  	<menu_item_call label="Partager" name="Share"/>
   125.5  	<menu_item_call label="Trouver l&apos;original" name="Find Original"/>
   125.6  	<menu_item_call label="Trouver tous les liens" name="Find All Links"/>
   125.7 +	<menu_item_call label="Remplacer les liens" name="Replace Links"/>
   125.8  	<menu_item_call label="Vider la corbeille" name="empty_trash"/>
   125.9  </toggleable_menu>
   126.1 --- a/indra/newview/skins/default/xui/fr/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
   126.2 +++ b/indra/newview/skins/default/xui/fr/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
   126.3 @@ -2,6 +2,7 @@
   126.4  <menu_bar name="Login Menu">
   126.5  	<menu label="Moi" name="File">
   126.6  		<menu_item_call label="Préférences..." name="Preferences..."/>
   126.7 +		<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
   126.8  		<menu_item_check label="Afficher le sélecteur de grille" name="Show Grid Picker"/>
   126.9  		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
  126.10  	</menu>
   127.1 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
   127.2 +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
   127.3 @@ -121,7 +121,7 @@
   127.4  			<menu_item_call label="Inclure la partie suivante ou le visage" name="Include Next Part or Face"/>
   127.5  			<menu_item_call label="Inclure la partie précédente ou le visage" name="Include Previous Part or Face"/>
   127.6  		</menu>
   127.7 -		<menu_item_call label="Groupes de liens..." name="pathfinding_linkset_menu_item"/>
   127.8 +		<menu_item_call label="Objets des régions" name="pathfinding_linkset_menu_item"/>
   127.9  		<menu_item_call label="Point central sur la sélection" name="Focus on Selection"/>
  127.10  		<menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/>
  127.11  		<menu label="Objet" name="Object">
  127.12 @@ -141,7 +141,7 @@
  127.13  			<menu_item_call label="Définir les scripts sur Pas d&apos;exécution" name="Set Scripts to Not Running"/>
  127.14  		</menu>
  127.15  		<menu label="Recherche de chemin" name="Pathfinding">
  127.16 -			<menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/>
  127.17 +			<menu_item_call label="Objets des régions" name="pathfinding_linksets_menu_item"/>
  127.18  			<menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/>
  127.19  			<menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/>
  127.20  			<menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/>
   128.1 --- a/indra/newview/skins/default/xui/fr/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
   128.2 +++ b/indra/newview/skins/default/xui/fr/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
   128.3 @@ -3,6 +3,10 @@
   128.4  	<global name="skipnexttime">
   128.5  		Ne plus afficher
   128.6  	</global>
   128.7 +	<global name="skipnexttimesessiononly">
   128.8 +		Ne plus afficher 
   128.9 +(pour cette session)
  128.10 +	</global>
  128.11  	<global name="alwayschoose">
  128.12  		Toujours choisir cette option
  128.13  	</global>
  128.14 @@ -342,8 +346,8 @@
  128.15  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Rejoindre"/>
  128.16  	</notification>
  128.17  	<notification name="JoinGroupNoCost">
  128.18 -		Vous vous apprêtez à rejoindre le groupe [NAME].
  128.19 -Voulez-vous continuer ?
  128.20 +		Vous vous apprêtez à rejoindre le groupe &lt;nolink&gt;[NAME]&lt;/nolink&gt;. 
  128.21 +Souhaitez-vous continuer ?
  128.22  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Fusionner"/>
  128.23  	</notification>
  128.24  	<notification name="JoinGroupCannotAfford">
  128.25 @@ -356,6 +360,40 @@
  128.26  Veuillez inviter des membres d&apos;ici 48 heures.
  128.27  		<usetemplate canceltext="Annuler" name="okcancelbuttons" notext="Annuler" yestext="Créer un groupe pour 100 L$"/>
  128.28  	</notification>
  128.29 +	<notification name="JoinGroupInaccessible">
  128.30 +		Vous n&apos;avez pas accès à ce groupe.
  128.31 +		<usetemplate name="okbutton" yestext="OK"/>
  128.32 +	</notification>
  128.33 +	<notification name="JoinGroupError">
  128.34 +		Erreur pendant le traitement de votre demande d&apos;adhésion au groupe
  128.35 +		<usetemplate name="okbutton" yestext="OK"/>
  128.36 +	</notification>
  128.37 +	<notification name="JoinGroupErrorReason">
  128.38 +		Impossible de se joindre au groupe : [motif]
  128.39 +		<usetemplate name="okbutton" yestext="OK"/>
  128.40 +	</notification>
  128.41 +	<notification name="JoinGroupTrialUser">
  128.42 +		Désolé, les utilisateurs-tests ne peuvent pas rejoindre de groupes.
  128.43 +		<usetemplate name="okbutton" yestext="OK"/>
  128.44 +	</notification>
  128.45 +	<notification name="JoinGroupMaxGroups">
  128.46 +		Vous ne pouvez pas rejoindre &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: 
  128.47 +Vous êtes déjà membre des [group_count] groupes, le nombre maximum autorisé est de [max_groups]
  128.48 +		<usetemplate name="okbutton" yestext="OK"/>
  128.49 +	</notification>
  128.50 +	<notification name="JoinGroupClosedEnrollment">
  128.51 +		Vous ne pouvez pas rejoindre &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: 
  128.52 +Le groupe n&apos;accepte plus de nouveaux adhérents.
  128.53 +		<usetemplate name="okbutton" yestext="OK"/>
  128.54 +	</notification>
  128.55 +	<notification name="JoinGroupSuccess">
  128.56 +		Vous avez été ajouté au groupe.
  128.57 +		<usetemplate name="okbutton" yestext="OK"/>
  128.58 +	</notification>
  128.59 +	<notification name="JoinGroupInsufficientFunds">
  128.60 +		Impossible de transférer la cotisation exigée de L$ [membership_fee].
  128.61 +		<usetemplate name="okbutton" yestext="OK"/>
  128.62 +	</notification>
  128.63  	<notification name="LandBuyPass">
  128.64  		Pour [COST] L$ vous pouvez pénétrer sur ce terrain ([PARCEL_NAME]) et y rester [TIME] heures. Acheter un pass ?
  128.65  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
  128.66 @@ -377,9 +415,9 @@
  128.67  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
  128.68  	</notification>
  128.69  	<notification name="ReturnObjectsDeededToGroup">
  128.70 -		Êtes-vous certain de vouloir renvoyer tous les objets partagés par le groupe [NAME] sur cette parcelle dans l&apos;inventaire du propriétaire précédent ?
  128.71 +		Êtes-vous certain de vouloir renvoyer tous les objets partagés par le groupe &apos;&lt;nolink&gt;[NAME]&lt;/nolink&gt;&apos; sur cette parcelle de terrain dans l&apos;inventaire du propriétaire précédent ? 
  128.72  
  128.73 -*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés !
  128.74 +*AVERTISSEMENT* Cela supprimera les objets non transférables cédés au groupe ! 
  128.75  
  128.76  Objets : [N]
  128.77  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
  128.78 @@ -423,7 +461,7 @@
  128.79  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
  128.80  	</notification>
  128.81  	<notification name="ReturnObjectsNotOwnedByGroup">
  128.82 -		Renvoyer les objets de cette parcelle qui ne sont pas partagés avec le groupe [NAME] à leur propriétaire ?
  128.83 +		Renvoyer les objets de cette parcelle qui ne sont PAS partagés avec le groupe &lt;nolink&gt;[NAME]&lt;/nolink&gt; à leur propriétaire ? 
  128.84  
  128.85  Objets : [N]
  128.86  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
  128.87 @@ -471,7 +509,7 @@
  128.88  		Une erreur est survenue lors du chargement de la capture d&apos;écran destinée au rapport, suite au problème suivant : [REASON]
  128.89  	</notification>
  128.90  	<notification name="MustAgreeToLogIn">
  128.91 -		Pour vous connecter à [SECOND_LIFE], vous devez accepter les Conditions d&apos;utilisation.
  128.92 +		Vous devez accepter lestermes et conditions; la Politique de confidentialité et les Conditions d&apos;utilisation de Second Life pour poursuivre votre connexion à [SECOND_LIFE].
  128.93  	</notification>
  128.94  	<notification name="CouldNotPutOnOutfit">
  128.95  		Impossible de mettre cet ensemble.
  128.96 @@ -724,7 +762,7 @@
  128.97  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Expulser"/>
  128.98  	</notification>
  128.99  	<notification name="EjectAvatarFromGroup">
 128.100 -		Vous avez expulsé [AVATAR_NAME] du groupe [GROUP_NAME]
 128.101 +		Vous avez expulsé [AVATAR_NAME]  du groupe &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;
 128.102  	</notification>
 128.103  	<notification name="AcquireErrorTooManyObjects">
 128.104  		Erreur d&apos;acquisition : trop d&apos;objets sélectionnés.
 128.105 @@ -1318,18 +1356,18 @@
 128.106  Veuillez sélectionner une zone plus petite et réessayer.
 128.107  	</notification>
 128.108  	<notification name="DeedLandToGroup">
 128.109 -		Si vous cédez ce terrain, le groupe devra avoir les moyens de le prendre en charge.
 128.110 -Le prix de la vente du terrain n&apos;est pas remboursé par le propriétaire. Si la parcelle que vous cédez se vend, le prix de la vente sera divisé en parts égales parmi les membres du groupe.
 128.111 +		La cession de cette parcelle requiert que le groupe dispose en permanence d&apos;un crédit suffisant pour payer les frais d&apos;occupation de terrain. 
 128.112 +Le prix d&apos;achat du terrain n&apos;est pas remboursé au propriétaire. Si une parcelle cédée est vendue, son prix de vente est redistribué à part égale entre les membres du groupe. 
 128.113  
 128.114 -Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ?
 128.115 +Céder ces [AREA] m² de terrain au groupe &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 128.116  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 128.117  	</notification>
 128.118  	<notification name="DeedLandToGroupWithContribution">
 128.119 -		La cession de cette parcelle requiert que le groupe dispose en permanence d&apos;un crédit suffisant pour payer les frais d&apos;occupation de terrain.
 128.120 -Elle inclura une contribution simultanée au groupe de la part de [NAME].
 128.121 -Le prix d&apos;achat du terrain n&apos;est pas remboursé au propriétaire. Si une parcelle cédée est vendue, son prix de vente est redistribué à part égale entre les membres du groupe.
 128.122 +		La cession de cette parcelle requiert que le groupe dispose en permanence d&apos;un crédit suffisant pour payer les frais d&apos;occupation de terrain. 
 128.123 +Elle inclura une contribution simultanée au groupe de la part de &apos;[NAME]&apos; Le prix d&apos;achat du terrain n&apos;est pas remboursé au propriétaire. 
 128.124 +Si une parcelle cédée est vendue, son prix de vente est redistribué à part égale entre les membres du groupe. 
 128.125  
 128.126 -Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ?
 128.127 +Céder ces [AREA] m² de terrain au groupe &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 128.128  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 128.129  	</notification>
 128.130  	<notification name="DisplaySetToSafe">
 128.131 @@ -1744,7 +1782,7 @@
 128.132  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 128.133  	</notification>
 128.134  	<notification name="GroupDepart">
 128.135 -		Vous avez quitté le groupe « [group_name] ».
 128.136 +		Vous avez quitté le groupe &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;.
 128.137  	</notification>
 128.138  	<notification name="OwnerCannotLeaveGroup">
 128.139  		Impossible de quitter le groupe. Vous ne pouvez pas quitter le groupe car vous en êtes le dernier propriétaire. Vous devez d&apos;abord affecter le rôle de propriétaire à un autre membre.
 128.140 @@ -2017,6 +2055,10 @@
 128.141  		Êtes-vous certain de vouloir modifier le règlement du domaine ?
 128.142  		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 128.143  	</notification>
 128.144 +	<notification name="EstateParcelAccessOverride">
 128.145 +		Le fait de décocher cette option est susceptible de lever les restrictions que les propriétaires des parcelles ont ajouté pour éviter tout différend, maintenir la confidentialité ou protéger les jeunes résidents contre tout contenu réservé aux adultes. Veuillez discuter avec les propriétaires du terrain si nécessaire.
 128.146 +		<usetemplate name="okbutton" yestext="OK"/>
 128.147 +	</notification>
 128.148  	<notification name="RegionEntryAccessBlocked">
 128.149  		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 128.150  		<usetemplate name="okbutton" yestext="OK"/>
 128.151 @@ -2357,7 +2399,17 @@
 128.152  	</notification>
 128.153  	<notification name="DeleteItems">
 128.154  		[QUESTION]
 128.155 -		<usetemplate ignoretext="Confirmer avant de supprimer des articles" name="okcancelignore" notext="Annuler" yestext="OK"/>
 128.156 +		<form name="form">
 128.157 +			<ignore name="ignore" text="Confirmer avant de supprimer des articles"/>
 128.158 +			<button name="Yes" text="OK"/>
 128.159 +			<button name="No" text="Annuler"/>
 128.160 +		</form>
 128.161 +	</notification>
 128.162 +	<notification name="DeleteFilteredItems">
 128.163 +		Votre inventaire est filtré actuellement et les objets que vous souhaitez supprimer ne sont pas tous visibles. 
 128.164 +
 128.165 +Voulez-vous vraiment les supprimer ?
 128.166 +		<usetemplate ignoretext="Confirmer avant de supprimer des articles filtrés." name="okcancelignore" notext="Annuler" yestext="OK"/>
 128.167  	</notification>
 128.168  	<notification name="ConfirmUnlink">
 128.169  		C’est une vaste sélection avec des groupes de liens. Si vous annulez les liens, vous risquez de ne pas pouvoir les rétablir. Vous devriez peut-être faire des copies des groupes de liens dans votre inventaire par mesure de précaution.
 128.170 @@ -2435,13 +2487,17 @@
 128.171  		Le dossier [FOLDERNAME] est un dossier système. La suppression d&apos;un dossier système peut provoquer une instabilité.  Voulez-vous vraiment le supprimer ?
 128.172  		<usetemplate ignoretext="Confirmer avant la suppression d&apos;un dossier système" name="okcancelignore" notext="Annuler" yestext="OK"/>
 128.173  	</notification>
 128.174 +	<notification name="PurgeSelectedItems">
 128.175 +		[COUNT] objet(s) sera(ont) supprimé(s) définitivement. Êtes-vous certain de vouloir supprimer le ou les objets sélectionnés de votre corbeille de manière permanente ?
 128.176 +		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 128.177 +	</notification>
 128.178  	<notification name="ConfirmEmptyTrash">
 128.179 -		Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ?
 128.180 -		<usetemplate ignoretext="Confirmer avant de vider la corbeille" name="okcancelignore" notext="Annuler" yestext="OK"/>
 128.181 +		[COUNT] objets seront supprimés définitivement. Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ?
 128.182 +		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 128.183  	</notification>
 128.184  	<notification name="TrashIsFull">
 128.185  		Votre corbeille déborde. Cela risque de provoquer des problèmes lors de la connexion.
 128.186 -		<usetemplate name="okcancelbuttons" notext="Je viderai la corbeille plus tard" yestext="Vider la corbeille"/>
 128.187 +		<usetemplate name="okcancelbuttons" notext="Je viderai la corbeille plus tard" yestext="Vérifier le dossier Corbeille"/>
 128.188  	</notification>
 128.189  	<notification name="ConfirmClearBrowserCache">
 128.190  		Êtes-vous certain de vouloir supprimer l&apos;historique de vos visites et recherches ?
 128.191 @@ -2570,6 +2626,9 @@
 128.192  	<notification name="AddSelfFriend">
 128.193  		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
 128.194  	</notification>
 128.195 +	<notification name="AddSelfRenderExceptions">
 128.196 +		Vous ne pouvez pas vous ajouter à la liste des exceptions.
 128.197 +	</notification>
 128.198  	<notification name="UploadingAuctionSnapshot">
 128.199  		Importation de photos SL et Web en cours...
 128.200  (prend environ 5 minutes.)
 128.201 @@ -2764,9 +2823,9 @@
 128.202  		Les objets sur la parcelle de terrain sélectionnée appartenant au résident [NAME] ont été rendus à leur propriétaire.
 128.203  	</notification>
 128.204  	<notification name="GroupObjectsReturned">
 128.205 -		Les objets sélectionnés sur la parcelle de terrain partagée avec le groupe [GROUPNAME] ont été renvoyés dans l&apos;inventaire de leur propriétaire.
 128.206 -Les objets donnés transférables ont étés renvoyés à leur propriétaire.
 128.207 -Les objets non transférables donnés au groupe ont étés supprimés.
 128.208 +		Les objets sélectionnés sur la parcelle de terrain partagée avec le groupe &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; ont été renvoyés dans l&apos;inventaire de leur propriétaire. 
 128.209 +Les objets donnés transférables ont étés renvoyés à leur propriétaire. 
 128.210 +Les objets non transférables donnés au groupe ont été supprimés.
 128.211  	</notification>
 128.212  	<notification name="UnOwnedObjectsReturned">
 128.213  		Les objets sélectionnés sur la parcelle et qui ne sont pas à vous ont été rendus à leurs propriétaires.
 128.214 @@ -3151,7 +3210,7 @@
 128.215  		</form>
 128.216  	</notification>
 128.217  	<notification name="ScriptDialogGroup">
 128.218 -		&lt;nolink&gt;[TITLE]&lt;/nolink&gt; de [GROUPNAME]
 128.219 +		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; 
 128.220  [MESSAGE]
 128.221  		<form name="form">
 128.222  			<button name="Client_Side_Mute" text="Bloquer"/>
 128.223 @@ -3198,7 +3257,7 @@
 128.224  		[NAME] a reçu une offre d&apos;inventaire et n&apos;est donc plus ignoré.
 128.225  	</notification>
 128.226  	<notification name="VoiceInviteGroup">
 128.227 -		[NAME] a rejoint un chat vocal avec le groupe [GROUP].
 128.228 +		[NAME] a rejoint un chat vocal avec le groupe &lt;nolink&gt;[GROUP]&lt;/nolink&gt;. 
 128.229  Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cette personne, cliquez sur Ignorer.
 128.230  		<form name="form">
 128.231  			<button name="Accept" text="Accepter"/>
 128.232 @@ -3307,6 +3366,9 @@
 128.233  	<notification name="AppearanceToXMLFailed">
 128.234  		Échec de l’enregistrement de l’apparence au format XML.
 128.235  	</notification>
 128.236 +	<notification name="SnapshotToComputerFailed">
 128.237 +		Échec d’enregistrement de la photo dans [PATH] : Le disque est plein. [NEED_MEMORY]KB est nécessaire mais l&apos;espace libre est de seulement [FREE_MEMORY]KB.
 128.238 +	</notification>
 128.239  	<notification name="PresetNotSaved">
 128.240  		Erreur d’enregistrement du préréglage [NAME].
 128.241  	</notification>
 128.242 @@ -3344,9 +3406,14 @@
 128.243  	<notification name="ShareNotification">
 128.244  		Sélectionnez les résidents avec lesquels partager l&apos;élément.
 128.245  	</notification>
 128.246 +	<notification name="MeshUploadErrorDetails">
 128.247 +		[LABEL] n&apos;a pas pu être téléchargé : [MESSAGE] 
 128.248 +[DETAILS]Voir SecondLife.log pour plus de détails
 128.249 +	</notification>
 128.250  	<notification name="MeshUploadError">
 128.251 -		Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER]
 128.252 -[DETAILS]Consultez SecondLife.log pour de plus amples détails
 128.253 +		Échec de chargement de [LABEL] : [MESSAGE] 
 128.254 +
 128.255 +Voir SecondLife.log pour plus de détails.
 128.256  	</notification>
 128.257  	<notification name="MeshUploadPermError">
 128.258  		Erreur lors de la demande des autorisations de chargement de maillage.
   129.1 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   129.2 +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   129.3 @@ -12,10 +12,17 @@
   129.4  	<text name="ItemcountText">
   129.5  		Articles :
   129.6  	</text>
   129.7 -	<filter_editor label="Filtrer l&apos;inventaire" name="inventory search editor"/>
   129.8 +	<filter_editor label="Saisir ici le texte de la recherche" name="inventory search editor"/>
   129.9 +	<combo_box name="search_type">
  129.10 +		<item label="Nom" name="Name" value="search_by_name"/>
  129.11 +		<item label="Créateur" name="Creator" value="search_by_creator"/>
  129.12 +		<item label="Description" name="Description" value="search_by_description"/>
  129.13 +		<item label="UUID" name="UUID" value="search_by_UUID"/>
  129.14 +	</combo_box>
  129.15  	<tab_container name="inventory filter tabs">
  129.16  		<inventory_panel label="MON INVENTAIRE" name="All Items"/>
  129.17  		<recent_inventory_panel label="RÉCENT" name="Recent Items"/>
  129.18 +		<inventory_panel label="PORTÉ" name="Worn Items"/>
  129.19  	</tab_container>
  129.20  	<layout_stack name="bottom_panel">
  129.21  		<layout_panel name="options_gear_btn_panel">
   130.1 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml	Tue Nov 21 09:46:31 2017 -0800
   130.2 +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml	Mon Dec 11 10:09:44 2017 -0800
   130.3 @@ -6,7 +6,7 @@
   130.4  	<text name="Cache:">
   130.5  		Cache :
   130.6  	</text>
   130.7 -	<spinner label="Taille du cache (256 - 9984 Mo)" name="cachesizespinner"/>
   130.8 +	<spinner label="Taille de la mémoire (256 - 9984MB)" name="cachesizespinner"/>
   130.9  	<text name="text_box5">
  130.10  		Mo
  130.11  	</text>
   131.1 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml	Tue Nov 21 09:46:31 2017 -0800
   131.2 +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml	Mon Dec 11 10:09:44 2017 -0800
   131.3 @@ -1,5 +1,6 @@
   131.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   131.5  <panel label="Chat écrit" name="chat">
   131.6 +	<check_box initial_value="true" label="Compléter vous-même les gestes dans le chat" name="auto_complete_gestures"/>
   131.7  	<panel name="general_chat_settings">
   131.8  		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
   131.9  		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
   132.1 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml	Tue Nov 21 09:46:31 2017 -0800
   132.2 +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml	Mon Dec 11 10:09:44 2017 -0800
   132.3 @@ -17,60 +17,34 @@
   132.4  	<text name="estate_owner">
   132.5  		(inconnu)
   132.6  	</text>
   132.7 -	<text name="Only Allow">
   132.8 -		Conditions d&apos;accès des résidents :
   132.9 -	</text>
  132.10 -	<check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Pour pouvoir accéder à ce domaine, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  132.11 -	<check_box label="Avoir plus de 18 ans" name="limit_age_verified" tool_tip="Pour accéder à ce domaine, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  132.12 +	<radio_group name="externally_visible_radio">
  132.13 +		<radio_item label="Autoriser uniquement les résidents et les groupes indiqués ci-dessous" name="estate_restricted_access"/>
  132.14 +		<radio_item label="Visite ouverte à tous" name="estate_public_access"/>
  132.15 +	</radio_group>
  132.16 +	<check_box label="Doit avoir plus de 18 ans" name="limit_age_verified" tool_tip="Pour accéder à ce domaine, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  132.17 +	<check_box label="Les infos de paiement doivent être enregistrées" name="limit_payment" tool_tip="Pour pouvoir accéder à ce domaine, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
  132.18 +	<check_box label="Les propriétaires de terrain peuvent imposer plus de restrictions" name="parcel_access_override"/>
  132.19  	<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
  132.20 -	<button label="?" name="voice_chat_help"/>
  132.21 -	<text name="abuse_email_text">
  132.22 -		E-mail où signaler l&apos;infraction :
  132.23 -	</text>
  132.24 -	<string name="email_unsupported">
  132.25 -		Non pris en charge
  132.26 -	</string>
  132.27 -	<button label="?" name="abuse_email_address_help"/>
  132.28 +	<check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
  132.29 +	<button label="Appliquer" name="apply_btn"/>
  132.30  	<text name="estate_manager_label">
  132.31  		Gérants du domaine :
  132.32  	</text>
  132.33 -	<button label="?" name="estate_manager_help"/>
  132.34 +	<text name="allow_resident_label">
  132.35 +		Toujours autorisé :
  132.36 +	</text>
  132.37  	<button label="Ajouter..." name="add_estate_manager_btn"/>
  132.38  	<button label="Supprimer..." name="remove_estate_manager_btn"/>
  132.39 -	<check_box label="Utiliser le temps universel" name="use_global_time_check"/>
  132.40 -	<button label="?" name="use_global_time_help"/>
  132.41 -	<check_box label="Soleil fixe" name="fixed_sun_check"/>
  132.42 -	<button label="?" name="fixed_sun_help"/>
  132.43 -	<slider label="Phase" name="sun_hour_slider"/>
  132.44 -	<check_box label="Autoriser l&apos;accès public" name="externally_visible_check"/>
  132.45 -	<button label="?" name="externally_visible_help"/>
  132.46 -	<check_box label="Vue sur le continent" name="mainland_visible_check"/>
  132.47 -	<button label="?" name="mainland_visible_help"/>
  132.48 -	<check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
  132.49 -	<button label="?" name="allow_direct_teleport_help"/>
  132.50 -	<text name="region_text_lbl">
  132.51 -		Refuser l&apos;accès selon les infos de paiement :
  132.52 -	</text>
  132.53 -	<check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous"/>
  132.54 -	<check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified"/>
  132.55 -	<check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted"/>
  132.56 -	<button label="Appliquer" name="apply_btn"/>
  132.57 -	<text name="allow_resident_label">
  132.58 -		Résidents autorisés :
  132.59 -	</text>
  132.60 -	<button label="?" name="allow_resident_help"/>
  132.61  	<button label="Ajouter..." name="add_allowed_avatar_btn"/>
  132.62  	<button label="Supprimer..." name="remove_allowed_avatar_btn"/>
  132.63  	<text name="allow_group_label">
  132.64 -		Groupes autorisés :
  132.65 +		Groupes toujours autorisés :
  132.66  	</text>
  132.67 -	<button label="?" name="allow_group_help"/>
  132.68 +	<text name="ban_resident_label">
  132.69 +		Toujours interdit :
  132.70 +	</text>
  132.71  	<button label="Ajouter..." name="add_allowed_group_btn"/>
  132.72  	<button label="Supprimer..." name="remove_allowed_group_btn"/>
  132.73 -	<text name="ban_resident_label">
  132.74 -		Résidents bannis :
  132.75 -	</text>
  132.76 -	<button label="?" name="ban_resident_help"/>
  132.77  	<button label="Ajouter..." name="add_banned_avatar_btn"/>
  132.78  	<button label="Supprimer..." name="remove_banned_avatar_btn"/>
  132.79  	<button label="Message au domaine..." name="message_estate_btn"/>
   133.1 --- a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml	Tue Nov 21 09:46:31 2017 -0800
   133.2 +++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml	Mon Dec 11 10:09:44 2017 -0800
   133.3 @@ -26,6 +26,7 @@
   133.4  		<radio_item label="Relief (normal)" name="Bumpiness (normal)" value="1"/>
   133.5  		<radio_item label="Brillance (spéculaire)" name="Shininess (specular)" value="2"/>
   133.6  	</radio_group>
   133.7 +	<check_box initial_value="false" label="Verrouiller la fonction répéter" name="checkbox_sync_settings" tool_tip="L&apos;ajustement des cartes se fait simultanément"/>
   133.8  	<texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
   133.9  	<text name="label alphamode">
  133.10  		Mode alpha
   134.1 --- a/indra/newview/skins/default/xui/fr/role_actions.xml	Tue Nov 21 09:46:31 2017 -0800
   134.2 +++ b/indra/newview/skins/default/xui/fr/role_actions.xml	Mon Dec 11 10:09:44 2017 -0800
   134.3 @@ -38,7 +38,7 @@
   134.4  		<action description="Toujours autoriser Modifier le terrain" longdescription="Vous pouvez modifier le relief d&apos;une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options." name="land allow edit land" value="23"/>
   134.5  		<action description="Toujours autoriser à voler" longdescription="Vous pouvez voler sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options." name="land allow fly" value="24"/>
   134.6  		<action description="Toujours autoriser à créer des objets" longdescription="Vous pouvez créer des objets sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options." name="land allow create" value="25"/>
   134.7 -		<action description="Toujours autoriser à créer des repères" longdescription="Vous pouvez créer un repère sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options." name="land allow landmark" value="26"/>
   134.8 +		<action description="Ignorer le lieu d’arrivée" longdescription="Les membres qui ont un Rôle dans cette capacité peuvent diriger le téléportage vers une parcelle appartenant à un groupe, même si le point d&apos;arrivée est fixé dans A propos du terrain &gt; Onglet Options." name="land allow direct teleport" value="26"/>
   134.9  		<action description="Autoriser à définir un domicile sur le terrain du groupe" longdescription="Un membre dans un rôle avec ce pouvoir peut utiliser le menu Monde &gt; Repères &gt; Définir le domicile ici sur une parcelle cédée à ce groupe." name="land allow set home" value="28"/>
  134.10  		<action description="Autoriser la réception d&apos;événements sur les terrains du groupe" longdescription="Les membres dont le rôle possède ce pouvoir peuvent sélectionner les parcelles détenues par le groupe comme lieu de réception lors d&apos;un événement." name="land allow host event" value="41"/>
  134.11  	</action_set>
   135.1 --- a/indra/newview/skins/default/xui/fr/strings.xml	Tue Nov 21 09:46:31 2017 -0800
   135.2 +++ b/indra/newview/skins/default/xui/fr/strings.xml	Mon Dec 11 10:09:44 2017 -0800
   135.3 @@ -261,9 +261,8 @@
   135.4  [TIME], heure du Pacifique.
   135.5  	</string>
   135.6  	<string name="LoginFailedAccountDisabled">
   135.7 -		Nous n&apos;avons pas réussi à traiter votre demande.
   135.8 -Pour obtenir de l&apos;aide, veuillez contacter l&apos;Assistance Second Life à la page suivante : http://secondlife.com/support.
   135.9 -Si vous ne parvenez pas à changer de mot de passe, veuillez appeler le (866) 476-9763.
  135.10 +		Impossible de traiter votre demande à l&apos;heure actuelle. 
  135.11 +Pour obtenir de l&apos;aide, veuillez contacter l&apos;Assistance Second Life à la page suivante : http://support.secondlife.com.
  135.12  	</string>
  135.13  	<string name="LoginFailedTransformError">
  135.14  		Incohérence des données lors de la connexion.
  135.15 @@ -704,6 +703,19 @@
  135.16  	<string name="AssetErrorUnknownStatus">
  135.17  		Statut inconnu
  135.18  	</string>
  135.19 +	<string name="AssetUploadServerUnreacheble">
  135.20 +		Service inaccessible.
  135.21 +	</string>
  135.22 +	<string name="AssetUploadServerDifficulties">
  135.23 +		Le serveur rencontres des difficultés imprévues.
  135.24 +	</string>
  135.25 +	<string name="AssetUploadServerUnavaliable">
  135.26 +		Services non disponible ou la durée du chargement est dépassée.
  135.27 +	</string>
  135.28 +	<string name="AssetUploadRequestInvalid">
  135.29 +		Erreur dans la demande de chargement. Veuillez consulter le site : 
  135.30 +http://secondlife.com/support pour vous aider à résoudre ce problème.
  135.31 +	</string>
  135.32  	<string name="texture">
  135.33  		texture
  135.34  	</string>
  135.35 @@ -2198,10 +2210,19 @@
  135.36  		tous les domaines que vous gérez pour [OWNER]
  135.37  	</string>
  135.38  	<string name="RegionInfoAllowedResidents">
  135.39 -		Résidents autorisés : ([ALLOWEDAGENTS], max. [MAXACCESS])
  135.40 +		Toujours autorisé : ([ALLOWEDAGENTS], max [MAXACCESS])
  135.41  	</string>
  135.42  	<string name="RegionInfoAllowedGroups">
  135.43 -		Groupes autorisés : ([ALLOWEDGROUPS], max. [MAXACCESS])
  135.44 +		Groupes toujours autorisés : [ALLOWEDGROUPS], max [MAXACCESS])
  135.45 +	</string>
  135.46 +	<string name="RegionInfoBannedResidents">
  135.47 +		Toujours interdits : ([BANNEDAGENTS], max. [MAXBANNED])
  135.48 +	</string>
  135.49 +	<string name="RegionInfoListTypeAllowedAgents">
  135.50 +		Toujours autorisé
  135.51 +	</string>
  135.52 +	<string name="RegionInfoListTypeBannedAgents">
  135.53 +		Toujours interdit
  135.54  	</string>
  135.55  	<string name="ScriptLimitsParcelScriptMemory">
  135.56  		Mémoire des scripts de parcelles
   136.1 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
   136.2 +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
   136.3 @@ -440,13 +440,10 @@
   136.4  			<panel.string name="estate_override">
   136.5  				Una o più di queste impostazioni sono già impostate a livello regionale
   136.6  			</panel.string>
   136.7 -			<check_box label="Consenti l&apos;accesso pubblico (se si rimuove la selezione vengono create linee di espulsione)" name="public_access"/>
   136.8 -			<text name="Only Allow">
   136.9 -				Consenti l&apos;accesso solo ai Residenti che:
  136.10 -			</text>
  136.11 -			<check_box label="Hanno informazioni di pagamento in archivio [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Per poter visitare questo lotto i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  136.12 -			<check_box label="Hanno almeno 18 anni [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Per poter visitare questo lotto i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  136.13 -			<check_box label="Permetti accesso al gruppo: [GROUP]" name="GroupCheck" tool_tip="Imposta il gruppo nel pannello generale."/>
  136.14 +			<check_box label="Chiunque può visitare (Se si rimuove la selezione vengono create linee di espulsione)" name="public_access"/>
  136.15 +			<check_box label="È necessario avere più di 18 anni [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Per poter visitare questo lotto i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  136.16 +			<check_box label="È necessario aver registrato le informazioni di pagamento [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Per poter visitare questo lotto i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  136.17 +			<check_box label="Consenti gruppo [GRUPPO] senza restrizioni" name="GroupCheck" tool_tip="Imposta il gruppo nel pannello generale."/>
  136.18  			<check_box label="Vendi pass a:" name="PassCheck" tool_tip="Permetti in questo terreno l&apos;accesso temporaneo"/>
  136.19  			<combo_box name="pass_combo">
  136.20  				<combo_box.item label="Chiunque" name="Anyone"/>
  136.21 @@ -454,9 +451,12 @@
  136.22  			</combo_box>
  136.23  			<spinner label="Prezzo in L$:" name="PriceSpin"/>
  136.24  			<spinner label="Ore di accesso:" name="HoursSpin"/>
  136.25 +			<text name="OwnerLimited">
  136.26 +				(Può essere che il proprietario immobiliare abbia limitato queste scelte)
  136.27 +			</text>
  136.28  			<panel name="Allowed_layout_panel">
  136.29  				<text label="Consenti sempre" name="AllowedText">
  136.30 -					Residenti consentiti ([COUNT], max [MAX])
  136.31 +					Sempre consentiti ([COUNT], max [MAX])
  136.32  				</text>
  136.33  				<name_list name="AccessList" tool_tip="([LISTED] in lista, [MAX] max)"/>
  136.34  				<button label="Aggiungi" name="add_allowed"/>
  136.35 @@ -464,7 +464,7 @@
  136.36  			</panel>
  136.37  			<panel name="Banned_layout_panel">
  136.38  				<text label="Espelli" name="BanCheck">
  136.39 -					Residenti espulsi ([COUNT], max [MAX])
  136.40 +					Sempre esclusi ([COUNT], max [MAX])
  136.41  				</text>
  136.42  				<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)"/>
  136.43  				<button label="Aggiungi" name="add_banned"/>
   137.1 --- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
   137.2 +++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
   137.3 @@ -3,6 +3,9 @@
   137.4  	<floater.string name="not_found">
   137.5  		&apos;[TEXT]&apos; non trovato
   137.6  	</floater.string>
   137.7 +	<floater.string name="not_found_text">
   137.8 +		Residente non trovato
   137.9 +	</floater.string>
  137.10  	<floater.string name="no_one_near">
  137.11  		Nessuno vicino
  137.12  	</floater.string>
   138.1 --- a/indra/newview/skins/default/xui/it/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
   138.2 +++ b/indra/newview/skins/default/xui/it/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
   138.3 @@ -7,5 +7,6 @@
   138.4  	<name_list name="render_settings_list">
   138.5  		<name_list.columns label="Nome" name="name"/>
   138.6  		<name_list.columns label="Impostazione di rendering" name="setting"/>
   138.7 +		<name_list.columns label="Data aggiunta" name="timestamp"/>
   138.8  	</name_list>
   138.9  </floater>
   139.1 --- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
   139.2 +++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
   139.3 @@ -15,6 +15,8 @@
   139.4  	<button label="Tutto" label_selected="Tutto" name="All"/>
   139.5  	<button label="Nulla" label_selected="Nulla" name="None"/>
   139.6  	<check_box label="Mostra sempre le cartelle" name="check_show_empty"/>
   139.7 +	<check_box label="Creato da me" name="check_created_by_me"/>
   139.8 +	<check_box label="Creato da altri" name="check_created_by_others"/>
   139.9  	<check_box label="Dall&apos;ultima sconnessione" name="check_since_logoff"/>
  139.10  	<text name="- OR -">
  139.11  		- Oppure -
   140.1 --- a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
   140.2 +++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
   140.3 @@ -1,5 +1,5 @@
   140.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   140.5 -<floater name="floater_pathfinding_linksets" title="Set collegati pathfinding">
   140.6 +<floater name="floater_pathfinding_linksets" title="OGGETTI REGIONE">
   140.7  	<floater.string name="messaging_get_inprogress">
   140.8  		Ricerca set collegati pathfinding in corso...
   140.9  	</floater.string>
  140.10 @@ -16,7 +16,7 @@
  140.11  		Nessun set collegato con pathfinding.
  140.12  	</floater.string>
  140.13  	<floater.string name="messaging_complete_available">
  140.14 -		[NUM_SELECTED] set collegati selezionati su [NUM_TOTAL].
  140.15 +		[NUM_SELECTED] selezionati su [NUM_TOTAL].
  140.16  	</floater.string>
  140.17  	<floater.string name="messaging_not_enabled">
  140.18  		In questa regione non è attivata la funzione pathfinding
  140.19 @@ -118,7 +118,7 @@
  140.20  			<scroll_list.columns label="Scriptato" name="scripted"/>
  140.21  			<scroll_list.columns label="Impatto" name="land_impact"/>
  140.22  			<scroll_list.columns label="Distanza" name="dist_from_you"/>
  140.23 -			<scroll_list.columns label="Uso set collegati" name="linkset_use"/>
  140.24 +			<scroll_list.columns label="Uso del pathfinding" name="linkset_use"/>
  140.25  			<scroll_list.columns label="A %" name="a_percent"/>
  140.26  			<scroll_list.columns label="B %" name="b_percent"/>
  140.27  			<scroll_list.columns label="C %" name="c_percent"/>
  140.28 @@ -133,7 +133,7 @@
  140.29  	</panel>
  140.30  	<panel name="pathfinding_linksets_actions">
  140.31  		<text name="linksets_actions_label">
  140.32 -			Azioni sui set collegati selezionati (se si rimuove un set collegato dal mondo, si potrebbero perdere i relativi attributi):
  140.33 +			Azioni sugli oggetti selezionati
  140.34  		</text>
  140.35  		<check_box label="Mostra marcatore" name="show_beacon"/>
  140.36  		<button label="Prendi" name="take_objects"/>
  140.37 @@ -144,7 +144,7 @@
  140.38  	</panel>
  140.39  	<panel name="pathfinding_linksets_attributes">
  140.40  		<text name="linksets_attributes_label">
  140.41 -			Modifica gli attributi dei set collegati selezionati e premi il pulsante per applicare le modifiche
  140.42 +			Modifica attributi pathfinding:
  140.43  		</text>
  140.44  		<text name="walkability_coefficients_label">
  140.45  			Camminabilità:
   141.1 --- a/indra/newview/skins/default/xui/it/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
   141.2 +++ b/indra/newview/skins/default/xui/it/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
   141.3 @@ -6,13 +6,16 @@
   141.4  	<floater.string name="loading_url">
   141.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Caricamento in corso %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
   141.6  	</floater.string>
   141.7 -	<button label="Continua" label_selected="Continua" name="Continue"/>
   141.8 -	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
   141.9 -	<check_box label="Accetto i Termini del servizio e le Regole sulla privacy" name="agree_chk"/>
  141.10  	<text name="tos_heading">
  141.11 -		Sei pregato di leggere attentamente i Termini del servizio e le Regole sulla privacy di seguito. Per continuare l&apos;accesso a [SECOND_LIFE], devi accettare le condizioni.
  141.12 +		Leggi i Termini e le Condizioni di Second Life, le clausole di riservatezza, i Termini del Servizio, compresi i requisiti per l&apos;utilizzo dell&apos;arbitrato e la rinuncia a qualunque ricorso di classe o gruppo per risolvere controversie.  Per continuare l&apos;accesso a [SECOND_LIFE], devi accettare le condizioni.
  141.13  	</text>
  141.14  	<text name="external_tos_required">
  141.15  		Per continuare, visita https://my.secondlife.com e accedi per accettare i Termini del servizio. Grazie.
  141.16  	</text>
  141.17 +	<check_box label="Ho letto e sono d’accordo con" name="agree_chk"/>
  141.18 +	<text name="agree_list">
  141.19 +		i Termini e le Condizioni di Second Life, le clausole di riservatezza, i Termini del Servizio, compresi i requisiti per la risoluzione delle dispute.
  141.20 +	</text>
  141.21 +	<button label="Continua" label_selected="Continua" name="Continue"/>
  141.22 +	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
  141.23  </floater>
   142.1 --- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
   142.2 +++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
   142.3 @@ -21,6 +21,7 @@
   142.4  		<menu_item_check label="Impostazione predefinita" name="RenderNormally"/>
   142.5  		<menu_item_check label="Sempre" name="AlwaysRenderFully"/>
   142.6  		<menu_item_check label="Mai" name="DoNotRender"/>
   142.7 +		<menu_item_call label="Eccezioni..." name="RenderExceptions"/>
   142.8  	</context_menu>
   142.9  	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
  142.10  </context_menu>
   143.1 --- a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
   143.2 +++ b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
   143.3 @@ -1,8 +1,14 @@
   143.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   143.5 -<menu name="Avatar Icon Menu">
   143.6 +<toggleable_menu name="Avatar Icon Menu">
   143.7  	<menu_item_call label="Vedi profilo" name="Show Profile"/>
   143.8  	<menu_item_call label="Manda IM..." name="Send IM"/>
   143.9  	<menu_item_call label="Richiedi teleport" name="Request Teleport"/>
  143.10  	<menu_item_call label="Aggiungi come amico..." name="Add Friend"/>
  143.11  	<menu_item_call label="Togli amicizia..." name="Remove Friend"/>
  143.12 -</menu>
  143.13 +	<context_menu label="Opzioni moderatore" name="Moderator Options">
  143.14 +		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
  143.15 +		<menu_item_call label="Disattiva audio di questo participante" name="ModerateVoiceMuteSelected"/>
  143.16 +		<menu_item_call label="Riattiva audio di questo participante" name="ModerateVoiceUnMuteSelected"/>
  143.17 +	</context_menu>
  143.18 +	<menu_item_call label="Espelli membro" name="BanMember"/>
  143.19 +</toggleable_menu>
   144.1 --- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
   144.2 +++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
   144.3 @@ -20,6 +20,7 @@
   144.4  		<menu_item_check label="Impostazione predefinita" name="RenderNormally"/>
   144.5  		<menu_item_check label="Sempre" name="AlwaysRenderFully"/>
   144.6  		<menu_item_check label="Mai" name="DoNotRender"/>
   144.7 +		<menu_item_call label="Eccezioni..." name="RenderExceptions"/>
   144.8  	</context_menu>
   144.9  	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
  144.10  </context_menu>
   145.1 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   145.2 +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   145.3 @@ -75,10 +75,12 @@
   145.4  	<menu_item_call label="Proprietà" name="Properties"/>
   145.5  	<menu_item_call label="Rinomina" name="Rename"/>
   145.6  	<menu_item_call label="Copia UUID dell&apos;oggetto" name="Copy Asset UUID"/>
   145.7 +	<menu_item_call label="Mostra nel pannello principale" name="Show in Main Panel"/>
   145.8  	<menu_item_call label="Taglia" name="Cut"/>
   145.9  	<menu_item_call label="Copia" name="Copy"/>
  145.10  	<menu_item_call label="Incolla" name="Paste"/>
  145.11  	<menu_item_call label="Incolla come link" name="Paste As Link"/>
  145.12 +	<menu_item_call label="Sostituisci link" name="Replace Links"/>
  145.13  	<menu_item_call label="Cancella" name="Delete"/>
  145.14  	<menu_item_call label="Elimina la cartella di sistema" name="Delete System Folder"/>
  145.15  	<menu_item_call label="Inizia la conferenza chat" name="Conference Chat Folder"/>
   146.1 --- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
   146.2 +++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
   146.3 @@ -13,5 +13,6 @@
   146.4  	<menu_item_call label="Condividi" name="Share"/>
   146.5  	<menu_item_call label="Trova originale" name="Find Original"/>
   146.6  	<menu_item_call label="Trova tutti i link" name="Find All Links"/>
   146.7 +	<menu_item_call label="Sostituisci link" name="Replace Links"/>
   146.8  	<menu_item_call label="Svuota cestino" name="empty_trash"/>
   146.9  </toggleable_menu>
   147.1 --- a/indra/newview/skins/default/xui/it/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
   147.2 +++ b/indra/newview/skins/default/xui/it/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
   147.3 @@ -2,6 +2,7 @@
   147.4  <menu_bar name="Login Menu">
   147.5  	<menu label="Io" name="File">
   147.6  		<menu_item_call label="Preferenze..." name="Preferences..."/>
   147.7 +		<menu_item_call label="Chiudi la finestra" name="Close Window"/>
   147.8  		<menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/>
   147.9  		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
  147.10  	</menu>
   148.1 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
   148.2 +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
   148.3 @@ -121,7 +121,7 @@
   148.4  			<menu_item_call label="Includi parte o faccia successiva" name="Include Next Part or Face"/>
   148.5  			<menu_item_call label="Includi parte o faccia precedente" name="Include Previous Part or Face"/>
   148.6  		</menu>
   148.7 -		<menu_item_call label="Set collegati..." name="pathfinding_linkset_menu_item"/>
   148.8 +		<menu_item_call label="Oggetti regione" name="pathfinding_linkset_menu_item"/>
   148.9  		<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
  148.10  		<menu_item_call label="Zoom sulla selezione" name="Zoom to Selection"/>
  148.11  		<menu label="Oggetto" name="Object">
  148.12 @@ -141,7 +141,7 @@
  148.13  			<menu_item_call label="Imposta script come non in esecuzione" name="Set Scripts to Not Running"/>
  148.14  		</menu>
  148.15  		<menu label="Pathfinding" name="Pathfinding">
  148.16 -			<menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/>
  148.17 +			<menu_item_call label="Oggetti regione" name="pathfinding_linksets_menu_item"/>
  148.18  			<menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/>
  148.19  			<menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/>
  148.20  			<menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/>
   149.1 --- a/indra/newview/skins/default/xui/it/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
   149.2 +++ b/indra/newview/skins/default/xui/it/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
   149.3 @@ -3,6 +3,10 @@
   149.4  	<global name="skipnexttime">
   149.5  		Non mostrare più la prossima volta
   149.6  	</global>
   149.7 +	<global name="skipnexttimesessiononly">
   149.8 +		Non mostrare più questo messaggio 
   149.9 +(nella sessione attuale)
  149.10 +	</global>
  149.11  	<global name="alwayschoose">
  149.12  		Scegli sempre questa opzione
  149.13  	</global>
  149.14 @@ -343,8 +347,8 @@
  149.15  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Iscriviti"/>
  149.16  	</notification>
  149.17  	<notification name="JoinGroupNoCost">
  149.18 -		Aderisci al gruppo [NAME].
  149.19 -Continuare?
  149.20 +		Stai per entrare a far parte del gruppo &lt;nolink&gt;[NAME]&lt;/nolink&gt;. 
  149.21 +Vuoi continuare?
  149.22  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Iscriviti"/>
  149.23  	</notification>
  149.24  	<notification name="JoinGroupCannotAfford">
  149.25 @@ -357,6 +361,40 @@
  149.26  Invita altri partecipanti entro le prossime 48 ore.
  149.27  		<usetemplate canceltext="Annulla" name="okcancelbuttons" notext="Annulla" yestext="Crea un gruppo per L$ 100"/>
  149.28  	</notification>
  149.29 +	<notification name="JoinGroupInaccessible">
  149.30 +		Non puoi accedere a questo gruppo.
  149.31 +		<usetemplate name="okbutton" yestext="OK"/>
  149.32 +	</notification>
  149.33 +	<notification name="JoinGroupError">
  149.34 +		Errore durante la richiesta di accesso al gruppo.
  149.35 +		<usetemplate name="okbutton" yestext="OK"/>
  149.36 +	</notification>
  149.37 +	<notification name="JoinGroupErrorReason">
  149.38 +		Impossibile unirsi al gruppo: [reason]
  149.39 +		<usetemplate name="okbutton" yestext="OK"/>
  149.40 +	</notification>
  149.41 +	<notification name="JoinGroupTrialUser">
  149.42 +		Siamo spiacenti, gli utenti in prova non possono unirsi ai gruppi.
  149.43 +		<usetemplate name="okbutton" yestext="OK"/>
  149.44 +	</notification>
  149.45 +	<notification name="JoinGroupMaxGroups">
  149.46 +		Non puoi unirti a ‘&lt;nolink&gt;[group_name]&lt;/nolink&gt;’: 
  149.47 +Sei già membro di [group_count] gruppi, il numero massimo consentito è di [max_groups]
  149.48 +		<usetemplate name="okbutton" yestext="OK"/>
  149.49 +	</notification>
  149.50 +	<notification name="JoinGroupClosedEnrollment">
  149.51 +		Non puoi unirti a ‘&lt;nolink&gt;[group_name]&lt;/nolink&gt;’: 
  149.52 +Il gruppo non ha ancora aperto le iscrizioni.
  149.53 +		<usetemplate name="okbutton" yestext="OK"/>
  149.54 +	</notification>
  149.55 +	<notification name="JoinGroupSuccess">
  149.56 +		Sei stato aggiunto al gruppo.
  149.57 +		<usetemplate name="okbutton" yestext="OK"/>
  149.58 +	</notification>
  149.59 +	<notification name="JoinGroupInsufficientFunds">
  149.60 +		Impossibile trasferire la quota di abbonamento richiesta di [membership_fee] L$.
  149.61 +		<usetemplate name="okbutton" yestext="OK"/>
  149.62 +	</notification>
  149.63  	<notification name="LandBuyPass">
  149.64  		Pagando [COST]L$ puoi entrare in questa terra (&apos;[PARCEL_NAME]&apos;) per [TIME] ore.  Compri un pass?
  149.65  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
  149.66 @@ -378,9 +416,9 @@
  149.67  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
  149.68  	</notification>
  149.69  	<notification name="ReturnObjectsDeededToGroup">
  149.70 -		Confermi di volere restituire tutti gli oggetti condivisi con il gruppo &apos;[NAME]&apos; di questo terreno agli inventari dei proprietari precedenti?
  149.71 +		Confermi di voler restituire all’inventario del precedente proprietario tutti gli oggetti condivisi in questo lotto con il gruppo ‘&lt;nolink&gt;[NAME]&lt;/nolink&gt;’? 
  149.72  
  149.73 -*ATTENZIONE* Questo cancellerà gli oggetti non trasferibili ceduti al gruppo!
  149.74 +*ATTENZIONE* Così facendo, verranno  eliminati tutti gli oggetti non trasferibili ceduti al gruppo! 
  149.75  
  149.76  Oggetti: [N]
  149.77  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
  149.78 @@ -424,7 +462,7 @@
  149.79  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
  149.80  	</notification>
  149.81  	<notification name="ReturnObjectsNotOwnedByGroup">
  149.82 -		Restituisci gli oggetti in questo terreno che NON sono condivisi con il gruppo [NAME] ai loro proprietari?
  149.83 +		Vuoi restituire gli oggetti di questo lotto di terra che NON sono condivisi con il gruppo &lt;nolink&gt;[NAME]&lt;/nolink&gt; ai loro proprietari? 
  149.84  
  149.85  Oggetti: [N]
  149.86  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
  149.87 @@ -472,7 +510,7 @@
  149.88  		C&apos;è stato un problema importando la foto del rapporto per il seguente motivo: [REASON]
  149.89  	</notification>
  149.90  	<notification name="MustAgreeToLogIn">
  149.91 -		Devi accettare i Termini di Servizio prima di proseguire il collegamento con [SECOND_LIFE].
  149.92 +		Devi accettare i Termini e le Condizioni di Second Life, le clausole di riservatezza e i Termini del Servizio per continuare l’accesso a [SECOND_LIFE].
  149.93  	</notification>
  149.94  	<notification name="CouldNotPutOnOutfit">
  149.95  		Non è stato possibile indossare un equipaggiamento.
  149.96 @@ -723,7 +761,7 @@
  149.97  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli"/>
  149.98  	</notification>
  149.99  	<notification name="EjectAvatarFromGroup">
 149.100 -		Hai espulso [AVATAR_NAME] dal gruppo [GROUP_NAME]
 149.101 +		Hai espulso [AVATAR_NAME] dal gruppo &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;
 149.102  	</notification>
 149.103  	<notification name="AcquireErrorTooManyObjects">
 149.104  		ERRORE DI ACQUISIZIONE: hai selezionato troppi oggetti.
 149.105 @@ -1322,19 +1360,18 @@
 149.106  Seleziona un&apos;area più piccola e riprova.
 149.107  	</notification>
 149.108  	<notification name="DeedLandToGroup">
 149.109 -		Cedendo questo terreno al gruppo sara richiesto ai componenti di avere e di mantenere il terreno con un credito sufficiente.
 149.110 -Il prezzo di acquisto del terreno non è rifondibile al proprietario.
 149.111 -Se una terreno ceduto al gruppo viene venduto, il prezzo di vendita verrà diviso in parti uguali fra i membri del gruppo.
 149.112 +		Completando la cessione del lotto, il gruppo dovrà avere e mantenere crediti sufficienti per l&apos;uso del terreno. 
 149.113 +Il prezzo di acquisto del terreno non viene rimborsato al proprietario. Se un lotto ceduto viene venduto, il prezzo di vendita viene distribuito in parti uguali tra i membri del gruppo. 
 149.114  
 149.115 -Cedi questo terreno di [AREA] m² al gruppo &apos;[GROUP_NAME]&apos;?
 149.116 +Cedere questi [AREA] m² di terreno al gruppo ‘&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 149.117  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 149.118  	</notification>
 149.119  	<notification name="DeedLandToGroupWithContribution">
 149.120 -		Completando la cessione del lotto, il gruppo dovrà avere e mantenere crediti sufficienti per l&apos;uso del terreno.
 149.121 -La cessione includerà un contributo contemporaneo di terreno al gruppo da &apos;[NAME]&apos;.
 149.122 -Il prezzo di acquisto del terreno non viene rimborsato al proprietario. Se un lotto ceduto viene venduto, il prezzo di vendita viene distribuito in maniera paritetica tra i membri del gruppo.
 149.123 +		Completando la cessione del lotto, il gruppo dovrà avere e mantenere crediti sufficienti per l&apos;uso del terreno. 
 149.124 +La cessione includerà un contributo contemporaneo di terreno al gruppo da &apos;[NAME]&apos;. 
 149.125 +Il prezzo di acquisto del terreno non viene rimborsato al proprietario. Se un lotto ceduto viene venduto, il prezzo di vendita viene distribuito in parti uguali tra i membri del gruppo. 
 149.126  
 149.127 -Cedere questi [AREA] m² di terreno al gruppo &apos;[GROUP_NAME]&apos;?
 149.128 +Cedere questi [AREA] m² di terreno al gruppo ‘&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 149.129  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 149.130  	</notification>
 149.131  	<notification name="DisplaySetToSafe">
 149.132 @@ -1748,7 +1785,7 @@
 149.133  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 149.134  	</notification>
 149.135  	<notification name="GroupDepart">
 149.136 -		Hai abbandonato il gruppo &quot;[group_name]&quot;.
 149.137 +		Hai abbandonato il gruppo “&lt;nolink&gt;[group_name]&lt;/nolink&gt;&quot;.
 149.138  	</notification>
 149.139  	<notification name="OwnerCannotLeaveGroup">
 149.140  		Impossibile abbandonare il gruppo. Non puoi abbandonare il gruppo perché sei l&apos;ultimo proprietario del gruppo. Devi prima assegnare a un altro membro il ruolo di proprietario.
 149.141 @@ -2022,6 +2059,10 @@
 149.142  		Confermi di voler cambiare il Regolamento della proprietà?
 149.143  		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 149.144  	</notification>
 149.145 +	<notification name="EstateParcelAccessOverride">
 149.146 +		Togliendo la spunta a questa opzione potrebbero essere rimosse le restrizioni che i proprietari di lotti hanno aggiunto per tenere lontani disturbatori, mantenere la privacy, o evitare che minorenni abbiano accesso a materiale per adulti. Parla con i proprietari del tuo lotto se ce n’è bisogno.
 149.147 +		<usetemplate name="okbutton" yestext="OK"/>
 149.148 +	</notification>
 149.149  	<notification name="RegionEntryAccessBlocked">
 149.150  		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 149.151  		<usetemplate name="okbutton" yestext="OK"/>
 149.152 @@ -2363,7 +2404,17 @@
 149.153  	</notification>
 149.154  	<notification name="DeleteItems">
 149.155  		[QUESTION]
 149.156 -		<usetemplate ignoretext="Conferma prima di cancellare gli elementi" name="okcancelignore" notext="Annulla" yestext="OK"/>
 149.157 +		<form name="form">
 149.158 +			<ignore name="ignore" text="Conferma prima di cancellare gli oggetti"/>
 149.159 +			<button name="Yes" text="OK"/>
 149.160 +			<button name="No" text="Annulla"/>
 149.161 +		</form>
 149.162 +	</notification>
 149.163 +	<notification name="DeleteFilteredItems">
 149.164 +		Nel tuo inventario è attualmente presente un filtro, e non tutti gli oggetti che stai per eliminare sono effettivamente visibili. 
 149.165 +
 149.166 +Sei sicuro di volerli eliminare?
 149.167 +		<usetemplate ignoretext="Conferma prima di cancellare gli oggetti" name="okcancelignore" notext="Annulla" yestext="OK"/>
 149.168  	</notification>
 149.169  	<notification name="ConfirmUnlink">
 149.170  		Questa è una selezione di grandi dimensioni con set collegati. Se viene scollegata, potrebbe non essere possibile ricollegarla. Come precauzione ti consigliamo di salvare copie dei set collegati nel tuo inventario.
 149.171 @@ -2440,13 +2491,17 @@
 149.172  		La cartella &apos;[FOLDERNAME]&apos; è una cartella di sistema. L&apos;eliminazione di cartelle di sistema può creare instabilità.  Sei sicuro di volerla eliminare?
 149.173  		<usetemplate ignoretext="Chiedi conferma prima di eliminare una cartella di sistema" name="okcancelignore" notext="Annulla" yestext="OK"/>
 149.174  	</notification>
 149.175 +	<notification name="PurgeSelectedItems">
 149.176 +		[COUNT] oggetti verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente gli oggetti selezionati dal tuo Cestino?
 149.177 +		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 149.178 +	</notification>
 149.179  	<notification name="ConfirmEmptyTrash">
 149.180 -		Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino?
 149.181 -		<usetemplate ignoretext="Conferma prima di svuotare la cartella del Cestino inventario" name="okcancelignore" notext="Annulla" yestext="OK"/>
 149.182 +		[COUNT] oggetti verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino?
 149.183 +		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 149.184  	</notification>
 149.185  	<notification name="TrashIsFull">
 149.186  		Il cestino è troppo pieno. Ciò potrebbe causare problemi durante l&apos;accesso.
 149.187 -		<usetemplate name="okcancelbuttons" notext="Svuota il cestino più tardi" yestext="Svuota il cestino adesso"/>
 149.188 +		<usetemplate name="okcancelbuttons" notext="Svuota il cestino più tardi" yestext="Controlla cartella cestino"/>
 149.189  	</notification>
 149.190  	<notification name="ConfirmClearBrowserCache">
 149.191  		Vuoi veramente eliminare la cronologia viaggi, web e ricerche fatte?
 149.192 @@ -2575,6 +2630,9 @@
 149.193  	<notification name="AddSelfFriend">
 149.194  		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
 149.195  	</notification>
 149.196 +	<notification name="AddSelfRenderExceptions">
 149.197 +		Non puoi aggiungere te stesso alla lista delle eccezioni rendering.
 149.198 +	</notification>
 149.199  	<notification name="UploadingAuctionSnapshot">
 149.200  		Sto importando le fotografie per l&apos;uso inworld e per il web...
 149.201  (Durata circa 5 minuti.)
 149.202 @@ -2768,9 +2826,9 @@
 149.203  		Sono stati restituiti al proprietario gli oggetti selezionati sul lotto nella terra di proprietà del residente &apos;[NAME]&apos;.
 149.204  	</notification>
 149.205  	<notification name="GroupObjectsReturned">
 149.206 -		Gli oggetti selezionati sul terreno e condivisi con il gruppo [GROUPNAME] sono stati restituiti nell&apos;inventario dei propietari.
 149.207 -Gli oggetti trasferibili ceduti sono stati restituiti ai proprietari precedenti.
 149.208 -Gli oggetti non trasferibili che erano stati ceduti al gruppo sono stati cancellati.
 149.209 +		Gli oggetti del lotto di terra selezionato condivisi con il gruppo &lt;nolink[GROUPNAME]&lt;/nolink&gt; sono stati restituiti all’inventario del loro proprietario. 
 149.210 +Gli oggetti ceduti trasferibili sono stati restituiti ai loro precedenti proprietari. 
 149.211 +Gli oggetti non trasferibili ceduti al gruppo sono stati eliminati.
 149.212  	</notification>
 149.213  	<notification name="UnOwnedObjectsReturned">
 149.214  		Gli oggetti selezionati sul terreno che non sono di tua proprietà sono stati restituiti ai loro proprietari.
 149.215 @@ -3155,7 +3213,7 @@
 149.216  		</form>
 149.217  	</notification>
 149.218  	<notification name="ScriptDialogGroup">
 149.219 -		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; di [GROUPNAME]
 149.220 +		‘&lt;nolink&gt;[TITLE]&lt;/nolink&gt;’ di &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; 
 149.221  [MESSAGE]
 149.222  		<form name="form">
 149.223  			<button name="Client_Side_Mute" text="Blocca"/>
 149.224 @@ -3202,8 +3260,8 @@
 149.225  		[NAME] ha ricevuto un&apos;offerta di inventario ed è stato automaticamente sbloccato.
 149.226  	</notification>
 149.227  	<notification name="VoiceInviteGroup">
 149.228 -		[NAME] si è aggiunto alla chiamata in chat vocale con il gruppo [GROUP].
 149.229 -Clicca su Accetta per unirti alla chiamata oppure su Declina to declinare l&apos;invito. Clicca su Blocca per bloccare questo chiamante.
 149.230 +		[NAME] si è aggiunto alla chiamata in chat vocale con il gruppo &lt;nolink&gt;[GROUP]&lt;/nolink&gt;. 
 149.231 +Fai clic su Accetta per unirti alla chiamata oppure su Rifiuta per rifiutare l&apos;invito. Fai clic su Blocca per bloccare l’autore della chiamata.
 149.232  		<form name="form">
 149.233  			<button name="Accept" text="Accetta"/>
 149.234  			<button name="Decline" text="Rifiuta"/>
 149.235 @@ -3311,6 +3369,9 @@
 149.236  	<notification name="AppearanceToXMLFailed">
 149.237  		Salvataggio aspetto in formato XML non riuscito.
 149.238  	</notification>
 149.239 +	<notification name="SnapshotToComputerFailed">
 149.240 +		Salvataggio istantanea in [PATH] non riuscito: Il disco è pieno. Sono necessari [NEED_MEMORY] KB ma sono disponibili solo [FREE_MEMORY] KB .
 149.241 +	</notification>
 149.242  	<notification name="PresetNotSaved">
 149.243  		Errore durante il salvataggio del valore predefinito [NAME].
 149.244  	</notification>
 149.245 @@ -3348,9 +3409,14 @@
 149.246  	<notification name="ShareNotification">
 149.247  		Scegli i residenti con i quali condividere.
 149.248  	</notification>
 149.249 +	<notification name="MeshUploadErrorDetails">
 149.250 +		[LABEL] caricamento fallito: [MESSAGE]
 149.251 +[DETAILS]Vedi SecondLife.log per ulteriori dettagli
 149.252 +	</notification>
 149.253  	<notification name="MeshUploadError">
 149.254 -		[LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER]
 149.255 -[DETAILS]Consulta SecondLife.log per informazioni dettagliate
 149.256 +		[LABEL] caricamento fallito: [MESSAGE] 
 149.257 +
 149.258 +Vedi SecondLife.log per ulteriori dettagli
 149.259  	</notification>
 149.260  	<notification name="MeshUploadPermError">
 149.261  		Errore durante la richiesta di autorizzazione al caricamento del reticolo.
   150.1 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   150.2 +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   150.3 @@ -12,10 +12,17 @@
   150.4  	<text name="ItemcountText">
   150.5  		Oggetti:
   150.6  	</text>
   150.7 -	<filter_editor label="Filtro" name="inventory search editor"/>
   150.8 +	<filter_editor label="Inserisci ricerca" name="inventory search editor"/>
   150.9 +	<combo_box name="search_type">
  150.10 +		<item label="Nome" name="Name" value="search_by_name"/>
  150.11 +		<item label="Creatore" name="Creator" value="search_by_creator"/>
  150.12 +		<item label="Descrizione" name="Description" value="search_by_description"/>
  150.13 +		<item label="UUID" name="UUID" value="search_by_UUID"/>
  150.14 +	</combo_box>
  150.15  	<tab_container name="inventory filter tabs">
  150.16  		<inventory_panel label="Tutti gli elementi" name="All Items"/>
  150.17  		<recent_inventory_panel label="Elementi recenti" name="Recent Items"/>
  150.18 +		<inventory_panel label="INDOSSATI" name="Worn Items"/>
  150.19  	</tab_container>
  150.20  	<layout_stack name="bottom_panel">
  150.21  		<layout_panel name="options_gear_btn_panel">
   151.1 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml	Tue Nov 21 09:46:31 2017 -0800
   151.2 +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml	Mon Dec 11 10:09:44 2017 -0800
   151.3 @@ -6,7 +6,7 @@
   151.4  	<text name="Cache:">
   151.5  		Cache:
   151.6  	</text>
   151.7 -	<spinner label="Dimensione cache (256 - 9984 MB)" name="cachesizespinner"/>
   151.8 +	<spinner label="Dimensioni cache (256 - 9984MB)" name="cachesizespinner"/>
   151.9  	<text name="text_box5">
  151.10  		MB
  151.11  	</text>
   152.1 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml	Tue Nov 21 09:46:31 2017 -0800
   152.2 +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml	Mon Dec 11 10:09:44 2017 -0800
   152.3 @@ -1,5 +1,6 @@
   152.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   152.5  <panel label="Text Chat" name="chat">
   152.6 +	<check_box initial_value="true" label="Auto-completamento gesti nella chat vicina" name="auto_complete_gestures"/>
   152.7  	<panel name="general_chat_settings">
   152.8  		<check_box initial_value="true" label="Simula la battitura tasti quando sei in chat" name="play_typing_animation"/>
   152.9  		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
   153.1 --- a/indra/newview/skins/default/xui/it/panel_region_estate.xml	Tue Nov 21 09:46:31 2017 -0800
   153.2 +++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml	Mon Dec 11 10:09:44 2017 -0800
   153.3 @@ -15,54 +15,36 @@
   153.4  	<text name="estate_owner">
   153.5  		(sconosciuto)
   153.6  	</text>
   153.7 -	<check_box label="Usa orario globale" name="use_global_time_check"/>
   153.8 -	<button label="?" name="use_global_time_help"/>
   153.9 -	<check_box label="Sole fisso" name="fixed_sun_check"/>
  153.10 -	<button label="?" name="fixed_sun_help"/>
  153.11 -	<slider label="Fase" name="sun_hour_slider"/>
  153.12 -	<check_box label="Permetti accesso pubblico" name="externally_visible_check"/>
  153.13 -	<button label="?" name="externally_visible_help"/>
  153.14 -	<text name="Only Allow">
  153.15 -		Consenti l&apos;accesso solo ai Residenti che:
  153.16 -	</text>
  153.17 -	<check_box label="Hanno memorizzato le informazioni per l&apos;addebito" name="limit_payment" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  153.18 -	<check_box label="Hanno almeno 18 anni" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  153.19 +	<radio_group name="externally_visible_radio">
  153.20 +		<radio_item label="Consenti solo residenti e gruppi elencati qui sotto" name="estate_restricted_access"/>
  153.21 +		<radio_item label="Chiunque può visitare" name="estate_public_access"/>
  153.22 +	</radio_group>
  153.23 +	<check_box label="È necessario avere più di 18 anni" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  153.24 +	<check_box label="È necessario aver registrato le informazioni di pagamento" name="limit_payment" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
  153.25 +	<check_box label="I proprietari dei lotti possono essere più restrittivi" name="parcel_access_override"/>
  153.26  	<check_box label="Permetti la chat voice" name="voice_chat_check"/>
  153.27 -	<button label="?" name="voice_chat_help"/>
  153.28  	<check_box label="Permetti teleport diretto" name="allow_direct_teleport"/>
  153.29 -	<button label="?" name="allow_direct_teleport_help"/>
  153.30 -	<text name="abuse_email_text" width="230">
  153.31 -		Indirizzo email per la denuncia di abuso:
  153.32 -	</text>
  153.33 -	<string name="email_unsupported">
  153.34 -		Tipologia non supportata
  153.35 -	</string>
  153.36 -	<button label="?" name="abuse_email_address_help"/>
  153.37  	<button label="Applica" name="apply_btn"/>
  153.38 -	<button font="SansSerifSmall" label="Espelli residente dalla proprietà..." name="kick_user_from_estate_btn"/>
  153.39 -	<button font="SansSerifSmall" label="Manda un messaggio di le proprietà..." name="message_estate_btn"/>
  153.40  	<text name="estate_manager_label">
  153.41  		Manager delle proprietà:
  153.42  	</text>
  153.43 -	<button label="?" name="estate_manager_help"/>
  153.44 +	<text name="allow_resident_label">
  153.45 +		Sempre consentito:
  153.46 +	</text>
  153.47 +	<button label="Aggiungi..." name="add_estate_manager_btn"/>
  153.48  	<button label="Rimuovi..." name="remove_estate_manager_btn"/>
  153.49 -	<button label="Aggiungi..." name="add_estate_manager_btn"/>
  153.50 -	<text name="allow_resident_label">
  153.51 -		Residenti autorizzati:
  153.52 +	<button label="Aggiungi..." name="add_allowed_avatar_btn"/>
  153.53 +	<button label="Rimuovi..." name="remove_allowed_avatar_btn"/>
  153.54 +	<text name="allow_group_label">
  153.55 +		Gruppi sempre consentiti:
  153.56  	</text>
  153.57 -	<button label="?" name="allow_resident_help"/>
  153.58 -	<button label="Rimuovi..." name="remove_allowed_avatar_btn"/>
  153.59 -	<button label="Aggiungi..." name="add_allowed_avatar_btn"/>
  153.60 -	<text name="allow_group_label">
  153.61 -		Gruppi autorizzati:
  153.62 +	<text name="ban_resident_label">
  153.63 +		Sempre escluso:
  153.64  	</text>
  153.65 -	<button label="?" name="allow_group_help"/>
  153.66 +	<button label="Aggiungi..." name="add_allowed_group_btn"/>
  153.67  	<button label="Rimuovi..." name="remove_allowed_group_btn"/>
  153.68 -	<button label="Aggiungi..." name="add_allowed_group_btn"/>
  153.69 -	<text name="ban_resident_label">
  153.70 -		Residenti bloccati:
  153.71 -	</text>
  153.72 -	<button label="?" name="ban_resident_help"/>
  153.73 +	<button label="Aggiungi..." name="add_banned_avatar_btn"/>
  153.74  	<button label="Rimuovi..." name="remove_banned_avatar_btn"/>
  153.75 -	<button label="Aggiungi..." name="add_banned_avatar_btn"/>
  153.76 +	<button font="SansSerifSmall" label="Manda un messaggio di le proprietà..." name="message_estate_btn"/>
  153.77 +	<button font="SansSerifSmall" label="Espelli residente dalla proprietà..." name="kick_user_from_estate_btn"/>
  153.78  </panel>
   154.1 --- a/indra/newview/skins/default/xui/it/panel_tools_texture.xml	Tue Nov 21 09:46:31 2017 -0800
   154.2 +++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml	Mon Dec 11 10:09:44 2017 -0800
   154.3 @@ -26,6 +26,7 @@
   154.4  		<radio_item label="Irregolarità (normale)" name="Bumpiness (normal)" value="1"/>
   154.5  		<radio_item label="Lucentezza (speculare)" name="Shininess (specular)" value="2"/>
   154.6  	</radio_group>
   154.7 +	<check_box initial_value="false" label="Blocca ripetizione" name="checkbox_sync_settings" tool_tip="Regola tutte le ripetizioni delle mappe contemporaneamente"/>
   154.8  	<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere una fotografia"/>
   154.9  	<text name="label alphamode">
  154.10  		Modalità Alfa
   155.1 --- a/indra/newview/skins/default/xui/it/role_actions.xml	Tue Nov 21 09:46:31 2017 -0800
   155.2 +++ b/indra/newview/skins/default/xui/it/role_actions.xml	Mon Dec 11 10:09:44 2017 -0800
   155.3 @@ -38,7 +38,7 @@
   155.4  		<action description="Consenti sempre la modifica del terreno" longdescription="I membri con questo ruolo e abilità possono modificare il terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow edit land" value="23"/>
   155.5  		<action description="Consenti sempre il volo" longdescription=" I membri con questo ruolo e abilità possono volare in un terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow fly" value="24"/>
   155.6  		<action description="Consenti sempre la creazione di oggetti" longdescription="I membri con questo ruolo e abilità possono creare oggetti in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow create" value="25"/>
   155.7 -		<action description="Consenti sempre la creazione di punti di riferimento" longdescription="I membri con questo ruolo e abilità possono creare punti di riferimento in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow landmark" value="26"/>
   155.8 +		<action description="Ignora punto di atterraggio" longdescription="I membri di un ruolo con questa abilità possono teletrasportarsi  direttamente in un lotto di proprietà di un gruppo, anche se il punto di atterraggio è stabilito in Informazioni sul terreno &gt; Opzioni." name="land allow direct teleport" value="26"/>
   155.9  		<action description="Consenti la funzione &apos;Imposta come Casa mia&apos; in un lotto di gruppo" longdescription="I membri in un ruolo con questa Abilità possono usare il menu Mondo &gt; Punti di riferimento &gt; Imposta come Casa su un lotto ceduto a questo gruppo." name="land allow set home" value="28"/>
  155.10  		<action description="Consentire &apos;Ospitare un evento&apos; su lotti di gruppo" longdescription="Membri in un ruolo con questa Abilità possono selezionare lotti posseduti da un gruppo come sedi in cui ospitare un evento." name="land allow host event" value="41"/>
  155.11  	</action_set>
   156.1 --- a/indra/newview/skins/default/xui/it/strings.xml	Tue Nov 21 09:46:31 2017 -0800
   156.2 +++ b/indra/newview/skins/default/xui/it/strings.xml	Mon Dec 11 10:09:44 2017 -0800
   156.3 @@ -258,9 +258,8 @@
   156.4  [TIME] fuso orario del Pacifico.
   156.5  	</string>
   156.6  	<string name="LoginFailedAccountDisabled">
   156.7 -		Non siamo attualmente in grado di completare la tua richiesta.
   156.8 -Contatta l&apos;assistenza Second Life alla pagina http://secondlife.com/support.
   156.9 -Se non sei in grado di cambiare la password, chiama (866) 476-9763.
  156.10 +		Non siamo attualmente in grado di completare la tua richiesta. 
  156.11 +Contatta l&apos;assistenza Second Life alla pagina http://support.secondlife.com.
  156.12  	</string>
  156.13  	<string name="LoginFailedTransformError">
  156.14  		Dati incompatibili rilevati durante l&apos;accesso.
  156.15 @@ -698,6 +697,19 @@
  156.16  	<string name="AssetErrorUnknownStatus">
  156.17  		Stato sconosciuto
  156.18  	</string>
  156.19 +	<string name="AssetUploadServerUnreacheble">
  156.20 +		Servizio non raggiungibile.
  156.21 +	</string>
  156.22 +	<string name="AssetUploadServerDifficulties">
  156.23 +		Il servizio sta riscontrando difficoltà inaspettate.
  156.24 +	</string>
  156.25 +	<string name="AssetUploadServerUnavaliable">
  156.26 +		Servizio non disponibile o limite di tempo per il caricamento raggiunto.
  156.27 +	</string>
  156.28 +	<string name="AssetUploadRequestInvalid">
  156.29 +		Errore nella richiesta di caricamento. Vai alla pagina 
  156.30 +http://secondlife.com/support per risolvere il problema.
  156.31 +	</string>
  156.32  	<string name="texture">
  156.33  		texture
  156.34  	</string>
  156.35 @@ -2183,10 +2195,19 @@
  156.36  		tutte le proprietà immobiliari che gestisci per conto di [OWNER]
  156.37  	</string>
  156.38  	<string name="RegionInfoAllowedResidents">
  156.39 -		Residenti consentiti: ([ALLOWEDAGENTS], massimo [MAXACCESS])
  156.40 +		Sempre consentiti: ([ALLOWEDAGENTS], max [MAXACCESS])
  156.41  	</string>
  156.42  	<string name="RegionInfoAllowedGroups">
  156.43 -		Gruppi ammessi: ([ALLOWEDGROUPS], massimo [MAXACCESS])
  156.44 +		Gruppi sempre consentiti: ([ALLOWEDGROUPS], max [MAXACCESS])
  156.45 +	</string>
  156.46 +	<string name="RegionInfoBannedResidents">
  156.47 +		Sempre esclusi: ([BANNEDAGENTS], max [MAXBANNED])
  156.48 +	</string>
  156.49 +	<string name="RegionInfoListTypeAllowedAgents">
  156.50 +		Sempre consentiti:
  156.51 +	</string>
  156.52 +	<string name="RegionInfoListTypeBannedAgents">
  156.53 +		Sempre esclusi:
  156.54  	</string>
  156.55  	<string name="ScriptLimitsParcelScriptMemory">
  156.56  		Memoria dello script del lotto
   157.1 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
   157.2 +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
   157.3 @@ -434,13 +434,10 @@
   157.4  			<panel.string name="estate_override">
   157.5  				1 つ以上のオプションが、不動産レベルで設定されています。
   157.6  			</panel.string>
   157.7 -			<check_box label="パブリックアクセスを許可(このオプションをオフにすると立入禁止ラインが作成されます)" name="public_access"/>
   157.8 -			<text name="Only Allow">
   157.9 -				次の住人にのみアクセスを許可:
  157.10 -			</text>
  157.11 -			<check_box label="支払情情報が登録されている [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="支払情報が登録されていないと、この区画にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  157.12 -			<check_box label="18 才以上です [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  157.13 -			<check_box label="グループのアクセスを許可:[GROUP]" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
  157.14 +			<check_box label="誰でも訪問可(このオプションをオフにすると立入禁止ラインが作成されます)" name="public_access"/>
  157.15 +			<check_box label="18 歳以上である必要があります [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  157.16 +			<check_box label="支払情報が登録されている必要があります [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="支払情報が登録されていないと、この区画にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  157.17 +			<check_box label="制約なしにグループ [GROUP] を許可する" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
  157.18  			<check_box label="入場許可を販売:" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。"/>
  157.19  			<combo_box name="pass_combo">
  157.20  				<combo_box.item label="誰でも" name="Anyone"/>
  157.21 @@ -448,9 +445,12 @@
  157.22  			</combo_box>
  157.23  			<spinner label="価格(L$):" name="PriceSpin"/>
  157.24  			<spinner label="アクセス時間:" name="HoursSpin"/>
  157.25 +			<text name="OwnerLimited">
  157.26 +				(不動産所有者がこのオプションに制約を与えている場合があります)
  157.27 +			</text>
  157.28  			<panel name="Allowed_layout_panel">
  157.29  				<text label="常に許可" name="AllowedText">
  157.30 -					許可された住人 ([COUNT]、最大 [MAX])
  157.31 +					常に許可する ([COUNT] 人、最大 [MAX] 人)
  157.32  				</text>
  157.33  				<name_list name="AccessList" tool_tip="(合計[LISTED] 人、最大 [MAX] 人)"/>
  157.34  				<button label="追加" name="add_allowed"/>
  157.35 @@ -458,7 +458,7 @@
  157.36  			</panel>
  157.37  			<panel name="Banned_layout_panel">
  157.38  				<text label="禁止" name="BanCheck">
  157.39 -					立入禁止された住人 ([COUNT]、最大 [MAX])
  157.40 +					常に禁止する ([COUNT] 人、最大 [MAX] 人)
  157.41  				</text>
  157.42  				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人)"/>
  157.43  				<button label="追加" name="add_banned"/>
   158.1 --- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
   158.2 +++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
   158.3 @@ -3,6 +3,9 @@
   158.4  	<floater.string name="not_found">
   158.5  		「[TEXT]」は見つかりませんでした
   158.6  	</floater.string>
   158.7 +	<floater.string name="not_found_text">
   158.8 +		住人が見つかりませんでした。
   158.9 +	</floater.string>
  158.10  	<floater.string name="no_one_near">
  158.11  		近くに誰もいません
  158.12  	</floater.string>
   159.1 --- a/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
   159.2 +++ b/indra/newview/skins/default/xui/ja/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
   159.3 @@ -7,5 +7,6 @@
   159.4  	<name_list name="render_settings_list">
   159.5  		<name_list.columns label="名前" name="name"/>
   159.6  		<name_list.columns label="描画設定" name="setting"/>
   159.7 +		<name_list.columns label="日付を追加" name="timestamp"/>
   159.8  	</name_list>
   159.9  </floater>
   160.1 --- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
   160.2 +++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
   160.3 @@ -15,6 +15,8 @@
   160.4  	<button label="すべて" label_selected="すべて" name="All"/>
   160.5  	<button label="なし" label_selected="なし" name="None"/>
   160.6  	<check_box label="常にフォルダを表示" name="check_show_empty"/>
   160.7 +	<check_box label="自作" name="check_created_by_me"/>
   160.8 +	<check_box label="他のユーザー作成" name="check_created_by_others"/>
   160.9  	<check_box label="ログオフ以降" name="check_since_logoff"/>
  160.10  	<text name="- OR -">
  160.11  		-または-
   161.1 --- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
   161.2 +++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
   161.3 @@ -1,5 +1,5 @@
   161.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   161.5 -<floater name="floater_pathfinding_linksets" title="パスファインディングリンクセット">
   161.6 +<floater name="floater_pathfinding_linksets" title="リージョンオブジェクト">
   161.7  	<floater.string name="messaging_get_inprogress">
   161.8  		パスファインディングリンクセットを照会中...
   161.9  	</floater.string>
  161.10 @@ -16,7 +16,7 @@
  161.11  		パスファインディングリンクセットがありません。
  161.12  	</floater.string>
  161.13  	<floater.string name="messaging_complete_available">
  161.14 -		[NUM_TOTAL] リンクセット中 [NUM_SELECTED] リンクセットが選択されました。
  161.15 +		[NUM_TOTAL] 中 [NUM_SELECTED] が選択されました。
  161.16  	</floater.string>
  161.17  	<floater.string name="messaging_not_enabled">
  161.18  		この地域(リージョン)はパスファインディングに対応していません。
  161.19 @@ -118,7 +118,7 @@
  161.20  			<scroll_list.columns label="スクリプト" name="scripted"/>
  161.21  			<scroll_list.columns label="負荷" name="land_impact"/>
  161.22  			<scroll_list.columns label="距離" name="dist_from_you"/>
  161.23 -			<scroll_list.columns label="リンクセットの用途" name="linkset_use"/>
  161.24 +			<scroll_list.columns label="パスファインディング使用" name="linkset_use"/>
  161.25  			<scroll_list.columns label="A %" name="a_percent"/>
  161.26  			<scroll_list.columns label="B %" name="b_percent"/>
  161.27  			<scroll_list.columns label="C %" name="c_percent"/>
  161.28 @@ -133,7 +133,7 @@
  161.29  	</panel>
  161.30  	<panel name="pathfinding_linksets_actions">
  161.31  		<text name="linksets_actions_label">
  161.32 -			選択したリンクセットに対するアクション (リンクセットがワールドから削除されると、その属性が失われる場合があります):
  161.33 +			選択されたアクション
  161.34  		</text>
  161.35  		<check_box label="ビーコンを表示" name="show_beacon"/>
  161.36  		<button label="取る" name="take_objects"/>
  161.37 @@ -144,7 +144,7 @@
  161.38  	</panel>
  161.39  	<panel name="pathfinding_linksets_attributes">
  161.40  		<text name="linksets_attributes_label">
  161.41 -			選択したリンクセットの属性を編集し、ボタンを押して変更を適用します
  161.42 +			パスファインディング属性を編集する
  161.43  		</text>
  161.44  		<text name="walkability_coefficients_label">
  161.45  			歩行可能性:
   162.1 --- a/indra/newview/skins/default/xui/ja/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
   162.2 +++ b/indra/newview/skins/default/xui/ja/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
   162.3 @@ -6,13 +6,16 @@
   162.4  	<floater.string name="loading_url">
   162.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
   162.6  	</floater.string>
   162.7 -	<button label="続行" label_selected="続行" name="Continue"/>
   162.8 -	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
   162.9 -	<check_box label="利用規約とプライバシーポリシーに同意します" name="agree_chk"/>
  162.10  	<text name="tos_heading">
  162.11 -		次の利用規約とプライバシーポリシーをよくお読みください。 [SECOND_LIFE] へのログインを続けるには、規約に同意する必要があります。
  162.12 +		次の Second Life の利用規約、プライバシーポリシー、およびサービス規約(仲裁の利用および紛争解決のためのいかなるクラスまたはグループの請求の放棄に関する必要条件を含む)をお読みください。[SECOND_LIFE] へのログインを続けるには、これらの規約に同意する必要があります。
  162.13  	</text>
  162.14  	<text name="external_tos_required">
  162.15  		操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。
  162.16  	</text>
  162.17 +	<check_box label="私は以下の内容を読み、同意します。" name="agree_chk"/>
  162.18 +	<text name="agree_list">
  162.19 +		Second Life の利用規約、プライバシーポリシー、およびサービス規約(紛争解決のための必要条件を含む)。
  162.20 +	</text>
  162.21 +	<button label="続行" label_selected="続行" name="Continue"/>
  162.22 +	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
  162.23  </floater>
   163.1 --- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
   163.2 +++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
   163.3 @@ -21,6 +21,7 @@
   163.4  		<menu_item_check label="デフォルト" name="RenderNormally"/>
   163.5  		<menu_item_check label="常に使用する" name="AlwaysRenderFully"/>
   163.6  		<menu_item_check label="使用しない" name="DoNotRender"/>
   163.7 +		<menu_item_call label="例外…" name="RenderExceptions"/>
   163.8  	</context_menu>
   163.9  	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
  163.10  </context_menu>
   164.1 --- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
   164.2 +++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
   164.3 @@ -1,8 +1,14 @@
   164.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   164.5 -<menu name="Avatar Icon Menu">
   164.6 +<toggleable_menu name="Avatar Icon Menu">
   164.7  	<menu_item_call label="プロフィールの表示" name="Show Profile"/>
   164.8  	<menu_item_call label="IMを送信..." name="Send IM"/>
   164.9  	<menu_item_call label="テレポートをリクエスト" name="Request Teleport"/>
  164.10  	<menu_item_call label="フレンドを追加..." name="Add Friend"/>
  164.11  	<menu_item_call label="フレンドを削除..." name="Remove Friend"/>
  164.12 -</menu>
  164.13 +	<context_menu label="モデレーターのオプション" name="Moderator Options">
  164.14 +		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
  164.15 +		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
  164.16 +		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
  164.17 +	</context_menu>
  164.18 +	<menu_item_call label="メンバーを立入禁止" name="BanMember"/>
  164.19 +</toggleable_menu>
   165.1 --- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
   165.2 +++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
   165.3 @@ -20,6 +20,7 @@
   165.4  		<menu_item_check label="デフォルト" name="RenderNormally"/>
   165.5  		<menu_item_check label="常に使用する" name="AlwaysRenderFully"/>
   165.6  		<menu_item_check label="使用しない" name="DoNotRender"/>
   165.7 +		<menu_item_call label="例外…" name="RenderExceptions"/>
   165.8  	</context_menu>
   165.9  	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
  165.10  </context_menu>
   166.1 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   166.2 +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   166.3 @@ -75,10 +75,12 @@
   166.4  	<menu_item_call label="プロパティ" name="Properties"/>
   166.5  	<menu_item_call label="名前を変更する" name="Rename"/>
   166.6  	<menu_item_call label="UUID をコピーする" name="Copy Asset UUID"/>
   166.7 +	<menu_item_call label="メイン画面で表示する" name="Show in Main Panel"/>
   166.8  	<menu_item_call label="カット" name="Cut"/>
   166.9  	<menu_item_call label="コピー" name="Copy"/>
  166.10  	<menu_item_call label="貼り付け" name="Paste"/>
  166.11  	<menu_item_call label="リンクを貼り付ける" name="Paste As Link"/>
  166.12 +	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
  166.13  	<menu_item_call label="削除" name="Delete"/>
  166.14  	<menu_item_call label="システムフォルダを削除する" name="Delete System Folder"/>
  166.15  	<menu_item_call label="コンファレンスチャットを開始する" name="Conference Chat Folder"/>
   167.1 --- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
   167.2 +++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
   167.3 @@ -13,5 +13,6 @@
   167.4  	<menu_item_call label="共有" name="Share"/>
   167.5  	<menu_item_call label="オリジナルを表示" name="Find Original"/>
   167.6  	<menu_item_call label="すべてのリンクを表示" name="Find All Links"/>
   167.7 +	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
   167.8  	<menu_item_call label="ごみ箱を空にする" name="empty_trash"/>
   167.9  </toggleable_menu>
   168.1 --- a/indra/newview/skins/default/xui/ja/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
   168.2 +++ b/indra/newview/skins/default/xui/ja/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
   168.3 @@ -2,6 +2,7 @@
   168.4  <menu_bar name="Login Menu">
   168.5  	<menu label="ミー" name="File">
   168.6  		<menu_item_call label="環境設定..." name="Preferences..."/>
   168.7 +		<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
   168.8  		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
   168.9  		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
  168.10  	</menu>
   169.1 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
   169.2 +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
   169.3 @@ -121,7 +121,7 @@
   169.4  			<menu_item_call label="次のパーツまたは面を含める" name="Include Next Part or Face"/>
   169.5  			<menu_item_call label="前のパーツまたは面を含める" name="Include Previous Part or Face"/>
   169.6  		</menu>
   169.7 -		<menu_item_call label="リンクセット..." name="pathfinding_linkset_menu_item"/>
   169.8 +		<menu_item_call label="リージョンオブジェクト" name="pathfinding_linkset_menu_item"/>
   169.9  		<menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/>
  169.10  		<menu_item_call label="選択したものをズームする" name="Zoom to Selection"/>
  169.11  		<menu label="オブジェクト" name="Object">
  169.12 @@ -141,7 +141,7 @@
  169.13  			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
  169.14  		</menu>
  169.15  		<menu label="パスファインディング" name="Pathfinding">
  169.16 -			<menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/>
  169.17 +			<menu_item_call label="リージョンオブジェクト" name="pathfinding_linksets_menu_item"/>
  169.18  			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
  169.19  			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
  169.20  			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
   170.1 --- a/indra/newview/skins/default/xui/ja/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
   170.2 +++ b/indra/newview/skins/default/xui/ja/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
   170.3 @@ -3,6 +3,10 @@
   170.4  	<global name="skipnexttime">
   170.5  		今後は表示しない
   170.6  	</global>
   170.7 +	<global name="skipnexttimesessiononly">
   170.8 +		以後、これを表示しない
   170.9 +(現セッションで)
  170.10 +	</global>
  170.11  	<global name="alwayschoose">
  170.12  		常にこのオプションを選択
  170.13  	</global>
  170.14 @@ -350,7 +354,7 @@
  170.15  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="参加"/>
  170.16  	</notification>
  170.17  	<notification name="JoinGroupNoCost">
  170.18 -		[NAME] というグループに入ろうとしています。
  170.19 +		&lt;nolink&gt;[NAME]&lt;/nolink&gt; というグループに入ろうとしています。
  170.20  続けますか?
  170.21  		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="参加"/>
  170.22  	</notification>
  170.23 @@ -364,6 +368,40 @@
  170.24  48 時間以内にメンバーを勧誘し、入会してもらってください。
  170.25  		<usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成"/>
  170.26  	</notification>
  170.27 +	<notification name="JoinGroupInaccessible">
  170.28 +		あなたはグループに参加することはできません。
  170.29 +		<usetemplate name="okbutton" yestext="OK"/>
  170.30 +	</notification>
  170.31 +	<notification name="JoinGroupError">
  170.32 +		グループ参加リクエスト中にエラーが発生しました。
  170.33 +		<usetemplate name="okbutton" yestext="OK"/>
  170.34 +	</notification>
  170.35 +	<notification name="JoinGroupErrorReason">
  170.36 +		グループに参加できません: [reason]
  170.37 +		<usetemplate name="okbutton" yestext="OK"/>
  170.38 +	</notification>
  170.39 +	<notification name="JoinGroupTrialUser">
  170.40 +		申し訳ありませんが、トライアルユーザーはグループに参加できません。
  170.41 +		<usetemplate name="okbutton" yestext="OK"/>
  170.42 +	</notification>
  170.43 +	<notification name="JoinGroupMaxGroups">
  170.44 +		「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません:
  170.45 +既に [group_count] グループのメンバーになっています。参加できるのは最大 [max_groups] グループまでです。
  170.46 +		<usetemplate name="okbutton" yestext="OK"/>
  170.47 +	</notification>
  170.48 +	<notification name="JoinGroupClosedEnrollment">
  170.49 +		「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」に参加できません:
  170.50 +このグループは現在、参加が制限されています。
  170.51 +		<usetemplate name="okbutton" yestext="OK"/>
  170.52 +	</notification>
  170.53 +	<notification name="JoinGroupSuccess">
  170.54 +		このユーザーグループに追加されました
  170.55 +		<usetemplate name="okbutton" yestext="OK"/>
  170.56 +	</notification>
  170.57 +	<notification name="JoinGroupInsufficientFunds">
  170.58 +		会員料金として必要な L$ [membership_fee] を送金することができません。
  170.59 +		<usetemplate name="okbutton" yestext="OK"/>
  170.60 +	</notification>
  170.61  	<notification name="LandBuyPass">
  170.62  		L$ [COST] で [TIME] 時間 [PARCEL_NAME] に入ることができます。
  170.63  入場許可を購入しますか?
  170.64 @@ -388,12 +426,11 @@
  170.65  		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
  170.66  	</notification>
  170.67  	<notification name="ReturnObjectsDeededToGroup">
  170.68 -		この区画のグループ [NAME] 共有のすべてのオブジェクトを、以前の所有者のインベントリに戻そうとしています。
  170.69 -操作を続行しますか?
  170.70 +		グループ「&lt;nolink&gt;[NAME]&lt;/nolink&gt;」と共有するこのにある区画のすべてのオブジェクトを前のオーナーのインベントリに返却しますか?
  170.71  
  170.72 -*警告* これにより、
  170.73 -グループに譲渡された「再販・プレゼント不可」のオブジェクトは削除されます!
  170.74 -オブジェクト: [N]
  170.75 +*注意*この操作をすると、グループに譲渡された譲渡禁止のオブジェクトを削除することになります。
  170.76 +
  170.77 +オブジェクト: [N]
  170.78  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
  170.79  	</notification>
  170.80  	<notification name="ReturnObjectsOwnedByUser">
  170.81 @@ -441,9 +478,9 @@
  170.82  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
  170.83  	</notification>
  170.84  	<notification name="ReturnObjectsNotOwnedByGroup">
  170.85 -		この土地の区画上のオブジェクトのうち、グループ [NAME] との間で共有していないオブジェクトを所有者に返却しますか?
  170.86 +		グループ &lt;nolink&gt;[NAME]&lt;/nolink&gt; と共有されていない、この区画にあるオブジェクトを前のオーナーに返却しますか?
  170.87  
  170.88 -オブジェクト: [N]
  170.89 +オブジェクト: [N]
  170.90  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
  170.91  	</notification>
  170.92  	<notification name="UnableToDisableOutsideScripts">
  170.93 @@ -490,7 +527,7 @@
  170.94  		次の理由で、レポートのスクリーンショットのアップロード時に問題が起こりました。 [REASON]
  170.95  	</notification>
  170.96  	<notification name="MustAgreeToLogIn">
  170.97 -		[SECOND_LIFE] へのログインを続けるには、利用規約に同意してください。
  170.98 +		[SECOND_LIFE] へのログインを続けるには、Second Life の利用規約、プライバシーポリシー、およびサービス規約に同意する必要があります。
  170.99  	</notification>
 170.100  	<notification name="CouldNotPutOnOutfit">
 170.101  		アウトフィットを装着できません。
 170.102 @@ -742,7 +779,7 @@
 170.103  		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
 170.104  	</notification>
 170.105  	<notification name="EjectAvatarFromGroup">
 170.106 -		[GROUP_NAME] から [AVATAR_NAME] を追放しました
 170.107 +		&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt; から [AVATAR_NAME] を追放しました
 170.108  	</notification>
 170.109  	<notification name="AcquireErrorTooManyObjects">
 170.110  		取得エラー:選択したオブジェクトの数が多すぎます。
 170.111 @@ -1349,20 +1386,18 @@
 170.112  選択する面積を小さくしてもう一度試してください。
 170.113  	</notification>
 170.114  	<notification name="DeedLandToGroup">
 170.115 -		この区画の譲渡に際しては、
 170.116 -このグループが十分な土地クレジットを保有および維持している必要があります。
 170.117 -土地の購入価格は、所有者に返金されません。譲渡された区画が売れると、売上金額はグループメンバーに均等に分配されます。
 170.118 +		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
 170.119 +土地の購入価格は所有者に返金されません。譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 170.120  
 170.121 -この [AREA] 平方メートルの土地を、グループ
 170.122 -「 [GROUP_NAME] 」に譲渡しますか?
 170.123 +この [AREA] m² の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか?
 170.124  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 170.125  	</notification>
 170.126  	<notification name="DeedLandToGroupWithContribution">
 170.127  		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
 170.128 -譲渡には同時に [NAME] からグループへの土地の貢献が含まれます。
 170.129 -土地の購入価格は所有者に返金されません。譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 170.130 +譲渡には同時に [NAME] からグループへの土地の貢献が含まれます。土地の購入価格は所有者に返金されません。
 170.131 +譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
 170.132  
 170.133 -この [AREA] m² の土地を [GROUP_NAME] というグループに譲渡しますか?
 170.134 +この [AREA] m² の土地を「&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;」というグループに譲渡しますか?
 170.135  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 170.136  	</notification>
 170.137  	<notification name="DisplaySetToSafe">
 170.138 @@ -1778,7 +1813,7 @@
 170.139  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 170.140  	</notification>
 170.141  	<notification name="GroupDepart">
 170.142 -		グループ &apos;[group_name]&apos; を抜けました。
 170.143 +		グループ「&lt;nolink&gt;[group_name]&lt;/nolink&gt;」を抜けました。
 170.144  	</notification>
 170.145  	<notification name="OwnerCannotLeaveGroup">
 170.146  		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
 170.147 @@ -2052,6 +2087,10 @@
 170.148  		不動産約款を変更しようとしています。続けますか?
 170.149  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 170.150  	</notification>
 170.151 +	<notification name="EstateParcelAccessOverride">
 170.152 +		このオプションをオフにすると、嫌がらせの防止やプライバシーの維持、18 才以下の住人を Adult コンテンツから守るために区画所有者が加えた制限が解除される可能性があります。必要に応じて区画所有者と相談してください。
 170.153 +		<usetemplate name="okbutton" yestext="OK"/>
 170.154 +	</notification>
 170.155  	<notification name="RegionEntryAccessBlocked">
 170.156  		訪問しようとしている地域(リージョン)には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 170.157  		<usetemplate name="okbutton" yestext="OK"/>
 170.158 @@ -2396,7 +2435,17 @@
 170.159  	</notification>
 170.160  	<notification name="DeleteItems">
 170.161  		[QUESTION]
 170.162 -		<usetemplate ignoretext="アイテムを削除する前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
 170.163 +		<form name="form">
 170.164 +			<ignore name="ignore" text="アイテムを削除する前の確認"/>
 170.165 +			<button name="Yes" text="OK"/>
 170.166 +			<button name="No" text="キャンセル"/>
 170.167 +		</form>
 170.168 +	</notification>
 170.169 +	<notification name="DeleteFilteredItems">
 170.170 +		あなたのインベントリには現在フィルターがかけられているため、削除しようとしているアイテムによっては表示されないことがあります。
 170.171 +
 170.172 +これらのアイテムを削除しますか?
 170.173 +		<usetemplate ignoretext="フィルリングされたアイテムを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 170.174  	</notification>
 170.175  	<notification name="ConfirmUnlink">
 170.176  		これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。そのような場合に備えて、リンクセットを自分の持ち物にコピーできます。
 170.177 @@ -2477,13 +2526,17 @@
 170.178  		「 [FOLDERNAME] 」 は、システムフォルダです。 システムフォルダを削除すると不安定になることがあります。  続けますか?
 170.179  		<usetemplate ignoretext="システムフォルダを削除する前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 170.180  	</notification>
 170.181 +	<notification name="PurgeSelectedItems">
 170.182 +		[COUNT] アイテムが完全に削除されます。ごみ箱内の選択した項目をすべて削除しますか?
 170.183 +		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 170.184 +	</notification>
 170.185  	<notification name="ConfirmEmptyTrash">
 170.186 -		ごみ箱の中身をすべて削除しますか?
 170.187 -		<usetemplate ignoretext="インベントリのごみ箱フォルダを空にする前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 170.188 +		[COUNT] アイテムが完全に削除されます。ごみ箱の項目をすべて削除しますか?
 170.189 +		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 170.190  	</notification>
 170.191  	<notification name="TrashIsFull">
 170.192  		ゴミ箱があふれています。これはログイン時に問題を引き起こします。
 170.193 -		<usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="今すぐゴミ箱を空にする"/>
 170.194 +		<usetemplate name="okcancelbuttons" notext="後でゴミ箱を空にする" yestext="ごみ箱フォルダーを確認する"/>
 170.195  	</notification>
 170.196  	<notification name="ConfirmClearBrowserCache">
 170.197  		トラベル、Web、検索の履歴をすべて削除しますか?
 170.198 @@ -2613,6 +2666,9 @@
 170.199  	<notification name="AddSelfFriend">
 170.200  		残念ながら自分自身をフレンド登録することはできません。
 170.201  	</notification>
 170.202 +	<notification name="AddSelfRenderExceptions">
 170.203 +		あなた自身をレンダリングの例外リストに加えることはできません。
 170.204 +	</notification>
 170.205  	<notification name="UploadingAuctionSnapshot">
 170.206  		インワールドと Web サイトのスナップショットをアップロード中です...
 170.207  (所要時間:約 5 分)
 170.208 @@ -2808,9 +2864,9 @@
 170.209  		「 [NAME] 」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。
 170.210  	</notification>
 170.211  	<notification name="GroupObjectsReturned">
 170.212 -		選択した区画上の、[GROUPNAME] というグループと共有していたオブジェクトは、それぞれの所有者のインベントリに返却されました。
 170.213 -譲渡されていた「再販・プレゼント可」のオブジェクトは、以前の所有者に返却されました。
 170.214 -グループに譲渡されていた「再販・プレゼント不可」のオブジェクトは、削除されました。
 170.215 +		グループ &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; と共有する、選択した区画にあるオブジェクトは、オブジェクトのオーナーのインベントリに返却されました。
 170.216 +譲渡済みの譲渡可能なオブジェクトが前のオーナーに返却されました。
 170.217 +グループに譲渡された譲渡禁止のオブジェクトは削除されました。
 170.218  	</notification>
 170.219  	<notification name="UnOwnedObjectsReturned">
 170.220  		選択した土地の区画上の、あなたの所有物では「なかった」オブジェクトは、本来の所有者に返却されました。
 170.221 @@ -3195,7 +3251,7 @@
 170.222  		</form>
 170.223  	</notification>
 170.224  	<notification name="ScriptDialogGroup">
 170.225 -		[GROUPNAME] の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
 170.226 +		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; の 「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」 
 170.227  [MESSAGE]
 170.228  		<form name="form">
 170.229  			<button name="Client_Side_Mute" text="ブロック"/>
 170.230 @@ -3242,8 +3298,8 @@
 170.231  		[NAME] はインベントリを受け取り、自動的にブロックが解除されました。
 170.232  	</notification>
 170.233  	<notification name="VoiceInviteGroup">
 170.234 -		[NAME] は [GROUP] のボイスチャットコールに参加しました。
 170.235 -受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
 170.236 +		[NAME] は &lt;nolink&gt;[GROUP]&lt;/nolink&gt; のボイスチャットコールに参加しました。
 170.237 +受け入れるをクリックするか、断る場合は拒否をクリックしてください。ブロックをクリックすると、この発信者をブロックします。
 170.238  		<form name="form">
 170.239  			<button name="Accept" text="受け入れる"/>
 170.240  			<button name="Decline" text="拒否"/>
 170.241 @@ -3348,6 +3404,9 @@
 170.242  	<notification name="AppearanceToXMLFailed">
 170.243  		外観を XML に保存できませんでした。
 170.244  	</notification>
 170.245 +	<notification name="SnapshotToComputerFailed">
 170.246 +		スナップショットを [PATH] に保存できませんでした:ディスクの空き容量が不足しています。[NEED_MEMORY]KB が必要ですが、[FREE_MEMORY]KB しかありません。
 170.247 +	</notification>
 170.248  	<notification name="PresetNotSaved">
 170.249  		プリセット [NAME] の保存エラー。
 170.250  	</notification>
 170.251 @@ -3385,9 +3444,14 @@
 170.252  	<notification name="ShareNotification">
 170.253  		共有する住人を選択します。
 170.254  	</notification>
 170.255 +	<notification name="MeshUploadErrorDetails">
 170.256 +		[LABEL] をアップロードできませんでした: [MESSAGE] 
 170.257 +[DETAILS]詳しくは、SecondLife.log をご覧ください。
 170.258 +	</notification>
 170.259  	<notification name="MeshUploadError">
 170.260 -		[LABEL] をアップロードできませんでした:[MESSAGE] [IDENTIFIER]
 170.261 -[DETAILS] 詳しくは、SecondLife.log をご覧ください。
 170.262 +		[LABEL] をアップロードできませんでした: [MESSAGE] 
 170.263 +
 170.264 +詳しくは、SecondLife.log をご覧ください
 170.265  	</notification>
 170.266  	<notification name="MeshUploadPermError">
 170.267  		メッシュのアップロード許可をリクエスト中にエラーが発生しました。
   171.1 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   171.2 +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   171.3 @@ -12,10 +12,17 @@
   171.4  	<text name="ItemcountText">
   171.5  		アイテム:
   171.6  	</text>
   171.7 -	<filter_editor label="インベントリをフィルター" name="inventory search editor"/>
   171.8 +	<filter_editor label="検索用語を入力する" name="inventory search editor"/>
   171.9 +	<combo_box name="search_type">
  171.10 +		<item label="名前" name="Name" value="search_by_name"/>
  171.11 +		<item label="制作者" name="Creator" value="search_by_creator"/>
  171.12 +		<item label="説明" name="Description" value="search_by_description"/>
  171.13 +		<item label="UUID" name="UUID" value="search_by_UUID"/>
  171.14 +	</combo_box>
  171.15  	<tab_container name="inventory filter tabs">
  171.16  		<inventory_panel label="インベントリ" name="All Items"/>
  171.17  		<recent_inventory_panel label="最新" name="Recent Items"/>
  171.18 +		<inventory_panel label="着用中" name="Worn Items"/>
  171.19  	</tab_container>
  171.20  	<layout_stack name="bottom_panel">
  171.21  		<layout_panel name="options_gear_btn_panel">
   172.1 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml	Tue Nov 21 09:46:31 2017 -0800
   172.2 +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml	Mon Dec 11 10:09:44 2017 -0800
   172.3 @@ -6,7 +6,7 @@
   172.4  	<text name="Cache:">
   172.5  		キャッシュ:
   172.6  	</text>
   172.7 -	<spinner label="キャッシュサイズ(256~9,984MB)" name="cachesizespinner"/>
   172.8 +	<spinner label="キャッシュサイズ (256 - 9984MB)" name="cachesizespinner"/>
   172.9  	<text name="text_box5">
  172.10  		MB
  172.11  	</text>
   173.1 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml	Tue Nov 21 09:46:31 2017 -0800
   173.2 +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml	Mon Dec 11 10:09:44 2017 -0800
   173.3 @@ -1,5 +1,6 @@
   173.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   173.5  <panel label="チャット" name="chat">
   173.6 +	<check_box initial_value="true" label="近くのチャットでジェスチャーを自動コンプリートする" name="auto_complete_gestures"/>
   173.7  	<panel name="general_chat_settings">
   173.8  		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
   173.9  		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
   174.1 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml	Tue Nov 21 09:46:31 2017 -0800
   174.2 +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml	Mon Dec 11 10:09:44 2017 -0800
   174.3 @@ -15,58 +15,34 @@
   174.4  	<text name="estate_owner">
   174.5  		(不明)
   174.6  	</text>
   174.7 -	<text name="Only Allow">
   174.8 -		次の住人にのみアクセスを許可:
   174.9 -	</text>
  174.10 -	<check_box label="支払情情報が登録されている" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  174.11 -	<check_box label="18 才以上です" name="limit_age_verified" tool_tip="この不動産(エステート)にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  174.12 +	<radio_group name="externally_visible_radio">
  174.13 +		<radio_item label="下記の住人とグループのみ許可する" name="estate_restricted_access"/>
  174.14 +		<radio_item label="誰でも訪問可" name="estate_public_access"/>
  174.15 +	</radio_group>
  174.16 +	<check_box label="18 歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産(エステート)にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  174.17 +	<check_box label="支払情報が登録されている必要があります" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
  174.18 +	<check_box label="区画所有者" name="parcel_access_override"/>
  174.19  	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
  174.20 -	<button label="?" name="voice_chat_help"/>
  174.21 -	<text name="abuse_email_text">
  174.22 -		嫌がらせに関するメール先:
  174.23 -	</text>
  174.24 -	<string name="email_unsupported">
  174.25 -		サポートされていない機能
  174.26 -	</string>
  174.27 -	<button label="?" name="abuse_email_address_help"/>
  174.28 +	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
  174.29 +	<button label="適用" name="apply_btn"/>
  174.30  	<text name="estate_manager_label">
  174.31  		不動産マネージャー:
  174.32  	</text>
  174.33 -	<button label="?" name="estate_manager_help"/>
  174.34 +	<text name="allow_resident_label">
  174.35 +		常に許可:
  174.36 +	</text>
  174.37  	<button label="追加..." name="add_estate_manager_btn"/>
  174.38  	<button label="削除..." name="remove_estate_manager_btn"/>
  174.39 -	<check_box label="世界時間を使用" name="use_global_time_check"/>
  174.40 -	<button label="?" name="use_global_time_help"/>
  174.41 -	<check_box label="太陽固定" name="fixed_sun_check"/>
  174.42 -	<button label="?" name="fixed_sun_help"/>
  174.43 -	<slider label="段階" name="sun_hour_slider"/>
  174.44 -	<check_box label="パブリックアクセスを許可" name="externally_visible_check"/>
  174.45 -	<button label="?" name="externally_visible_help"/>
  174.46 -	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
  174.47 -	<button label="?" name="allow_direct_teleport_help"/>
  174.48 -	<text name="region_text_lbl">
  174.49 -		支払い状況によりアクセスを拒否:
  174.50 -	</text>
  174.51 -	<check_box label="支払情報登録がないものを拒否" name="deny_anonymous"/>
  174.52 -	<check_box label="支払情報登録があるものを拒否" name="deny_identified"/>
  174.53 -	<check_box label="使用されている支払情報を拒否" name="deny_transacted"/>
  174.54 -	<button label="適用" name="apply_btn"/>
  174.55 -	<text name="allow_resident_label">
  174.56 -		許可された住人:
  174.57 -	</text>
  174.58 -	<button label="?" name="allow_resident_help"/>
  174.59  	<button label="追加..." name="add_allowed_avatar_btn"/>
  174.60  	<button label="削除..." name="remove_allowed_avatar_btn"/>
  174.61  	<text name="allow_group_label">
  174.62 -		許可されたグループ:
  174.63 +		グループを常に許可:
  174.64  	</text>
  174.65 -	<button label="?" name="allow_group_help"/>
  174.66 +	<text name="ban_resident_label">
  174.67 +		常に禁止:
  174.68 +	</text>
  174.69  	<button label="追加..." name="add_allowed_group_btn"/>
  174.70  	<button label="削除..." name="remove_allowed_group_btn"/>
  174.71 -	<text name="ban_resident_label">
  174.72 -		禁止された住人:
  174.73 -	</text>
  174.74 -	<button label="?" name="ban_resident_help"/>
  174.75  	<button label="追加..." name="add_banned_avatar_btn"/>
  174.76  	<button label="削除..." name="remove_banned_avatar_btn"/>
  174.77  	<button label="メッセージを不動産に送信..." name="message_estate_btn"/>
   175.1 --- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml	Tue Nov 21 09:46:31 2017 -0800
   175.2 +++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml	Mon Dec 11 10:09:44 2017 -0800
   175.3 @@ -26,6 +26,7 @@
   175.4  		<radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
   175.5  		<radio_item label="輝き (反射)" name="Shininess (specular)" value="2"/>
   175.6  	</radio_group>
   175.7 +	<check_box initial_value="false" label="繰り返しをロックする" name="checkbox_sync_settings" tool_tip="すべてのマップの繰り返しを調整する"/>
   175.8  	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
   175.9  	<text name="label alphamode">
  175.10  		アルファモード
   176.1 --- a/indra/newview/skins/default/xui/ja/role_actions.xml	Tue Nov 21 09:46:31 2017 -0800
   176.2 +++ b/indra/newview/skins/default/xui/ja/role_actions.xml	Mon Dec 11 10:09:44 2017 -0800
   176.3 @@ -38,7 +38,7 @@
   176.4  		<action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」>「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23"/>
   176.5  		<action description="常に「飛行」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が「土地情報」>「オプション」タブでオフになっていても、飛行が可能です。" name="land allow fly" value="24"/>
   176.6  		<action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」>「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25"/>
   176.7 -		<action description="常に「ランドマークを作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にランドマークを作成することができます。その区画が「土地情報」>「オプション」タブでオフになっていても、ランドマークの作成が可能です。" name="land allow landmark" value="26"/>
   176.8 +		<action description="着地点を無視する" longdescription="この能力を持つ役割のメンバーは、。[土地について &gt; オプション] タブで着地点が設定されている場合でもグループ所有の区画に直接テレポートできます。" name="land allow direct teleport" value="26"/>
   176.9  		<action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「世界」メニュー &gt; ランドマーク &gt; 現在地をホームに設定 を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28"/>
  176.10  		<action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41"/>
  176.11  	</action_set>
   177.1 --- a/indra/newview/skins/default/xui/ja/strings.xml	Tue Nov 21 09:46:31 2017 -0800
   177.2 +++ b/indra/newview/skins/default/xui/ja/strings.xml	Mon Dec 11 10:09:44 2017 -0800
   177.3 @@ -262,8 +262,7 @@
   177.4  	</string>
   177.5  	<string name="LoginFailedAccountDisabled">
   177.6  		現在リクエストを完了することができません。
   177.7 -Second Life のサポート(http://secondlife.com/support)にお問い合わせください。
   177.8 -パスワードを変更できない場合には、(866) 476-9763 に電話でお問い合わせください。
   177.9 +Second Life のサポート(http://support.secondlife.com)にお問い合わせください。
  177.10  	</string>
  177.11  	<string name="LoginFailedTransformError">
  177.12  		ログイン時にデータの不一致が見つかりました。
  177.13 @@ -704,6 +703,19 @@
  177.14  	<string name="AssetErrorUnknownStatus">
  177.15  		不明のステータス
  177.16  	</string>
  177.17 +	<string name="AssetUploadServerUnreacheble">
  177.18 +		サービスがご利用いただけません。
  177.19 +	</string>
  177.20 +	<string name="AssetUploadServerDifficulties">
  177.21 +		サーバーに予期せぬ問題が発生しました。
  177.22 +	</string>
  177.23 +	<string name="AssetUploadServerUnavaliable">
  177.24 +		サービスがご利用いただけないか、アップロードがタイムアウトしました。
  177.25 +	</string>
  177.26 +	<string name="AssetUploadRequestInvalid">
  177.27 +		アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート
  177.28 +(http://secondlife.com/support)にお問い合わせください。
  177.29 +	</string>
  177.30  	<string name="texture">
  177.31  		テクスチャ
  177.32  	</string>
  177.33 @@ -2197,10 +2209,19 @@
  177.34  		あなたが [OWNER] のために管理するすべての不動産
  177.35  	</string>
  177.36  	<string name="RegionInfoAllowedResidents">
  177.37 -		許可された住人: ([ALLOWEDAGENTS] 人、最大 [MAXACCESS] 人)
  177.38 +		常に許可:([ALLOWEDAGENTS] 人、最大 [MAXACCESS] 人)
  177.39  	</string>
  177.40  	<string name="RegionInfoAllowedGroups">
  177.41 -		許可されたグループ: ([ALLOWEDGROUPS]、最大 [MAXACCESS] )
  177.42 +		グループを常に許可:([ALLOWEDGROUPS]、最大 [MAXACCESS])
  177.43 +	</string>
  177.44 +	<string name="RegionInfoBannedResidents">
  177.45 +		常に禁止:([BANNEDAGENTS] 人、最大 [MAXBANNED] 人)
  177.46 +	</string>
  177.47 +	<string name="RegionInfoListTypeAllowedAgents">
  177.48 +		常に許可
  177.49 +	</string>
  177.50 +	<string name="RegionInfoListTypeBannedAgents">
  177.51 +		常に禁止
  177.52  	</string>
  177.53  	<string name="ScriptLimitsParcelScriptMemory">
  177.54  		区画スクリプトメモリ
   178.1 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
   178.2 +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
   178.3 @@ -435,13 +435,10 @@
   178.4  			<panel.string name="estate_override">
   178.5  				Uma ou mais destas opções está definida no nível de propriedade.
   178.6  			</panel.string>
   178.7 -			<check_box label="Permitir acesso público (Desmarcar esse item cria limites)" name="public_access"/>
   178.8 -			<text name="Only Allow">
   178.9 -				Permitir acesso apenas para residentes que:
  178.10 -			</text>
  178.11 -			<check_box label="Possuam Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Os residentes devem ter seus dados de pagamento cadastrados para acessar este lote.  Consulte o [SUPPORT_SITE] para saber mais."/>
  178.12 -			<check_box label="Tem 18 anos ou mais [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar este lote. Consulte o [SUPPORT_SITE] para obter mais informações."/>
  178.13 -			<check_box label="Permitir acesso do grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
  178.14 +			<check_box label="Qualquer um pode visitar (Desmarcar esse item criará limites)" name="public_access"/>
  178.15 +			<check_box label="Deve ser maior de 18 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar este lote. Consulte o [SUPPORT_SITE] para obter mais informações."/>
  178.16 +			<check_box label="Deve conter no arquivo as informações de pagamento [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Os residentes devem ter seus dados de pagamento cadastrados para acessar este lote.  Consulte o [SUPPORT_SITE] para saber mais."/>
  178.17 +			<check_box label="Permitir grupo [GROUP] sem restrições" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
  178.18  			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
  178.19  			<combo_box name="pass_combo">
  178.20  				<combo_box.item label="Qualquer um" name="Anyone"/>
  178.21 @@ -449,9 +446,12 @@
  178.22  			</combo_box>
  178.23  			<spinner label="Preço em L$:" name="PriceSpin"/>
  178.24  			<spinner label="Horas de acesso:" name="HoursSpin"/>
  178.25 +			<text name="OwnerLimited">
  178.26 +				(O proprietário do imóvel pode ter limitado estas escolhas)
  178.27 +			</text>
  178.28  			<panel name="Allowed_layout_panel">
  178.29  				<text label="Always Allow" name="AllowedText">
  178.30 -					Residentes permitidos ([COUNT], máx: [MAX])
  178.31 +					Sempre permitido ([COUNT], máx: [MAX])
  178.32  				</text>
  178.33  				<name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/>
  178.34  				<button label="Adicionar" name="add_allowed"/>
  178.35 @@ -459,7 +459,7 @@
  178.36  			</panel>
  178.37  			<panel name="Banned_layout_panel">
  178.38  				<text label="Ban" name="BanCheck">
  178.39 -					Residentes banidos ([COUNT], máx: [MAX])
  178.40 +					Sempre banido ([COUNT], máx: [MAX])
  178.41  				</text>
  178.42  				<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])"/>
  178.43  				<button label="Adicionar" name="add_banned"/>
   179.1 --- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
   179.2 +++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
   179.3 @@ -3,6 +3,9 @@
   179.4  	<floater.string name="not_found">
   179.5  		&apos;[TEXT]&apos; não encontrado
   179.6  	</floater.string>
   179.7 +	<floater.string name="not_found_text">
   179.8 +		Residente não encontrado.
   179.9 +	</floater.string>
  179.10  	<floater.string name="no_one_near">
  179.11  		Ninguém por perto
  179.12  	</floater.string>
   180.1 --- a/indra/newview/skins/default/xui/pt/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
   180.2 +++ b/indra/newview/skins/default/xui/pt/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
   180.3 @@ -7,5 +7,6 @@
   180.4  	<name_list name="render_settings_list">
   180.5  		<name_list.columns label="Nome" name="name"/>
   180.6  		<name_list.columns label="Configuração de renderização" name="setting"/>
   180.7 +		<name_list.columns label="Data adicionada" name="timestamp"/>
   180.8  	</name_list>
   180.9  </floater>
   181.1 --- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
   181.2 +++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
   181.3 @@ -15,6 +15,8 @@
   181.4  	<button label="Tudo" label_selected="Tudo" name="All"/>
   181.5  	<button label="Nenhum" label_selected="Nenhum" name="None"/>
   181.6  	<check_box label="Sempre mostrar as pastas" name="check_show_empty"/>
   181.7 +	<check_box label="Criado por mim" name="check_created_by_me"/>
   181.8 +	<check_box label="Criado por outros" name="check_created_by_others"/>
   181.9  	<check_box label="Desde o Logoff" name="check_since_logoff"/>
  181.10  	<text name="- OR -">
  181.11  		- OU -
   182.1 --- a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
   182.2 +++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
   182.3 @@ -1,5 +1,5 @@
   182.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   182.5 -<floater name="floater_pathfinding_linksets" title="Linksets do pathfinding">
   182.6 +<floater name="floater_pathfinding_linksets" title="REGIÃO OBJETOS">
   182.7  	<floater.string name="messaging_get_inprogress">
   182.8  		Procurando por linksets do pathfinding...
   182.9  	</floater.string>
  182.10 @@ -16,7 +16,7 @@
  182.11  		Nenhum linkset do pathfinding.
  182.12  	</floater.string>
  182.13  	<floater.string name="messaging_complete_available">
  182.14 -		[NUM_SELECTED] linksets selecionados de [NUM_TOTAL].
  182.15 +		[NUM_SELECTED] selecionado de [NUM_TOTAL].
  182.16  	</floater.string>
  182.17  	<floater.string name="messaging_not_enabled">
  182.18  		Esta região não está habilitada para pathfinding.
  182.19 @@ -118,7 +118,7 @@
  182.20  			<scroll_list.columns label="Com script" name="scripted"/>
  182.21  			<scroll_list.columns label="Impacto" name="land_impact"/>
  182.22  			<scroll_list.columns label="Distância" name="dist_from_you"/>
  182.23 -			<scroll_list.columns label="Uso do linkset" name="linkset_use"/>
  182.24 +			<scroll_list.columns label="Uso de pathfinding" name="linkset_use"/>
  182.25  			<scroll_list.columns label="A %" name="a_percent"/>
  182.26  			<scroll_list.columns label="B %" name="b_percent"/>
  182.27  			<scroll_list.columns label="C %" name="c_percent"/>
  182.28 @@ -133,7 +133,7 @@
  182.29  	</panel>
  182.30  	<panel name="pathfinding_linksets_actions">
  182.31  		<text name="linksets_actions_label">
  182.32 -			Ações em linksets selecionados (se um linkset for removido de um mundo, seus atributos podem ser perdidos):
  182.33 +			Ações sobre o selecionado
  182.34  		</text>
  182.35  		<check_box label="Exibir baliza" name="show_beacon"/>
  182.36  		<button label="Pegar" name="take_objects"/>
  182.37 @@ -144,7 +144,7 @@
  182.38  	</panel>
  182.39  	<panel name="pathfinding_linksets_attributes">
  182.40  		<text name="linksets_attributes_label">
  182.41 -			Edite os atributos de linksets selecionados e pressione o botão para aplicar as alterações
  182.42 +			Editar atributos do pathfinding
  182.43  		</text>
  182.44  		<text name="walkability_coefficients_label">
  182.45  			Possibilidade de caminhar:
   183.1 --- a/indra/newview/skins/default/xui/pt/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
   183.2 +++ b/indra/newview/skins/default/xui/pt/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
   183.3 @@ -6,13 +6,16 @@
   183.4  	<floater.string name="loading_url">
   183.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Carregando %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETermos%20de%20Serviço%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
   183.6  	</floater.string>
   183.7 -	<button label="Continuar" label_selected="Continuar" name="Continue"/>
   183.8 -	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
   183.9 -	<check_box label="Concordo com os Termos de Serviço e com a Política de Privacidade" name="agree_chk"/>
  183.10  	<text name="tos_heading">
  183.11 -		Leia com atenção os Termos do Serviço e a Política de Privacidade. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar esses termos.
  183.12 +		Por favor, leia os seguintes Termos e condições, Política de privacidade e Termos de serviço do Second Life, incluindo a exigência do uso da arbitragem e a renúncia de qualquer reivindicação de classe ou grupo para resolver disputas. Para continuar a acessar o [SECOND_LIFE], é preciso aceitar os acordos.
  183.13  	</text>
  183.14  	<text name="external_tos_required">
  183.15  		Antes de continuar, você precisará visitar https://my.secondlife.com e fazer login para aceitar os Termos de Serviço. Obrigado!
  183.16  	</text>
  183.17 +	<check_box label="Li e concordo" name="agree_chk"/>
  183.18 +	<text name="agree_list">
  183.19 +		os Termos e condições, Política de privacidade e Termos de serviço do Second Life, incluindo as exigências para resolver disputas.
  183.20 +	</text>
  183.21 +	<button label="Continuar" label_selected="Continuar" name="Continue"/>
  183.22 +	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
  183.23  </floater>
   184.1 --- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
   184.2 +++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
   184.3 @@ -21,6 +21,7 @@
   184.4  		<menu_item_check label="Padrão" name="RenderNormally"/>
   184.5  		<menu_item_check label="Sempre" name="AlwaysRenderFully"/>
   184.6  		<menu_item_check label="Nunca" name="DoNotRender"/>
   184.7 +		<menu_item_call label="Exceções..." name="RenderExceptions"/>
   184.8  	</context_menu>
   184.9  	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
  184.10  </context_menu>
   185.1 --- a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
   185.2 +++ b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
   185.3 @@ -1,8 +1,14 @@
   185.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   185.5 -<menu name="Avatar Icon Menu">
   185.6 +<toggleable_menu name="Avatar Icon Menu">
   185.7  	<menu_item_call label="Ver perfil" name="Show Profile"/>
   185.8  	<menu_item_call label="Enviar MI..." name="Send IM"/>
   185.9  	<menu_item_call label="Solicitar teletransporte" name="Request Teleport"/>
  185.10  	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
  185.11  	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
  185.12 -</menu>
  185.13 +	<context_menu label="Opções do moderador" name="Moderator Options">
  185.14 +		<menu_item_check label="Permitir bate-papo de texto" name="AllowTextChat"/>
  185.15 +		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
  185.16 +		<menu_item_call label="Desfazer silenciar" name="ModerateVoiceUnMuteSelected"/>
  185.17 +	</context_menu>
  185.18 +	<menu_item_call label="Banir membro" name="BanMember"/>
  185.19 +</toggleable_menu>
   186.1 --- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
   186.2 +++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
   186.3 @@ -20,6 +20,7 @@
   186.4  		<menu_item_check label="Padrão" name="RenderNormally"/>
   186.5  		<menu_item_check label="Sempre" name="AlwaysRenderFully"/>
   186.6  		<menu_item_check label="Nunca" name="DoNotRender"/>
   186.7 +		<menu_item_call label="Exceções..." name="RenderExceptions"/>
   186.8  	</context_menu>
   186.9  	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
  186.10  </context_menu>
   187.1 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   187.2 +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   187.3 @@ -75,10 +75,12 @@
   187.4  	<menu_item_call label="Propriedades" name="Properties"/>
   187.5  	<menu_item_call label="Renomear" name="Rename"/>
   187.6  	<menu_item_call label="Copiar item UUID" name="Copy Asset UUID"/>
   187.7 +	<menu_item_call label="Mostrar no Painel Principal" name="Show in Main Panel"/>
   187.8  	<menu_item_call label="Cortar" name="Cut"/>
   187.9  	<menu_item_call label="Copiar" name="Copy"/>
  187.10  	<menu_item_call label="Colar" name="Paste"/>
  187.11  	<menu_item_call label="Colar como link" name="Paste As Link"/>
  187.12 +	<menu_item_call label="Links trocados" name="Replace Links"/>
  187.13  	<menu_item_call label="Apagar" name="Delete"/>
  187.14  	<menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/>
  187.15  	<menu_item_call label="Pasta conversa em conferência" name="Conference Chat Folder"/>
   188.1 --- a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
   188.2 +++ b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
   188.3 @@ -13,5 +13,6 @@
   188.4  	<menu_item_call label="Compartilhar" name="Share"/>
   188.5  	<menu_item_call label="Encontrar original" name="Find Original"/>
   188.6  	<menu_item_call label="Encontrar todos os links" name="Find All Links"/>
   188.7 +	<menu_item_call label="Links trocados" name="Replace Links"/>
   188.8  	<menu_item_call label="Esvaziar lixeira" name="empty_trash"/>
   188.9  </toggleable_menu>
   189.1 --- a/indra/newview/skins/default/xui/pt/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
   189.2 +++ b/indra/newview/skins/default/xui/pt/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
   189.3 @@ -2,6 +2,7 @@
   189.4  <menu_bar name="Login Menu">
   189.5  	<menu label="Eu" name="File">
   189.6  		<menu_item_call label="Preferências..." name="Preferences..."/>
   189.7 +		<menu_item_call label="Fechar janela" name="Close Window"/>
   189.8  		<menu_item_check label="Exibir seletor da grade" name="Show Grid Picker"/>
   189.9  		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
  189.10  	</menu>
   190.1 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
   190.2 +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
   190.3 @@ -121,7 +121,7 @@
   190.4  			<menu_item_call label="Incluir próxima parte ou face" name="Include Next Part or Face"/>
   190.5  			<menu_item_call label="Incluir parte anterior ou face" name="Include Previous Part or Face"/>
   190.6  		</menu>
   190.7 -		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
   190.8 +		<menu_item_call label="Região Objetos" name="pathfinding_linkset_menu_item"/>
   190.9  		<menu_item_call label="Enfocar seleção" name="Focus on Selection"/>
  190.10  		<menu_item_call label="Ampliar seleção" name="Zoom to Selection"/>
  190.11  		<menu label="Objeto:" name="Object">
  190.12 @@ -141,7 +141,7 @@
  190.13  			<menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/>
  190.14  		</menu>
  190.15  		<menu label="Pathfinding" name="Pathfinding">
  190.16 -			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
  190.17 +			<menu_item_call label="Região Objetos" name="pathfinding_linksets_menu_item"/>
  190.18  			<menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/>
  190.19  			<menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/>
  190.20  			<menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/>
   191.1 --- a/indra/newview/skins/default/xui/pt/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
   191.2 +++ b/indra/newview/skins/default/xui/pt/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
   191.3 @@ -3,6 +3,10 @@
   191.4  	<global name="skipnexttime">
   191.5  		Não exibir isto novamente
   191.6  	</global>
   191.7 +	<global name="skipnexttimesessiononly">
   191.8 +		Não exibir isto novamente 
   191.9 +(para a sessão atual)
  191.10 +	</global>
  191.11  	<global name="alwayschoose">
  191.12  		Sempre escolher esta opção
  191.13  	</global>
  191.14 @@ -342,7 +346,7 @@
  191.15  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Unir-se"/>
  191.16  	</notification>
  191.17  	<notification name="JoinGroupNoCost">
  191.18 -		Você está prestes a entrar no grupo [NAME].
  191.19 +		Você está prestes a entrar no grupo &lt;nolink&gt;[NAME]&lt;/nolink&gt;. 
  191.20  Deseja continuar?
  191.21  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/>
  191.22  	</notification>
  191.23 @@ -356,6 +360,39 @@
  191.24  Convite outros membros dentro de 48 horas.
  191.25  		<usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Criar grupo por L$100"/>
  191.26  	</notification>
  191.27 +	<notification name="JoinGroupInaccessible">
  191.28 +		Este grupo não está acessível para você.
  191.29 +		<usetemplate name="okbutton" yestext="OK"/>
  191.30 +	</notification>
  191.31 +	<notification name="JoinGroupError">
  191.32 +		Erro no processamento da sua solicitação de associação ao grupo.
  191.33 +		<usetemplate name="okbutton" yestext="OK"/>
  191.34 +	</notification>
  191.35 +	<notification name="JoinGroupErrorReason">
  191.36 +		Não foi possível entrar para o grupo: [reason]
  191.37 +		<usetemplate name="okbutton" yestext="OK"/>
  191.38 +	</notification>
  191.39 +	<notification name="JoinGroupTrialUser">
  191.40 +		Lamentamos, usuários com conta experimental não pode entrar em grupos.
  191.41 +		<usetemplate name="okbutton" yestext="OK"/>
  191.42 +	</notification>
  191.43 +	<notification name="JoinGroupMaxGroups">
  191.44 +		Não pode entrar &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: Você já é um membro de [group_count] grupos, o número máximo permitido é de [max_groups]
  191.45 +		<usetemplate name="okbutton" yestext="OK"/>
  191.46 +	</notification>
  191.47 +	<notification name="JoinGroupClosedEnrollment">
  191.48 +		Não pode entrar &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: 
  191.49 +O grupo não está aberto para novas inscrições.
  191.50 +		<usetemplate name="okbutton" yestext="OK"/>
  191.51 +	</notification>
  191.52 +	<notification name="JoinGroupSuccess">
  191.53 +		Você foi adicionado ao grupo
  191.54 +		<usetemplate name="okbutton" yestext="OK"/>
  191.55 +	</notification>
  191.56 +	<notification name="JoinGroupInsufficientFunds">
  191.57 +		Não foi possível transferir a taxa solicitada do plano em L$ [membership_fee].
  191.58 +		<usetemplate name="okbutton" yestext="OK"/>
  191.59 +	</notification>
  191.60  	<notification name="LandBuyPass">
  191.61  		Por L$[COST] você pode ingressar no terreno (&apos;[PARCEL_NAME]&apos;) por [TIME] horas.  Comprar um passe de acesso?
  191.62  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  191.63 @@ -377,9 +414,9 @@
  191.64  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
  191.65  	</notification>
  191.66  	<notification name="ReturnObjectsDeededToGroup">
  191.67 -		Tem certeza de que quer devolver todos os objetos compartilhados com o grupo &apos;[NAME]&apos; neste lote, para o inventário do seu antigo Proprietário?
  191.68 +		Tem certeza de que deseja devolver todos os objetos compartilhados com o grupo &apos;&lt;nolink&gt;[NAME]&lt;/nolink&gt;&apos; neste lote do terreno para o inventário dos seus antigos proprietários? 
  191.69  
  191.70 -*AVISO* Isso irá deletar os objetos não transferíveis doados ao grupo!
  191.71 +*AVISO* Esta ação excluirá todos os objetos não transferíveis doados para o grupo! 
  191.72  
  191.73  Objetos: [N]
  191.74  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Devolver"/>
  191.75 @@ -422,7 +459,7 @@
  191.76  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Desativar"/>
  191.77  	</notification>
  191.78  	<notification name="ReturnObjectsNotOwnedByGroup">
  191.79 -		Retornar os objetos deste lote que NÃO são compartilhados com o grupo [NAME] de volta para seus proprietários?
  191.80 +		Devolver os objetos neste lote do terreno que NÃO foram compartilhados com o grupo &lt;nolink&gt;[NAME]&lt;/nolink&gt; para os seus proprietários? 
  191.81  
  191.82  Objetos: [N]
  191.83  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Devolver"/>
  191.84 @@ -470,7 +507,7 @@
  191.85  		Houve um problema ao carregar a foto da reportagem devido à seguinte razão: [REASON]
  191.86  	</notification>
  191.87  	<notification name="MustAgreeToLogIn">
  191.88 -		Você deve concordar com os Termos de Serviço para continuar a entrar no [SECOND_LIFE].
  191.89 +		Você deve concordar com os Termos e condições, Política de privacidade e Termos de serviço Second Life para continuar a acessar o [SECOND_LIFE].
  191.90  	</notification>
  191.91  	<notification name="CouldNotPutOnOutfit">
  191.92  		Não foi possível vestir o look. A pasta do look não contém roupas, partes do corpo ou acessórios.
  191.93 @@ -719,7 +756,7 @@
  191.94  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ejetar"/>
  191.95  	</notification>
  191.96  	<notification name="EjectAvatarFromGroup">
  191.97 -		Você ejetou [AVATAR_NAME] do grupo [GROUP_NAME]
  191.98 +		Você ejetou [AVATAR_NAME] do grupo &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;
  191.99  	</notification>
 191.100  	<notification name="AcquireErrorTooManyObjects">
 191.101  		Erro de aquisição: Muitos objetos selecionados.
 191.102 @@ -1316,18 +1353,18 @@
 191.103  Por favor, selecione uma área menor e tente novamente.
 191.104  	</notification>
 191.105  	<notification name="DeedLandToGroup">
 191.106 -		No ato da doação deste lote, o grupo deverá ter e manter créditos suficientes para ter o terreno.
 191.107 -O preço de aquisição dos terrenos não é restituído ao proprietário. Se uma parcela doada for vendida, o preço de venda é dividido igualmente entre os membros do grupo.
 191.108 +		Ao transferir este terreno, o grupo precisa ter e manter créditos de uso de terrenos suficiente. 
 191.109 +O preço pago pelo terreno não será reembolsado ao proprietário. Se um terreno doado for vendido, a receita da venda será dividida igualmente entre os membros do grupo. 
 191.110  
 191.111 -Doar [AREA] m² ao grupo &apos;[GROUP_NAME]&apos;?
 191.112 +Doar esta [AREA] m² do terreno para o grupo &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 191.113  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 191.114  	</notification>
 191.115  	<notification name="DeedLandToGroupWithContribution">
 191.116 -		Ao transferir este terreno, o grupo precisa ter e manter créditos de uso de terrenos suficientes.
 191.117 -A doação inclui uma contribuição de terreno ao grupo de parte de &apos;[NAME]&apos;.
 191.118 -O preço pago pelo terreno não será reembolsado ao proprietário. Se um terreno doado for vendido, a receita da venda será dividida igualmente entre os membros do grupo.
 191.119 +		Ao transferir este terreno, o grupo precisa ter e manter créditos de uso de terrenos suficiente. 
 191.120 +A doação inclui uma contribuição de terreno ao grupo de &apos;[NAME]&apos;. 
 191.121 +O preço pago pelo terreno não será reembolsado ao proprietário. Se um terreno doado for vendido, a receita da venda será dividida igualmente entre os membros do grupo. 
 191.122  
 191.123 -Doar este terreno de [AREA] m² para o grupo &apos;[GROUP_NAME]&apos;?
 191.124 +Doar esta [AREA] m² do terreno para o grupo &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 191.125  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 191.126  	</notification>
 191.127  	<notification name="DisplaySetToSafe">
 191.128 @@ -1738,7 +1775,7 @@
 191.129  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sair"/>
 191.130  	</notification>
 191.131  	<notification name="GroupDepart">
 191.132 -		Você deixou o grupo &apos;[group_name]&apos;.
 191.133 +		Você deixou o grupo &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;.
 191.134  	</notification>
 191.135  	<notification name="OwnerCannotLeaveGroup">
 191.136  		Não foi possível deixar o grupo. Você não pode deixar o grupo pois é o último proprietário dele. Primeiramente, atribua outro membro à função de proprietário.
 191.137 @@ -2010,6 +2047,10 @@
 191.138  		Tem certeza de que deseja mudar o Corretor da Propriedade?
 191.139  		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar"/>
 191.140  	</notification>
 191.141 +	<notification name="EstateParcelAccessOverride">
 191.142 +		Ao desselecionar esta opção, você pode remover as restrições que os proprietários dos terrenos adicionaram para evitar problemas, manter a privacidade ou proteger residentes menores de idade contra conteúdo adulto. Por favor, discuta com os seus proprietários de terreno conforme necessário.
 191.143 +		<usetemplate name="okbutton" yestext="OK"/>
 191.144 +	</notification>
 191.145  	<notification name="RegionEntryAccessBlocked">
 191.146  		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 191.147  		<usetemplate name="okbutton" yestext="OK"/>
 191.148 @@ -2350,7 +2391,17 @@
 191.149  	</notification>
 191.150  	<notification name="DeleteItems">
 191.151  		[QUESTION]
 191.152 -		<usetemplate ignoretext="Confirmar antes de excluir" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 191.153 +		<form name="form">
 191.154 +			<ignore name="ignore" text="Confirmar antes de excluir"/>
 191.155 +			<button name="Yes" text="OK"/>
 191.156 +			<button name="No" text="Cancelar"/>
 191.157 +		</form>
 191.158 +	</notification>
 191.159 +	<notification name="DeleteFilteredItems">
 191.160 +		O seu inventário está atualmente filtrado e nem todos os itens que você está para excluir estão atualmente visíveis. 
 191.161 +
 191.162 +Tem certeza de que deseja exclui-los?
 191.163 +		<usetemplate ignoretext="Confirme antes de excluir os itens filtrados" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 191.164  	</notification>
 191.165  	<notification name="ConfirmUnlink">
 191.166  		Essa é uma seleção ampla com linksets. Se você desvinculá-la, pode não ser possível vinculá-la novamente. Como precaução, pode ser interessante fazer cópias dos linksets no seu inventário.
 191.167 @@ -2428,13 +2479,17 @@
 191.168  		A pasta &apos;[FOLDERNAME]&apos; é uma pasta do sistema. Excluir pastas de sistema pode deixar o sistema instável.   Tem certeza de que quer prosseguir?
 191.169  		<usetemplate ignoretext="Confirmar antes de excluir pastas do sistema." name="okcancelignore" notext="Cancelar" yestext="OK"/>
 191.170  	</notification>
 191.171 +	<notification name="PurgeSelectedItems">
 191.172 +		[COUNT] item(ns) será(ão) permanentemente excluído(s) Tem certeza de que deseja excluir permanentemente o(s) item(ns) da sua lixeira?
 191.173 +		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 191.174 +	</notification>
 191.175  	<notification name="ConfirmEmptyTrash">
 191.176 -		Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre?
 191.177 -		<usetemplate ignoretext="Confirmar antes de esvaziar a pasta Lixeira" name="okcancelignore" notext="Não" yestext="Sim"/>
 191.178 +		[COUNT] itens serão excluídos permanentemente. Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre?
 191.179 +		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 191.180  	</notification>
 191.181  	<notification name="TrashIsFull">
 191.182  		Sua lixeira está transbordando. Isso pode causar problemas no logon.
 191.183 -		<usetemplate name="okcancelbuttons" notext="Esvaziarei a lixeira mais tarde" yestext="Esvaziar lixeira agora"/>
 191.184 +		<usetemplate name="okcancelbuttons" notext="Esvaziarei a lixeira mais tarde" yestext="Verifique a pasta lixeira"/>
 191.185  	</notification>
 191.186  	<notification name="ConfirmClearBrowserCache">
 191.187  		Tem certeza de que quer apagar todo o histórico de viagens, web e buscas?
 191.188 @@ -2563,6 +2618,9 @@
 191.189  	<notification name="AddSelfFriend">
 191.190  		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
 191.191  	</notification>
 191.192 +	<notification name="AddSelfRenderExceptions">
 191.193 +		Você não pode adicionar a si mesmo para renderizar a lista de exceções.
 191.194 +	</notification>
 191.195  	<notification name="UploadingAuctionSnapshot">
 191.196  		Fazendo o upload das fotos do site da web e do mundo...
 191.197  (Leva cerca de 5 minutos)
 191.198 @@ -2753,9 +2811,9 @@
 191.199  		Os objetos no lote selecionado, do residente [NAME], foram devolidos ao proprietãrio.
 191.200  	</notification>
 191.201  	<notification name="GroupObjectsReturned">
 191.202 -		Os objetos no lote selecionado de terreno compartilhado pelo grupo [GROUPNAME], voltaram para os inventários de seus donos.
 191.203 -Objetos trasnferíveis dados ao grupo, voltaram aos seus donos anteriores.
 191.204 -Objetos não transferíveis dados ao grupo foram deletados.
 191.205 +		Os objetos no lote selecionado do terreno compartilhado com o grupo &lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt; retornaram para o inventário do proprietário. 
 191.206 +Os objetos transferíveis doados são devolvidos para os seus antigos proprietários. 
 191.207 +Objetos não transferíveis que foram doados para o grupo foram excluídos.
 191.208  	</notification>
 191.209  	<notification name="UnOwnedObjectsReturned">
 191.210  		Os objetos no lote selecionado que NÃO são seus, voltaram aos seus donos.
 191.211 @@ -3140,7 +3198,7 @@
 191.212  		</form>
 191.213  	</notification>
 191.214  	<notification name="ScriptDialogGroup">
 191.215 -		&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]&apos;
 191.216 +		&lt;nolink&gt;[GROUPNAME]&lt;/nolink&gt;&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 191.217  [MESSAGE]
 191.218  		<form name="form">
 191.219  			<button name="Client_Side_Mute" text="Bloquear"/>
 191.220 @@ -3187,8 +3245,8 @@
 191.221  		[NAME] recebeu dinheiro e foi desbloqueado(a) automaticamente.
 191.222  	</notification>
 191.223  	<notification name="VoiceInviteGroup">
 191.224 -		[NAME] atendeu uma ligação de bate-papo de voz com o grupo [GROUP].  
 191.225 -Clique em Aceitar para atender ou em Recusar para recusar este convite.  Clique em Bloquear para bloquear ligações deste avatar.
 191.226 +		[NAME] entrou em um bate-papo de voz com o grupo &lt;nolink&gt;[GROUP]&lt;/nolink&gt;. 
 191.227 +Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique em Bloquear para bloquear ligações deste avatar.
 191.228  		<form name="form">
 191.229  			<button name="Accept" text="Aceitar"/>
 191.230  			<button name="Decline" text="Recusar"/>
 191.231 @@ -3296,6 +3354,9 @@
 191.232  	<notification name="AppearanceToXMLFailed">
 191.233  		Falha ao salvar a aparência como XML.
 191.234  	</notification>
 191.235 +	<notification name="SnapshotToComputerFailed">
 191.236 +		Falha ao salvar fotografia em [PATH]: Disco cheio. [NEED_MEMORY]KB é necessário, mas somente [FREE_MEMORY]KB está livre.
 191.237 +	</notification>
 191.238  	<notification name="PresetNotSaved">
 191.239  		Erro ao salvar predefinição [NAME].
 191.240  	</notification>
 191.241 @@ -3333,9 +3394,14 @@
 191.242  	<notification name="ShareNotification">
 191.243  		Selecione os residentes com quem compartilhar.
 191.244  	</notification>
 191.245 +	<notification name="MeshUploadErrorDetails">
 191.246 +		[LABEL] falhou ao realizar upload: [MESSAGE] 
 191.247 +[DETAILS]Acesse SecondLife.log para detalhes
 191.248 +	</notification>
 191.249  	<notification name="MeshUploadError">
 191.250 -		Falha no envio de [LABEL]: [MESSAGE] [IDENTIFIER]
 191.251 -[DETAILS]Consulte SecondLife.log para obter mais detalhes
 191.252 +		[LABEL] falhou ao realizar upload: [MESSAGE] 
 191.253 +
 191.254 +Acesse SecondLife.log para detalhes
 191.255  	</notification>
 191.256  	<notification name="MeshUploadPermError">
 191.257  		Erro ao solicitar permissões de upload de mesh.
   192.1 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   192.2 +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   192.3 @@ -12,10 +12,17 @@
   192.4  	<text name="ItemcountText">
   192.5  		Itens:
   192.6  	</text>
   192.7 -	<filter_editor label="Filtro" name="inventory search editor"/>
   192.8 +	<filter_editor label="Digite o texto de pesquisa" name="inventory search editor"/>
   192.9 +	<combo_box name="search_type">
  192.10 +		<item label="Nome" name="Name" value="search_by_name"/>
  192.11 +		<item label="Criador" name="Creator" value="search_by_creator"/>
  192.12 +		<item label="Descrição" name="Description" value="search_by_description"/>
  192.13 +		<item label="UUID" name="UUID" value="search_by_UUID"/>
  192.14 +	</combo_box>
  192.15  	<tab_container name="inventory filter tabs">
  192.16  		<inventory_panel label="Todos os itens" name="All Items"/>
  192.17  		<recent_inventory_panel label="Itens recentes" name="Recent Items"/>
  192.18 +		<inventory_panel label="USADO" name="Worn Items"/>
  192.19  	</tab_container>
  192.20  	<layout_stack name="bottom_panel">
  192.21  		<layout_panel name="options_gear_btn_panel">
   193.1 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml	Tue Nov 21 09:46:31 2017 -0800
   193.2 +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml	Mon Dec 11 10:09:44 2017 -0800
   193.3 @@ -6,7 +6,7 @@
   193.4  	<text name="Cache:">
   193.5  		Cache:
   193.6  	</text>
   193.7 -	<spinner label="Cache (256 - 9984 MB)" name="cachesizespinner"/>
   193.8 +	<spinner label="Tamanho do cache (256 - 9984MB)" name="cachesizespinner"/>
   193.9  	<text name="text_box5">
  193.10  		MB
  193.11  	</text>
   194.1 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml	Tue Nov 21 09:46:31 2017 -0800
   194.2 +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml	Mon Dec 11 10:09:44 2017 -0800
   194.3 @@ -1,5 +1,6 @@
   194.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   194.5  <panel label="Chat" name="chat">
   194.6 +	<check_box initial_value="true" label="Auto completar os gestos em um bate-papo local" name="auto_complete_gestures"/>
   194.7  	<panel name="general_chat_settings">
   194.8  		<check_box initial_value="true" label="Executar animação de digitação durante o bate-papo" name="play_typing_animation"/>
   194.9  		<check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/>
   195.1 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml	Tue Nov 21 09:46:31 2017 -0800
   195.2 +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml	Mon Dec 11 10:09:44 2017 -0800
   195.3 @@ -15,54 +15,36 @@
   195.4  	<text name="estate_owner">
   195.5  		(desconhecido)
   195.6  	</text>
   195.7 -	<check_box label="Usar Tempo global" name="use_global_time_check"/>
   195.8 -	<button label="?" name="use_global_time_help"/>
   195.9 -	<check_box label="Sol fixo" name="fixed_sun_check"/>
  195.10 -	<button label="?" name="fixed_sun_help"/>
  195.11 -	<slider label="Fase" name="sun_hour_slider"/>
  195.12 -	<check_box label="Permitir acesso público" name="externally_visible_check"/>
  195.13 -	<button label="?" name="externally_visible_help"/>
  195.14 -	<text name="Only Allow">
  195.15 -		Permitir acesso apenas para residentes que:
  195.16 -	</text>
  195.17 -	<check_box label="Dados de pagamento constam no registro." name="limit_payment" tool_tip="Propriedade de acesso restrito a residentes que já cadastraram seus dados de pagamento  Consulte o [SUPPORT_SITE] para saber mais."/>
  195.18 -	<check_box label="Tem 18 anos ou mais" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar esta propriedade. Consulte o [SUPPORT_SITE] para obter mais informações."/>
  195.19 +	<radio_group name="externally_visible_radio">
  195.20 +		<radio_item label="Permitir somente os residentes e os grupos listados abaixo" name="estate_restricted_access"/>
  195.21 +		<radio_item label="Qualquer um pode visitar" name="estate_public_access"/>
  195.22 +	</radio_group>
  195.23 +	<check_box label="Deve ser maior de 18 anos" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar esta propriedade. Consulte o [SUPPORT_SITE] para obter mais informações."/>
  195.24 +	<check_box label="Deve ter informação de pagamento no arquivo" name="limit_payment" tool_tip="Propriedade de acesso restrito a residentes que já cadastraram seus dados de pagamento  Consulte o [SUPPORT_SITE] para saber mais."/>
  195.25 +	<check_box label="Os proprietários dos lotes podem ser mais restritivos." name="parcel_access_override"/>
  195.26  	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
  195.27 -	<button label="?" name="voice_chat_help"/>
  195.28  	<check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
  195.29 -	<button label="?" name="allow_direct_teleport_help"/>
  195.30 -	<text name="abuse_email_text">
  195.31 -		Endereço de email de Abuso:
  195.32 -	</text>
  195.33 -	<string name="email_unsupported">
  195.34 -		Funcionalidade não suportada
  195.35 -	</string>
  195.36 -	<button label="?" name="abuse_email_address_help"/>
  195.37  	<button label="Aplicar" name="apply_btn"/>
  195.38 -	<button label="Expulsar da propriedade..." name="kick_user_from_estate_btn"/>
  195.39 -	<button label="Enviar mensagem à Propriedade" name="message_estate_btn"/>
  195.40  	<text name="estate_manager_label">
  195.41  		Gerentes da propriedade:
  195.42  	</text>
  195.43 -	<button label="?" name="estate_manager_help"/>
  195.44 +	<text name="allow_resident_label">
  195.45 +		Sempre permitido:
  195.46 +	</text>
  195.47 +	<button label="Adicionar..." name="add_estate_manager_btn"/>
  195.48  	<button label="Remover..." name="remove_estate_manager_btn"/>
  195.49 -	<button label="Adicionar..." name="add_estate_manager_btn"/>
  195.50 -	<text name="allow_resident_label">
  195.51 -		Residentes permitidos:
  195.52 +	<button label="Adicionar..." name="add_allowed_avatar_btn"/>
  195.53 +	<button label="Remover..." name="remove_allowed_avatar_btn"/>
  195.54 +	<text name="allow_group_label">
  195.55 +		Grupos sempre permitidos:
  195.56  	</text>
  195.57 -	<button label="?" name="allow_resident_help"/>
  195.58 -	<button label="Remover..." name="remove_allowed_avatar_btn"/>
  195.59 -	<button label="Adicionar..." name="add_allowed_avatar_btn"/>
  195.60 -	<text name="allow_group_label">
  195.61 -		Grupos permitidos:
  195.62 +	<text name="ban_resident_label">
  195.63 +		Sempre banido:
  195.64  	</text>
  195.65 -	<button label="?" name="allow_group_help"/>
  195.66 +	<button label="Adicionar..." name="add_allowed_group_btn"/>
  195.67  	<button label="Remover..." name="remove_allowed_group_btn"/>
  195.68 -	<button label="Adicionar..." name="add_allowed_group_btn"/>
  195.69 -	<text name="ban_resident_label">
  195.70 -		Residentes banidos:
  195.71 -	</text>
  195.72 -	<button label="?" name="ban_resident_help"/>
  195.73 +	<button label="Adicionar..." name="add_banned_avatar_btn"/>
  195.74  	<button label="Remover..." name="remove_banned_avatar_btn"/>
  195.75 -	<button label="Adicionar..." name="add_banned_avatar_btn"/>
  195.76 +	<button label="Enviar mensagem à Propriedade" name="message_estate_btn"/>
  195.77 +	<button label="Expulsar da propriedade..." name="kick_user_from_estate_btn"/>
  195.78  </panel>
   196.1 --- a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml	Tue Nov 21 09:46:31 2017 -0800
   196.2 +++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml	Mon Dec 11 10:09:44 2017 -0800
   196.3 @@ -26,6 +26,7 @@
   196.4  		<radio_item label="Relevo (normal)" name="Bumpiness (normal)" value="1"/>
   196.5  		<radio_item label="Brilho (especular)" name="Shininess (specular)" value="2"/>
   196.6  	</radio_group>
   196.7 +	<check_box initial_value="false" label="Repetir bloqueio" name="checkbox_sync_settings" tool_tip="Ajustar os mapas repetidos simultaneamente"/>
   196.8  	<texture_picker label="Textura" name="texture control" tool_tip="Selecionar imagem"/>
   196.9  	<text name="label alphamode">
  196.10  		Modo alpha
   197.1 --- a/indra/newview/skins/default/xui/pt/role_actions.xml	Tue Nov 21 09:46:31 2017 -0800
   197.2 +++ b/indra/newview/skins/default/xui/pt/role_actions.xml	Mon Dec 11 10:09:44 2017 -0800
   197.3 @@ -38,7 +38,7 @@
   197.4  		<action description="Sempre permitir &apos;Editar terreno&apos;" longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções." name="land allow edit land" value="23"/>
   197.5  		<action description="Sempre permitir &apos;Voar&apos;" longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções." name="land allow fly" value="24"/>
   197.6  		<action description="Sempre permitir &apos;Criar objetos&apos;" longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções." name="land allow create" value="25"/>
   197.7 -		<action description="Sempre permitir &apos;Criar ponto de referência&apos;" longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções." name="land allow landmark" value="26"/>
   197.8 +		<action description="Ignorar um ponto de aterrissagem" longdescription="O membros com um Cargo com esta Habilidade pode se teleportar direto para um lote de propriedade aberta, mesmo que um ponto de aterrissagem tenha sido definido em Sobre terrenos &gt; guia Opções." name="land allow direct teleport" value="26"/>
   197.9  		<action description="Permitir &apos;Colocar casa aqui&apos; no terreno do grupo" longdescription="Membros exercendo cargos com esta função podem selecionar no menu Mundo &gt; Marcos &gt; Definir como casa em lotes doados ao grupo." name="land allow set home" value="28"/>
  197.10  		<action description="Permitir a &apos;Organização de eventos&apos; que usam terrenos do grupo" longdescription="Membros que exercem cargos com esta função podem usar terrenos do grupo para eventos que estão organizando." name="land allow host event" value="41"/>
  197.11  	</action_set>
   198.1 --- a/indra/newview/skins/default/xui/pt/strings.xml	Tue Nov 21 09:46:31 2017 -0800
   198.2 +++ b/indra/newview/skins/default/xui/pt/strings.xml	Mon Dec 11 10:09:44 2017 -0800
   198.3 @@ -235,7 +235,8 @@
   198.4  		Sua conta não está disponível para acesso até [TIME], horário do Pacífico nos EUA (GMT-08).
   198.5  	</string>
   198.6  	<string name="LoginFailedAccountDisabled">
   198.7 -		Não é possível concluir a solicitação neste momento. Para obter mais ajuda, conte o suporte em http://secondlife.com/support. Caso você não possa mudar sua senha, ligue para (866) 476-9763.
   198.8 +		Não é possível concluir a solicitação neste momento. 
   198.9 +Entre em contato com o suporte do Second Life para obter ajuda em http://support.secondlife.com.
  198.10  	</string>
  198.11  	<string name="LoginFailedTransformError">
  198.12  		Dados discrepantes detectados durante o login.  Contate support@secondlife.com.
  198.13 @@ -653,6 +654,19 @@
  198.14  	<string name="AssetErrorUnknownStatus">
  198.15  		Status desconhecido
  198.16  	</string>
  198.17 +	<string name="AssetUploadServerUnreacheble">
  198.18 +		Serviço não disponível.
  198.19 +	</string>
  198.20 +	<string name="AssetUploadServerDifficulties">
  198.21 +		O servidor está enfrentando dificuldades inesperadas.
  198.22 +	</string>
  198.23 +	<string name="AssetUploadServerUnavaliable">
  198.24 +		Serviço não disponível ou o tempo final para upload foi atingido.
  198.25 +	</string>
  198.26 +	<string name="AssetUploadRequestInvalid">
  198.27 +		Erro na solicitação de upload. Acesso 
  198.28 +http://secondlife.com/support para ajuda ao resolver este problema.
  198.29 +	</string>
  198.30  	<string name="texture">
  198.31  		textura
  198.32  	</string>
  198.33 @@ -2138,10 +2152,19 @@
  198.34  		todas as propriedades que você gerencia para [OWNER]
  198.35  	</string>
  198.36  	<string name="RegionInfoAllowedResidents">
  198.37 -		Residentes autorizados: ([ALLOWEDAGENTS], max [MAXACCESS])
  198.38 +		Sempre permitido: ([ALLOWEDAGENTS], máx [MAXACCESS])
  198.39  	</string>
  198.40  	<string name="RegionInfoAllowedGroups">
  198.41 -		Grupos permitidos: ([ALLOWEDGROUPS], max [MAXACCESS])
  198.42 +		Grupos sempre permitidos: ([ALLOWEDGROUPS], máx [MAXACCESS])
  198.43 +	</string>
  198.44 +	<string name="RegionInfoBannedResidents">
  198.45 +		Grupos banidos: ([BANNEDAGENTS], máx [MAXBANNED])
  198.46 +	</string>
  198.47 +	<string name="RegionInfoListTypeAllowedAgents">
  198.48 +		Sempre permitido
  198.49 +	</string>
  198.50 +	<string name="RegionInfoListTypeBannedAgents">
  198.51 +		Sempre banido
  198.52  	</string>
  198.53  	<string name="ScriptLimitsParcelScriptMemory">
  198.54  		Memória de scripts no lote
   199.1 --- a/indra/newview/skins/default/xui/ru/floater_about_land.xml	Tue Nov 21 09:46:31 2017 -0800
   199.2 +++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml	Mon Dec 11 10:09:44 2017 -0800
   199.3 @@ -430,13 +430,10 @@
   199.4  			<panel.string name="estate_override">
   199.5  				Часть этих параметров установлена на уровне землевладения
   199.6  			</panel.string>
   199.7 -			<check_box label="Разрешить публичный доступ (снятие флажка приведет к созданию линий запрета)" name="public_access"/>
   199.8 -			<text name="Only Allow">
   199.9 -				Разрешить доступ только таким жителям:
  199.10 -			</text>
  199.11 -			<check_box label="Зарегистрирована информация об оплате [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Для доступа к этому участку у жителя должна быть зарегистрирована информация об оплате.  Более подробная информация находится здесь: [SUPPORT_SITE]."/>
  199.12 -			<check_box label="18 лет и старше [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Доступ к этому участку имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
  199.13 -			<check_box label="Разрешить доступ группе: [GROUP]" name="GroupCheck" tool_tip="Группа устанавливается на основной вкладке."/>
  199.14 +			<check_box label="Доступ открыт для всех (При снятия выделения будет создана запись в строке запрета)" name="public_access"/>
  199.15 +			<check_box label="Должен быть 18 и старше [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Доступ к этому участку имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
  199.16 +			<check_box label="Информация о платежах должна быть в файле [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Для доступа к этому участку у жителя должна быть зарегистрирована информация об оплате.  Более подробная информация находится здесь: [SUPPORT_SITE]."/>
  199.17 +			<check_box label="Разрешить группе [GROUP] без всяких ограничений" name="GroupCheck" tool_tip="Группа устанавливается на основной вкладке."/>
  199.18  			<check_box label="Продать доступ:" name="PassCheck" tool_tip="Разрешить временный доступ к участку."/>
  199.19  			<combo_box name="pass_combo">
  199.20  				<combo_box.item label="Все" name="Anyone"/>
  199.21 @@ -444,9 +441,12 @@
  199.22  			</combo_box>
  199.23  			<spinner label="Цена в L$:" name="PriceSpin"/>
  199.24  			<spinner label="Часы доступа:" name="HoursSpin"/>
  199.25 +			<text name="OwnerLimited">
  199.26 +				(Владелец собственности может ограничить этот выбор)
  199.27 +			</text>
  199.28  			<panel name="Allowed_layout_panel">
  199.29  				<text label="Всегда разрешено" name="AllowedText">
  199.30 -					Допущенные жители ([COUNT], макс. [MAX])
  199.31 +					Всегда разрешено ([COUNT], макс. [MAX])
  199.32  				</text>
  199.33  				<name_list name="AccessList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
  199.34  				<button label="Добавить" name="add_allowed"/>
  199.35 @@ -454,7 +454,7 @@
  199.36  			</panel>
  199.37  			<panel name="Banned_layout_panel">
  199.38  				<text label="Бан" name="BanCheck">
  199.39 -					Забаненные жители ([COUNT], макс. [MAX])
  199.40 +					Всегда заблокировано ([COUNT], макс. [MAX])
  199.41  				</text>
  199.42  				<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
  199.43  				<button label="Добавить" name="add_banned"/>
   200.1 --- a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml	Tue Nov 21 09:46:31 2017 -0800
   200.2 +++ b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml	Mon Dec 11 10:09:44 2017 -0800
   200.3 @@ -3,6 +3,9 @@
   200.4  	<floater.string name="not_found">
   200.5  		Текст «[TEXT]» не найден
   200.6  	</floater.string>
   200.7 +	<floater.string name="not_found_text">
   200.8 +		Житель не найден.
   200.9 +	</floater.string>
  200.10  	<floater.string name="no_one_near">
  200.11  		Рядом никого нет
  200.12  	</floater.string>
   201.1 --- a/indra/newview/skins/default/xui/ru/floater_avatar_render_settings.xml	Tue Nov 21 09:46:31 2017 -0800
   201.2 +++ b/indra/newview/skins/default/xui/ru/floater_avatar_render_settings.xml	Mon Dec 11 10:09:44 2017 -0800
   201.3 @@ -7,5 +7,6 @@
   201.4  	<name_list name="render_settings_list">
   201.5  		<name_list.columns label="Имя" name="name"/>
   201.6  		<name_list.columns label="Настройка отрисовки" name="setting"/>
   201.7 +		<name_list.columns label="Дата добавлена" name="timestamp"/>
   201.8  	</name_list>
   201.9  </floater>
   202.1 --- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml	Tue Nov 21 09:46:31 2017 -0800
   202.2 +++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml	Mon Dec 11 10:09:44 2017 -0800
   202.3 @@ -15,6 +15,8 @@
   202.4  	<button label="Все" label_selected="Все" name="All"/>
   202.5  	<button label="Нет" label_selected="Нет" name="None"/>
   202.6  	<check_box label="Всегда показывать папки" name="check_show_empty"/>
   202.7 +	<check_box label="Создано мной" name="check_created_by_me"/>
   202.8 +	<check_box label="Создано другими" name="check_created_by_others"/>
   202.9  	<check_box label="С момента выхода" name="check_since_logoff"/>
  202.10  	<text name="- OR -">
  202.11  		- ИЛИ -
   203.1 --- a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml	Tue Nov 21 09:46:31 2017 -0800
   203.2 +++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml	Mon Dec 11 10:09:44 2017 -0800
   203.3 @@ -1,5 +1,5 @@
   203.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   203.5 -<floater name="floater_pathfinding_linksets" title="Наборы связей для поиска пути">
   203.6 +<floater name="floater_pathfinding_linksets" title="ОБЪЕКТЫ РЕГИОНА">
   203.7  	<floater.string name="messaging_get_inprogress">
   203.8  		Запрос наборов связей для поиска пути...
   203.9  	</floater.string>
  203.10 @@ -16,7 +16,7 @@
  203.11  		Нет наборов связей для поиска пути.
  203.12  	</floater.string>
  203.13  	<floater.string name="messaging_complete_available">
  203.14 -		Выбрано наборов связей: [NUM_SELECTED] из [NUM_TOTAL].
  203.15 +		Выбрано [NUM_SELECTED] из [NUM_TOTAL].
  203.16  	</floater.string>
  203.17  	<floater.string name="messaging_not_enabled">
  203.18  		В этом регионе не разрешен поиск пути.
  203.19 @@ -118,7 +118,7 @@
  203.20  			<scroll_list.columns label="Скриптовые" name="scripted"/>
  203.21  			<scroll_list.columns label="Воздействие" name="land_impact"/>
  203.22  			<scroll_list.columns label="Расстояние" name="dist_from_you"/>
  203.23 -			<scroll_list.columns label="Использование набора связей" name="linkset_use"/>
  203.24 +			<scroll_list.columns label="Использование поиска пути" name="linkset_use"/>
  203.25  			<scroll_list.columns label="A %" name="a_percent"/>
  203.26  			<scroll_list.columns label="B %" name="b_percent"/>
  203.27  			<scroll_list.columns label="C %" name="c_percent"/>
  203.28 @@ -133,7 +133,7 @@
  203.29  	</panel>
  203.30  	<panel name="pathfinding_linksets_actions">
  203.31  		<text name="linksets_actions_label">
  203.32 -			Действия с выбранными наборами связей (если атрибут удаляется из мира, его атрибуты могут быть утрачены):
  203.33 +			Действия с выбранным
  203.34  		</text>
  203.35  		<check_box label="Показать метку" name="show_beacon"/>
  203.36  		<button label="Взять" name="take_objects"/>
  203.37 @@ -144,7 +144,7 @@
  203.38  	</panel>
  203.39  	<panel name="pathfinding_linksets_attributes">
  203.40  		<text name="linksets_attributes_label">
  203.41 -			Измените атрибуты выбранных наборов связей и нажмите кнопку, чтобы применить изменения
  203.42 +			Изменить параметры поиска пути
  203.43  		</text>
  203.44  		<text name="walkability_coefficients_label">
  203.45  			Проходимость:
   204.1 --- a/indra/newview/skins/default/xui/ru/floater_tos.xml	Tue Nov 21 09:46:31 2017 -0800
   204.2 +++ b/indra/newview/skins/default/xui/ru/floater_tos.xml	Mon Dec 11 10:09:44 2017 -0800
   204.3 @@ -6,13 +6,16 @@
   204.4  	<floater.string name="loading_url">
   204.5  		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
   204.6  	</floater.string>
   204.7 -	<button label="Продолжить" label_selected="Продолжить" name="Continue"/>
   204.8 -	<button label="Отмена" label_selected="Отмена" name="Cancel"/>
   204.9 -	<check_box label="Я принимаю условия Пользовательского соглашения и Политики конфиденциальности" name="agree_chk"/>
  204.10  	<text name="tos_heading">
  204.11 -		Внимательно прочитайте Пользовательское соглашение и Политику конфиденциальности. Для входа в [SECOND_LIFE] вы должны согласиться с условиями соглашения.
  204.12 +		Прочитайте условия и положения по конфиденциальности Пользовательского соглашения Second Life, включая порядок разрешения споров и отказ от любого требования класса или группы для разрешения разногласий. Для входа в [SECOND_LIFE] вы должны согласиться с условиями соглашения.
  204.13  	</text>
  204.14  	<text name="external_tos_required">
  204.15  		Для продолжения перейдите на сайт https://my.secondlife.com, войдите и примите Условия обслуживания. Спасибо!
  204.16  	</text>
  204.17 +	<check_box label="Я прочитал и согласен с" name="agree_chk"/>
  204.18 +	<text name="agree_list">
  204.19 +		условия и положения по конфиденциальности Пользовательского соглашения, включая требования по разрешению разногласий.
  204.20 +	</text>
  204.21 +	<button label="Продолжить" label_selected="Продолжить" name="Continue"/>
  204.22 +	<button label="Отмена" label_selected="Отмена" name="Cancel"/>
  204.23  </floater>
   205.1 --- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml	Tue Nov 21 09:46:31 2017 -0800
   205.2 +++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml	Mon Dec 11 10:09:44 2017 -0800
   205.3 @@ -21,6 +21,7 @@
   205.4  		<menu_item_check label="По умолчанию" name="RenderNormally"/>
   205.5  		<menu_item_check label="Всегда" name="AlwaysRenderFully"/>
   205.6  		<menu_item_check label="Никогда" name="DoNotRender"/>
   205.7 +		<menu_item_call label="Исключения..." name="RenderExceptions"/>
   205.8  	</context_menu>
   205.9  	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
  205.10  </context_menu>
   206.1 --- a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml	Tue Nov 21 09:46:31 2017 -0800
   206.2 +++ b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml	Mon Dec 11 10:09:44 2017 -0800
   206.3 @@ -1,8 +1,14 @@
   206.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   206.5 -<menu name="Avatar Icon Menu">
   206.6 +<toggleable_menu name="Avatar Icon Menu">
   206.7  	<menu_item_call label="Открыть профиль" name="Show Profile"/>
   206.8  	<menu_item_call label="Отправить сообщение..." name="Send IM"/>
   206.9  	<menu_item_call label="Запрос телепортации" name="Request Teleport"/>
  206.10  	<menu_item_call label="Добавить в друзья..." name="Add Friend"/>
  206.11  	<menu_item_call label="Удалить из друзей..." name="Remove Friend"/>
  206.12 -</menu>
  206.13 +	<context_menu label="Параметры модератора" name="Moderator Options">
  206.14 +		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
  206.15 +		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
  206.16 +		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
  206.17 +	</context_menu>
  206.18 +	<menu_item_call label="Заблокировать участника" name="BanMember"/>
  206.19 +</toggleable_menu>
   207.1 --- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml	Tue Nov 21 09:46:31 2017 -0800
   207.2 +++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml	Mon Dec 11 10:09:44 2017 -0800
   207.3 @@ -20,6 +20,7 @@
   207.4  		<menu_item_check label="По умолчанию" name="RenderNormally"/>
   207.5  		<menu_item_check label="Всегда" name="AlwaysRenderFully"/>
   207.6  		<menu_item_check label="Никогда" name="DoNotRender"/>
   207.7 +		<menu_item_call label="Исключения..." name="RenderExceptions"/>
   207.8  	</context_menu>
   207.9  	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
  207.10  </context_menu>
   208.1 --- a/indra/newview/skins/default/xui/ru/menu_inventory.xml	Tue Nov 21 09:46:31 2017 -0800
   208.2 +++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml	Mon Dec 11 10:09:44 2017 -0800
   208.3 @@ -75,10 +75,12 @@
   208.4  	<menu_item_call label="Свойства" name="Properties"/>
   208.5  	<menu_item_call label="Переименовать" name="Rename"/>
   208.6  	<menu_item_call label="Копировать UUID актива" name="Copy Asset UUID"/>
   208.7 +	<menu_item_call label="Показать на главной панели" name="Show in Main Panel"/>
   208.8  	<menu_item_call label="Вырезать" name="Cut"/>
   208.9  	<menu_item_call label="Копировать" name="Copy"/>
  208.10  	<menu_item_call label="Вставить" name="Paste"/>
  208.11  	<menu_item_call label="Вставить как ссылку" name="Paste As Link"/>
  208.12 +	<menu_item_call label="Заменить ссылки" name="Replace Links"/>
  208.13  	<menu_item_call label="Удалить" name="Delete"/>
  208.14  	<menu_item_call label="Удалить системную папку" name="Delete System Folder"/>
  208.15  	<menu_item_call label="Начать конференцию" name="Conference Chat Folder"/>
   209.1 --- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml	Tue Nov 21 09:46:31 2017 -0800
   209.2 +++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml	Mon Dec 11 10:09:44 2017 -0800
   209.3 @@ -13,5 +13,6 @@
   209.4  	<menu_item_call label="Поделиться" name="Share"/>
   209.5  	<menu_item_call label="Найти оригинал" name="Find Original"/>
   209.6  	<menu_item_call label="Найти все ссылки" name="Find All Links"/>
   209.7 +	<menu_item_call label="Заменить ссылки" name="Replace Links"/>
   209.8  	<menu_item_call label="Очистить корзину" name="empty_trash"/>
   209.9  </toggleable_menu>
   210.1 --- a/indra/newview/skins/default/xui/ru/menu_login.xml	Tue Nov 21 09:46:31 2017 -0800
   210.2 +++ b/indra/newview/skins/default/xui/ru/menu_login.xml	Mon Dec 11 10:09:44 2017 -0800
   210.3 @@ -2,6 +2,7 @@
   210.4  <menu_bar name="Login Menu">
   210.5  	<menu label="Я" name="File">
   210.6  		<menu_item_call label="Настройки..." name="Preferences..."/>
   210.7 +		<menu_item_call label="Закрыть окно" name="Close Window"/>
   210.8  		<menu_item_check label="Выбор сетки" name="Show Grid Picker"/>
   210.9  		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
  210.10  	</menu>
   211.1 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml	Tue Nov 21 09:46:31 2017 -0800
   211.2 +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml	Mon Dec 11 10:09:44 2017 -0800
   211.3 @@ -119,7 +119,7 @@
   211.4  			<menu_item_call label="Включить следующую часть или лицо" name="Include Next Part or Face"/>
   211.5  			<menu_item_call label="Включить предыдущую часть или лицо" name="Include Previous Part or Face"/>
   211.6  		</menu>
   211.7 -		<menu_item_call label="Наборы связей..." name="pathfinding_linkset_menu_item"/>
   211.8 +		<menu_item_call label="Объекты региона" name="pathfinding_linkset_menu_item"/>
   211.9  		<menu_item_call label="Фокус на выбранном" name="Focus on Selection"/>
  211.10  		<menu_item_call label="Приблизить к выбранному" name="Zoom to Selection"/>
  211.11  		<menu label="Объект" name="Object">
  211.12 @@ -139,7 +139,7 @@
  211.13  			<menu_item_call label="Остановить скрипты" name="Set Scripts to Not Running"/>
  211.14  		</menu>
  211.15  		<menu label="Поиск пути" name="Pathfinding">
  211.16 -			<menu_item_call label="Наборы связей..." name="pathfinding_linksets_menu_item"/>
  211.17 +			<menu_item_call label="Объекты региона" name="pathfinding_linksets_menu_item"/>
  211.18  			<menu_item_call label="Персонажи..." name="pathfinding_characters_menu_item"/>
  211.19  			<menu_item_call label="Просмотр/тестирование..." name="pathfinding_console_menu_item"/>
  211.20  		</menu>
   212.1 --- a/indra/newview/skins/default/xui/ru/notifications.xml	Tue Nov 21 09:46:31 2017 -0800
   212.2 +++ b/indra/newview/skins/default/xui/ru/notifications.xml	Mon Dec 11 10:09:44 2017 -0800
   212.3 @@ -3,6 +3,10 @@
   212.4  	<global name="skipnexttime">
   212.5  		Больше не показывать
   212.6  	</global>
   212.7 +	<global name="skipnexttimesessiononly">
   212.8 +		Больше не показывать 
   212.9 +(в текущей сессии)
  212.10 +	</global>
  212.11  	<global name="alwayschoose">
  212.12  		Всегда выбирать эту опцию
  212.13  	</global>
  212.14 @@ -343,7 +347,7 @@
  212.15  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Вступить"/>
  212.16  	</notification>
  212.17  	<notification name="JoinGroupNoCost">
  212.18 -		Вы вступаете в группу [NAME].
  212.19 +		Вы вступаете в группу &lt;nolink&gt;[NAME]&lt;/nolink&gt;. 
  212.20  Продолжить?
  212.21  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Вступить"/>
  212.22  	</notification>
  212.23 @@ -357,6 +361,39 @@
  212.24  Пригласите участников в ближайшие 48 часов.
  212.25  		<usetemplate canceltext="Отмена" name="okcancelbuttons" notext="Отмена" yestext="Создать группу за L$100"/>
  212.26  	</notification>
  212.27 +	<notification name="JoinGroupInaccessible">
  212.28 +		Вход в эту группу закрыт для вас.
  212.29 +		<usetemplate name="okbutton" yestext="OK"/>
  212.30 +	</notification>
  212.31 +	<notification name="JoinGroupError">
  212.32 +		Ошибка при обработке запроса о членстве в группе.
  212.33 +		<usetemplate name="okbutton" yestext="OK"/>
  212.34 +	</notification>
  212.35 +	<notification name="JoinGroupErrorReason">
  212.36 +		Невозможно войти в группу: [reason]
  212.37 +		<usetemplate name="okbutton" yestext="OK"/>
  212.38 +	</notification>
  212.39 +	<notification name="JoinGroupTrialUser">
  212.40 +		Извините, тестовые пользователи не могут вступить группы.
  212.41 +		<usetemplate name="okbutton" yestext="OK"/>
  212.42 +	</notification>
  212.43 +	<notification name="JoinGroupMaxGroups">
  212.44 +		Вы не можете вступить в &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: Вы уже являетесь [group_count] членом группы, макс. количество членов может быть только [max_groups]
  212.45 +		<usetemplate name="okbutton" yestext="OK"/>
  212.46 +	</notification>
  212.47 +	<notification name="JoinGroupClosedEnrollment">
  212.48 +		Вы не можете вступить в &apos;&lt;nolink&gt;[group_name]&lt;/nolink&gt;&apos;: 
  212.49 +Приём в группу закрыт.
  212.50 +		<usetemplate name="okbutton" yestext="OK"/>
  212.51 +	</notification>
  212.52 +	<notification name="JoinGroupSuccess">
  212.53 +		Вы включены в группу.
  212.54 +		<usetemplate name="okbutton" yestext="OK"/>
  212.55 +	</notification>
  212.56 +	<notification name="JoinGroupInsufficientFunds">
  212.57 +		Невозможно передать необходимой суммы L$ [membership_fee] платы за членство.
  212.58 +		<usetemplate name="okbutton" yestext="OK"/>
  212.59 +	</notification>
  212.60  	<notification name="LandBuyPass">
  212.61  		За L$[COST] вы можете находиться на этой земле («[PARCEL_NAME]») в течение [TIME] часов.  Купить пропуск?
  212.62  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
  212.63 @@ -378,9 +415,9 @@
  212.64  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
  212.65  	</notification>
  212.66  	<notification name="ReturnObjectsDeededToGroup">
  212.67 -		Вы действительно хотите вернуть все объекты, переданные группе «[NAME]» на этом земельном участке, обратно в инвентарь их прежних владельцев?
  212.68 +		Вы действительно хотите вернуть все объекты, находящиеся в совместном пользовании с группой &apos;&lt;nolink&gt;[NAME]&lt;/nolink&gt;&apos; на этом земельном участке, обратно в инвентарь их прежних владельцев? 
  212.69  
  212.70 -*ПРЕДУПРЕЖДЕНИЕ* Все непереносимые объекты, предоставленные этой группе, будут удалены!
  212.71 +*ПРЕДУПРЕЖДЕНИЕ* Все именные объекты, переданные этой группе, будут удалены! 
  212.72  
  212.73  Объекты: [N]
  212.74  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
  212.75 @@ -424,7 +461,7 @@
  212.76  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
  212.77  	</notification>
  212.78  	<notification name="ReturnObjectsNotOwnedByGroup">
  212.79 -		Вернуть все объекты на этом земельном участке, НЕ переданные группе «[NAME]», их владельцам?
  212.80 +		Вернуть объекты на этом земельном участке, которые НЕ находятся в совместном пользовании с группой &lt;nolink&gt;[NAME]&lt;/nolink&gt; их владельцам? 
  212.81  
  212.82  Объекты: [N]
  212.83  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
  212.84 @@ -472,7 +509,7 @@
  212.85  		Ошибка при передаче снимка отчета по следующей причине: [REASON]
  212.86  	</notification>
  212.87  	<notification name="MustAgreeToLogIn">
  212.88 -		Для входа в [SECOND_LIFE] вы должны принять условия Пользовательского соглашения.
  212.89 +		Для входа в [SECOND_LIFE] вы должны принять условия конфиденциальности Пользовательского соглашения Second Life.
  212.90  	</notification>
  212.91  	<notification name="CouldNotPutOnOutfit">
  212.92  		Не удалось надеть костюм.
  212.93 @@ -725,7 +762,7 @@
  212.94  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Выкинуть"/>
  212.95  	</notification>
  212.96  	<notification name="EjectAvatarFromGroup">
  212.97 -		Вы исключили аватар [AVATAR_NAME] из группы [GROUP_NAME]
  212.98 +		Вы исключили аватар [AVATAR_NAME] из группы &lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;
  212.99  	</notification>
 212.100  	<notification name="AcquireErrorTooManyObjects">
 212.101  		ОШИБКА ПРИОБРЕТЕНИЯ: выбрано слишком много объектов.
 212.102 @@ -1323,18 +1360,18 @@
 212.103  Выберите меньшую область и повторите попытку.
 212.104  	</notification>
 212.105  	<notification name="DeedLandToGroup">
 212.106 -		После передачи этого участка группе потребуется достаточное количество финансов для поддержки данной земли.
 212.107 -Стоимость покупки земли не возвращается владельцу. Если переданный участок продается, выручка за нее равномерно распределяется между участниками группы.
 212.108 +		После передачи этого участка группе потребуется достаточное количество финансов для владения и ухода за этой землей. 
 212.109 +Сумма покупки земли не возмещается владельцу. При продаже переданного участка её вырученная сумма равномерно распределяется между участниками группы. 
 212.110  
 212.111 -Передать эти [AREA] м² земли группе «[GROUP_NAME]»?
 212.112 +Передать эти [AREA] м² земли группе &apos;&lt;nolink&gt;[GROUP_NAME]&lt;/nolink&gt;&apos;?
 212.113  		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 212.114  	</notification>
 212.115  	<notification name="DeedLandToGroupWithContribution">
 212.116 -		После передачи этого участка группе потребуется достаточное количество финансов для поддержки данной земли.
 212.117 -Передача будет включать одновременный земельный взнос в группу от жителя «[NAME]».
 212.118 -Стоимость покупки земли не возвращается владельцу. Если переданный участок продается, выручка за нее равномерно распределяется между участниками группы.
 212.119 +		После передачи этого участка группе потребуется достаточное количество финансов для